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 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9 (commit) from 1eef496d47de2136929254b491f9b60fe6f8d5fc (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 91b4ba6d6e3add4d29cfb85109dd6b739d3450c9 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Feb 21 09:26:36 2020 +0100

u-boot: split rpi aarch64 quirk into parts

on of the changed variables was used before the old quirk.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/u-boot/boot.cmd | 13 ++++++++++--- config/u-boot/boot.scr | Bin 2736 -> 2915 bytes 2 files changed, 10 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index b2fe0684f..3517fe946 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -15,7 +15,7 @@ if test ${cpu} = "armv8"; then echo ; else setenv kernel_type -multi; - fi; +fi;

# Import uEnv txt... if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then @@ -34,6 +34,14 @@ if test "${board}" = "sunxi"; then setenv fdtfile ${DTBSUNXI}; fi;

+# Quirk for RPi on aarch64 becuase u-boot cannot use the +# initrd on aarch64 and without ramdisk no UUID +if test ${cpu} = "armv8"; then + if test ${board} = "rpi"; then + setenv root_dev /dev/mmcblk0p3; + fi; +fi; + # Check if serial console is enabled if test "${SERIAL-CONSOLE}" = "ON"; then if test ${console} = ""; then @@ -93,8 +101,7 @@ fi; # initrd on aarch64 if test ${cpu} = "armv8"; then if test ${board} = "rpi"; then - setenv ramdisk_addr -; - setenv root_dev /dev/mmcblk0p3; + setenv ramdisk_addr -; fi; fi;

diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index d7b604849..7fde534e3 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