[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-110-g3f387c4

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  3f387c48a21bf3bd41e0b51411cda256e32e6121 (commit)
       via  2f006417ca521d5018c408f04efa71f9ff34fbf9 (commit)
      from  2ec424151abb1fece24fb094d77900b04708931e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3f387c48a21bf3bd41e0b51411cda256e32e6121
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Mar 8 15:38:10 2012 +0100

    [BUILDROOT] BR2012.02: update U-Boot dependencies on elftosb when using .sb bin files

commit 2f006417ca521d5018c408f04efa71f9ff34fbf9
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Mar 8 12:31:23 2012 +0100

    [BUILDROOT] BR2012.02: support U-Boot .sb Safe Boot file format

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in       |    2 +
 ...support-for-Safe-Boot-file-format-this-fo.patch |   51 ++++++++++++++++++++
 2 files changed, 53 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2012.02/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index ee777c3..32cd523 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -14,10 +14,12 @@ ifeq ($(CPU_NAME),imxl)
 U_BOOT_BIN=u-boot.bin
 else ifeq ($(CPU_NAME),imx28)
 U_BOOT_BIN=u-boot.sb
+UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
 U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.sb
 TARGETS+=host-elftosb host-imx28-usb-downloader
 else
 U_BOOT_BIN=u-boot-nand.bin
+UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
 endif
 
 endif
diff --git a/patches/buildroot/2012.02/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch b/patches/buildroot/2012.02/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
new file mode 100644
index 0000000..ecc0856
--- /dev/null
+++ b/patches/buildroot/2012.02/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
@@ -0,0 +1,51 @@
+From 4120ce0947982895eba6cea75615bac32e2c8e42 Mon Sep 17 00:00:00 2001
+From: Eric Jarrige <eri...@ar...>
+Date: Thu, 8 Mar 2012 13:28:29 +0100
+Subject: [PATCH] U-Boot: add support for Safe Boot file format - this format is used by some Freescale cpu
+
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ boot/uboot/Config.in |    3 +++
+ boot/uboot/uboot.mk  |    4 ++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
+index c8db9fb..5fd5258 100644
+--- a/boot/uboot/Config.in
++++ b/boot/uboot/Config.in
+@@ -90,6 +90,9 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
+ 	depends on BR2_bfin
+ 	bool "u-boot.ldr"
+ 
++config BR2_TARGET_UBOOT_FORMAT_SB
++	bool "u-boot.sb"
++
+ endchoice
+ 
+ menuconfig BR2_TARGET_UBOOT_NETWORK
+diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
+index db9de8d..47a016f 100644
+--- a/boot/uboot/uboot.mk
++++ b/boot/uboot/uboot.mk
+@@ -7,6 +7,7 @@ UBOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
+ UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
+ 
+ UBOOT_INSTALL_IMAGES = YES
++UBOOT_DEPENDENCIES = $(ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)) host-elftosb
+ 
+ ifeq ($(UBOOT_VERSION),custom)
+ # Handle custom U-Boot tarballs as specified by the configuration
+@@ -29,6 +30,9 @@ 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_SB),y)
++UBOOT_BIN          = u-boot.sb
++UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
+ else
+ UBOOT_BIN          = u-boot.bin
+ endif
+-- 
+1.7.2.5
+


hooks/post-receive
-- 
armadeus