[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2608-g4cd7f5b

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  4cd7f5bea3f47dd72ddd4ef72b817bf7472a47a9 (commit)
       via  aa1d22352f8ecb43e22243f5ecdd67744ef079f2 (commit)
      from  7a7114f65aecd1d75a76f258270ca222add2dcdb (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 4cd7f5bea3f47dd72ddd4ef72b817bf7472a47a9
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Dec 5 09:53:05 2011 +0100

    [BUILDROOT][APF28] Update apf28 default configuration

commit aa1d22352f8ecb43e22243f5ecdd67744ef079f2
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Dec 5 09:43:52 2011 +0100

    [BUILDROOT][UBOOT] Add apf28 nand bootloader

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

Summary of changes:
 buildroot/configs/apf28_defconfig                  |    6 +++++-
 buildroot/target/device/armadeus/Makefile.in       |    3 +++
 .../2011.05/166-uboot-add-u-boot_make_target.patch |   17 +++++++++++++++++
 .../2011.11/02-uboot-apf28-update-makefile.patch   |   16 ++++++++++++++++
 4 files changed, 41 insertions(+), 1 deletions(-)
 create mode 100644 patches/buildroot/2011.05/166-uboot-add-u-boot_make_target.patch
 create mode 100644 patches/u-boot/2011.11/02-uboot-apf28-update-makefile.patch

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 184c51a..a4f6559 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -25,7 +25,6 @@ BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_ELFTOSB=y
 BR2_TARGET_GENERIC_HOSTNAME="armadeus"
 BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -59,6 +58,11 @@ BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_UBIFS=y
 BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
 BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://localhost/download/u-boot-2011.11.27.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.11"
+BR2_TARGET_UBOOT_TOOL_ENV=y
+# BR2_TARGET_UBOOT_NETWORK is not set
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index d92c1ee..2b98a01 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -10,6 +10,9 @@ LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
 U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
 ifeq ($(BOARD_NAME),apf9328)
 U_BOOT_BIN=u-boot.bin
+else ifeq ($(BOARD_NAME),apf28)
+U_BOOT_BIN=u-boot.nand
+TARGETS+=host-elftosb
 else
 U_BOOT_BIN=u-boot-nand.bin
 endif
diff --git a/patches/buildroot/2011.05/166-uboot-add-u-boot_make_target.patch b/patches/buildroot/2011.05/166-uboot-add-u-boot_make_target.patch
new file mode 100644
index 0000000..0357957
--- /dev/null
+++ b/patches/buildroot/2011.05/166-uboot-add-u-boot_make_target.patch
@@ -0,0 +1,17 @@
+Add U-Boot compilation target option to support apf28
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: buildroot/boot/u-boot/u-boot.mk
+===================================================================
+--- buildroot/boot/u-boot/u-boot.mk	2011-12-03 23:14:14.763758000 +0100
++++ buildroot/boot/u-boot/u-boot.mk	2011-12-04 13:57:35.800193155 +0100
+@@ -169,7 +169,7 @@ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DI
+ 	$(TARGET_CONFIGURE_OPTS) \
+ 		$(U_BOOT_CONFIGURE_OPTS) \
+ 		$(MAKE) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
+-		$(U_BOOT_MAKE_OPT) -C $(U_BOOT_DIR)
++		$(U_BOOT_MAKE_OPT) -C $(U_BOOT_DIR) $(U_BOOT_BIN)
+ 
+ # Copy the result to the images/ directory
+ $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
diff --git a/patches/u-boot/2011.11/02-uboot-apf28-update-makefile.patch b/patches/u-boot/2011.11/02-uboot-apf28-update-makefile.patch
new file mode 100644
index 0000000..32cd8f7
--- /dev/null
+++ b/patches/u-boot/2011.11/02-uboot-apf28-update-makefile.patch
@@ -0,0 +1,16 @@
+diff -purN u-boot-custom.ori/Makefile u-boot-custom/Makefile
+--- u-boot-custom.ori/Makefile	2011-11-23 21:23:45.000000000 +0100
++++ u-boot-custom/Makefile	2011-12-04 13:48:38.335464312 +0100
+@@ -421,6 +421,12 @@ $(obj)u-boot.sb:       $(obj)u-boot.bin 
+ 		elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
+ 			-o $(obj)u-boot.sb
+ 
++$(obj)u-boot.nand:       $(obj)u-boot.sb
++		$(obj)tools/mxsboot nand u-boot.sb u-boot.nand
++
++$(obj)u-boot.sd:       $(obj)u-boot.sb
++		$(obj)tools/mxsboot sd u-boot.sb u-boot.sd
++
+ ifeq ($(CONFIG_SANDBOX),y)
+ GEN_UBOOT = \
+ 		cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \


hooks/post-receive
-- 
armadeus


