Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[people/teissler/ipfire-2.x.git] / lfs / u-boot

diff --git a/lfs/u-boot b/lfs/u-boot
index b13dd65d02d07443798337f2ed1a00ffaf7fa2b8..eafb59262fc52095abc0193096997addc58b918f 100644 (file)
--- 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-2013  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,7 +24,7 @@
 
 include Config
 
-VER        = 2013.07
+VER        = 2013.10
 
 THISAPP    = u-boot-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8445162690052e6afd4b8f87af2bb557
+$(DL_FILE)_MD5 = a076a044b64371edc52f7e562b13f6b2
 
 install : $(TARGET)
 
@@ -79,8 +79,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -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 \
+       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.img /boot/
+       cp -vf $(DIR_SRC)/config/u-boot/* /boot/
        cd $(DIR_APP) && make distclean
 
        # Wandboard Quad