From ddc492dd30283a3108d1436f849abedad345d6b5 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Aug 2013 16:58:37 +0000
Subject: [PATCH] u-boot: Build images for Pandaboard and Wandboard.

---
 config/rootfiles/common/armv5tel/u-boot | 12 ++++++
 lfs/u-boot                              | 56 ++++++++++++++++++-------
 make.sh                                 |  1 +
 3 files changed, 55 insertions(+), 14 deletions(-)
 create mode 100644 config/rootfiles/common/armv5tel/u-boot

diff --git a/config/rootfiles/common/armv5tel/u-boot b/config/rootfiles/common/armv5tel/u-boot
new file mode 100644
index 0000000000..1048dc8182
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/u-boot
@@ -0,0 +1,12 @@
+usr/bin/mkimage
+#usr/share/u-boot
+#usr/share/u-boot/pandaboard
+#usr/share/u-boot/pandaboard/MLO
+#usr/share/u-boot/pandaboard/u-boot.bin
+#usr/share/u-boot/pandaboard/u-boot.img
+#usr/share/u-boot/wandboard_dl
+#usr/share/u-boot/wandboard_dl/u-boot.imx
+#usr/share/u-boot/wandboard_quad
+#usr/share/u-boot/wandboard_quad/u-boot.imx
+#usr/share/u-boot/wandboard_solo
+#usr/share/u-boot/wandboard_solo/u-boot.imx
diff --git a/lfs/u-boot b/lfs/u-boot
index 551fea5269..b13dd65d02 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -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        = 2013.07
 
-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 = 8445162690052e6afd4b8f87af2bb557
 
 install : $(TARGET)
 
@@ -75,13 +73,43 @@ 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)
-	cd $(DIR_APP) && install MLO /boot/
-	cd $(DIR_APP) && install u-boot.bin /boot/
-	cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+	# 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.bin u-boot.img \
+		/usr/share/u-boot/pandaboard
+	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
+
+	# mkimage
+	cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
+	cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index e45d59d711..557835ca9f 100755
--- a/make.sh
+++ b/make.sh
@@ -377,6 +377,7 @@ buildipfire() {
   ipfiremake dvb-firmwares
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
+  ipfiremake u-boot
   ipfiremake u-boot-panda
 
   if [ "${MACHINE_TYPE}" != "arm" ]; then
-- 
2.39.2