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, master has been updated via 6b10e08aec961c14732271b17a03db1ba43c3f9e (commit) via 4c5aba14f273c8ce1879518a52fd8dee0b13ae28 (commit) from 24e7c426de292e00fb482e1db2b8eb77e82a45ee (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 6b10e08aec961c14732271b17a03db1ba43c3f9e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 16 16:01:50 2022 +0000

core165: Ship u-boot

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 4c5aba14f273c8ce1879518a52fd8dee0b13ae28 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Feb 27 09:07:39 2022 +0000

u-boot: add OrangePi Zero Plus (Allwinner H5)

this u-boot should also work with NanoPi R1S H5

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/rootfiles/common/aarch64/u-boot | 2 ++ .../{oldcore/159 => core/165}/filelists/aarch64/u-boot | 0 lfs/u-boot | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/159 => core/165}/filelists/aarch64/u-boot (100%)

Difference in files: diff --git a/config/rootfiles/common/aarch64/u-boot b/config/rootfiles/common/aarch64/u-boot index ab22769e3..2b60c7802 100644 --- a/config/rootfiles/common/aarch64/u-boot +++ b/config/rootfiles/common/aarch64/u-boot @@ -10,6 +10,8 @@ boot/uboot.env usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin #usr/share/u-boot/nanopi_r4s usr/share/u-boot/nanopi_r4s/u-boot-rockchip.bin +#usr/share/u-boot/orangepi_zero_plus +usr/share/u-boot/orangepi_zero_plus/u-boot-sunxi-with-spl.bin #usr/share/u-boot/rpi usr/share/u-boot/rpi/u-boot-rpi3.bin usr/share/u-boot/rpi/u-boot-rpi4.bin diff --git a/config/rootfiles/core/165/filelists/aarch64/u-boot b/config/rootfiles/core/165/filelists/aarch64/u-boot new file mode 120000 index 000000000..2a16bdbfe --- /dev/null +++ b/config/rootfiles/core/165/filelists/aarch64/u-boot @@ -0,0 +1 @@ +../../../../common/aarch64/u-boot \ No newline at end of file diff --git a/lfs/u-boot b/lfs/u-boot index d081061fa..019927f1f 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -186,8 +186,22 @@ else cd $(DIR_APP) && install u-boot.bin /boot/u-boot-rpi4.bin cd $(DIR_APP) && make distclean

+ # OrangePi Zero Plus + cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) + cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz + cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=sun50i_a64 DEBUG=0 bl31 + cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/sun50i_a64/release/bl31.bin bl31.bin + cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) + -mkdir -pv /usr/share/u-boot/orangepi_zero_plus + cd $(DIR_APP) && make CROSS_COMPILE="" orangepi_zero_plus_config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi Zero+ - IPFire.org"!' .config + cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" + cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \ + /usr/share/u-boot/orangepi_zero_plus + cd $(DIR_APP) && make distclean + cd $(DIR_APP) && rm -f bl31.bin + # Nanopi R2S -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rockchip/generate-2-ethaddr.diff cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 @@ -212,7 +226,6 @@ else cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Nanopi R4S - IPFire.org"!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200!' .config -# cd $(DIR_APP) && sed -i -e 's!.*CONFIG_MISC_INIT_R.*!CONFIG_MISC_INIT_R=y!' .config cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ /usr/share/u-boot/nanopi_r4s/u-boot-rockchip.bin

hooks/post-receive -- IPFire 2.x development tree