[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-406-gd5a92cd

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  d5a92cdd65ace4de47806797aa1db590cf6a7cc5 (commit)
       via  d2bb619743419f45540d0014c1bd6701acff854e (commit)
      from  0e8d101698347120a31867618032d8cabbead7c7 (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 d5a92cdd65ace4de47806797aa1db590cf6a7cc5
Merge: d2bb619 0e8d101
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Aug 21 17:31:42 2013 +0200

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit d2bb619743419f45540d0014c1bd6701acff854e
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Aug 21 17:30:54 2013 +0200

    [BUILDROOT] Fix typo and update apf51/pps51 default configs

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

Summary of changes:
 buildroot/configs/apf51_defconfig                  |    4 ++--
 buildroot/configs/apf51test_defconfig              |    4 ++--
 buildroot/configs/pps51_defconfig                  |    4 ++--
 ...add_support_for_custom_binary_file_format.patch |   10 +++++-----
 ...oot-add_support_for_Safe_Boot_file_format.patch |    6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 1ba1720..440ee1f 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -87,8 +87,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-20
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
-BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT=y
-BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME="u-boot-with-nand-spl.imx"
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
 BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index bef1030..425d2fa 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -153,8 +153,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-20
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
-BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT=y
-BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME="u-boot-with-nand-spl.imx"
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
 BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 76c267e..8f49ab1 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -100,8 +100,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-20
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(ARMADEUS_PATH)/apf51/apf51-u-boot-2013.04.h"
-BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT=y
-BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME="u-boot-with-nand-spl.imx"
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
 BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
diff --git a/patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch b/patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch
index 636ff2e..00c0133 100644
--- a/patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch
+++ b/patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch
@@ -8,7 +8,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  	depends on BR2_bfin
  	bool "u-boot.ldr"
  
-+config BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT
++config BR2_TARGET_UBOOT_FORMAT_CUSTOM
 +	bool "custom binary format"
 +	help
 +	  Use CPU-specific binary format.
@@ -18,9 +18,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +
  endchoice
  
-+config BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME
++config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
 +	string "U-Boot binary target name"
-+	depends on BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT
++	depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM
 +	help
 +	  Specify the kernel make target to build the kernel that you
 +	  need.
@@ -34,8 +34,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  UBOOT_BIN          = u-boot-nand.bin
  else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
  UBOOT_BIN          = u-boot.img
-+else ifeq ($(BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT),y)
-+UBOOT_BIN          = $(call qstrip,$(BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME))
++else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
++UBOOT_BIN          = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
 +UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
  else
  UBOOT_BIN          = u-boot.bin
diff --git a/patches/buildroot/2013.05/052-U-Boot-add_support_for_Safe_Boot_file_format.patch b/patches/buildroot/2013.05/052-U-Boot-add_support_for_Safe_Boot_file_format.patch
index 5a1192d..f3ce0c1 100644
--- a/patches/buildroot/2013.05/052-U-Boot-add_support_for_Safe_Boot_file_format.patch
+++ b/patches/buildroot/2013.05/052-U-Boot-add_support_for_Safe_Boot_file_format.patch
@@ -13,7 +13,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +config BR2_TARGET_UBOOT_FORMAT_SB
 +	bool "u-boot.sb"
 +
- config BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT
+ config BR2_TARGET_UBOOT_FORMAT_CUSTOM
  	bool "custom binary format"
  	help
 --- buildroot/boot/uboot/uboot.mk
@@ -26,6 +26,6 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +UBOOT_DEPENDENCIES += host-elftosb
 +UBOOT_BIN          = u-boot.sb
 +UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
- else ifeq ($(BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT),y)
- UBOOT_BIN          = $(call qstrip,$(BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME))
+ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
+ UBOOT_BIN          = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
  UBOOT_MAKE_TARGET  = $(UBOOT_BIN)


hooks/post-receive
-- 
armadeus


