X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fu-boot;h=ffd558bddd1fc9b163a0569ffb470ac285afc8b2;hp=1a7c3458fc114b487739254267880502d39683f9;hb=d45d524725eb0c9578c71d4fa8353ef44407c780;hpb=6703371d2d8dc81ddf1c04601125fc50465957b0

diff --git a/lfs/u-boot b/lfs/u-boot
index 1a7c3458fc..ffd558bddd 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-$(MKIMAGE)
-SUP_ARCH   = armv5tel
+SUP_ARCH   = armv5tel aarch64
 
 ###############################################################################
 # Top-level Rules
@@ -76,10 +76,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
 ifneq "$(MKIMAGE)" "1"
+ifeq "${BUILD_ARCH}" "armv5tel"
 	# Pandaboard
 	-mkdir -pv /usr/share/u-boot/pandaboard
 	cd $(DIR_APP) && make CROSS_COMPILE="" omap4_panda_config
-	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" IPFire.org"!' .config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Pandaboard - IPFire.org"!' .config
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
 	cd $(DIR_APP) && install -v -m 644 MLO u-boot.img \
 		/usr/share/u-boot/pandaboard
@@ -87,70 +88,94 @@ ifneq "$(MKIMAGE)" "1"
 	cd $(DIR_APP) && install MLO /boot/
 	cd $(DIR_APP) && install u-boot.img /boot/
 	cd $(DIR_APP) && make distclean
+	
 
 	# Wandboard
-#	-mkdir -pv /usr/share/u-boot/wandboard
-#	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_config
-#	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
-#	cd $(DIR_APP) && install -v -m 644 u-boot.imx \
-#		/usr/share/u-boot/wandboard
-#	cd $(DIR_APP) && make distclean
+	-mkdir -pv /usr/share/u-boot/wandboard
+	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Wandboard - IPFire.org"!' .config
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" u-boot.imx
+	cd $(DIR_APP) && install -v -m 644 u-boot.imx \
+		/usr/share/u-boot/wandboard
+	cd $(DIR_APP) && make distclean
 
 	# Raspberry Pi
 	-mkdir -pv /usr/share/u-boot/rpi
 	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_config
-	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" IPFire.org"!' .config
+	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
+	cd $(DIR_APP) && make distclean
 
 	# Raspberry Pi 2
 	-mkdir -pv /usr/share/u-boot/rpi2
 	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_2_config
-	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" IPFire.org"!' .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
+	cd $(DIR_APP) && make distclean
 
-	# Raspberry Pi 3
+	# 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
 	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_32b_config
-	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" IPFire.org"!' .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-32.img
-	# Install rpi2 u-boot as default rpi kernel8-32
+	# Install rpi3 32bit u-boot as default rpi kernel8-32
 	cd $(DIR_APP) && install u-boot.bin /boot/kernel8-32.img
+	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=" IPFire.org"!' .config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi Zero/IPFire Nano - 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
+	cd $(DIR_APP) && make distclean
 
 	# Orange Pi PC
 	-mkdir -pv /usr/share/u-boot/orangepi_pc
 	cd $(DIR_APP) && make CROSS_COMPILE="" orangepi_pc_config
-	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" IPFire.org"!' .config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi PC - 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_pc
+	cd $(DIR_APP) && make distclean
 
 	# LeMaker Banana Pi
 	-mkdir -pv /usr/share/u-boot/banana_pi
 	cd $(DIR_APP) && make CROSS_COMPILE="" Bananapi_config
-	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" IPFire.org"!' .config
+	cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" BananaPi - 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/banana_pi
+	cd $(DIR_APP) && make distclean
 
+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
+	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
+	cd $(DIR_APP) && make distclean
+
+endif
 	# create an empty 128 KB File for the u-boot env
 	dd if=/dev/zero of=/boot/uboot.env bs=1K count=128
 	
@@ -161,7 +186,11 @@ ifneq "$(MKIMAGE)" "1"
 
 else
 	# mkimage
+ifeq "${BUILD_ARCH}" "armv5tel"
 	cd $(DIR_APP) && make CROSS_COMPILE="" omap4_panda_config
+else
+	cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_config
+endif
 	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
 	cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
 endif