uboot: add a new binary format for u-boot.img

For some platforms like OMAP, a new binary format is now being used
for u-boot: u-boot.img. It is basically u-boot.bin which has been
processed with mkimage.

Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index cb4064804832ca706d7c5f47a28cd5c76e5a91eb..f83cf4b51065dac4350a88ada24bdfd510948b85 100644 (file)
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -83,6 +83,9 @@ choice
 config BR2_TARGET_UBOOT_FORMAT_BIN
        bool "u-boot.bin"
 
+config BR2_TARGET_UBOOT_FORMAT_IMG
+       bool "u-boot.img"
+
 config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
        bool "u-boot-nand.bin"
 

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index f64964c006d6e498d5ae3eb5b847de348871aa1d..31190922f88315609f1852c10b8a2d765af8ecd2 100644 (file)
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -29,6 +29,8 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
 UBOOT_BIN          = u-boot.ldr
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
 UBOOT_BIN          = u-boot-nand.bin
+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
+UBOOT_BIN          = u-boot.img
 else
 UBOOT_BIN          = u-boot.bin
 endif