diff --git a/config/boot-roseapple.cmd b/config/boot-roseapple.cmd index 6514b409c4..9f39dc2ac1 100644 --- a/config/boot-roseapple.cmd +++ b/config/boot-roseapple.cmd @@ -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 \ No newline at end of file +# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr diff --git a/config/sources/s500.conf b/config/sources/s500.conf index ab28094d69..c6e96037c0 100644 --- a/config/sources/s500.conf +++ b/config/sources/s500.conf @@ -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 } diff --git a/scripts/armhwinfo b/scripts/armhwinfo index 395fc26488..119f4ca926 100644 --- a/scripts/armhwinfo +++ b/scripts/armhwinfo @@ -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"