[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2486-g641bd3c

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  641bd3c844cbc15767a151e9b9425dda4145f2c3 (commit)
       via  baf07186af78da1876e442c0bd6b6a08d25526d1 (commit)
       via  929c8699880a2f8b78b1f3712d52306a17629132 (commit)
       via  5e3fb473475204d203bbda59efa2763073eb54bb (commit)
       via  651ef8a7ee03df0c6641081ef438f950c58df879 (commit)
      from  2226f4e8a6651943e8f35d1a453b0e353fb4e562 (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 641bd3c844cbc15767a151e9b9425dda4145f2c3
Merge: baf0718 2226f4e
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Aug 12 10:48:17 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit baf07186af78da1876e442c0bd6b6a08d25526d1
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Aug 12 10:47:20 2011 +0200

    [BUILDROOT] [2011.05] Makes Armadeus specific Makefile.in sourced again by BR

commit 929c8699880a2f8b78b1f3712d52306a17629132
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Aug 11 17:32:09 2011 +0200

    Fixes patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.patch

commit 5e3fb473475204d203bbda59efa2763073eb54bb
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 10 18:39:46 2011 +0200

    [BUILDROOT] Makes it possible to choose generic tty even when custom rootfs option is selected

commit 651ef8a7ee03df0c6641081ef438f950c58df879
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Aug 10 18:38:41 2011 +0200

    [BUILDROOT] [2010.05] Makes 051h-u-boot-makes_binary_targets_name_overloadable.patch work again

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

Summary of changes:
 .../2011.05/001-add_armadeus_device.patch          |   13 +++++++-
 ...t-makes_binary_targets_name_overloadable.patch} |   19 +++++++------
 ...lection_even_when_custom_rootfs_is_chosen.patch |   29 ++++++++++++++++++++
 3 files changed, 50 insertions(+), 11 deletions(-)
 rename patches/buildroot/2011.05/{051h-u-boot-makes_binary_targets_name_overloadable.tofix => 051h-u-boot-makes_binary_targets_name_overloadable.patch} (78%)
 create mode 100644 patches/buildroot/2011.05/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch

diff --git a/patches/buildroot/2011.05/001-add_armadeus_device.patch b/patches/buildroot/2011.05/001-add_armadeus_device.patch
index f629dd3..c085d36 100644
--- a/patches/buildroot/2011.05/001-add_armadeus_device.patch
+++ b/patches/buildroot/2011.05/001-add_armadeus_device.patch
@@ -2,11 +2,20 @@ Add armadeus target specific menu to BR.
 
 Index: buildroot/target/generic/Config.in
 ===================================================================
---- buildroot.orig/target/generic/Config.in	2011-08-08 12:12:01.000000000 +0200
-+++ buildroot/target/generic/Config.in	2011-08-08 12:12:06.000000000 +0200
+--- buildroot.orig/target/generic/Config.in	2011-05-27 16:18:21.000000000 +0200
++++ buildroot/target/generic/Config.in	2011-08-11 17:51:41.000000000 +0200
 @@ -126,4 +126,5 @@
  	  only argument. Make sure the exit code of that script is 0,
  	  otherwise make will stop after calling it.
  
 +source "target/device/armadeus/Config.in"
  endmenu
+Index: buildroot/target/Makefile.in
+===================================================================
+--- buildroot.orig/target/Makefile.in	2011-08-11 17:52:02.000000000 +0200
++++ buildroot/target/Makefile.in	2011-08-11 17:52:41.000000000 +0200
+@@ -1,3 +1,4 @@
+ # make sure to put everything that is board-specific before the tarroot targets
+ include target/generic/Makefile.in
+ 
++include target/device/armadeus/Makefile.in
diff --git a/patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.tofix b/patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.patch
similarity index 78%
rename from patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.tofix
rename to patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.patch
index 59d817a..2d017c0 100644
--- a/patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.tofix
+++ b/patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.patch
@@ -1,7 +1,7 @@
 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.
+target/* Makefiles need to be sourced before boot/* ones.
 
 Specific for Armadeus.
 
@@ -10,9 +10,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2011-01-27 15:24:18.000000000 +0100
-+++ buildroot/boot/u-boot/u-boot.mk	2011-01-27 15:24:20.000000000 +0100
-@@ -28,16 +28,22 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2011-08-10 18:33:24.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2011-08-10 18:33:36.000000000 +0200
+@@ -28,6 +28,7 @@
  U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
  U_BOOT_CAT:=$(BZCAT)
  
@@ -20,13 +20,14 @@ Index: buildroot/boot/u-boot/u-boot.mk
  ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
  U_BOOT_BIN:=u-boot.kwb
  U_BOOT_MAKE_OPT:=$(U_BOOT_BIN)
+@@ -36,10 +37,15 @@
  else
  U_BOOT_BIN:=u-boot.bin
  endif
-+endif
++endif # ifeq ($(U_BOOT_BIN),)
 +
 +ifeq ($(U_BOOT_TARGET_BIN),)
-+U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin
++U_BOOT_TARGET_BIN:=u-boot.bin
 +endif
  
  MKIMAGE:=$(HOST_DIR)/usr/bin/mkimage
@@ -50,9 +51,9 @@ Index: buildroot/boot/u-boot/u-boot.mk
  $(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
 Index: buildroot/Makefile
 ===================================================================
---- buildroot.orig/Makefile	2011-01-27 15:22:58.000000000 +0100
-+++ buildroot/Makefile	2011-01-27 15:24:20.000000000 +0100
-@@ -301,8 +301,8 @@
+--- buildroot.orig/Makefile	2011-08-10 18:33:29.000000000 +0200
++++ buildroot/Makefile	2011-08-10 18:35:00.000000000 +0200
+@@ -320,8 +320,8 @@
  
  include package/*/*.mk
  
diff --git a/patches/buildroot/2011.05/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch b/patches/buildroot/2011.05/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
new file mode 100644
index 0000000..22b1279
--- /dev/null
+++ b/patches/buildroot/2011.05/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
@@ -0,0 +1,29 @@
+On Armadeus platforms, we use a custom rootfs AND we need to be able to choose
+generic serial tty device.
+
+Specific to Armadeus ??
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/target/generic/Config.in
+===================================================================
+--- buildroot.orig/target/generic/Config.in	2011-08-10 18:15:59.000000000 +0200
++++ buildroot/target/generic/Config.in	2011-08-10 18:16:18.000000000 +0200
+@@ -72,8 +72,6 @@
+ 	  Path custom target skeleton.
+ endif
+ 
+-if BR2_ROOTFS_SKELETON_DEFAULT
+-
+ config BR2_TARGET_GENERIC_GETTY_PORT
+ 	string "Port to run a getty (login prompt) on"
+ 	default "ttyS0"
+@@ -109,8 +107,6 @@
+ 	default "57600"		if BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600
+ 	default "115200"	if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200
+ 
+-endif # BR2_ROOTFS_SKELETON_DEFAULT
+-
+ config BR2_ROOTFS_POST_BUILD_SCRIPT
+ 	string "Custom script to run before creating filesystem images"
+ 	default ""


hooks/post-receive
-- 
armadeus


