[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-180-g6991289
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-180-g6991289
|
From: Julien B a. A. <ar...@us...> - 2010-02-09 08:43:08
|
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 6991289a87361580df838696bef4e333eaf86f15 (commit)
via c0040595e9e3251769220050225844b5f42b7a06 (commit)
via 9fe0fb58c76eb993108b3ea6aea29cb682382211 (commit)
via 03bca8832be2b0513517207863c937986ef7554e (commit)
via b001b7272d07a7ce316c6b8b604ecfb84134c461 (commit)
from bb4806807ebaf7f204a886f1b98470617ce758d1 (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 6991289a87361580df838696bef4e333eaf86f15
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 09:41:32 2010 +0100
[BUILDROOT] [2010.02] Makes 051/U-Boot patch work again by dividing it in functionnal sub-patches. Add a first U-Boot 1.3.4 fix for gcc 4.4 (from mainline).
commit c0040595e9e3251769220050225844b5f42b7a06
Author: Julien Boibessot <jul...@ar...>
Date: Sat Feb 6 11:31:45 2010 +0100
Improve comments in quiltify.sh
commit 9fe0fb58c76eb993108b3ea6aea29cb682382211
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 5 10:29:47 2010 +0100
[BUILDROOT] [2010.02] Fixes 053-libusb.patch
commit 03bca8832be2b0513517207863c937986ef7554e
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 5 10:28:34 2010 +0100
[BUILDROOT] [2010.02] Updates cleanup_buildroot.sh
commit b001b7272d07a7ce316c6b8b604ecfb84134c461
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 5 10:28:07 2010 +0100
[BUILDROOT] [2010.02] Removes unneeded 026-jffs2root.patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 9 ++-
buildroot/package/.gitignore | 1 +
buildroot/target/.gitignore | 1 +
buildroot/target/device/.gitignore | 1 +
..._symbols_inlined_compilation_with_gcc_4_4.patch | 59 ++++++++++++++++++++
patches/buildroot/026-jffs2root.patch | 2 +
.../2010.02/026-jffs2root.unused_to_check | 18 ------
.../051a-u-boot-add_copy_to_functionnality.patch | 57 +++++++++++++++++++
...1b-u-boot-change_board_name_default_value.patch | 15 +++++
...51c-u-boot-makes_u-boot-clean_target_work.patch | 19 ++++++
...d_possibility_to_choose_board_header_file.patch | 53 ++++++++++++++++++
...u-boot-add_1.3.4_version_specific_support.patch | 49 ++++++++++++++++
...madeus_specific_options_for_config_header.patch | 30 ++++++++++
.../051g-u-boot-add_u-boot-unpacked_target.patch | 15 +++++
.../2010.02/053-libusb-bump_version.patch | 21 +++++++
patches/buildroot/2010.02/053-libusb.to_fix | 13 ----
patches/buildroot/2010.02/cleanup_buildroot.sh | 2 +-
scripts/quiltify.sh | 4 +-
18 files changed, 333 insertions(+), 36 deletions(-)
create mode 100644 buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
delete mode 100644 patches/buildroot/2010.02/026-jffs2root.unused_to_check
create mode 100644 patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
create mode 100644 patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch
create mode 100644 patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch
create mode 100644 patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
create mode 100644 patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch
create mode 100644 patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
create mode 100644 patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
create mode 100644 patches/buildroot/2010.02/053-libusb-bump_version.patch
delete mode 100644 patches/buildroot/2010.02/053-libusb.to_fix
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index b1d0160..44fb9d0 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Feb 3 13:49:16 2010
+# Mon Feb 8 16:44:09 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.02-git"
@@ -529,6 +529,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_PCMCIA is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
# BR2_PACKAGE_SYSSTAT is not set
@@ -784,14 +785,16 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
#
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
-BR2_TARGET_UBOOT_2009_11=y
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
+BR2_TARGET_UBOOT_1_3_4=y
+# BR2_TARGET_UBOOT_2009_11 is not set
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_2009_06 is not set
# BR2_TARGET_UBOOT_2009_03 is not set
# BR2_TARGET_UBOOT_2009_01 is not set
# BR2_TARGET_UBOOT_2008_10 is not set
# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
-BR2_UBOOT_VERSION="2009.11"
+BR2_UBOOT_VERSION="1.3.4"
BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 29bfb0f..14597d9 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -4,6 +4,7 @@
/Config.in
/Config.in.bak
/Makefile.autotools.in
+/Makefile.package.in
/Makefile.in
/buildroot-libtool.patch
diff --git a/buildroot/target/.gitignore b/buildroot/target/.gitignore
index b0582a5..e965ec4 100644
--- a/buildroot/target/.gitignore
+++ b/buildroot/target/.gitignore
@@ -19,3 +19,4 @@ Makefile.in
#ubifs
#u-boot
/x86/
+/xtensa/
diff --git a/buildroot/target/device/.gitignore b/buildroot/target/device/.gitignore
index 4b19070..be8347b 100644
--- a/buildroot/target/device/.gitignore
+++ b/buildroot/target/device/.gitignore
@@ -13,3 +13,4 @@ Soekris/
valka/
Via/
x86/
+xtensa/
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch b/buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
new file mode 100644
index 0000000..9cbfbf7
--- /dev/null
+++ b/buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
@@ -0,0 +1,59 @@
+From: Ron Lee <ro...@de...>
+Date: Wed, 5 Aug 2009 18:14:01 +0000 (+0200)
+Subject: ARM Don't inline weak symbols
+X-Git-Tag: v2009.11-rc2~59^2
+X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=f865fcbbb35851e75fee9c3a3fa8e0f71d9e6463
+
+ARM Don't inline weak symbols
+
+------------------------------------------------------------------------
+
+GCC 4.4 complains about this now.
+
+Signed-off-by: Ron Lee <ro...@de...>
+---
+
+Index: u-boot-1.3.4/lib_arm/board.c
+===================================================================
+--- u-boot-1.3.4.orig/lib_arm/board.c 2010-02-05 16:48:16.000000000 +0100
++++ u-boot-1.3.4/lib_arm/board.c 2010-02-05 16:48:20.000000000 +0100
+@@ -135,19 +135,19 @@
+ * May be supplied by boards if desired
+ */
+ void inline __coloured_LED_init (void) {}
+-void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
++void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
+ void inline __red_LED_on (void) {}
+-void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
++void red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
+ void inline __red_LED_off(void) {}
+-void inline red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
++void red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
+ void inline __green_LED_on(void) {}
+-void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
++void green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
+ void inline __green_LED_off(void) {}
+-void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
++void green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
+ void inline __yellow_LED_on(void) {}
+-void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
++void yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
+ void inline __yellow_LED_off(void) {}
+-void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
++void yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
+
+ /************************************************************************
+ * Init Utilities *
+Index: u-boot-1.3.4/common/main.c
+===================================================================
+--- u-boot-1.3.4.orig/common/main.c 2010-02-05 16:50:51.000000000 +0100
++++ u-boot-1.3.4/common/main.c 2010-02-05 16:51:14.000000000 +0100
+@@ -48,7 +48,7 @@
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+ void inline __show_boot_progress (int val) {}
+-void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
++void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+
+ #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
+ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
diff --git a/patches/buildroot/026-jffs2root.patch b/patches/buildroot/026-jffs2root.patch
index 5173e2c..592ccf3 100644
--- a/patches/buildroot/026-jffs2root.patch
+++ b/patches/buildroot/026-jffs2root.patch
@@ -1,3 +1,5 @@
+No more needed with latest BR version.
+
Index: buildroot/target/jffs2/jffs2root.mk
===================================================================
--- buildroot.orig/target/jffs2/jffs2root.mk 2010-01-25 10:03:35.000000000 +0100
diff --git a/patches/buildroot/2010.02/026-jffs2root.unused_to_check b/patches/buildroot/2010.02/026-jffs2root.unused_to_check
deleted file mode 100644
index 1fa5341..0000000
--- a/patches/buildroot/2010.02/026-jffs2root.unused_to_check
+++ /dev/null
@@ -1,18 +0,0 @@
-No more usefull on 2010.02 ???
-
-Index: buildroot/target/jffs2/jffs2root.mk
-===================================================================
---- buildroot.orig/target/jffs2/jffs2root.mk 2010-01-25 10:03:35.000000000 +0100
-+++ buildroot/target/jffs2/jffs2root.mk 2010-01-25 10:04:15.000000000 +0100
-@@ -58,7 +58,10 @@
- ifneq ($(BR2_HAVE_INFOPAGES),y)
- @rm -rf $(TARGET_DIR)/usr/info
- endif
-- @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
-+ @test -d $(TARGET_DIR)/usr/share && \
-+ rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
-+ true
-+# @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
- $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
- # Use fakeroot to pretend all target binaries are owned by root
- rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
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
new file mode 100644
index 0000000..1224d6f
--- /dev/null
+++ b/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
@@ -0,0 +1,57 @@
+Implements (quite) the same as BR2_LINUX_COPYTO for U-Boot.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/target/u-boot/Config.in
+===================================================================
+--- buildroot.orig/target/u-boot/Config.in 2010-02-05 13:31:08.000000000 +0100
++++ buildroot/target/u-boot/Config.in 2010-02-05 14:38:40.000000000 +0100
+@@ -126,6 +126,12 @@
+ help
+ Install fw_printenv / fw_setenv tools in target.
+
++config BR2_TARGET_UBOOT_COPYTO
++ string "Copy binary image to <dir>..."
++ default ""
++ help
++ Copy U-Boot binary image to secondary location.
++
+ menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
+ bool "Generate a default environment"
+ help
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-05 14:05:30.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-05 14:08:52.000000000 +0100
+@@ -46,6 +46,11 @@
+ U_BOOT_TARGETS+=$(TARGET_DIR)/usr/sbin/fw_printenv
+ endif
+
++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)
++endif
++
+ U_BOOT_CONFIGURE_OPTS :=
+
+ ifneq ($(BR2_TARGET_UBOOT_1_2_0_ATMEL),)
+@@ -167,6 +172,12 @@
+ 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_BIN): $(BINARIES_DIR)/$(U_BOOT_BIN)
++ mkdir -p $(U_BOOT_COPYTO)
++ cp -dpf $< $@
++endif
++
+ $(U_BOOT_TOOLS): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ mkdir -p $(@D)
+ cp -dpf $(U_BOOT_DIR)/tools/mkimage $@
+@@ -289,5 +300,6 @@
+ @echo BR2_TARGET_UBOOT_ETH1ADDR = $(BR2_TARGET_UBOOT_ETH1ADDR)
+ @echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
+ @echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
++ @echo U_BOOT_COPYTO = $(U_BOOT_COPYTO)
+ @exit 0
+
diff --git a/patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch b/patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch
new file mode 100644
index 0000000..43e8a1f
--- /dev/null
+++ b/patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch
@@ -0,0 +1,15 @@
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: buildroot/target/u-boot/Config.in
+===================================================================
+--- buildroot.orig/target/u-boot/Config.in 2010-02-05 15:28:46.000000000 +0100
++++ buildroot/target/u-boot/Config.in 2010-02-05 15:29:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ 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.
diff --git a/patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch b/patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch
new file mode 100644
index 0000000..79fbd39
--- /dev/null
+++ b/patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch
@@ -0,0 +1,19 @@
+Otherwise "make u-boot-clean" complains if arm-linux-gcc is not is your PATH.
+Only needed for U-Boot 1.3.4 ??
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-06 15:17:24.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-08 11:19:29.000000000 +0100
+@@ -208,7 +208,8 @@
+ u-boot-autoscript: $(U_BOOT_AUTOSCRIPT).img
+
+ u-boot-clean:
+- -$(MAKE) -C $(U_BOOT_DIR) clean
++ -$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) -C $(U_BOOT_DIR) clean
++ rm -f $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ rm -f $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS)
+
+ u-boot-dirclean:
diff --git a/patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
new file mode 100644
index 0000000..834a5f4
--- /dev/null
+++ b/patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -0,0 +1,53 @@
+
+BR maintainer removes this change (and others) with this commit:
+http://git.buildroot.net/buildroot/commit/?id=3bab463be4a42de790b745ab2e873e1c1ce42f2d
+
+We need it because U-Boot's mainline doesn't have (yet?) our boards configs.
+So this patch reverts the removing + refines it.
+
+Index: buildroot/target/u-boot/Config.in
+===================================================================
+--- buildroot.orig/target/u-boot/Config.in 2010-02-08 11:34:35.000000000 +0100
++++ buildroot/target/u-boot/Config.in 2010-02-08 11:34:38.000000000 +0100
+@@ -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"
++ 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
++ mainline or wanting to test a config different from the default one.
++
+ choice
+ prompt "U-Boot Version"
+ default BR2_TARGET_UBOOT_2009_11
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-08 11:34:36.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-08 11:34:38.000000000 +0100
+@@ -88,7 +88,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/
++endif
++ touch $@
++
++$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.config_header_copied
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+@@ -292,6 +298,7 @@
+ u-boot-status:
+ @echo
+ @echo U_BOOT_INC_CONF_FILE = $(U_BOOT_INC_CONF_FILE)
++ @echo BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE = $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)
+ @echo BR2_UBOOT_VERSION = $(BR2_UBOOT_VERSION)
+ @echo BR2_TARGET_UBOOT_SERVERIP = $(BR2_TARGET_UBOOT_SERVERIP)
+ @echo BR2_TARGET_UBOOT_IPADDR = $(BR2_TARGET_UBOOT_IPADDR)
diff --git a/patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch b/patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch
new file mode 100644
index 0000000..60adf2a
--- /dev/null
+++ b/patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch
@@ -0,0 +1,49 @@
+Specific for Armadeus boards.
+
+Index: buildroot/target/u-boot/Config.in
+===================================================================
+--- buildroot.orig/target/u-boot/Config.in 2010-02-08 11:19:36.000000000 +0100
++++ buildroot/target/u-boot/Config.in 2010-02-08 11:19:36.000000000 +0100
+@@ -25,6 +25,9 @@
+ help
+ Select the specific U-Boot version you want to use
+
++config BR2_TARGET_UBOOT_1_3_4
++ bool "u-boot-1.3.4"
++
+ config BR2_TARGET_UBOOT_2009_11
+ bool "u-boot-2009.11"
+
+@@ -56,6 +59,7 @@
+
+ config BR2_UBOOT_VERSION
+ string
++ default "1.3.4" if BR2_TARGET_UBOOT_1_3_4
+ default "2009.11" if BR2_TARGET_UBOOT_2009_11
+ default "2009.08" if BR2_TARGET_UBOOT_2009_08
+ default "2009.06" if BR2_TARGET_UBOOT_2009_06
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-08 11:25:55.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-08 11:33:26.000000000 +0100
+@@ -190,6 +190,11 @@
+
+ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ mkdir -p $(@D)
++ifeq ($(U_BOOT_VERSION),1.3.4)
++ $(TARGET_CC) -I$(U_BOOT_DIR)/include -DUSE_HOSTCC -o $@ \
++ $(U_BOOT_DIR)/tools/mkimage.c \
++ $(addprefix $(U_BOOT_DIR)/tools/,crc32.c image.c md5.c sha1.c fdt*.c)
++else
+ $(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
+ -DUSE_HOSTCC -o $@ \
+ $(U_BOOT_DIR)/common/image.c \
+@@ -198,7 +203,7 @@
+ $(addprefix $(U_BOOT_DIR)/lib_generic/,crc32.c md5.c sha1.c) \
+ $(U_BOOT_DIR)/tools/os_support.c \
+ $(U_BOOT_DIR)/libfdt/fdt*.c
+-
++endif
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
+
+ $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN)
diff --git a/patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
new file mode 100644
index 0000000..0334050
--- /dev/null
+++ b/patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
@@ -0,0 +1,30 @@
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-08 11:34:47.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-08 11:34:52.000000000 +0100
+@@ -162,6 +162,17 @@
+ endif
+ @echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
+ endif # BR2_TARGET_UBOOT_DEFAULT_ENV
++ifneq ($(strip $(BOARD_NAME)),"")
++ $(call insert_define, CONFIG_BOARD_NAME, $(BOARD_NAME))
++endif
++ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),)
++ $(SED) "s,^#define CFG_SDRAM_MBYTE_SYZE.*,#define CFG_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
++ $(U_BOOT_INC_CONF_FILE)
++endif
++ifneq ($(BR2_TARGET_ARMADEUS_NR_SDRAM),)
++ $(SED) "s,^#define CONFIG_NR_DRAM_BANKS.*,#define CONFIG_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
++ $(U_BOOT_INC_CONF_FILE)
++endif
+ touch $@
+
+ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified
+@@ -314,5 +325,7 @@
+ @echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
+ @echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
+ @echo U_BOOT_COPYTO = $(U_BOOT_COPYTO)
++ @echo BR2_TARGET_ARMADEUS_SDRAM_SIZE = $(BR2_TARGET_ARMADEUS_SDRAM_SIZE)
++ @echo BR2_TARGET_ARMADEUS_NR_SDRAM = $(BR2_TARGET_ARMADEUS_NR_SDRAM)
+ @exit 0
+
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
new file mode 100644
index 0000000..d8c20b5
--- /dev/null
+++ b/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
@@ -0,0 +1,15 @@
+Specific for Armadeus (needed by quiltify script).
+
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-05 15:09:08.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-05 15:09:35.000000000 +0100
+@@ -74,6 +74,8 @@
+ mkdir -p $(U_BOOT_DIR)
+ touch $@
+
++u-boot-unpacked: $(U_BOOT_DIR)/.unpacked
++
+ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
+ toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \
+ u-boot-$(U_BOOT_VERSION)-\*.patch \
diff --git a/patches/buildroot/2010.02/053-libusb-bump_version.patch b/patches/buildroot/2010.02/053-libusb-bump_version.patch
new file mode 100644
index 0000000..594395e
--- /dev/null
+++ b/patches/buildroot/2010.02/053-libusb-bump_version.patch
@@ -0,0 +1,21 @@
+0.1.12-10 is no more available, so move to latest version.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/libusb/libusb.mk
+===================================================================
+--- buildroot.orig/package/libusb/libusb.mk 2010-02-05 10:18:33.000000000 +0100
++++ buildroot/package/libusb/libusb.mk 2010-02-05 10:19:29.000000000 +0100
+@@ -4,9 +4,10 @@
+ #
+ #############################################################
+ LIBUSB_VERSION:=0.1.12
+-LIBUSB_PATCH_FILE:=libusb_$(LIBUSB_VERSION)-10.diff.gz
++LIBUSB_PATCH_FILE:=libusb_$(LIBUSB_VERSION)-14.diff.gz
+ LIBUSB_SOURCE:=libusb_$(LIBUSB_VERSION).orig.tar.gz
+-LIBUSB_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/libu/libusb
++#LIBUSB_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/libu/libusb
++LIBUSB_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libu/libusb
+ LIBUSB_DIR:=$(BUILD_DIR)/libusb-$(LIBUSB_VERSION)
+ LIBUSB_CAT:=$(ZCAT)
+ LIBUSB_BINARY:=usr/lib/libusb.so
diff --git a/patches/buildroot/2010.02/053-libusb.to_fix b/patches/buildroot/2010.02/053-libusb.to_fix
deleted file mode 100644
index dfff8c8..0000000
--- a/patches/buildroot/2010.02/053-libusb.to_fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Latest BR downgrades to 0.1.12-10 from snapshot.debian.net
-
---- buildroot/package/libusb/libusb.mk~ 2008-11-21 09:15:25.000000000 +0100
-+++ buildroot/package/libusb/libusb.mk 2008-11-22 18:12:18.000000000 +0100
-@@ -4,7 +4,7 @@
- #
- #############################################################
- LIBUSB_VERSION:=0.1.12
--LIBUSB_PATCH_FILE:=libusb_$(LIBUSB_VERSION)-12.diff.gz
-+LIBUSB_PATCH_FILE:=libusb_$(LIBUSB_VERSION)-13.diff.gz
- LIBUSB_SOURCE:=libusb_$(LIBUSB_VERSION).orig.tar.gz
- #LIBUSB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libusb/
- LIBUSB_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libu/libusb
diff --git a/patches/buildroot/2010.02/cleanup_buildroot.sh b/patches/buildroot/2010.02/cleanup_buildroot.sh
index ce31382..e05712e 100755
--- a/patches/buildroot/2010.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.02/cleanup_buildroot.sh
@@ -13,4 +13,4 @@ rm -rf buildroot/package/uucp/
rm -f buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/multimedia/flite/
rm -rf buildroot/package/libcurl/
-
+rm -f buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index cfda698..0ea5871 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -103,8 +103,9 @@ if [ "$QUILT_TARGET_NAME" != "Buildroot" ]; then
ask_user "Rename or delete the current $QUILT_TARGET_NAME directory: $QUILT_TARGET_DIR \n?? (R/d)"
EXT=`date +%Y_%m_%d_%Hh%M`
if [ "$answer" == "d" ]; then
- echo "Deleting current $QUILT_TARGET_NAME dir"
+ echo -n "Deleting current $QUILT_TARGET_NAME dir..."
rm -rf $QUILT_TARGET_DIR
+ echo "done"
else
echo "Renaming $QUILT_TARGET_DIR"
echo " to " "$QUILT_TARGET_DIR"."$EXT"
@@ -118,6 +119,7 @@ else # For Buildroot
fi
# Get XXX unpacked sources
+echo "Getting sources... (make $QUILT_MAKEFILE_TARGET)"
make $QUILT_MAKEFILE_TARGET
if [ "$?" != 0 ]; then
echo "Failed to get sources, please check your view !!"
hooks/post-receive
--
armadeus
|
