From 0270ef1f01d33f1e8011d8aa267d31f589a8a4a5 Mon Sep 17 00:00:00 2001 From: Marco Franceschetti Date: Fri, 13 May 2016 13:54:30 +0200 Subject: [PATCH 1/3] armhwinfo: roseapple: dont't use the exact value --- scripts/armhwinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 4df345b0606cf79e9e3a05bb1a8a1aee25ad2d37 Mon Sep 17 00:00:00 2001 From: Marco Franceschetti Date: Fri, 13 May 2016 23:40:05 +0200 Subject: [PATCH 2/3] S500: u-boot: use armbian logo --- config/sources/s500.conf | 1 + 1 file changed, 1 insertion(+) 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 } From c5a4653f4180a921f3e82e76bd2f03da5e9824a6 Mon Sep 17 00:00:00 2001 From: Marco Franceschetti Date: Sat, 14 May 2016 21:53:37 +0200 Subject: [PATCH 3/3] roseapple: boot.cmd: set console --- config/boot-roseapple.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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