[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-186-g31fcd95
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-186-g31fcd95
|
From: Julien B a. A. <ar...@us...> - 2010-02-09 21:34:13
|
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 31fcd95ab43436dac6204f127334ba529bcf534a (commit)
via 267e6282528d0d2a56be1f4ceae517859f69e1c9 (commit)
via 203b8d3390da5ad6606fe46f1a25abf319a85d22 (commit)
via f58d4aa663d15cd4d7447e39bb3e7a5c269888af (commit)
from 89f5c0634dec1fed3f269a96b7ffbdf426375d33 (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 31fcd95ab43436dac6204f127334ba529bcf534a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 22:33:36 2010 +0100
Rename u-boot-unpacked target in u-boot-src-unpacked
commit 267e6282528d0d2a56be1f4ceae517859f69e1c9
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 19:03:51 2010 +0100
Updates some .gitignore
commit 203b8d3390da5ad6606fe46f1a25abf319a85d22
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 19:03:02 2010 +0100
[BUILDROOT] [2010.02] Makes U-Boot binary renaming work again
commit f58d4aa663d15cd4d7447e39bb3e7a5c269888af
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 18:15:59 2010 +0100
[BUILDROOT] [2010.02] Updates apf27 default config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 5 +-
buildroot/target/.gitignore | 2 +-
buildroot/target/device/.gitignore | 3 +-
buildroot/target/device/armadeus/apf27/Makefile.in | 6 ++-
.../target/device/armadeus/apf9328/Makefile.in | 3 +
buildroot/target/u-boot/.gitignore | 1 +
patches/buildroot/051-u-boot.patch | 2 +-
.../051a-u-boot-add_copy_to_functionnality.patch | 4 +-
.../051g-u-boot-add_u-boot-unpacked_target.patch | 2 +-
...ot-makes_binary_targets_name_overloadable.patch | 44 ++++++++++++++++++++
scripts/quiltify.sh | 2 +-
11 files changed, 64 insertions(+), 10 deletions(-)
create mode 100644 patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 44fb9d0..fbfb306 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Feb 8 16:44:09 2010
+# Tue Feb 9 11:51:05 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.02-git"
@@ -800,7 +800,8 @@ BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
# BR2_TARGET_UBOOT_SILENT is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
-# BR2_TARGET_UBOOT_TOOL_ENV is not set
+BR2_TARGET_UBOOT_TOOL_ENV=y
+BR2_TARGET_UBOOT_COPYTO=""
# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
#
diff --git a/buildroot/target/.gitignore b/buildroot/target/.gitignore
index e965ec4..6d7796a 100644
--- a/buildroot/target/.gitignore
+++ b/buildroot/target/.gitignore
@@ -11,7 +11,7 @@
/jffs2/
/linux/
/makedevs
-Makefile.in
+/Makefile.in
/powerpc/
/romfs/
/squashfs/
diff --git a/buildroot/target/device/.gitignore b/buildroot/target/device/.gitignore
index be8347b..b3132da 100644
--- a/buildroot/target/device/.gitignore
+++ b/buildroot/target/device/.gitignore
@@ -6,7 +6,8 @@ Config.*
Hitachi/
jp/
KwikByte/
-Makefile.*
+Makefile.in.linux
+/Makefile.in
mips/
Sharp/
Soekris/
diff --git a/buildroot/target/device/armadeus/apf27/Makefile.in b/buildroot/target/device/armadeus/apf27/Makefile.in
index 00fa0b1..8e48415 100644
--- a/buildroot/target/device/armadeus/apf27/Makefile.in
+++ b/buildroot/target/device/armadeus/apf27/Makefile.in
@@ -1,2 +1,6 @@
+ifeq ($(BR2_VERSION),"0.10.0-svn")
U_BOOT_BINLOC=u-boot-nand.bin
-
+else
+U_BOOT_BIN=u-boot-nand.bin
+U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
+endif
diff --git a/buildroot/target/device/armadeus/apf9328/Makefile.in b/buildroot/target/device/armadeus/apf9328/Makefile.in
index 09dbe0f..a6e01f7 100644
--- a/buildroot/target/device/armadeus/apf9328/Makefile.in
+++ b/buildroot/target/device/armadeus/apf9328/Makefile.in
@@ -1 +1,4 @@
TARGETS+=u-boot-brec
+ifneq ($(BR2_VERSION),"0.10.0-svn")
+U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
+endif
diff --git a/buildroot/target/u-boot/.gitignore b/buildroot/target/u-boot/.gitignore
index 6037245..faccc6c 100644
--- a/buildroot/target/u-boot/.gitignore
+++ b/buildroot/target/u-boot/.gitignore
@@ -1 +1,2 @@
/Config.in
+/Makefile.in
diff --git a/patches/buildroot/051-u-boot.patch b/patches/buildroot/051-u-boot.patch
index 937ec89..b9920c2 100644
--- a/patches/buildroot/051-u-boot.patch
+++ b/patches/buildroot/051-u-boot.patch
@@ -66,7 +66,7 @@ Index: buildroot/target/u-boot/Makefile.in
| tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-+u-boot-unpacked: $(U_BOOT_DIR)/.unpacked
++u-boot-src-unpacked: $(U_BOOT_DIR)/.unpacked
+
$(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot/ \
diff --git a/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch b/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
index 1224d6f..d43c71f 100644
--- a/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
+++ b/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
@@ -29,7 +29,7 @@ Index: buildroot/target/u-boot/Makefile.in
+ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_COPYTO)),)
+U_BOOT_COPYTO:=$(call qstrip,$(BR2_TARGET_UBOOT_COPYTO))
-+U_BOOT_TARGETS+=$(U_BOOT_COPYTO)/$(U_BOOT_BIN)
++U_BOOT_TARGETS+=$(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN)
+endif
+
U_BOOT_CONFIGURE_OPTS :=
@@ -40,7 +40,7 @@ Index: buildroot/target/u-boot/Makefile.in
(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
+ifneq ($(U_BOOT_COPYTO),)
-+$(U_BOOT_COPYTO)/$(U_BOOT_BIN): $(BINARIES_DIR)/$(U_BOOT_BIN)
++$(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ mkdir -p $(U_BOOT_COPYTO)
+ cp -dpf $< $@
+endif
diff --git a/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch b/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
index d8c20b5..3110dfc 100644
--- a/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
+++ b/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
@@ -8,7 +8,7 @@ Index: buildroot/target/u-boot/Makefile.in
mkdir -p $(U_BOOT_DIR)
touch $@
-+u-boot-unpacked: $(U_BOOT_DIR)/.unpacked
++u-boot-src-unpacked: $(U_BOOT_DIR)/.unpacked
+
$(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \
diff --git a/patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch b/patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
new file mode 100644
index 0000000..14a2507
--- /dev/null
+++ b/patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
@@ -0,0 +1,44 @@
+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).
+
+Specific for Armadeus.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-09 16:25:54.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-09 16:48:44.000000000 +0100
+@@ -11,14 +11,18 @@
+ U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
+ U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
+ U_BOOT_CAT:=$(BZCAT)
++ifeq ($(U_BOOT_BIN),)
+ U_BOOT_BIN:=u-boot.bin
++endif
++ifeq ($(U_BOOT_TARGET_BIN),)
+ U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin
++endif
+
+ U_BOOT_TOOLS:=$(HOST_DIR)/usr/bin/mkimage
+ MKIMAGE:=$(U_BOOT_TOOLS)
+ U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript
+
+-U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)
++U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_TARGET_BIN) $(U_BOOT_TOOLS)
+
+ ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV)),y)
+ U_BOOT_TARGETS += u-boot-autoscript
+@@ -185,11 +189,10 @@
+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
+ -C $(U_BOOT_DIR)
+
+-$(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
++$(BINARIES_DIR)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
+ rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
+ cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
+- (cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
+
+ ifneq ($(U_BOOT_COPYTO),)
+ $(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 0ea5871..3bea317 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -59,7 +59,7 @@ if [ "$answer" == "Buildroot" ]; then
QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/buildroot
elif [ "$answer" == "U-Boot" ]; then
QUILT_TARGET_NAME="U-Boot"
- QUILT_MAKEFILE_TARGET="u-boot-unpacked"
+ QUILT_MAKEFILE_TARGET="u-boot-src-unpacked"
QUILT_MAKEFILE_TARGET_TOUCH=".unpacked .patched"
QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_VERSION"
QUILT_TARGET_DIR=$ARMADEUS_U_BOOT_DIR
hooks/post-receive
--
armadeus
|
