From 34d94c7c0e81a6753ec1db80bc679711831413da Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 14 Mar 2012 16:45:07 +0100
Subject: [PATCH] u-boot: update to 2011.12 and build MLO + bin for pandaboard.

---
 config/rootfiles/common/armv5tel/u-boot |   6 ++++++
 config/rootfiles/common/armv5tel/uboot  |   1 -
 config/u-boot/boot.scr                  | Bin 0 -> 300 bytes
 config/u-boot/boot.script               |   4 ++++
 config/u-boot/convert_bootscript        |   1 +
 lfs/u-boot                              |  17 ++++++++++++-----
 6 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 config/rootfiles/common/armv5tel/u-boot
 delete mode 100644 config/rootfiles/common/armv5tel/uboot
 create mode 100755 config/u-boot/boot.scr
 create mode 100755 config/u-boot/boot.script
 create mode 100755 config/u-boot/convert_bootscript

diff --git a/config/rootfiles/common/armv5tel/u-boot b/config/rootfiles/common/armv5tel/u-boot
new file mode 100644
index 000000000..759d41d76
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/u-boot
@@ -0,0 +1,6 @@
+#boot/MLO
+#boot/u-boot.bin
+usr/bin/mkimage
+boot/boot.scr
+boot/boot.script
+boot/convert_bootscript
diff --git a/config/rootfiles/common/armv5tel/uboot b/config/rootfiles/common/armv5tel/uboot
deleted file mode 100644
index 80864b79c..000000000
--- a/config/rootfiles/common/armv5tel/uboot
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/mkimage
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
new file mode 100755
index 0000000000000000000000000000000000000000..bdc4267f6fc38ab56821ed69483b249ee292777a
GIT binary patch
literal 300
zcmY#ql?-!=^w{bjUvrs(f#D4hgMpb|a}_HS8;pyOegcwAODxIBPfStB%}rJ?urgFI
zsIV}A0EJS|+{E-$-OPft%%W7?{M^I>E-b1I&A`fms`D~SP!t!ZmZavDDJ13Rmn0UY
z7b}z%CFa^18~G|E=jRpY=cL+}lvMf~=@=TC8W|YmStt|%6_zJvmM9eG7AISpR#fQa
zCMGAQq!ihzloltYmSlj~U{$vIDXC@pKqn{VWE&J1D-@M;fo#b|c0JG|P^WPL0A5W{
A{{R30

literal 0
HcmV?d00001

diff --git a/config/u-boot/boot.script b/config/u-boot/boot.script
new file mode 100755
index 000000000..e30615fbf
--- /dev/null
+++ b/config/u-boot/boot.script
@@ -0,0 +1,4 @@
+fatload mmc 0:1 0x80000000 uImage-ipfire-omap
+fatload mmc 0:1 0x81600000 uInit-ipfire-omap
+setenv bootargs vram=32M console=ttyO2,115200n8 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 rw
+bootm 0x80000000 0x81600000
diff --git a/config/u-boot/convert_bootscript b/config/u-boot/convert_bootscript
new file mode 100755
index 000000000..962191f14
--- /dev/null
+++ b/config/u-boot/convert_bootscript
@@ -0,0 +1 @@
+mkimage -A arm -T script -C none -d boot.script boot.scr
diff --git a/lfs/u-boot b/lfs/u-boot
index 6fbd888eb..551fea526 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -24,10 +24,12 @@
 
 include Config
 
-VER        = 2011.06
+VER        = 2011.12
+# Linare version: git clone git://git.linaro.org/boot/u-boot-linaro-stable.git
+# Branch: origin/Linaro-u-boot-2011.12
 
-THISAPP    = u-boot-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = uboot-panda-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -41,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0cc5026aad02f218a9b9ac56b301c97a
+$(DL_FILE)_MD5 = 19975e9bb4b10d8e67db84e51fcaa43b
 
 install : $(TARGET)
 
@@ -73,8 +75,13 @@ dist:
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@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)
 	@$(POSTBUILD)