From 3a0f93f122fa03d04e427c350ab7c11cf57c3c1a Mon Sep 17 00:00:00 2001 From: Thomas Kaiser Date: Wed, 24 Feb 2016 13:05:37 +0100 Subject: [PATCH] Use one boot.cmd for all sunxi boards again and differentiate inside boards.sh unless we got display stuff for sun8i fixed and can use normal disp_init --- boards.sh | 2 +- config/boot.cmd | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/boards.sh b/boards.sh index d24961cdbf..be1eccdf6f 100644 --- a/boards.sh +++ b/boards.sh @@ -131,7 +131,7 @@ install_board_specific (){ else cp $SRC/lib/config/boot.cmd $DEST/cache/sdcard/boot/boot.cmd # orangepi h3 temp exceptions - [[ $LINUXFAMILY == "sun8i" ]] && sed -i '1s/^/gpio set PA15\nsetenv machid 1029\nsetenv bootm_boot_mode sec\n/' $DEST/cache/sdcard/boot/boot.cmd + [[ $LINUXFAMILY == "sun8i" ]] && sed -i -e '1s/^/gpio set PA15\nsetenv machid 1029\nsetenv bootm_boot_mode sec\n/' -e 's/\ disp.screen0_output_mode=1920x1080p60//' $DEST/cache/sdcard/boot/boot.cmd [[ $BOARD == orangepiplus ]] && sed -i '/^gpio set PA15/a gpio set PG11' $DEST/cache/sdcard/boot/boot.cmd # let's prepare for old kernel too chroot $DEST/cache/sdcard /bin/bash -c \ diff --git a/config/boot.cmd b/config/boot.cmd index b79de59c5a..5057522640 100644 --- a/config/boot.cmd +++ b/config/boot.cmd @@ -1,5 +1,4 @@ -# disp.screen0_output_mode=1920x1080p60 to set video mode -setenv bootargs "console=tty1 root=/dev/mmcblk0p1 rootwait rootfstype=ext4 cgroup-enable=memory swapaccount=1 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 hdmi.audio=EDID:0 panic=10 consoleblank=0 enforcing=0 loglevel=1" +setenv bootargs "console=tty1 root=/dev/mmcblk0p1 rootwait rootfstype=ext4 cgroup-enable=memory swapaccount=1 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 hdmi.audio=EDID:0 disp.screen0_output_mode=1920x1080p60 panic=10 consoleblank=0 enforcing=0 loglevel=1" #-------------------------------------------------------------------------------------------------------------------------------- # Boot loader script to boot with different boot methods for old and new kernel #--------------------------------------------------------------------------------------------------------------------------------