From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 2e1528a90095ad8f0421d631f75844a7ad26e04c
Date: Sun, 05 Jan 2025 14:15:54 +0000
Message-ID: <4YQzqt6pcgz2xtH@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3690657432931666665=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3690657432931666665==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  2e1528a90095ad8f0421d631f75844a7ad26e04c (commit)
      from  15667b3394ff07a9970f0c7ea76f27f08b5d1323 (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 2e1528a90095ad8f0421d631f75844a7ad26e04c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 5 14:14:19 2025 +0000

    u-boot: add support for OrangePi PC 2
   =20
    this board can also boot with the OrangePi Zero+ u-boot
    but then it not support video out.
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/u-boot/boot.cmd |  6 +++++-
 config/u-boot/uEnv.txt |  1 -
 lfs/u-boot             | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index dc634ca98..929d30862 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -41,7 +41,11 @@ fi;
=20
 # for compatiblity reasons set DTBSUNXI if we run on sunxi
 if test "${board}" =3D "sunxi"; then
-	setenv fdtfile ${DTBSUNXI};
+	if test ${DTBSUNXI} =3D ""; then
+		echo ...;
+	else
+		setenv fdtfile ${DTBSUNXI};
+	fi;
 fi;
=20
 # Check if serial console is enabled
diff --git a/config/u-boot/uEnv.txt b/config/u-boot/uEnv.txt
index 21780a971..e4d40d1b1 100644
--- a/config/u-boot/uEnv.txt
+++ b/config/u-boot/uEnv.txt
@@ -1,4 +1,3 @@
 KVER=3DxxxKVERxxx
-DTBSUNXI=3Dsun8i-h3-nanopi-r1.dtb
 root_dev=3DUUID=3DxxxROOT-UUIDxxx
 SERIAL-CONSOLE=3DON
diff --git a/lfs/u-boot b/lfs/u-boot
index d686917b2..d92ab3012 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -127,6 +127,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make distclean
 	cd $(DIR_APP) && rm -f bl31.bin
=20
+	# OrangePi PC 2
+	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=3Dsun50i_a64 ARC=
H=3Daarch64 CROSS_COMPILE=3D"aarch64-pc-linux-gnu-" DEBUG=3D0 bl31
+	cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/sun50i_a64/releas=
e/bl31.bin bl31.bin
+	cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
+	-mkdir -pv /usr/share/u-boot/orangepi_pc2
+	cd $(DIR_APP) && make CROSS_COMPILE=3D"" orangepi_pc2_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=3D.*!CONFIG_IDENT_STRING=
=3D"  OrangePi PC2 - IPFire.org"!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE=3D"" HOSTCC=3D"gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \
+		/usr/share/u-boot/orangepi_pc2
+	cd $(DIR_APP) && make distclean
+	cd $(DIR_APP) && rm -f bl31.bin
+
+
 	# distrobootcmd support was removed for rockchip boards. Revert.
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/u-boot-2024.10-=
revert_rockchip_distro_bootcmd_removal.patch
=20


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

--===============3690657432931666665==--