target/u-boot: add 2009.11 and update target mkimage so it builds with 2009.11

In 2009.11, a number of extra files are needed to build mkimage. Adjust
the makefile to add those if available, so it builds with both 2009.11
and older releases.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index b2f21dabe1d5f109c8cbd7d5f324f2459af6126d..01b25aa3127d6b852b6a8f257191de6e0646391b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@
 
        Updated/fixed packages: autoconf, bind, binutils, busybox,
        directfb, gst-plugins-bad, hal, iw, libfuse, libpcap, lighttpd,
-       mesa, mpg123, mtd-utils, pcre, qt, sshfs, tremor, usbutils
+       mesa, mpg123, mtd-utils, pcre, qt, sshfs, tremor, u-boot, usbutils
 
        Issues resolved (http://bugs.uclibc.org):
 

diff --git a/target/u-boot/Config.in b/target/u-boot/Config.in
index 12a5543075d1d0cda6431db1bd51b2a31668ec5b..2689f6975891ae32ec7b86accc4c5093b64e9c87 100644 (file)
--- a/target/u-boot/Config.in
+++ b/target/u-boot/Config.in
@@ -13,16 +13,20 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
        prompt "U-Boot Version"
-       default BR2_TARGET_UBOOT_2009_08
+       default BR2_TARGET_UBOOT_2009_11
        help
          Select the specific U-Boot version you want to use
 
+config BR2_TARGET_UBOOT_2009_11
+       bool "u-boot-2009.11"
+
 config BR2_TARGET_UBOOT_2009_08
        bool "u-boot-2009.08"
+       depends on BR2_DEPRECATED || BR2_RECENT
 
 config BR2_TARGET_UBOOT_2009_06
        bool "u-boot-2009.06"
-       depends on BR2_DEPRECATED || BR2_RECENT
+       depends on BR2_DEPRECATED
 
 config BR2_TARGET_UBOOT_2009_03
        bool "u-boot-2009.03"
@@ -44,6 +48,7 @@ endchoice
 
 config BR2_UBOOT_VERSION
        string
+       default "2009.11"       if BR2_TARGET_UBOOT_2009_11
        default "2009.08"       if BR2_TARGET_UBOOT_2009_08
        default "2009.06"       if BR2_TARGET_UBOOT_2009_06
        default "2009.03"       if BR2_TARGET_UBOOT_2009_03

diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index dd45b42ac7ed108d32b8df19653932a79b28745e..5efbd54d2f5edbabf531dedaaef1ded244ef44d1 100644 (file)
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -175,8 +175,11 @@ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
        mkdir -p $(@D)
        $(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
                -DUSE_HOSTCC -o $@ \
-               $(U_BOOT_DIR)/tools/mkimage.c $(U_BOOT_DIR)/common/image.c \
+               $(U_BOOT_DIR)/common/image.c \
+               $(wildcard $(addprefix $(U_BOOT_DIR)/tools/,default_image.c \
+                       fit_image.c kwbimage.c mkimage.c)) \
                $(addprefix $(U_BOOT_DIR)/lib_generic/,crc32.c md5.c sha1.c) \
+               $(U_BOOT_DIR)/tools/os_support.c \
                $(U_BOOT_DIR)/libfdt/fdt*.c
 
        $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@