Merge pull request #305 from vonfritz/WIP/actions

Some small fixes
This commit is contained in:
Igor Pečovnik 2016-05-16 21:48:06 +02:00
commit 310c16933c
3 changed files with 4 additions and 3 deletions

View File

@ -1,6 +1,6 @@
setenv fdt_high "0xffffffff"
setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=/dev/mmcblk0p2 rw console=ttyS0,115200 rootfstype=ext4 loglevel=1 rootwait"
setenv bootargs "earlyprintk clk_ignore_unused selinux=0 scandelay root=/dev/mmcblk0p2 rw console=tty1 rootfstype=ext4 loglevel=1 rootwait"
fatload mmc 0:1 0x04000000 dtb/actduino_bubble_gum_sdboot_linux.dtb
fatload mmc 0:1 0x00008000 zImage
bootz 0x00008000 - 0x04000000
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

View File

@ -35,4 +35,5 @@ family_tweaks()
{
printf "blacklist wlan_8723bs_vq0\nblacklist ctp_gslX680\nblacklist ctp_gsl3680\n" > $CACHEDIR/sdcard/etc/modprobe.d/blacklist-guitar.conf
printf "blacklist gsensor_mir3da\nblacklist gsensor_stk8313\nblacklist gsensor_bma222\nblacklist lightsensor_ltr301\n" >> $CACHEDIR/sdcard/etc/modprobe.d/blacklist-guitar.conf
gzip < $SRC/lib/bin/armbian-u-boot.bmp > $CACHEDIR/sdcard/boot/boot_logo.bmp.gz
}

View File

@ -64,7 +64,7 @@ detect_board() {
ID="Clearfog"
fi
if [ $HARDWARE = "gs705a" ]; then
if [ $MEMTOTAL == 2004 ]; then
if [ $MEMTOTAL -gt 1800 ]; then
ID="Roseapple Pi"
else
ID="Guitar"