[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-62-gbab28cf

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  bab28cfc6cb5a3bec027525590a39abe1d88fcfa (commit)
       via  087df1150a0f5e1d9f48df51ba77526fdd203755 (commit)
       via  a3129eff4e153ddb9a916b691a3341ee396785b3 (commit)
      from  ff3699d5222d0c1b62f0e75e1026e0805675ecf3 (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 bab28cfc6cb5a3bec027525590a39abe1d88fcfa
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 14:58:18 2010 +0200

    [BUILDROOT] [2010.11] u-boot: makes the resulting binary copied with the right name in output/images/

commit 087df1150a0f5e1d9f48df51ba77526fdd203755
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 13:53:56 2010 +0200

    [BUILDROOT] [2010.11] u-boot: makes u-boot.mk use the right config file for apf* (apf memory config wasn't taken into account before this change)

commit a3129eff4e153ddb9a916b691a3341ee396785b3
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 11:58:54 2010 +0200

    [BUILDROOT] [2010.11] Merge 051i U-Boot patch into 051d. Both patches apply on the same purpose

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

Summary of changes:
 buildroot/target/device/armadeus/u-boot/u-boot.mk  |    5 ++-
 .../2010.11/051-u-boot.a_refaire_entierement       |   46 --------------------
 ...d_possibility_to_choose_board_header_file.patch |   26 ++++++++---
 ...u-boot-add_1.3.4_version_specific_support.patch |   12 +++---
 ...madeus_specific_options_for_config_header.patch |    6 +-
 .../051g-u-boot-add_u-boot-unpacked_target.patch   |    6 +-
 ...ot-makes_binary_targets_name_overloadable.patch |   22 ++++++++-
 .../051i-u-boot-multi-version-support.patch        |   26 -----------
 8 files changed, 54 insertions(+), 95 deletions(-)
 delete mode 100644 patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch

diff --git a/buildroot/target/device/armadeus/u-boot/u-boot.mk b/buildroot/target/device/armadeus/u-boot/u-boot.mk
index 9f9a84e..fe30fad 100644
--- a/buildroot/target/device/armadeus/u-boot/u-boot.mk
+++ b/buildroot/target/device/armadeus/u-boot/u-boot.mk
@@ -4,14 +4,17 @@
 #
 #############################################################
 
-U_BOOT_BIN=$(BOARD_NAME)-u-boot.bin
 BR2_TARGET_U_BOOT_CONFIG_BOARD=$(BR2_TARGET_UBOOT_BOARDNAME)_config
 ifndef BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
 BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=$(BOARD_PATH)/$(BOARD_NAME).h
 endif
 ifeq ($(BR2_VERSION),"0.10.0-svn")
+U_BOOT_BIN=$(BOARD_NAME)-u-boot.bin
 MKIMAGE_BINLOC:=$(STAGING_DIR)/usr/bin/mkimage
 MKIMAGE:=$(KERNEL_CROSS)mkimage
+else
+# New BR:
+U_BOOT_TARGET_BIN=$(BOARD_NAME)-u-boot.bin
 endif
 
 BR2_TARGET_UBOOT_ETH1ADDR=""
diff --git a/patches/buildroot/2010.11/051-u-boot.a_refaire_entierement b/patches/buildroot/2010.11/051-u-boot.a_refaire_entierement
index 908e27f..d95f0b1 100644
--- a/patches/buildroot/2010.11/051-u-boot.a_refaire_entierement
+++ b/patches/buildroot/2010.11/051-u-boot.a_refaire_entierement
@@ -1,43 +1,5 @@
 Never send to BR.
 
-Index: buildroot/target/u-boot/Config.in
-===================================================================
---- buildroot.orig/target/u-boot/Config.in	2008-11-03 09:15:09.000000000 +0100
-+++ buildroot/target/u-boot/Config.in	2010-01-06 22:23:02.000000000 +0100
-@@ -6,11 +6,18 @@
- if BR2_TARGET_UBOOT
- config BR2_TARGET_UBOOT_BOARDNAME
- 	string "board name"
--	default "$(BOARD_NAME)"
-+	default "$(BR2_BOARD_NAME)"
- 	help
- 	  One of U-Boot supported boards to be built.
- 	  This will be suffixed with _config to meet U-Boot standard naming.
- 
-+config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
-+	string "U-Boot header file"
-+	depends on BR2_TARGET_UBOOT
-+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
-+	help
-+	  U-Boot config Header file to use to build U-Boot for your target.
-+
- choice
- 	prompt "U-Boot Version"
- 	default BR2_TARGET_UBOOT_2009_11
-@@ -132,6 +139,13 @@
- 	bool "fw_printenv tool in target"
- 	help
- 	  Install fw_printenv / fw_setenv tools in target.
-+
-+config BR2_TARGET_UBOOT_COPYTO
-+	string "also copy the image to..."
-+	depends on BR2_TARGET_UBOOT
-+	default ""
-+	help
-+	  Copies the resulting image to a secondary location.
- 
- menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
- 	bool "Generate a default environment"
 Index: buildroot/target/u-boot/Makefile.in
 ===================================================================
 --- buildroot.orig/target/u-boot/Makefile.in	2008-11-03 09:15:09.000000000 +0100
@@ -141,11 +103,3 @@ Index: buildroot/target/u-boot/Makefile.in
  
  u-boot-dirclean:
  	rm -rf $(U_BOOT_DIR)
-@@ -173,5 +204,7 @@
- 	@echo BR2_TARGET_UBOOT_BOOTARGS = $(BR2_TARGET_UBOOT_BOOTARGS)
- 	@echo BR2_TARGET_UBOOT_BOOTCMD = $(BR2_TARGET_UBOOT_BOOTCMD)
- 	@echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
-+	@echo BR2_TARGET_ARMADEUS_SDRAM_SIZE = $(BR2_TARGET_ARMADEUS_SDRAM_SIZE)
-+	@echo BR2_TARGET_ARMADEUS_NR_SDRAM = $(BR2_TARGET_ARMADEUS_NR_SDRAM)
- 	@echo
- 	@exit 0
diff --git a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
index 44ba0fe..9a0e8a5 100644
--- a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
+++ b/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -7,15 +7,15 @@ So this patch reverts the removing + refines it.
 
 Index: buildroot/boot/u-boot/Config.in
 ===================================================================
---- buildroot.orig/boot/u-boot/Config.in	2010-10-18 18:01:03.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in	2010-10-18 18:01:07.000000000 +0200
+--- buildroot.orig/boot/u-boot/Config.in	2010-10-20 11:59:43.000000000 +0200
++++ buildroot/boot/u-boot/Config.in	2010-10-20 12:03:30.000000000 +0200
 @@ -11,6 +11,14 @@
  	  One of U-Boot supported boards to be built.
  	  This will be suffixed with _config to meet U-Boot standard naming.
  
 +config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
 +	string "U-Boot header file"
-+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
++	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
 +	help
 +	  U-Boot config header file to use to build U-Boot for your target.
 +	  Mainly for people using boards not (yet) integrated in U-Boot's
@@ -26,16 +26,28 @@ Index: buildroot/boot/u-boot/Config.in
  	default BR2_TARGET_UBOOT_2010_06
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:01:06.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:01:07.000000000 +0200
-@@ -87,7 +87,13 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 11:59:43.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 12:09:50.000000000 +0200
+@@ -45,7 +45,11 @@
+ U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
+ endif
+ 
++ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
++U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(BR2_TARGET_UBOOT_BOARDNAME).h
++else
+ U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
++endif
+ 
+ ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
+ U_BOOT_TARGETS+=$(TARGET_DIR)/usr/bin/mkimage
+@@ -87,7 +91,13 @@
  endif
  	touch $@
  
 -$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
 +$(U_BOOT_DIR)/.config_header_copied: $(U_BOOT_DIR)/.patched
 +ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
-+	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/
++	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_INC_CONF_FILE)
 +endif
 +	touch $@
 +
diff --git a/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch b/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
index ea8b76c..8b593ad 100644
--- a/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
+++ b/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
@@ -2,8 +2,8 @@ Specific for Armadeus boards.
 
 Index: buildroot/boot/u-boot/Config.in
 ===================================================================
---- buildroot.orig/boot/u-boot/Config.in	2010-10-18 18:01:07.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in	2010-10-18 18:01:16.000000000 +0200
+--- buildroot.orig/boot/u-boot/Config.in	2010-10-20 12:03:30.000000000 +0200
++++ buildroot/boot/u-boot/Config.in	2010-10-20 13:42:06.000000000 +0200
 @@ -25,6 +25,9 @@
  	help
  	  Select the specific U-Boot version you want to use
@@ -24,9 +24,9 @@ Index: buildroot/boot/u-boot/Config.in
  	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:01:07.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:01:16.000000000 +0200
-@@ -167,6 +167,11 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 12:09:50.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 13:42:06.000000000 +0200
+@@ -171,6 +171,11 @@
  # Build manually mkimage for the target
  $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
  	mkdir -p $(@D)
@@ -38,7 +38,7 @@ Index: buildroot/boot/u-boot/u-boot.mk
  	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
  		-DUSE_HOSTCC -o $@ \
  		$(U_BOOT_DIR)/common/image.c \
-@@ -175,7 +180,7 @@
+@@ -179,7 +184,7 @@
  		$(addprefix $(U_BOOT_DIR)/lib*/,crc32.c md5.c sha1.c) \
  		$(U_BOOT_DIR)/tools/os_support.c \
  		$(wildcard $(U_BOOT_DIR)/libfdt/fdt*.c $(U_BOOT_DIR)/lib/libfdt/fdt*.c)
diff --git a/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
index ada50c9..3556a8c 100644
--- a/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
+++ b/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
@@ -2,9 +2,9 @@ Armadeus APF modules require some special U-Boot config variables to be set.
 
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:01:16.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:01:30.000000000 +0200
-@@ -133,6 +133,17 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 13:42:06.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 13:42:14.000000000 +0200
+@@ -137,6 +137,17 @@
  endif
  	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
  endif # BR2_TARGET_UBOOT_NETWORK
diff --git a/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch b/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch
index 175e80b..d075b7f 100644
--- a/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch
+++ b/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch
@@ -2,9 +2,9 @@ Specific for Armadeus (needed by quiltify.sh script).
 
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:01:30.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:29:27.000000000 +0200
-@@ -78,6 +78,8 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 13:42:14.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 13:42:17.000000000 +0200
+@@ -82,6 +82,8 @@
  		| tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
  	touch $@
  
diff --git a/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch b/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
index 4a95e54..a13444a 100644
--- a/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
+++ b/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
@@ -1,14 +1,16 @@
 Allow board custom Makefiles to choose the name of the U-Boot's resulting binary
 and the name it should take when copied to $(BINARIES_DIR).
 
+target/* Makefiles need to be sources before boot/* ones.
+
 Specific for Armadeus.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:30:21.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:43:14.000000000 +0200
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 13:42:17.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 14:01:39.000000000 +0200
 @@ -34,10 +34,13 @@
  else
  U_BOOT_BIN:=u-boot.bin
@@ -24,7 +26,7 @@ Index: buildroot/boot/u-boot/u-boot.mk
  U_BOOT_ARCH=$(KERNEL_ARCH)
  
  # u-boot in the past used arch=ppc for powerpc
-@@ -158,9 +161,9 @@
+@@ -162,9 +165,9 @@
  		$(U_BOOT_MAKE_OPT) -C $(U_BOOT_DIR)
  
  # Copy the result to the images/ directory
@@ -36,3 +38,17 @@ Index: buildroot/boot/u-boot/u-boot.mk
  
  ifneq ($(U_BOOT_COPYTO),)
  $(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+Index: buildroot/Makefile
+===================================================================
+--- buildroot.orig/Makefile	2010-10-20 14:49:41.000000000 +0200
++++ buildroot/Makefile	2010-10-20 14:49:52.000000000 +0200
+@@ -304,8 +304,8 @@
+ TARGETS+=target-purgelocales
+ endif
+ 
+-include boot/common.mk
+ include target/Makefile.in
++include boot/common.mk
+ include linux/linux.mk
+ include fs/common.mk
+ 
diff --git a/patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch b/patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch
deleted file mode 100644
index f7d7cde..0000000
--- a/patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: buildroot/boot/u-boot/Config.in
-===================================================================
---- buildroot.orig/boot/u-boot/Config.in	2010-10-18 18:46:55.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in	2010-10-18 18:47:42.000000000 +0200
-@@ -13,7 +13,7 @@
- 
- config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
- 	string "U-Boot header file"
--	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
-+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
- 	help
- 	  U-Boot config header file to use to build U-Boot for your target.
- 	  Mainly for people using boards not (yet) integrated in U-Boot's
-Index: buildroot/boot/u-boot/u-boot.mk
-===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:46:34.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:48:23.000000000 +0200
-@@ -94,7 +94,7 @@
- 
- $(U_BOOT_DIR)/.config_header_copied: $(U_BOOT_DIR)/.patched
- ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
--	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/
-+	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/$(BR2_TARGET_UBOOT_BOARDNAME).h
- endif
- 	touch $@
- 


hooks/post-receive
-- 
armadeus


