X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fu-boot;h=b3548c36c6f818b1f0491a3dba59ba2222b39e08;hb=27ef66c26c480542f0ea60d85302da5ada0f0648;hp=551fea5269d536970e432df50266cc97f300df90;hpb=e384ca20f634bcea499448cb0ae84b2d200ff87c;p=ipfire-2.x.git

diff --git a/lfs/u-boot b/lfs/u-boot
index 551fea5269..b3548c36c6 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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,12 +24,10 @@
 
 include Config
 
-VER        = 2011.12
-# Linare version: git clone git://git.linaro.org/boot/u-boot-linaro-stable.git
-# Branch: origin/Linaro-u-boot-2011.12
+VER        = 2014.04
 
-THISAPP    = uboot-panda-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+THISAPP    = u-boot-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -43,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 19975e9bb4b10d8e67db84e51fcaa43b
+$(DL_FILE)_MD5 = 6d2116d1385a66e9a59742caa9d62a54
 
 install : $(TARGET)
 
@@ -75,13 +73,67 @@ dist:
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make tools $(MAKETUNING)
-	cd $(DIR_APP) && install tools/mkimage /usr/bin/
-	cd $(DIR_APP) && make omap4_panda_config
-	cd $(DIR_APP) && make $(MAKETUNING)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/U-Boot-v2-fs-fat-read-fix-fat16-ls-read-issue.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot-support-gcc-6.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot-c99-inline-fix.patch
+
+	cd $(DIR_APP)/include/linux && ln -s compiler-gcc6.h compiler-gcc7.h
+
+	# Pandaboard
+	-mkdir -pv /usr/share/u-boot/pandaboard
+	cd $(DIR_APP) && make CROSS_COMPILE="" omap4_panda_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
+	# Install pandaboard uboot as default
 	cd $(DIR_APP) && install MLO /boot/
-	cd $(DIR_APP) && install u-boot.bin /boot/
+	cd $(DIR_APP) && install u-boot.img /boot/
+	cd $(DIR_APP) && make distclean
+
+	# Wandboard Quad
+	-mkdir -pv /usr/share/u-boot/wandboard_quad
+	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_quad_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_quad
+	cd $(DIR_APP) && make distclean
+
+	# Wandboard Dual
+	-mkdir -pv /usr/share/u-boot/wandboard_dl
+	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_dl_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_dl
+	cd $(DIR_APP) && make distclean
+
+	# Wandboard Solo
+	-mkdir -pv /usr/share/u-boot/wandboard_solo
+	cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_solo_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_solo
+	cd $(DIR_APP) && make distclean
+
+	# LeMaker Banana Pi
+	-mkdir -pv /usr/share/u-boot/banana_pi
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/002-uboot-jwrdegoede-psci-support.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch
+	cd $(DIR_APP) && make CROSS_COMPILE="" Bananapi_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
+
+	# mkimage
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
+	cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
+
+	# config (uEnv.txt)
 	cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+	# patch real Kernel version to uEnv.txt
+	sed -e "s/xxxKVERxxx/$(KVER)/g" -i /boot/uEnv.txt
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)