Merge remote-tracking branch 'ms/arm-freescale' into fifteen

Conflicts:
	make.sh

diff --git a/config/rootfiles/common/armv5tel/u-boot b/config/rootfiles/common/armv5tel/u-boot
index 759d41d76f5456bc93e3e2c819f2c34d5ebe69ac..1048dc8182a91d6e838c060d79a06b220b3d7073 100644 (file)
--- a/config/rootfiles/common/armv5tel/u-boot
+++ b/config/rootfiles/common/armv5tel/u-boot
@@ -1,6 +1,12 @@
-#boot/MLO
-#boot/u-boot.bin
 usr/bin/mkimage
-boot/boot.scr
-boot/boot.script
-boot/convert_bootscript
+#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/config/rootfiles/common/armv5tel/u-boot-panda b/config/rootfiles/common/armv5tel/u-boot-panda
new file mode 100644 (file)
index 0000000..544d9d7
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/u-boot-panda
@@ -0,0 +1,5 @@
+#boot/MLO
+#boot/u-boot.bin
+boot/boot.scr
+boot/boot.script
+boot/convert_bootscript

diff --git a/lfs/u-boot b/lfs/u-boot
index 551fea5269d536970e432df50266cc97f300df90..b13dd65d02d07443798337f2ed1a00ffaf7fa2b8 100644 (file)
--- 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/lfs/u-boot-panda b/lfs/u-boot-panda
new file mode 100644 (file)
index 0000000..8441ee6
--- /dev/null
+++ b/lfs/u-boot-panda
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+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
+
+THISAPP    = uboot-panda-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = armv5tel
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 19975e9bb4b10d8e67db84e51fcaa43b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       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)

diff --git a/make.sh b/make.sh
index 8b468217353ae597358130498cbaabf3622fdce3..7ad42b09579f433be38f23222c9052c567cbc244 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -377,8 +377,9 @@ buildipfire() {
   ipfiremake dvb-firmwares
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
-  ipfiremake u-boot
   ipfiremake bc
+  ipfiremake u-boot
+  ipfiremake u-boot-panda
 
   if [ "${MACHINE_TYPE}" != "arm" ]; then