From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 10 Jun 2021 13:06:05 +0000 (+0000)
Subject: u-boot: update to 2021.04
X-Git-Tag: v2.27-core159~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=184cbf9b2a5655f96d46db055bd121f23f87747b;p=ipfire-2.x.git

u-boot: update to 2021.04

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

diff --git a/config/rootfiles/common/aarch64/u-boot b/config/rootfiles/common/aarch64/u-boot
index 4a4d9088e7..5b2d5cf09d 100644
--- a/config/rootfiles/common/aarch64/u-boot
+++ b/config/rootfiles/common/aarch64/u-boot
@@ -1,9 +1,11 @@
 boot/boot.cmd
 boot/boot.mk
 boot/boot.scr
-boot/kernel8.img
 boot/uEnv.txt
 boot/uboot.env
+boot/u-boot-rpi3.bin
+boot/u-boot-rpi4.bin
 #usr/share/u-boot
-#usr/share/u-boot/rpi3
-usr/share/u-boot/rpi3/kernel8.img
+#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/common/armv5tel/u-boot b/config/rootfiles/common/armv5tel/u-boot
index f44d03c6c4..09ac00348d 100644
--- a/config/rootfiles/common/armv5tel/u-boot
+++ b/config/rootfiles/common/armv5tel/u-boot
@@ -2,9 +2,9 @@ boot/MLO
 boot/boot.cmd
 boot/boot.mk
 boot/boot.scr
-boot/kernel.img
-boot/kernel7.img
-boot/kernel8-32.img
+boot/u-boot-rpi1.bin
+boot/u-boot-rpi2.bin
+boot/u-boot-rpi3.bin
 boot/u-boot.img
 boot/uEnv.txt
 boot/uboot.env
@@ -19,10 +19,8 @@ usr/share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin
 usr/share/u-boot/pandaboard/MLO
 usr/share/u-boot/pandaboard/u-boot.img
 #usr/share/u-boot/rpi
-usr/share/u-boot/rpi/kernel.img
-#usr/share/u-boot/rpi2
-usr/share/u-boot/rpi2/kernel7.img
-#usr/share/u-boot/rpi3
-usr/share/u-boot/rpi3/kernel8-32.img
+usr/share/u-boot/rpi/u-boot-rpi1.bin
+usr/share/u-boot/rpi/u-boot-rpi2.bin
+usr/share/u-boot/rpi/u-boot-rpi3.bin
 #usr/share/u-boot/wandboard
 usr/share/u-boot/wandboard/u-boot.imx
diff --git a/lfs/u-boot b/lfs/u-boot
index d534fbe897..672de74fe4 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2021.01
+VER        = 2021.04
 
 THISAPP    = u-boot-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a3206df1c1b97df7a4ddcdd17cb97d0c
+$(DL_FILE)_MD5 = 1299c23ee4fde7e73a1b9f8f80fd28e0
 
 install : $(TARGET)
 
@@ -107,39 +107,35 @@ ifeq "${BUILD_ARCH}" "armv5tel"
 	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi1 - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
 	cd $(DIR_APP) && install -v -m 644 u-boot.bin \
-		/usr/share/u-boot/rpi/kernel.img
-	# Install rpi u-boot as default rpi kernel
-	cd $(DIR_APP) && install u-boot.bin /boot/kernel.img
+		/usr/share/u-boot/rpi/u-boot-rpi1.bin
+	cd $(DIR_APP) && install u-boot.bin /boot/u-boot-rpi1.bin
 	cd $(DIR_APP) && make distclean
 
 	# Raspberry Pi 2
-	-mkdir -pv /usr/share/u-boot/rpi2
+	-mkdir -pv /usr/share/u-boot/rpi
 	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_2_config
 	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi2 - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
 	cd $(DIR_APP) && install -v -m 644 u-boot.bin \
-		/usr/share/u-boot/rpi2/kernel7.img
-	# Install rpi2 u-boot as default rpi kernel7
-	cd $(DIR_APP) && install u-boot.bin /boot/kernel7.img
+		/usr/share/u-boot/rpi/u-boot-rpi2.bin
+	cd $(DIR_APP) && install u-boot.bin /boot/u-boot-rpi2.bin
 	cd $(DIR_APP) && make distclean
 
 	# Raspberry Pi 3 32bit
-	-mkdir -pv /usr/share/u-boot/rpi3
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
+	-mkdir -pv /usr/share/u-boot/rpi
 	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_32b_config
-	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi3 - IPFire.org"!' .config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi3 32bit - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
 	cd $(DIR_APP) && install -v -m 644 u-boot.bin \
-		/usr/share/u-boot/rpi3/kernel8-32.img
-	# Install rpi3 32bit u-boot as default rpi kernel8-32
-	cd $(DIR_APP) && install u-boot.bin /boot/kernel8-32.img
+		/usr/share/u-boot/rpi/u-boot-rpi3.bin
+	cd $(DIR_APP) && install u-boot.bin /boot/u-boot-rpi3.bin
 	cd $(DIR_APP) && make distclean
 
 	# Orange Pi Zero
 	-mkdir -pv /usr/share/u-boot/orangepi_zero
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/orangepi-zero-add-macs.diff
 	cd $(DIR_APP) && make CROSS_COMPILE="" orangepi_zero_config
-	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi Zero/IPFire Nano - IPFire.org"!' .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
@@ -165,15 +161,23 @@ ifeq "${BUILD_ARCH}" "armv5tel"
 
 else
 	# Raspberry Pi 3
-	-mkdir -pv /usr/share/u-boot/rpi3
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rpi/u-boot-2018.03_add_rpi3-b-plus.patch
+	-mkdir -pv /usr/share/u-boot/rpi
 	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_config
 	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi3 - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
 	cd $(DIR_APP) && install -v -m 644 u-boot.bin \
-		/usr/share/u-boot/rpi3/kernel8.img
-	# Install rpi3 u-boot as default rpi kernel8
-	cd $(DIR_APP) && install u-boot.bin /boot/kernel8.img
+		/usr/share/u-boot/rpi/u-boot-rpi3.bin
+	cd $(DIR_APP) && install u-boot.bin /boot/u-boot-rpi3.bin
+	cd $(DIR_APP) && make distclean
+
+	# Raspberry Pi 4
+	-mkdir -pv /usr/share/u-boot/rpi
+	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_4_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" RPi4 - IPFire.org"!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && install -v -m 644 u-boot.bin \
+		/usr/share/u-boot/rpi/u-boot-rpi4.bin
+	cd $(DIR_APP) && install u-boot.bin /boot/u-boot-rpi4.bin
 	cd $(DIR_APP) && make distclean
 
 endif