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 d76e142f7c4a43f2ab851671f813e3df6d6a2576 (commit) via b1217522771c466eaff0ea859499bef70396c403 (commit) via 498ea59524c410d6e7dea9c4f923e18947be587b (commit) via 706d825587bd152366973c163dde085e937540f5 (commit) via 7d5a7fea48ca883f19ad604a7a51820671de82a0 (commit) from 0664b1720d2d32f01ad9b9126450e35aa4d357df (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 d76e142f7c4a43f2ab851671f813e3df6d6a2576 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Jun 27 07:34:16 2022 +0000

Revert "U-Boot: Update to 2022.04"

Arne reported that this introduced regressions on some NanoPi models.

This reverts commit b8a9c9e70a0ff84401e53f1481f3c1eafab76a29.

commit b1217522771c466eaff0ea859499bef70396c403 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Jun 27 07:34:10 2022 +0000

Revert "Core Update 169: Ship U-Boot"

This reverts commit 65264b3ba6358d78d70c2cc7b9e1c883b0b4af4a.

commit 498ea59524c410d6e7dea9c4f923e18947be587b Author: Peter Müller peter.mueller@ipfire.org Date: Mon Jun 27 07:33:59 2022 +0000

Revert "u-boot: Clarify source URLs and add missing rk3399 firmware"

This reverts commit be5703ef78b6244dcf06b72e6f34ab72b2e7fc55.

commit 706d825587bd152366973c163dde085e937540f5 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Jun 27 07:33:48 2022 +0000

Revert "u-boot: .xz != .gz"

This reverts commit 01b3a62a35a38db9d67121e66f983c0e0a38ca46.

commit 7d5a7fea48ca883f19ad604a7a51820671de82a0 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Jun 27 07:33:40 2022 +0000

Revert "u-boot: Sigh, fix another .xz != .gz"

This reverts commit 480202725b872018667ce0cdc337c25c94cef72b.

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

Summary of changes: config/rootfiles/core/169/filelists/aarch64/u-boot | 1 - config/rootfiles/core/169/filelists/armv6l/u-boot | 1 - lfs/u-boot | 19 ++++++++----------- 3 files changed, 8 insertions(+), 13 deletions(-) delete mode 120000 config/rootfiles/core/169/filelists/aarch64/u-boot delete mode 120000 config/rootfiles/core/169/filelists/armv6l/u-boot

Difference in files: diff --git a/config/rootfiles/core/169/filelists/aarch64/u-boot b/config/rootfiles/core/169/filelists/aarch64/u-boot deleted file mode 120000 index 2a16bdbfe..000000000 --- a/config/rootfiles/core/169/filelists/aarch64/u-boot +++ /dev/null @@ -1 +0,0 @@ -../../../../common/aarch64/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/169/filelists/armv6l/u-boot b/config/rootfiles/core/169/filelists/armv6l/u-boot deleted file mode 120000 index e88d95fac..000000000 --- a/config/rootfiles/core/169/filelists/armv6l/u-boot +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv6l/u-boot \ No newline at end of file diff --git a/lfs/u-boot b/lfs/u-boot index 7b1ad4a0a..f7341675d 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -24,7 +24,7 @@

include Config

-VER = 2022.04 +VER = 2021.07

THISAPP = u-boot-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -35,24 +35,21 @@ SUP_ARCH = armv6l aarch64

CFLAGS := $(patsubst -fstack-protector-strong,,$(CFLAGS))

-ATF_VER = 2.7 +ATF_VER = 2.6

############################################################################### # Top-level Rules ###############################################################################

-objects = $(DL_FILE) arm-trusted-firmware-$(ATF_VER).tar.gz arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.gz +objects = $(DL_FILE) arm-trusted-firmware-$(ATF_VER).tar.gz arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.xz

$(DL_FILE) = $(DL_FROM)/$(DL_FILE) arm-trusted-firmware-$(ATF_VER).tar.gz = $(DL_FROM)/arm-trusted-firmware-$(ATF_VER).tar.gz -arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.gz = $(DL_FROM)/arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.gz +arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.xz = $(DL_FROM)/arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.xz

-# Downloaded from https://ftp.denx.de/pub/u-boot/ -$(DL_FILE)_BLAKE2 = 5d2035130c0631f8f1b7f7963bedf71578a66994e3950eb103a404a08e85686cd971ba51e8172093ccb75d975101024bf2a94d4064763ad57ad8950c11092319 -# Downloaded from https://github.com/ARM-software/arm-trusted-firmware/tags -arm-trusted-firmware-$(ATF_VER).tar.gz_BLAKE2 = 4fc4d5646e272200d40081902e17f0be32956f451622f011a0d568c8cf26e15ab165fe16a69cf222241f7ba1d443add562d6d382277eb4fb2b49c3918cabdbad -# Downloaded from https://github.com/skiffos/rk3399-firmware-blobs/tags -arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.gz_BLAKE2 = d6441f38f5795b1c7d4e15fe9b2fec3632490283d1e8f0a0ce53b7456413e9f455c78f4071f73f664c16813dba97897941d40ef3037a9f60302de158b7f3cd41 +$(DL_FILE)_BLAKE2 = 1a209a604e0f30264781a14ca855bbb777e8f1c031de60d28de397084fc9bfc4a3771ad00ec22f5cdcfa721f22707a533b9b59004ac0b107df927f23dc5ab0a6 +arm-trusted-firmware-$(ATF_VER).tar.gz_BLAKE2 = 1d0caff9ea6d97276d1377483e3f81901c935f9af784b7a735636c75b00106935a7e301c21ecec7b9fd9a97dcf873ac1b12169bf7211dae3d975b78d379eba74 +arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.xz_BLAKE2 = bc5245c1af911eb8ce8def743339102bb46d6aa854fbe916584775479dc97c9a9176c1d1615afc7ede496c7ca9da78db52d9c2eaf1290a4d06e53dbb1933e658

install : $(TARGET)

@@ -223,7 +220,7 @@ else

# Nanopi R4S # arm trusted firmware for rk3399 cannot build without cortex m0 gcc crosscompiler - cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.gz + cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER)-rk3399-binary.tar.xz -mkdir -pv /usr/share/u-boot/nanopi_r4s cd $(DIR_APP) && make CROSS_COMPILE="" nanopi-r4s-rk3399_config cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Nanopi R4S - IPFire.org"!' .config

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