This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via a62be8a2d9fecc59a7592f1a8347b0087148a896 (commit) via 777ba8192ccda88d0fb66cb42b28ec2fd209db87 (commit) from 8569b3e11be974db7d11da779ce8c66b4dadfa81 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit a62be8a2d9fecc59a7592f1a8347b0087148a896 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Feb 20 12:24:36 2020 +0100
u-boot: add quirk for rpi on aarch64
the current rpi u-boot will not load the ramdisk correctly so the kernel will crash with loaded ramdisk. Remove ramdisk and replace root UUID by /dev/mmcblk0p3 if boot was on armv8 and rpi.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 777ba8192ccda88d0fb66cb42b28ec2fd209db87 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Feb 20 12:21:28 2020 +0100
u-boot: remove kirkwood kernel detection from bootscript
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/u-boot/boot.cmd | 22 ++++++++++++++-------- config/u-boot/boot.scr | Bin 2607 -> 2736 bytes 2 files changed, 14 insertions(+), 8 deletions(-)
Difference in files: diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index b86b6809a..b2fe0684f 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -11,15 +11,11 @@ if test ${boot_part} = ""; then setenv boot_part ${dev_num}:1; fi;
-if test ${soc} = "kirkwood"; then - setenv kernel_type -kirkwood; +if test ${cpu} = "armv8"; then + echo ; else - if test ${cpu} = "armv8"; then - echo ; - else - setenv kernel_type -multi; + setenv kernel_type -multi; fi; -fi;
# Import uEnv txt... if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then @@ -91,7 +87,17 @@ if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel else echo Ramdisk not loaded...; setenv ramdisk_addr -; -fi ; +fi; + +# Quirk for RPi on aarch64 becuase u-boot cannot use the +# initrd on aarch64 +if test ${cpu} = "armv8"; then + if test ${board} = "rpi"; then + setenv ramdisk_addr -; + setenv root_dev /dev/mmcblk0p3; + fi; +fi; + bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}; booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index b3c6bc2c8..d7b604849 100644 Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
hooks/post-receive -- IPFire 2.x development tree