From 81302ba68569ff62566fe463a4a8ac1a1d12baca Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Sun, 18 Mar 2012 23:04:51 +0100 Subject: 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 Acked-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 3 +++ boot/uboot/uboot.mk | 2 ++ 2 files changed, 5 insertions(+) (limited to 'boot') diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index cb4064804..f83cf4b51 100644 --- 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 f64964c00..31190922f 100644 --- 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 -- cgit v1.2.3