From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] u-boot: add OrangePi Zero Plus (Allwinner H5)
Date: Sun, 27 Feb 2022 08:59:10 +0000
Message-ID: <20220227085910.3791265-1-arne_f@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3132139480180253132=="
List-Id: <development.lists.ipfire.org>

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

this u-boot should also work with NanoPi R1S H5

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 config/rootfiles/common/aarch64/u-boot |  2 ++
 lfs/u-boot                             | 17 +++++++++++++++--
 make.sh                                |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

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/lfs/u-boot b/lfs/u-boot
index b68cd6faf..2018a8a5f 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
=20
+	# 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=3Dsun50i_a64 DEB=
UG=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_zero_plus
+	cd $(DIR_APP) && make CROSS_COMPILE=3D"" orangepi_zero_plus_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=3D.*!CONFIG_IDENT_STRING=
=3D"  OrangePi Zero+  - 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_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/gener=
ate-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=3Drk3328 ARCH=3D=
aarch64 DEBUG=3D0 bl31
@@ -212,7 +226,6 @@ else
 	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=3D.*!CONFIG_IDENT_STRING=
=3D" Nanopi R4S - IPFire.org"!' .config
 	cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=3D.*!CONFIG_BOOTCOMMAND=
=3D"console=3DttyS2,115200n8;run distro_bootcmd"!' .config
 	cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=3D.*!CONFIG_BAUDRATE=3D11520=
0!' .config
-#	cd $(DIR_APP) && sed -i -e 's!.*CONFIG_MISC_INIT_R.*!CONFIG_MISC_INIT_R=3D=
y!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE=3D"" HOSTCC=3D"gcc $(CFLAGS)"
 	cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \
 		/usr/share/u-boot/nanopi_r4s/u-boot-rockchip.bin
diff --git a/make.sh b/make.sh
index 79798834a..6e84d8d1b 100755
--- a/make.sh
+++ b/make.sh
@@ -1181,6 +1181,7 @@ buildipfire() {
   # multi kernel builds so KCFG is empty
   lfsmake2 linux		KCFG=3D""
   lfsmake2 rtl8189es		KCFG=3D""
+  lfsmake2 rtl8189fs		KCFG=3D""
   lfsmake2 rtl8812au		KCFG=3D""
   lfsmake2 rtl8822bu		KCFG=3D""
   lfsmake2 xradio		KCFG=3D""
--=20
2.25.1


--===============3132139480180253132==--