armadeus-commitlog Mailing List for armadeus (Page 84)

Brought to you by: sszy

armadeus-commitlog — Armadeus GIT commit logs

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2007	Jan (43)	Feb (8)	Mar (7)	Apr (8)	May (14)	Jun (6)	Jul (4)	Aug (17)	Sep (18)	Oct (19)	Nov (52)	Dec (30)
2008	Jan (6)	Feb (6)	Mar (15)	Apr (22)	May (13)	Jun (11)	Jul (41)	Aug (10)	Sep (14)	Oct (21)	Nov (4)	Dec (66)
2009	Jan (67)	Feb (57)	Mar (90)	Apr (54)	May (64)	Jun (76)	Jul (14)	Aug (18)	Sep (18)	Oct (20)	Nov (15)	Dec (36)
2010	Jan (28)	Feb (25)	Mar (32)	Apr (23)	May (22)	Jun (62)	Jul (36)	Aug (16)	Sep (12)	Oct (20)	Nov (44)	Dec (25)
2011	Jan (36)	Feb (49)	Mar (28)	Apr (38)	May (26)	Jun (52)	Jul (33)	Aug (32)	Sep (19)	Oct (26)	Nov (13)	Dec (32)
2012	Jan (38)	Feb (34)	Mar (91)	Apr (35)	May (31)	Jun (72)	Jul (23)	Aug (13)	Sep (33)	Oct (47)	Nov (18)	Dec (22)
2013	Jan (31)	Feb (22)	Mar (26)	Apr (11)	May (38)	Jun (15)	Jul (37)	Aug (68)	Sep (34)	Oct (11)	Nov (26)	Dec (31)
2014	Jan (60)	Feb (55)	Mar (21)	Apr (31)	May (17)	Jun (35)	Jul (24)	Aug (17)	Sep (11)	Oct (23)	Nov (10)	Dec (23)
2015	Jan (15)	Feb (34)	Mar (46)	Apr (23)	May (12)	Jun (14)	Jul (18)	Aug (22)	Sep (6)	Oct (2)	Nov (1)	Dec (6)
2016	Jan (5)	Feb (7)	Mar (10)	Apr (10)	May (17)	Jun (6)	Jul (4)	Aug (6)	Sep (22)	Oct (8)	Nov (9)	Dec (5)
2017	Jan (11)	Feb (12)	Mar (27)	Apr (9)	May (1)	Jun (5)	Jul (11)	Aug (10)	Sep (6)	Oct (10)	Nov (4)	Dec (6)
2018	Jan (6)	Feb (13)	Mar (9)	Apr (7)	May (10)	Jun (9)	Jul (21)	Aug (13)	Sep (10)	Oct (4)	Nov (6)	Dec (1)
2019	Jan (6)	Feb (2)	Mar (5)	Apr (6)	May (19)	Jun (14)	Jul (18)	Aug (3)	Sep (5)	Oct (7)	Nov (8)	Dec (4)
2020	Jan (10)	Feb (3)	Mar (9)	Apr (7)	May (2)	Jun (18)	Jul (3)	Aug	Sep	Oct (7)	Nov	Dec (1)
2021	Jan (9)	Feb (6)	Mar (4)	Apr (11)	May (7)	Jun (5)	Jul (2)	Aug (4)	Sep (10)	Oct (9)	Nov (5)	Dec
2022	Jan (2)	Feb (12)	Mar (3)	Apr (5)	May (1)	Jun (3)	Jul (2)	Aug (1)	Sep (4)	Oct (4)	Nov (1)	Dec (3)
2023	Jan (5)	Feb (3)	Mar (3)	Apr (2)	May (1)	Jun (3)	Jul (3)	Aug (2)	Sep (1)	Oct (1)	Nov	Dec (4)
2024	Jan (2)	Feb (3)	Mar (8)	Apr (4)	May (1)	Jun (13)	Jul (7)	Aug (1)	Sep (6)	Oct (5)	Nov (11)	Dec (7)
2025	Jan (3)	Feb (1)	Mar (6)	Apr (4)	May (4)	Jun (1)	Jul (1)	Aug (7)	Sep (4)	Oct (4)	Nov (4)	Dec (1)
2026	Jan (3)	Feb (7)	Mar (3)	Apr (1)	May (6)	Jun (3)	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 82 83 84 85 86 .. 153 > >> (Page 84 of 153)

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2687-geb1ee13

From: jorasse <jo...@us...> - 2012-01-16 00:36:57

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  eb1ee13698a40c44a78455240a77c61f1a779f12 (commit)
       via  1304c03fe609084c795444929cc7b77e1265bc11 (commit)
      from  2d3e05029edb74da6ddeed7e87d2a5f5f165d79a (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 eb1ee13698a40c44a78455240a77c61f1a779f12
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jan 16 01:36:05 2012 +0100

    [UBOOT] apf51: Clean-up

commit 1304c03fe609084c795444929cc7b77e1265bc11
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jan 16 01:34:59 2012 +0100

    [UBOOT] apf51: Fix memory cache alignement issue

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

Summary of changes:
 patches/u-boot/2011.12/400-imx51.patch |    7 +------
 patches/u-boot/2011.12/401-apf51.patch |   14 +++++++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/patches/u-boot/2011.12/400-imx51.patch b/patches/u-boot/2011.12/400-imx51.patch
index 13455d4..4db9287 100644
--- a/patches/u-boot/2011.12/400-imx51.patch
+++ b/patches/u-boot/2011.12/400-imx51.patch
@@ -427,7 +427,7 @@
  }
 --- u-boot-2011.12/arch/arm/lib/cache-cp15.c	2011-12-23 20:25:35.000000000 +0100
 +++ u-boot-2011.12/arch/arm/lib/cache-cp15.c	2012-01-09 22:28:01.960696861 +0100
-@@ -86,10 +86,17 @@ static inline void mmu_setup(void)
+@@ -86,6 +86,13 @@ static inline void mmu_setup(void)
  	/* Set the access control to all-supervisor */
  	asm volatile("mcr p15, 0, %0, c3, c0, 0"
  		     : : "r" (~0));
@@ -441,9 +441,4 @@
  	/* and enable the mmu */
  	reg = get_cr();	/* get control reg. */
  	cp_delay();
--	set_cr(reg | CR_M);
-+	set_cr(reg | CR_M | CR_A | CR_Z);
- }
- 
- static int mmu_enabled(void)
 
diff --git a/patches/u-boot/2011.12/401-apf51.patch b/patches/u-boot/2011.12/401-apf51.patch
index 51ac68b..fe9dc14 100644
--- a/patches/u-boot/2011.12/401-apf51.patch
+++ b/patches/u-boot/2011.12/401-apf51.patch
@@ -79,9 +79,9 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
 +{
 +	u32 size1, size2=0;
 +
-+	size1 = get_ram_size((void *)CONFIG_SYS_SDRAM_1_BASE, PHYS_SDRAM_1_SIZE);
-+#if ( CONFIG_SYS_NR_DRAM_BANKS > 1 )
-+	size2 = get_ram_size((void *)CONFIG_SYS_SDRAM_2_BASE, PHYS_SDRAM_2_SIZE);
++	size1 = get_ram_size((void *)CSD0_BASE_ADDR, PHYS_SDRAM_1_SIZE);
++#if ( CONFIG_NR_DRAM_BANKS > 1 )
++	size2 = get_ram_size((void *)CSD1_BASE_ADDR, PHYS_SDRAM_2_SIZE);
 +#endif
 +
 +	gd->ram_size = size1 + size2;
@@ -90,10 +90,10 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
 +
 +void dram_init_banksize(void)
 +{
-+	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_1_BASE;
++	gd->bd->bi_dram[0].start = CSD0_BASE_ADDR;
 +	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-+#if ( CONFIG_SYS_NR_DRAM_BANKS > 1 )
-+	gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_2_BASE;
++#if ( CONFIG_NR_DRAM_BANKS > 1 )
++	gd->bd->bi_dram[1].start = CSD1_BASE_ADDR;
 +	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
 +#endif
 +}
@@ -922,7 +922,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
 +int board_init(void)
 +{
 +	/* address of boot parameters */
-+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_1_BASE + 0x100;
++	gd->bd->bi_boot_params = CSD0_BASE_ADDR + 0x100;
 +
 +	return 0;
 +}


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2685-g2d3e050

From: jorasse <jo...@us...> - 2012-01-14 11:14:48

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  2d3e05029edb74da6ddeed7e87d2a5f5f165d79a (commit)
       via  be0fe721a8ea713cea993c13a0f37daeb88d7284 (commit)
      from  3fac1112a42bddaf7330a0598c8b16178c56861f (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 2d3e05029edb74da6ddeed7e87d2a5f5f165d79a
Merge: be0fe72 3fac111
Author: Eric Jarrige <eri...@ar...>
Date:   Sat Jan 14 12:14:25 2012 +0100

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

commit be0fe721a8ea713cea993c13a0f37daeb88d7284
Author: Eric Jarrige <eri...@ar...>
Date:   Sat Jan 14 12:13:43 2012 +0100

    [UBOOT] apf51: update u-boot recover version to the latest version

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

Summary of changes:
 software/uboot_recover/apf51-u-boot.bin |  Bin 251756 -> 256956 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/software/uboot_recover/apf51-u-boot.bin b/software/uboot_recover/apf51-u-boot.bin
index c213be3..6b4982a 100644
Binary files a/software/uboot_recover/apf51-u-boot.bin and b/software/uboot_recover/apf51-u-boot.bin differ


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2683-g3fac111

From: jorasse <jo...@us...> - 2012-01-14 10:58:49

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  3fac1112a42bddaf7330a0598c8b16178c56861f (commit)
      from  924ce1b58fdc1c190b28ffb72f3b6adef14b9b15 (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 3fac1112a42bddaf7330a0598c8b16178c56861f
Author: Eric Jarrige <eri...@ar...>
Date:   Sat Jan 14 11:40:08 2012 +0100

    [BUILDROOT] Pixman: Bump version 0.18.0 and fix outdated version

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

Summary of changes:
 ...p-version-0.18.0-and-fix-outdated-version.patch |   24 ++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2011.05/170-Pixman-Bump-version-0.18.0-and-fix-outdated-version.patch

diff --git a/patches/buildroot/2011.05/170-Pixman-Bump-version-0.18.0-and-fix-outdated-version.patch b/patches/buildroot/2011.05/170-Pixman-Bump-version-0.18.0-and-fix-outdated-version.patch
new file mode 100644
index 0000000..d84fb99
--- /dev/null
+++ b/patches/buildroot/2011.05/170-Pixman-Bump-version-0.18.0-and-fix-outdated-version.patch
@@ -0,0 +1,24 @@
+Pixman: Bump version 0.18.0 and fix outdated version
+
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ package/pixman/pixman.mk |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
+index 2b39a77..9f4a0fd 100644
+--- a/package/pixman/pixman.mk
++++ b/package/pixman/pixman.mk
+@@ -3,7 +3,7 @@
+ # pixman
+ #
+ ################################################################################
+-PIXMAN_VERSION = 0.17.6
++PIXMAN_VERSION = 0.18.0
+ PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
+ PIXMAN_SITE = http://cairographics.org/releases/
+ PIXMAN_AUTORECONF = NO
+-- 
+1.7.0.4
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2682-g924ce1b

From: jorasse <jo...@us...> - 2012-01-13 21:14:29

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  924ce1b58fdc1c190b28ffb72f3b6adef14b9b15 (commit)
       via  45cfe30b40720351c9cbee37c8a499236081c577 (commit)
      from  60bbbb1a908fab77459bc030975e87206b0f732c (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 924ce1b58fdc1c190b28ffb72f3b6adef14b9b15
Merge: 45cfe30 60bbbb1
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Jan 13 22:14:02 2012 +0100

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

commit 45cfe30b40720351c9cbee37c8a499236081c577
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Jan 13 22:13:40 2012 +0100

    [UBOOT] apf51: change PLL errata 12051 workaround to be generic

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

Summary of changes:
 patches/u-boot/2011.12/400-imx51.patch |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/patches/u-boot/2011.12/400-imx51.patch b/patches/u-boot/2011.12/400-imx51.patch
index ea1f2bb..13455d4 100644
--- a/patches/u-boot/2011.12/400-imx51.patch
+++ b/patches/u-boot/2011.12/400-imx51.patch
@@ -1,6 +1,5 @@
-diff -purN u-boot-custom.ori/arch/arm/cpu/armv7/imx-common/timer.c u-boot-custom/arch/arm/cpu/armv7/imx-common/timer.c
---- u-boot-custom.ori/arch/arm/cpu/armv7/imx-common/timer.c	2011-12-19 12:12:54.000000000 +0100
-+++ u-boot-custom/arch/arm/cpu/armv7/imx-common/timer.c	2011-12-21 13:01:57.460272879 +0100
+--- u-boot-2011.12/arch/arm/cpu/armv7/imx-common/timer.c	2011-12-19 12:12:54.000000000 +0100
++++ u-boot-2011.12/arch/arm/cpu/armv7/imx-common/timer.c	2011-12-21 13:01:57.460272879 +0100
 @@ -97,7 +97,7 @@ ulong get_timer(ulong base)
  void __udelay(unsigned long usec)
  {
@@ -11,7 +10,7 @@ diff -purN u-boot-custom.ori/arch/arm/cpu/armv7/imx-common/timer.c u-boot-custom
  	if (!tmo)
  		tmo = 1;
 --- u-boot-2011.12/arch/arm/cpu/armv7/mx5/lowlevel_init.S	2011-12-23 20:25:35.000000000 +0100
-+++ u-boot-custom/arch/arm/cpu/armv7/mx5/lowlevel_init.S	2012-01-08 16:57:41.168590215 +0100
++++ u-boot-2011.12/arch/arm/cpu/armv7/mx5/lowlevel_init.S	2012-01-08 16:57:41.168590215 +0100
 @@ -23,6 +23,71 @@
  #include <asm/arch/imx-regs.h>
  #include <generated/asm-offsets.h>
@@ -122,6 +121,15 @@ diff -purN u-boot-custom.ori/arch/arm/cpu/armv7/imx-common/timer.c u-boot-custom
  	str r1, [r0, #PLL_DP_CTL]
  1:	ldr r1, [r0, #PLL_DP_CTL]
  	ands r1, r1, #0x1
+@@ -125,7 +190,7 @@
+ 	ldr r2, =\pll
+ 	mov r1, #0x0
+ 	str r1, [r2, #PLL_DP_CONFIG] /* Disable auto-restart AREN bit */
+-	ldr r1, =0x00001236
++	ldr r1, =CONFIG_SYS_PLL_DP_CTL_VAL  | 0x04
+ 	str r1, [r2, #PLL_DP_CTL]    /* Restart PLL with PLM=1 */
+ 1:	ldr r1, [r2, #PLL_DP_CTL]    /* Wait for lock */
+ 	ands r1, r1, #0x1
 @@ -154,6 +219,16 @@
  	ldr r0, =CCM_BASE_ADDR
  
@@ -238,9 +246,8 @@ diff -purN u-boot-custom.ori/arch/arm/cpu/armv7/imx-common/timer.c u-boot-custom
  /* Board level setting value */
  W_DP_OP_864:              .word DP_OP_864
  W_DP_MFD_864:             .word DP_MFD_864
-diff -purN u-boot-custom.ori/arch/arm/include/asm/arch-mx5/imx-regs.h u-boot-custom/arch/arm/include/asm/arch-mx5/imx-regs.h
---- u-boot-custom.ori/arch/arm/include/asm/arch-mx5/imx-regs.h	2011-12-19 12:12:54.000000000 +0100
-+++ u-boot-custom/arch/arm/include/asm/arch-mx5/imx-regs.h	2011-12-21 17:59:31.411491501 +0100
+--- u-boot-2011.12/arch/arm/include/asm/arch-mx5/imx-regs.h	2011-12-19 12:12:54.000000000 +0100
++++ u-boot-2011.12/arch/arm/include/asm/arch-mx5/imx-regs.h	2011-12-21 17:59:31.411491501 +0100
 @@ -236,6 +236,7 @@
  #define M4IF_FBPM0	0x40
  #define M4IF_FIDBP	0x48
@@ -407,7 +414,7 @@ diff -purN u-boot-custom.ori/arch/arm/include/asm/arch-mx5/imx-regs.h u-boot-cus
  #include <asm/types.h>
  
 --- u-boot-2011.12/arch/arm/cpu/armv7/cpu.c	2011-12-23 20:25:35.000000000 +0100
-+++ u-boot-custom/arch/arm/cpu/armv7/cpu.c	2012-01-09 22:44:26.148876883 +0100
++++ u-boot-2011.12/arch/arm/cpu/armv7/cpu.c	2012-01-09 22:44:26.148876883 +0100
 @@ -79,5 +79,9 @@ int cleanup_before_linux(void)
  	 */
  	invalidate_dcache_all();
@@ -418,8 +425,8 @@ diff -purN u-boot-custom.ori/arch/arm/include/asm/arch-mx5/imx-regs.h u-boot-cus
 +
  	return 0;
  }
---- u-boot-custom.ref/arch/arm/lib/cache-cp15.c	2011-12-23 20:25:35.000000000 +0100
-+++ u-boot-custom/arch/arm/lib/cache-cp15.c	2012-01-09 22:28:01.960696861 +0100
+--- u-boot-2011.12/arch/arm/lib/cache-cp15.c	2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/arch/arm/lib/cache-cp15.c	2012-01-09 22:28:01.960696861 +0100
 @@ -86,10 +86,17 @@ static inline void mmu_setup(void)
  	/* Set the access control to all-supervisor */
  	asm volatile("mcr p15, 0, %0, c3, c0, 0"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2680-g60bbbb1

From: Julien B a. A. <ar...@us...> - 2012-01-13 12:57:11

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  60bbbb1a908fab77459bc030975e87206b0f732c (commit)
       via  5de5be5656343ceb69379e5c8d7fbf52c4bf5777 (commit)
      from  192b7f682141417e0f7f4dc8f573838b7cbcece0 (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 60bbbb1a908fab77459bc030975e87206b0f732c
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jan 13 13:56:22 2012 +0100

    [BUILDROOT] Fixes "copy" download method

commit 5de5be5656343ceb69379e5c8d7fbf52c4bf5777
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jan 13 13:55:07 2012 +0100

    Spelling

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

Summary of changes:
 ...buildroot-Adding_copy_method_for_download.patch |   14 +++++++-------
 .../packages/as_devices/python/AsDevices/AsAdc.py  |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch b/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
index dd2af1b..35bfc82 100644
--- a/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
+++ b/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
@@ -6,8 +6,8 @@ Signed-off-by :Â Fabien Marteau <fab...@ar...>
 
 Index: buildroot/Config.in
 ===================================================================
---- buildroot.orig/Config.in	2011-08-08 12:11:53.000000000 +0200
-+++ buildroot/Config.in	2011-08-08 12:16:47.000000000 +0200
+--- buildroot.orig/Config.in	2011-05-27 16:18:21.000000000 +0200
++++ buildroot/Config.in	2012-01-13 13:51:18.000000000 +0100
 @@ -16,6 +16,10 @@
  
  menu "Commands"
@@ -21,8 +21,8 @@ Index: buildroot/Config.in
  	default "wget --passive-ftp -nd -t 3"
 Index: buildroot/package/Makefile.package.in
 ===================================================================
---- buildroot.orig/package/Makefile.package.in	2011-08-08 12:11:53.000000000 +0200
-+++ buildroot/package/Makefile.package.in	2011-08-08 12:16:47.000000000 +0200
+--- buildroot.orig/package/Makefile.package.in	2011-05-27 16:18:21.000000000 +0200
++++ buildroot/package/Makefile.package.in	2012-01-13 13:52:21.000000000 +0100
 @@ -73,6 +73,7 @@
  SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET)
  BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET)
@@ -38,9 +38,9 @@ Index: buildroot/package/Makefile.package.in
 +
 +define DOWNLOAD_COPY
 +	pushd $(DL_DIR) > /dev/null && \
-+	$(COPY) $($(PKG)_SITE) $($(PKG)_DL_DIR)/ && \
-+	$(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \
-+	rm -rf $($(PKG)_DL_DIR) && \
++	$(COPY) $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
++	$(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME) && \
++	rm -rf $($(PKG)_BASE_NAME) && \
 +	popd > /dev/null
 +endef
 +
diff --git a/target/packages/as_devices/python/AsDevices/AsAdc.py b/target/packages/as_devices/python/AsDevices/AsAdc.py
index 11d54f5..7f56c2e 100644
--- a/target/packages/as_devices/python/AsDevices/AsAdc.py
+++ b/target/packages/as_devices/python/AsDevices/AsAdc.py
@@ -30,7 +30,7 @@
 #
 #-----------------------------------------------------------------------------
 
-__doc__ = "This class drive ARMadeus boards ADCs"
+__doc__ = "This class drives Armadeus boards ADCs"
 __version__ = "0.1"
 __author__ = "Fabien Marteau <fab...@ar...>"
 
@@ -49,7 +49,7 @@ class AsAdc:
         try:
             self.__device = wrapper.adc_open(aAdcType, aDeviceNum, aVRef)
         except Exception, e:
-            raise AsAdcError("Can't open adc port type "+str(aAdcType)+\
+            raise AsAdcError("Can't open ADC port type "+str(aAdcType)+\
                                 " num "+str(aDeviceNum))
 
     def __del__(self):


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2678-g192b7f6

From: Julien B a. A. <ar...@us...> - 2012-01-12 20:37:53

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  192b7f682141417e0f7f4dc8f573838b7cbcece0 (commit)
       via  9c0e1fa40c5e36a8e93967837bc5761444bc0f74 (commit)
      from  8c3329cb82dad286bec60ef71bff5aeebfa0a3dd (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 192b7f682141417e0f7f4dc8f573838b7cbcece0
Merge: 9c0e1fa 8c3329c
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 12 21:37:14 2012 +0100

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

commit 9c0e1fa40c5e36a8e93967837bc5761444bc0f74
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 12 21:36:24 2012 +0100

    [BUILDROOT] Updates pygame package with latest BR mainline commit

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

Summary of changes:
 .../2011.05/083-adds_pygame_package.patch          |  196 ++++++++++----------
 patches/buildroot/2011.05/cleanup_buildroot.sh     |    2 +-
 2 files changed, 100 insertions(+), 98 deletions(-)

diff --git a/patches/buildroot/2011.05/083-adds_pygame_package.patch b/patches/buildroot/2011.05/083-adds_pygame_package.patch
index a9f6fc7..e98c47e 100644
--- a/patches/buildroot/2011.05/083-adds_pygame_package.patch
+++ b/patches/buildroot/2011.05/083-adds_pygame_package.patch
@@ -6,16 +6,16 @@ and Scrap needs X11.
 numeric*array modules requires Numeric or numpy Python package which is not
 in BR yet.
 
-Inspired by a patch from Jean Schurger and the work of the OpenEmbedded team.
+Commited in BR.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: buildroot/package/pygame/Config.in
+Index: buildroot/package/python-pygame/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Config.in	2012-01-05 15:13:40.000000000 +0100
-@@ -0,0 +1,85 @@
-+config BR2_PACKAGE_PYGAME
++++ buildroot/package/python-pygame/Config.in	2012-01-12 21:20:18.000000000 +0100
+@@ -0,0 +1,76 @@
++config BR2_PACKAGE_PYTHON_PYGAME
 +	bool "pygame"
 +	depends on BR2_PACKAGE_PYTHON
 +	select BR2_PACKAGE_SDL
@@ -27,193 +27,195 @@ Index: buildroot/package/pygame/Config.in
 +
 +	  http://www.pygame.org/
 +
-+menu "pygame optional modules selection"
-+	depends on BR2_PACKAGE_PYGAME
-+
-+config BR2_PACKAGE_PYGAME_IMAGE
++if BR2_PACKAGE_PYTHON_PYGAME
++config BR2_PACKAGE_PYTHON_PYGAME_IMAGE
 +	bool "pygame.image"
-+	default y
-+	depends on BR2_PACKAGE_SDL_IMAGE
-+	depends on BR2_PACKAGE_SDL_IMAGE_PNG
-+	depends on BR2_PACKAGE_SDL_IMAGE_JPEG
++	select BR2_PACKAGE_SDL_IMAGE
++	select BR2_PACKAGE_SDL_IMAGE_PNG
++	select BR2_PACKAGE_SDL_IMAGE_JPEG
 +	help
-+	  pygame module for loading, saving and transfering images
-+
-+comment "pygame.image requires sdl_image with png and jpeg support"
-+	depends on !BR2_PACKAGE_PYGAME_IMAGE
++	  pygame module for loading, saving and transfering images.
++	  Will autoselect sdl_image with png and jpeg support.
 +
-+config BR2_PACKAGE_PYGAME_FONT
++config BR2_PACKAGE_PYTHON_PYGAME_FONT
 +	bool "pygame.font"
-+	depends on BR2_PACKAGE_SDL_TTF
++	select BR2_PACKAGE_SDL_TTF
 +	help
-+	  pygame module for loading and rendering fonts
-+
-+comment "pygame.font requires sdl_ttf"
-+	depends on !BR2_PACKAGE_PYGAME_FONT
++	  pygame module for loading and rendering fonts.
++	  Will autoselect sdl_ttf.
 +
-+config BR2_PACKAGE_PYGAME_MIXER
++config BR2_PACKAGE_PYTHON_PYGAME_MIXER
 +	bool "pygame.mixer"
-+	depends on BR2_PACKAGE_SDL_MIXER
++	select BR2_PACKAGE_SDL_MIXER
 +	help
-+	  pygame module for loading and playing sounds
++	  pygame module for loading and playing sounds.
++	  Will autoselect sdl_mixer.
 +
-+comment "pygame.mixer requires sdl_mixer"
-+	depends on !BR2_PACKAGE_PYGAME_MIXER
-+
-+config BR2_PACKAGE_PYGAME_MIXER_MUSIC
++config BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC
 +	bool "pygame.mixer.music"
-+	depends on BR2_PACKAGE_PYGAME_MIXER
++	depends on BR2_PACKAGE_PYTHON_PYGAME_MIXER
 +	help
 +	  pygame module for controlling streamed audio
 +
-+config BR2_PACKAGE_PYGAME_SNDARRAY
++config BR2_PACKAGE_PYTHON_PYGAME_SNDARRAY
 +	bool "pygame.sndarray"
-+	depends on BR2_PACKAGE_PYGAME_MIXER && BR2_PACKAGE_PYTHON_NUMERIC
++	depends on BR2_PACKAGE_PYTHON_PYGAME_MIXER && BR2_PACKAGE_PYTHON_NUMERIC
 +	help
 +	  pygame module for accessing sound sample data
 +
 +comment "pygame.sndarray depends on Python's Numeric extension that is not (yet) supported"
-+	depends on !BR2_PACKAGE_PYGAME_SNDARRAY
++	depends on !BR2_PACKAGE_PYTHON_PYGAME_SNDARRAY
 +
-+config BR2_PACKAGE_PYGAME_SURFARRAY
++config BR2_PACKAGE_PYTHON_PYGAME_SURFARRAY
 +	bool "pygame.surfarray"
 +	depends on BR2_PACKAGE_PYTHON_NUMERIC
 +	help
 +	  pygame module for accessing surface pixel data using array interfaces
 +
 +comment "pygame.surfarray depends on Python's Numeric extension that is not (yet) supported"
-+	depends on !BR2_PACKAGE_PYGAME_SURFARRAY
++	depends on !BR2_PACKAGE_PYTHON_PYGAME_SURFARRAY
 +
-+config BR2_PACKAGE_PYGAME_MOVIE
++config BR2_PACKAGE_PYTHON_PYGAME_MOVIE
 +	bool "pygame.movie"
 +	depends on BR2_PACKAGE_SMPEG
 +	help
 +	  pygame module for playback of mpeg video
 +
 +comment "pygame.movie depends on smpeg"
-+	depends on !BR2_PACKAGE_PYGAME_MOVIE
++	depends on !BR2_PACKAGE_PYTHON_PYGAME_MOVIE
 +
-+config BR2_PACKAGE_PYGAME_SCRAP
++config BR2_PACKAGE_PYTHON_PYGAME_SCRAP
 +	bool "pygame.scrap"
 +	depends on BR2_PACKAGE_SDL_X11
 +	help
 +	  pygame module for clipboard support (X11 needed)
 +
-+endmenu
-Index: buildroot/package/pygame/pygame.mk
++endif
+Index: buildroot/package/python-pygame/python-pygame.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/pygame.mk	2012-01-05 15:45:16.000000000 +0100
-@@ -0,0 +1,100 @@
-+######################################################################
++++ buildroot/package/python-pygame/python-pygame.mk	2012-01-12 21:24:05.000000000 +0100
+@@ -0,0 +1,111 @@
++#############################################################
 +#
 +# Pygame
 +#
-+######################################################################
-+
-+PYGAME_VERSION:= 1.9.1release
-+PYGAME_SITE:= http://www.pygame.org/ftp/
-+
-+ifeq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
-+PYGAME_OPT_DEPENDS += sdl_image
++#############################################################
++# stable 1.9.1 release requires V4L which has been wiped out of recent Linux
++# kernels, so use latest mercurial revision until next stable release is out.
++PYTHON_PYGAME_VERSION = f0bb4a4b365d
++PYTHON_PYGAME_SOURCE  = pygame-$(PYTHON_PYGAME_VERSION).tar.gz
++PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame
++PYTHON_PYGAME_SITE_METHOD = hg
++
++ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
++PYTHON_PYGAME_OPT_DEPENDS += sdl_image
 +endif
-+ifeq ($(BR2_PACKAGE_PYGAME_FONT),y)
-+PYGAME_OPT_DEPENDS += sdl_ttf
-+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_MIXER),y)
-+PYGAME_OPT_DEPENDS += sdl_mixer
++
++ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y)
++PYTHON_PYGAME_OPT_DEPENDS += sdl_ttf
 +endif
-+ifeq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
-+PYGAME_OPT_DEPENDS += smpeg
++
++ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y)
++PYTHON_PYGAME_OPT_DEPENDS += sdl_mixer
 +endif
-+PYGAME_DEPENDENCIES = python sdl $(PYGAME_OPT_DEPENDS)
 +
-+ifneq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
-+define PYGAME_CONFIGURE_IMAGE
++PYTHON_PYGAME_DEPENDENCIES = python sdl $(PYTHON_PYGAME_OPT_DEPENDS)
++
++ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
++define PYTHON_PYGAME_UNCONFIGURE_IMAGE
 +	$(SED) 's/^imageext/#imageext/' $(@D)/Setup
 +endef
 +endif
 +
-+ifneq ($(BR2_PACKAGE_PYGAME_FONT),y)
-+define PYGAME_CONFIGURE_FONT
++ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y)
++define PYTHON_PYGAME_UNCONFIGURE_FONT
 +	$(SED) 's/^font/#font/' $(@D)/Setup
 +endef
 +endif
 +
-+ifneq ($(BR2_PACKAGE_PYGAME_MIXER),y)
-+define PYGAME_CONFIGURE_MIXER
++ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y)
++define PYTHON_PYGAME_UNCONFIGURE_MIXER
 +	$(SED) 's/^mixer/#mixer/g' $(@D)/Setup
 +endef
 +endif
 +
-+ifneq ($(BR2_PACKAGE_PYGAME_SNDARRAY),y)
-+define PYGAME_CONFIGURE_SNDARRAY
++# Both require numpy or numeric python module
++define PYTHON_PYGAME_UNCONFIGURE_SNDARRAY
 +	$(SED) 's/^_numericsndarray/#_numericsndarray/' $(@D)/Setup
 +endef
-+endif
 +
-+ifneq ($(BR2_PACKAGE_PYGAME_SURFARRAY),y)
-+define PYGAME_CONFIGURE_SURFARRAY
++define PYTHON_PYGAME_UNCONFIGURE_SURFARRAY
 +	$(SED) 's/^_numericsurfarray/#_numericsurfarray/' $(@D)/Setup
 +endef
-+endif
 +
-+ifneq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
-+define PYGAME_CONFIGURE_MOVIE
++# Requires smpeg
++define PYTHON_PYGAME_UNCONFIGURE_MOVIE
 +	$(SED) 's/^movie/#movie/' $(@D)/Setup
 +endef
-+endif
 +
-+ifneq ($(BR2_PACKAGE_PYGAME_SCRAP),y)
-+define PYGAME_CONFIGURE_SCRAP
++ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_SCRAP),y)
++define PYTHON_PYGAME_UNCONFIGURE_SCRAP
 +	$(SED) 's/^scrap/#scrap/' $(@D)/Setup
 +endef
 +endif
 +
-+PYGAME_SDL_FLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
-+PYGAME_SDL_FLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
++PYTHON_PYGAME_SDL_FLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
++PYTHON_PYGAME_SDL_FLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
 +
 +# Pygame needs a Setup file where options should be commented out if
 +# dependencies are not available
-+define PYGAME_CONFIGURE_CMDS
++define PYTHON_PYGAME_CONFIGURE_CMDS
 +	cp -f $(@D)/Setup.in $(@D)/Setup
-+	$(SED) 's<^SDL = <SDL = $(PYGAME_SDL_FLAGS) \n#<' $(@D)/Setup
++	$(SED) 's~^SDL = ~SDL = $(PYTHON_PYGAME_SDL_FLAGS) \n#~' $(@D)/Setup
 +	$(SED) 's/^pypm/#pypm/' $(@D)/Setup
-+	$(PYGAME_CONFIGURE_IMAGE)
-+	$(PYGAME_CONFIGURE_FONT)
-+	$(PYGAME_CONFIGURE_MIXER)
-+	$(PYGAME_CONFIGURE_SNDARRAY)
-+	$(PYGAME_CONFIGURE_SURFARRAY)
-+	$(PYGAME_CONFIGURE_MOVIE)
-+	$(PYGAME_CONFIGURE_SCRAP)
++	$(PYTHON_PYGAME_UNCONFIGURE_IMAGE)
++	$(PYTHON_PYGAME_UNCONFIGURE_FONT)
++	$(PYTHON_PYGAME_UNCONFIGURE_MIXER)
++	$(PYTHON_PYGAME_UNCONFIGURE_SNDARRAY)
++	$(PYTHON_PYGAME_UNCONFIGURE_SURFARRAY)
++	$(PYTHON_PYGAME_UNCONFIGURE_MOVIE)
++	$(PYTHON_PYGAME_UNCONFIGURE_SCRAP)
 +endef
 +
-+define PYGAME_BUILD_CMDS
++define PYTHON_PYGAME_BUILD_CMDS
 +	(cd $(@D); CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 +		LDSHARED="$(TARGET_CROSS)gcc -shared" \
++		CROSS_COMPILING=yes \
++		_python_sysroot=$(STAGING_DIR) \
++		_python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
++		_python_prefix=/usr \
++		_python_exec_prefix=/usr \
 +		$(HOST_DIR)/usr/bin/python setup.py build)
 +endef
 +
-+define PYGAME_INSTALL_TARGET_CMDS
-+	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr && \
-+	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs && \
-+	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests)
++ifneq ($(BR2_HAVE_DOCUMENTATION),y)
++define PYTHON_PYGAME_REMOVE_DOC
++	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs
++endef
++endif
++
++define PYTHON_PYGAME_INSTALL_TARGET_CMDS
++	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install \
++		--prefix=$(TARGET_DIR)/usr)
++	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests
++	$(PYTHON_PYGAME_REMOVE_DOC)
 +endef
 +
-+define PYGAME_UNINSTALL_TARGET_CMDS
++define PYTHON_PYGAME_UNINSTALL_TARGET_CMDS
 +	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame*
 +endef
 +
-+$(eval $(call GENTARGETS,package,pygame))
++$(eval $(call GENTARGETS,package,python-pygame))
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2012-01-03 19:24:08.000000000 +0100
-+++ buildroot/package/Config.in	2012-01-05 15:45:47.000000000 +0100
+--- buildroot.orig/package/Config.in	2012-01-12 21:16:29.000000000 +0100
++++ buildroot/package/Config.in	2012-01-12 21:25:13.000000000 +0100
 @@ -112,6 +112,7 @@
  source "package/imagemagick/Config.in"
  source "package/linux-fusion/Config.in"
  source "package/lite/Config.in"
-+source "package/pygame/Config.in"
++source "package/python-pygame/Config.in"
  source "package/sawman/Config.in"
  source "package/sdl/Config.in"
  source "package/sdl_image/Config.in"
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index 8b4c35d..a67af75 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -7,7 +7,7 @@
 rm -rf buildroot/package/games/quake-pak/
 rm -rf buildroot/package/games/sdlquake/
 rm -rf buildroot/package/gpm/
-rm -rf buildroot/package/pygame/
+rm -rf buildroot/package/python-pygame/
 rm -rf buildroot/package/uucp/
 rm -f  buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
 rm -rf buildroot/package/multimedia/flite/


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2676-g8c3329c

From: jorasse <jo...@us...> - 2012-01-12 19:45:54

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  8c3329cb82dad286bec60ef71bff5aeebfa0a3dd (commit)
       via  bc1f0da61a19774d0fab3ddef22368e28f95089a (commit)
       via  f90a0b67282ac673641f23492fe8528b16c7d4a8 (commit)
       via  bd90491cff20602eb69487c9c4039fee4f914fc0 (commit)
      from  2310cbb7c81f94b304eaf5936871c7a041183280 (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 8c3329cb82dad286bec60ef71bff5aeebfa0a3dd
Merge: bc1f0da 2310cbb
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jan 12 20:45:09 2012 +0100

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

commit bc1f0da61a19774d0fab3ddef22368e28f95089a
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jan 12 20:39:19 2012 +0100

    [UBOOT] apf51: preliminary migration to u-Boot 2011.12

commit f90a0b67282ac673641f23492fe8528b16c7d4a8
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jan 12 20:30:30 2012 +0100

    [LINUX] apf51: make kernel auto relocatble on boot

commit bd90491cff20602eb69487c9c4039fee4f914fc0
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jan 12 20:07:54 2012 +0100

    [UBOOT] Workaround to fix bug #102: reboot from Linux doesn't work on APF51, most of the time

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

Summary of changes:
 .../armadeus/apf51/apf51-linux-2.6.38.config       |    1 +
 .../device/armadeus/apf51/apf51-u-boot-2010.03.h   |    2 +-
 .../u-boot/2010.03/u-boot-2010.03-401-apf51.patch  |    5 +-
 patches/u-boot/2011.12/400-imx51.patch             |  442 ++++++++++++++++
 .../401-apf51.patch}                               |  553 ++++++++++----------
 patches/u-boot/2011.12/403-apf51-wdog.patch        |   20 +
 .../u-boot/2011.12/405-remove_extra_printk.patch   |   25 +
 .../407-imx51-nand.patch}                          |    8 +-
 .../409-apf51-nand-spl.patch}                      |  179 +-------
 .../410-imx-iim.patch}                             |  156 ++----
 .../2011.12/411-Fix-high-voltage-nand-sd.patch     |   29 +
 ..._i2c-add_support_for_the_iMX51_processor.patch} |    7 +-
 patches/u-boot/2011.12/425-cortex-relocation.patch |   23 +
 13 files changed, 859 insertions(+), 591 deletions(-)
 create mode 100644 patches/u-boot/2011.12/400-imx51.patch
 copy patches/u-boot/{2010.03/u-boot-2010.03-401-apf51.patch => 2011.12/401-apf51.patch} (83%)
 create mode 100644 patches/u-boot/2011.12/403-apf51-wdog.patch
 create mode 100644 patches/u-boot/2011.12/405-remove_extra_printk.patch
 copy patches/u-boot/{2010.03/u-boot-2010.03-407-imx51-nand.patch => 2011.12/407-imx51-nand.patch} (99%)
 copy patches/u-boot/{2010.03/u-boot-2010.03-409-apf51-nand-spl.patch => 2011.12/409-apf51-nand-spl.patch} (77%)
 copy patches/u-boot/{2010.03/u-boot-2010.03-410-imx-iim.patch => 2011.12/410-imx-iim.patch} (82%)
 create mode 100644 patches/u-boot/2011.12/411-Fix-high-voltage-nand-sd.patch
 copy patches/u-boot/{2010.03/u-boot-2010.03-424-armadeus-mxc_i2c-add_support_for_the_iMX51_processor.patch => 2011.12/424-armadeus-mxc_i2c-add_support_for_the_iMX51_processor.patch} (77%)
 create mode 100644 patches/u-boot/2011.12/425-cortex-relocation.patch

diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 1b5f7e3..25526b3 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -26,6 +26,7 @@ CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_AUTO_ZRELADDR=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index c0732f3..78fb140 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -29,7 +29,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION 	"0.5"
-#define CONFIG_IDENT_STRING	" apf51 patch 0.6"
+#define CONFIG_IDENT_STRING	" apf51 patch 0.7"
 
 //#define APF51_PROTO
 //#define APF51_RECOVER
diff --git a/patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch b/patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch
index 5c8d7b9..0d4e2e6 100644
--- a/patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch
+++ b/patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch
@@ -2,7 +2,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ u-boot-2010.03/board/armadeus/apf51/apf51.c	2011-06-21 16:59:15.000000000 +0200
-@@ -0,0 +1,1157 @@
+@@ -0,0 +1,1160 @@
 +/*
 + * (C) Copyright 2010 Eric Jarrige, Armadeus Project
 + *
@@ -911,6 +911,9 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	writel((CONFIG_PLL1_FREQ/CONFIG_ARM_CLK_FREQ)-1,
 +		CCM_BASE_ADDR + CLKCTL_CACRR);
 +
++	/* Disable warm reset */
++	writel(0x560, SRC_BASE_ADDR);
++
 +	gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
 +	/* address of boot parameters */
 +	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_1_BASE + 0x100;
diff --git a/patches/u-boot/2011.12/400-imx51.patch b/patches/u-boot/2011.12/400-imx51.patch
new file mode 100644
index 0000000..ea1f2bb
--- /dev/null
+++ b/patches/u-boot/2011.12/400-imx51.patch
@@ -0,0 +1,442 @@
+diff -purN u-boot-custom.ori/arch/arm/cpu/armv7/imx-common/timer.c u-boot-custom/arch/arm/cpu/armv7/imx-common/timer.c
+--- u-boot-custom.ori/arch/arm/cpu/armv7/imx-common/timer.c	2011-12-19 12:12:54.000000000 +0100
++++ u-boot-custom/arch/arm/cpu/armv7/imx-common/timer.c	2011-12-21 13:01:57.460272879 +0100
+@@ -97,7 +97,7 @@ ulong get_timer(ulong base)
+ void __udelay(unsigned long usec)
+ {
+ 	unsigned long now, start, tmo;
+-	tmo = usec * (CLK_32KHZ / 1000) / 1000;
++	tmo = usec * (CLK_32KHZ / CONFIG_SYS_HZ) / 1000;
+ 
+ 	if (!tmo)
+ 		tmo = 1;
+--- u-boot-2011.12/arch/arm/cpu/armv7/mx5/lowlevel_init.S	2011-12-23 20:25:35.000000000 +0100
++++ u-boot-custom/arch/arm/cpu/armv7/mx5/lowlevel_init.S	2012-01-08 16:57:41.168590215 +0100
+@@ -23,6 +23,71 @@
+ #include <asm/arch/imx-regs.h>
+ #include <generated/asm-offsets.h>
+ 
++#ifndef CONFIG_SYS_PLL_DP_CTL_VAL
++/* use internal oscillator */
++#define CONFIG_SYS_PLL_DP_CTL_VAL 		0x00001232
++#endif
++
++#ifndef CONFIG_SYS_CCSR_VAL
++/* use internal oscillator */
++#define CONFIG_SYS_CCSR_VAL 			0x00000000
++#endif
++
++/* define default SDRAM config */
++#ifndef CONFIG_SYS_DRR_MR_VAL
++#define CONFIG_SYS_DRR_MR_VAL			0x0632
++#endif
++
++#ifndef CONFIG_SYS_DRR_EMR_VAL
++#define CONFIG_SYS_DRR_EMR_VAL			0x040
++#endif
++
++#ifndef CONFIG_SYS_SDRAM_ESDCTL_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDCTL_REGISTER_VAL	0xb2a20000
++#endif
++#ifndef CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL	0xE99668BA
++#endif
++#ifndef CONFIG_SYS_SDRAM_ESDMISC_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDMISC_REGISTER_VAL	0x000ad6d0
++#endif
++#ifndef CONFIG_SYS_SDRAM_ESDCDLY1_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDCDLY1_REGISTER_VAL	0x00F48000
++#endif
++#ifndef CONFIG_SYS_SDRAM_ESDCDLY2_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDCDLY2_REGISTER_VAL	0x00F48000
++#endif
++#ifndef CONFIG_SYS_SDRAM_ESDCDLY3_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDCDLY3_REGISTER_VAL	0x00F48000
++#endif
++#ifndef CONFIG_SYS_SDRAM_ESDCDLY4_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDCDLY4_REGISTER_VAL	0x00F48000
++#endif
++#ifndef CONFIG_SYS_SDRAM_ESDCDLY5_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDCDLY5_REGISTER_VAL	0x00F48000
++#endif
++#ifndef CONFIG_SYS_SDRAM_ESDGPR_REGISTER_VAL
++#define CONFIG_SYS_SDRAM_ESDGPR_REGISTER_VAL	0x90000000
++#endif
++
++#ifndef CONFIG_SYS_CBCDR_VAL
++#define CONFIG_SYS_CBCDR_VAL	0x59E35100
++#endif
++
++#ifndef CONFIG_SYS_CBCMR_VAL
++/* Use lp_apm (24MHz) source for perclk */
++#define CONFIG_SYS_CBCMR_VAL	0x000020C2
++#endif
++
++#ifndef CONFIG_SYS_CSCDR1_VAL
++#define CONFIG_SYS_CSCDR1_VAL 0x00C30321
++#endif
++
++#ifndef CONFIG_SYS_CBCMR1_VAL
++/* Use PLL 2 for UART's, get 66.5MHz from it */
++#define CONFIG_SYS_CBCMR1_VAL 0xA5A2A020
++#endif
++
+ /*
+  * L2CC Cache setup/invalidation/disable
+  */
+@@ -81,23 +146,23 @@
+ 	ldr r0, =M4IF_BASE_ADDR
+ 
+ 	ldr r1, =0x00000203
+-	str r1, [r0, #0x40]
++	str r1, [r0, #M4IF_FBPM0]
+ 
+ 	ldr r1, =0x0
+-	str r1, [r0, #0x44]
++	str r1, [r0, #M4IF_FBPM1]
+ 
+ 	ldr r1, =0x00120125
+-	str r1, [r0, #0x9C]
++	str r1, [r0, #M4IF_FPWC]
+ 
+ 	ldr r1, =0x001901A3
+-	str r1, [r0, #0x48]
++	str r1, [r0, #M4IF_MIF4]
+ 
+ #endif
+ .endm /* init_m4if */
+ 
+ .macro setup_pll pll, freq
+ 	ldr r0, =\pll
+-	ldr r1, =0x00001232
++	ldr r1, =CONFIG_SYS_PLL_DP_CTL_VAL
+ 	str r1, [r0, #PLL_DP_CTL] /* Set DPLL ON (set UPEN bit): BRMO=1 */
+ 	mov r1, #0x2
+ 	str r1, [r0, #PLL_DP_CONFIG] /* Enable auto-restart AREN bit */
+@@ -114,7 +179,7 @@
+ 	str r1, [r0, #PLL_DP_MFN]
+ 	str r1, [r0, #PLL_DP_HFS_MFN]
+ 
+-	ldr r1, =0x00001232
++	ldr r1, =CONFIG_SYS_PLL_DP_CTL_VAL
+ 	str r1, [r0, #PLL_DP_CTL]
+ 1:	ldr r1, [r0, #PLL_DP_CTL]
+ 	ands r1, r1, #0x1
+@@ -154,6 +219,16 @@
+ 	ldr r0, =CCM_BASE_ADDR
+ 
+ #if defined(CONFIG_MX51)
++#ifdef CONFIG_SYS_CCR_VAL
++	ldr r1, =CONFIG_SYS_CCR_VAL
++	str r1, [r0, #CLKCTL_CCMR]
++
++	/* make sure clocks are ready */
++1:	ldr r1, [r0, #CLKCTL_CSR]
++	cmp r1, #CONFIG_SYS_CSR_VAL
++	bne 1b
++#endif
++
+ 	/* Gate of clocks to the peripherals first */
+ 	ldr r1, =0x3FFFFFFF
+ 	str r1, [r0, #CLKCTL_CCGR0]
+@@ -198,7 +273,7 @@
+ #endif
+ 
+ 	/* Switch ARM to step clock */
+-	mov r1, #0x4
++	mov r1, #CONFIG_SYS_CCSR_VAL | 0x04
+ 	str r1, [r0, #CLKCTL_CCSR]
+ 
+ #if defined(CONFIG_MX51_PLL_ERRATA)
+@@ -233,7 +308,7 @@
+ 	/* Set the platform clock dividers */
+ 	ldr r0, =ARM_BASE_ADDR
+ 	ldr r1, =0x00000725
+-	str r1, [r0, #0x14]
++	str r1, [r0, #CORTEX_A8_ICGC]
+ 
+ 	ldr r0, =CCM_BASE_ADDR
+ 
+@@ -250,16 +325,16 @@
+ #endif
+ 	str r1, [r0, #CLKCTL_CACRR]
+ 	/* Switch ARM back to PLL 1 */
+-	mov r1, #0
++	mov r1, #CONFIG_SYS_CCSR_VAL
+ 	str r1, [r0, #CLKCTL_CCSR]
+ 
+ #if defined(CONFIG_MX51)
+ 	/* setup the rest */
+-	/* Use lp_apm (24MHz) source for perclk */
+-	ldr r1, =0x000020C2
++	/* select source for perclk */
++	ldr r1, =CONFIG_SYS_CBCMR_VAL
+ 	orr r1,r1,#CONFIG_SYS_DDR_CLKSEL
+ 	str r1, [r0, #CLKCTL_CBCMR]
+-	/* ddr clock from PLL 1, all perclk dividers are 1 since using 24MHz */
++	/* ddr clock from PLL 1 */
+ 	ldr r1, =CONFIG_SYS_CLKTL_CBCDR
+ 	str r1, [r0, #CLKCTL_CBCDR]
+ #endif
+@@ -279,9 +354,9 @@
+ 
+ #if defined(CONFIG_MX51)
+ 	/* Use PLL 2 for UART's, get 66.5MHz from it */
+-	ldr r1, =0xA5A2A020
++	ldr r1, =CONFIG_SYS_CBCMR1_VAL
+ 	str r1, [r0, #CLKCTL_CSCMR1]
+-	ldr r1, =0x00C30321
++	ldr r1, =CONFIG_SYS_CSCDR1_VAL
+ 	str r1, [r0, #CLKCTL_CSCDR1]
+ #elif defined(CONFIG_MX53)
+ 	ldr r1, [r0, #CLKCTL_CSCDR1]
+@@ -324,6 +399,11 @@ lowlevel_init:
+ 	str r1, [r0, #0x4]
+ #endif
+ 
++	/* ARM errata ID #468414 */
++	mrc 15, 0, r1, c1, c0, 1
++	orr r1, r1, #(1 << 5)    /* enable L1NEON bit */
++	mcr 15, 0, r1, c1, c0, 1
++
+ 	init_l2cc
+ 
+ 	init_aips
+@@ -332,9 +412,34 @@ lowlevel_init:
+ 
+ 	init_clock
+ 
+-	/* r12 saved upper lr*/
++/* make U-Boot runnable form "almost" anywhere */
++/* but SYS_TEXT_BASE should be in RAM */
++copy2ram:		/* populate _TEXT_BASE with U-Boot from load addr */
++	ldr	r0, _start_adr
++	ldr	r1, _copy2ram
++	sub	r1, r1, r0
++	adr	r0, copy2ram
++	sub	r0, r0, r1
++	ldr	r1, =CONFIG_SYS_TEXT_BASE
++	cmp	r0, r1
++	beq	end_of_copy2ram		/* skip U-Boot copy */
++	ldr	r2, =CONFIG_SYS_MONITOR_LEN
++	add	r2, r2, r0		/* r2 <- source end address	    */
++
++copy_loop:
++	ldmia	r0!, {r9-r10}		/* copy from source address [r0]    */
++	stmia	r1!, {r9-r10}		/* copy to   target address [r1]    */
++	cmp	r0, r2			/* until source end address [r2]    */
++	blo	copy_loop
++
++end_of_copy2ram:
+ 	mov pc,lr
+ 
++_copy2ram:
++	.word copy2ram
++_start_adr:
++	.word _start	/* r12 saved upper lr*/
++
+ /* Board level setting value */
+ W_DP_OP_864:              .word DP_OP_864
+ W_DP_MFD_864:             .word DP_MFD_864
+diff -purN u-boot-custom.ori/arch/arm/include/asm/arch-mx5/imx-regs.h u-boot-custom/arch/arm/include/asm/arch-mx5/imx-regs.h
+--- u-boot-custom.ori/arch/arm/include/asm/arch-mx5/imx-regs.h	2011-12-19 12:12:54.000000000 +0100
++++ u-boot-custom/arch/arm/include/asm/arch-mx5/imx-regs.h	2011-12-21 17:59:31.411491501 +0100
+@@ -236,6 +236,7 @@
+ #define M4IF_FBPM0	0x40
+ #define M4IF_FIDBP	0x48
+ 
++#ifndef DP_OP_800
+ /* Assuming 24MHz input clock with doubler ON */
+ /*                            MFI         PDF */
+ #define DP_OP_864	((8 << 4) + ((1 - 1)  << 0))
+@@ -270,6 +271,7 @@
+ #define DP_OP_216	((6 << 4) + ((3 - 1)  << 0))
+ #define DP_MFD_216	(4 - 1)
+ #define DP_MFN_216	3
++#endif /* DP_OP_800 */
+ 
+ #define CHIP_REV_1_0            0x10
+ #define CHIP_REV_1_1            0x11
+@@ -282,6 +284,148 @@
+ 
+ #define IMX_IIM_BASE            (IIM_BASE_ADDR)
+ 
++/* DDR commands */
++/* cs ChipSelect in range of 0..1 */
++/* ba Bank Address in range of 0..3 */
++/* addr Pseudo Address as expected by the DDR */
++
++#define CONFIG_SYS_DDR_NOP_CMD(cs)		(0x00008000 + (cs << 2))
++#define CONFIG_SYS_DRR_PRECHARGE_CMD(cs, ba)	(0x04008008 + (cs << 2) + ba)
++#define CONFIG_SYS_DRR_AUTOREFRESH_CMD(cs)	(0x00008010 + (cs << 2))
++#define CONFIG_SYS_DRR_LMR_CMD(cs, ba, addr)	(0x00008018 + (addr << 16) + (cs << 2) + ba)
++
++//#ifdef __ASSEMBLY__
++
++/* ESDCTL */
++#define ESDCTL_ESDCTL0                  0x00
++#define ESDCTL_ESDCFG0                  0x04
++#define ESDCTL_ESDCTL1                  0x08
++#define ESDCTL_ESDCFG1                  0x0C
++#define ESDCTL_ESDMISC                  0x10
++#define ESDCTL_ESDSCR                   0x14
++#define ESDCTL_ESDCDLY1                 0x20
++#define ESDCTL_ESDCDLY2                 0x24
++#define ESDCTL_ESDCDLY3                 0x28
++#define ESDCTL_ESDCDLY4                 0x2C
++#define ESDCTL_ESDCDLY5                 0x30
++#define ESDCTL_ESDCDLYGD                0x34
++
++/* M4IF */
++#define M4IF_PSM0		0x000
++#define M4IF_PSM1		0x004
++#define M4IF_MDSR6		0x018
++#define M4IF_MDSR7		0x01C
++#define M4IF_MDSR8		0x020
++#define M4IF_MDSR0		0x024
++#define M4IF_MDSR1		0x028
++#define M4IF_MDSR2		0x02C
++#define M4IF_MDSR3		0x030
++#define M4IF_MDSR4		0x034
++#define M4IF_MDSR5		0x038
++/*#define M4IF_FBPM0		0x040*/
++#define M4IF_FBPM1		0x044
++#define M4IF_MIF4		0x048
++#define M4IF_SBAR0		0x04C
++#define M4IF_SERL0		0x050
++#define M4IF_SERH0		0x054
++#define M4IF_SSRL0		0x058
++#define M4IF_SSRH0		0x05C
++#define M4IF_SBAR1		0x060
++#define M4IF_SERL1		0x064
++#define M4IF_SERH1		0x068
++#define M4IF_SSRL1		0x06C
++#define M4IF_SSRH1		0x070
++#define M4IF_I2ULA		0x074
++#define M4IF_I2ACR		0x078
++#define M4IF_RINT2		0x07C
++#define M4IF_SBS0		0x084
++#define M4IF_SBS1		0x088
++#define M4IF_MCR0		0x08C
++#define M4IF_MCR1		0x090
++#define M4IF_MDCR		0x094
++#define M4IF_FACR		0x098
++#define M4IF_FPWC		0x09C
++
++/* IOMUX */
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS		0x04A4
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS		0x04A8
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDWE		0x04AC
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE0	0x04B0
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCKE1	0x04B4
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK	0x04B8
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0	0x04BC
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1	0x04C0
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS2	0x04C4
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS3	0x04C8
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CS0		0x04CC
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_CS1		0x04D0
++
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0		0x04D4
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1		0x04D8
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM2		0x04DC
++#define IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM3		0x04E0
++#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDBA2		0x050C
++#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDODT1	0x050C
++#define IOMUXC_SW_PAD_CTL_PAD_EIM_SDODT0	0x0510
++
++#define IOMUXC_SW_PAD_CTL_GRP_DDRPKS		0x0820
++#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B4		0x082C
++#define IOMUXC_SW_PAD_CTL_GRP_INDDR		0x0830
++#define IOMUXC_SW_PAD_CTL_GRP_PKEDDR		0x0838
++#define IOMUXC_SW_PAD_CTL_GRP_DDR_A0		0x083C
++#define IOMUXC_SW_PAD_CTL_GRP_DDR_A1		0x0848
++#define IOMUXC_SW_PAD_CTL_GRP_DDRAPUS		0x084C
++#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR0		0x085C
++#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR1		0x0864
++#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR2		0x086C
++#define IOMUXC_SW_PAD_CTL_GRP_HVDDR		0x0870
++#define IOMUXC_SW_PAD_CTL_GRP_HYSDDR3		0x0874
++#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B0	0x0878
++#define IOMUXC_SW_PAD_CTL_GRP_DDRAPKS		0x087C
++
++#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B1	0x0880
++#define IOMUXC_SW_PAD_CTL_GRP_DDRPUS		0x0884
++#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B2	0x088C
++#define IOMUXC_SW_PAD_CTL_GRP_PKEADDR		0x0890
++#define IOMUXC_SW_PAD_CTL_GRP_DRAM_SR_B4	0x089C
++#define IOMUXC_SW_PAD_CTL_GRP_INMODE1		0x08A0
++#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B0		0x08A4
++#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B1		0x08AC
++
++#define IOMUXC_SW_PAD_CTL_GRP_DDR_SR_A0		0x08B0
++
++#define IOMUXC_SW_PAD_CTL_GRP_DRAM_B2		0x08B8
++
++#define IOMUXC_SW_PAD_CTL_GRP_DDR_SR_A1		0x08BC
++#ifdef __ASSEMBLY__
++#define PAD_CTL_SRE_SLOW (0x0 << 0)	/* Slow slew rate */
++#define PAD_CTL_SRE_FAST (0x1 << 0)	/* Fast slew rate */
++#define PAD_CTL_DRV_LOW (0x0 << 1)	/* Low drive strength */
++#define PAD_CTL_DRV_MEDIUM (0x1 << 1)	/* Medium drive strength */
++#define PAD_CTL_DRV_HIGH (0x2 << 1)	/* High drive strength */
++#define PAD_CTL_DRV_MAX (0x3 << 1)	/* Max drive strength */
++#define PAD_CTL_ODE_OPENDRAIN_NONE (0x0 << 3)	/* Opendrain disable */
++#define PAD_CTL_ODE_OPENDRAIN_ENABLE (0x1 << 3)/* Opendrain enable */
++#define PAD_CTL_100K_PD (0x0 << 4)	/* 100Kohm pulldown */
++#define PAD_CTL_47K_PU (0x1 << 4)	/* 47Kohm pullup */
++#define PAD_CTL_100K_PU (0x2 << 4)	/* 100Kohm pullup */
++#define PAD_CTL_22K_PU (0x3 << 4)	/* 22Kohm pullup */
++#define PAD_CTL_PUE_KEEPER (0x0 << 6)	/* enable pulldown */
++#define PAD_CTL_PUE_PULL (0x1 << 6)	/* enable pullup */
++#define PAD_CTL_PKE_NONE (0x0 << 7)	/* Disable pullup/pulldown */
++#define PAD_CTL_PKE_ENABLE (0x1 << 7)	/* Enable pullup/pulldown */
++#define PAD_CTL_HYS_NONE (0x0 << 8)	/* Hysteresis disabled */
++#define PAD_CTL_HYS_ENABLE (0x1 << 8)	/* Hysteresis enabled */
++#define PAD_CTL_DDR_INPUT_CMOS (0x0 << 9)/* DDR input CMOS */
++#define PAD_CTL_DDR_INPUT_DDR (0x1 << 9)/* DDR input DDR */
++#define PAD_CTL_DRV_VOT_LOW (0x0 << 13) /* Low voltage mode */
++#define PAD_CTL_DRV_VOT_HIGH (0x1 << 13)/* High voltage mode */
++#endif /* __ASSEMBLY__ */
++/* ARM CORTEX A8*/
++#define CORTEX_A8_ICGC 		0x14
++
++//#endif /* __ASSEMBLY__ */
++
+ #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
+ #include <asm/types.h>
+ 
+--- u-boot-2011.12/arch/arm/cpu/armv7/cpu.c	2011-12-23 20:25:35.000000000 +0100
++++ u-boot-custom/arch/arm/cpu/armv7/cpu.c	2012-01-09 22:44:26.148876883 +0100
+@@ -79,5 +79,9 @@ int cleanup_before_linux(void)
+ 	 */
+ 	invalidate_dcache_all();
+ 
++#ifndef CONFIG_L2_OFF
++	v7_outer_cache_enable();
++#endif
++
+ 	return 0;
+ }
+--- u-boot-custom.ref/arch/arm/lib/cache-cp15.c	2011-12-23 20:25:35.000000000 +0100
++++ u-boot-custom/arch/arm/lib/cache-cp15.c	2012-01-09 22:28:01.960696861 +0100
+@@ -86,10 +86,17 @@ static inline void mmu_setup(void)
+ 	/* Set the access control to all-supervisor */
+ 	asm volatile("mcr p15, 0, %0, c3, c0, 0"
+ 		     : : "r" (~0));
++
++	/* Workaround for arm errata #709718 */
++	/* Setup PRRR so device is always mapped to non-shared */
++	asm volatile ("mrc p15, 0, %0, c10, c2, 0" : "=r"(i) : /*:*/);
++	i &= (~(3 << 0x10));
++	asm volatile ("mcr p15, 0, %0, c10, c2, 0" : : "r"(i) /*:*/);
++
+ 	/* and enable the mmu */
+ 	reg = get_cr();	/* get control reg. */
+ 	cp_delay();
+-	set_cr(reg | CR_M);
++	set_cr(reg | CR_M | CR_A | CR_Z);
+ }
+ 
+ static int mmu_enabled(void)
+
diff --git a/patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch b/patches/u-boot/2011.12/401-apf51.patch
similarity index 83%
copy from patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch
copy to patches/u-boot/2011.12/401-apf51.patch
index 5c8d7b9..51ac68b 100644
--- a/patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch
+++ b/patches/u-boot/2011.12/401-apf51.patch
@@ -1,10 +1,10 @@
-Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
+Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/apf51.c	2011-06-21 16:59:15.000000000 +0200
-@@ -0,0 +1,1157 @@
++++ u-boot-custom/board/armadeus/apf51/apf51.c	2012-01-12 17:19:58.434303119 +0100
+@@ -0,0 +1,1263 @@
 +/*
-+ * (C) Copyright 2010 Eric Jarrige, Armadeus Project
++ * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
 + *
 + * See file CREDITS for list of people who contributed to this
 + * project.
@@ -27,11 +27,15 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +
 +#include <common.h>
 +#include <command.h>
++#include <asm/armv7.h>
 +#include <asm/io.h>
 +#include <asm/arch/imx-regs.h>
-+#include <asm/arch/asm-offsets.h>
-+#include <asm/arch/mx51_pins.h>
++#include <generated/asm-offsets.h>
++#include <asm/arch/crm_regs.h>
++#include <asm/arch/mx5x_pins.h>
 +#include <asm/arch/iomux.h>
++#include <asm/arch/sys_proto.h>
++#include <asm/gpio.h>
 +#include <asm/errno.h>
 +#include <i2c.h>
 +//#include <asm/arch/imx_spi.h>
@@ -43,7 +47,6 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +
 +DECLARE_GLOBAL_DATA_PTR;
 +
-+static u32 system_rev;
 +unsigned long boot_verb = 0;
 +
 +
@@ -72,22 +75,27 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +}
 +
 +
-+u32 get_board_rev(void)
++int dram_init(void)
 +{
-+	return system_rev;
++	u32 size1, size2=0;
++
++	size1 = get_ram_size((void *)CONFIG_SYS_SDRAM_1_BASE, PHYS_SDRAM_1_SIZE);
++#if ( CONFIG_SYS_NR_DRAM_BANKS > 1 )
++	size2 = get_ram_size((void *)CONFIG_SYS_SDRAM_2_BASE, PHYS_SDRAM_2_SIZE);
++#endif
++
++	gd->ram_size = size1 + size2;
++	return 0;
 +}
 +
-+int dram_init(void)
++void dram_init_banksize(void)
 +{
-+#if ( CONFIG_SYS_NR_DRAM_BANKS > 0 )
 +	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_1_BASE;
-+	gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_1_SIZE;
-+#endif
++	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 +#if ( CONFIG_SYS_NR_DRAM_BANKS > 1 )
 +	gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_2_BASE;
-+	gd->bd->bi_dram[1].size = CONFIG_SYS_SDRAM_2_SIZE;
++	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
 +#endif
-+	return 0;
 +}
 +
 +void setup_usb(void)
@@ -194,8 +202,8 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	mxc_iomux_set_pad(MX51_PIN_UART2_RXD, UART_PAD_CFG);
 +	mxc_iomux_set_pad(MX51_PIN_UART2_TXD, UART_PAD_CFG);
 +
-+	mxc_iomux_set_input(MUX_IN_UART2_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH2);
-+	mxc_iomux_set_input(MUX_IN_UART2_IPP_UART_RTS_B_SELECT_INPUT,INPUT_CTL_PATH3);
++	mxc_iomux_set_input(MX51_UART2_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH2);
++	mxc_iomux_set_input(MX51_UART2_IPP_UART_RTS_B_SELECT_INPUT,INPUT_CTL_PATH3);
 +	/*
 +	 * uart3
 +	 */
@@ -212,7 +220,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	mxc_iomux_set_pad(MX51_PIN_UART3_RXD, UART_PAD_CFG);
 +	mxc_iomux_set_pad(MX51_PIN_UART3_TXD, UART_PAD_CFG);
 +
-+	mxc_iomux_set_input(MUX_IN_UART3_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH4);
++	mxc_iomux_set_input(MX51_UART3_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH4);
 +#endif
 +}
 +
@@ -253,8 +261,8 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	mxc_iomux_set_pad(MX51_PIN_EIM_CS4, AUD_PAD_CFG);
 +	mxc_iomux_set_pad(MX51_PIN_EIM_CS5, AUD_PAD_CFG);
 +
-+	mxc_iomux_set_input(MUX_IN_AUDMUX_P5_INPUT_TXCLK_AMX_SELECT_INPUT,INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_AUDMUX_P5_INPUT_TXFS_AMX_SELECT_INPUT,INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_AUDMUX_P5_INPUT_TXCLK_AMX_SELECT_INPUT,INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_AUDMUX_P5_INPUT_TXFS_AMX_SELECT_INPUT,INPUT_CTL_PATH1);
 +	/*
 +	 * audmux6
 +	 */
@@ -418,7 +426,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +				 PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
 +
 +	/* pwm 1 & 2 */
-+	mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT1);
++	mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT0);
 +	mxc_iomux_set_pad(MX51_PIN_GPIO1_2, GPIO_PAD_CFG);
 +
 +	mxc_request_iomux(MX51_PIN_GPIO1_3, IOMUX_CONFIG_ALT1);
@@ -619,58 +627,14 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	mxc_iomux_set_pad(MX51_PIN_NANDF_D14, CSPI_PAD_CFG);
 +	mxc_iomux_set_pad(MX51_PIN_NANDF_D15, CSPI_PAD_CFG);
 +
-+	mxc_iomux_set_input(MUX_IN_CSPI_IPP_IND_SS_B_1_SELECT_INPUT,
++	mxc_iomux_set_input(MX51_CSPI_IPP_IND_SS_B_1_SELECT_INPUT,
 +					INPUT_CTL_PATH1);
 +}
 +
-+#define GPIO_DR		0x00	/* Data Register */
-+#define GPIO_GDIR	0x04	/* GPIO direction */
-+#define GPIO_PSR	0x08	/* Pad Status Reg */
-+#define GPIO_ICR1	0x0c	/* Interrupt Configuration Reg 1 */
-+#define GPIO_ICR2	0x10	/* Interrupt Configuration Reg 2 */
-+#define GPIO_IMR	0x14	/* Interrupt Mask Reg */
-+#define GPIO_ISR	0x18	/* Interrupt Status Reg */
-+#define GPIO_EDR	0x1c	/* Edge Detect Reg */
-+
-+#define PORT_BADDR(n)	(GPIO1_BASE_ADDR + (n) * 0x4000)
-+
-+void imx_gpio_pin_cfg_dir(unsigned int pin, int dir)
-+{
-+	u32 gpio_num = IOMUX_TO_GPIO(pin);
-+	u32 gpio_off = GPIO_TO_INDEX(gpio_num);
-+	u32 baddr = PORT_BADDR(GPIO_TO_PORT(gpio_num));
-+
-+	if (dir)
-+		__REG(baddr + GPIO_GDIR) |= (1 << gpio_off);
-+	else
-+		__REG(baddr + GPIO_GDIR) &= ~(1 << gpio_off);
-+}
-+
-+void imx_gpio_pin_set(unsigned int pin, int value)
-+{
-+	u32 gpio_num = IOMUX_TO_GPIO(pin);
-+	u32 gpio_off = GPIO_TO_INDEX(gpio_num);
-+	u32 baddr = PORT_BADDR(GPIO_TO_PORT(gpio_num));
-+
-+	if (value)
-+		__REG(baddr + GPIO_DR) |= (1 << gpio_off);
-+	else
-+		__REG(baddr + GPIO_DR) &= ~(1 << gpio_off);
-+}
-+
-+int imx_gpio_pin_get(unsigned int pin)
-+{
-+        u32 gpio_num = IOMUX_TO_GPIO(pin);
-+        u32 gpio_off = GPIO_TO_INDEX(gpio_num);
-+        u32 baddr = PORT_BADDR(GPIO_TO_PORT(gpio_num));
-+
-+        return (__REG(baddr + GPIO_PSR) >> gpio_off) & 1;
-+}
-+
-+
 +#ifdef CONFIG_I2C_MXC
 +#define I2C_PAD_CFG	(PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH | \
 +	PAD_CTL_ODE_OPENDRAIN_ENABLE | PAD_CTL_100K_PU | PAD_CTL_HYS_ENABLE)
++
 +static void setup_i2c(unsigned int module_base)
 +{
 +	/*
@@ -695,7 +659,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +		/* SDA */
 +		mxc_request_iomux(MX51_PIN_EIM_D27,
 +					IOMUX_CONFIG_ALT4 | IOMUX_CONFIG_SION);
-+		mxc_iomux_set_input(MUX_IN_I2C2_IPP_SDA_IN_SELECT_INPUT,
++		mxc_iomux_set_input(MX51_I2C2_IPP_SDA_IN_SELECT_INPUT,
 +					INPUT_CTL_PATH0);
 +		break;
 +
@@ -712,9 +676,9 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +#define CFG_FEC_PAD		(PAD_CTL_DRV_MEDIUM | PAD_CTL_PUE_KEEPER | \
 +				 PAD_CTL_HYS_ENABLE | PAD_CTL_DRV_VOT_HIGH)
 +
-+	/* Ethernet PHY Reset */
-+	imx_gpio_pin_set(CONFIG_SYS_PHY_RESET_GPIO,0);
-+	imx_gpio_pin_cfg_dir(CONFIG_SYS_PHY_RESET_GPIO, 1);
++
++	gpio_set_value(CONFIG_SYS_PHY_RESET_GPIO, 0);
++	gpio_direction_output(CONFIG_SYS_PHY_RESET_GPIO, 0);
 +
 +	/* FEC TX_ER muxed with DI_GP3 */
 +	mxc_request_iomux(MX51_PIN_DI_GP3, IOMUX_CONFIG_ALT2);
@@ -789,29 +753,48 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	mxc_iomux_set_pad(MX51_PIN_DISP2_DAT15, CFG_FEC_PAD);
 +
 +	/* FEC signals involved in daisy chain should be mapped to DISP2/DI2 pads */
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_COL_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_CRS_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_MDI_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_RDATA_0_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_RDATA_1_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_RDATA_2_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_RDATA_3_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_RX_CLK_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_RX_DV_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_RX_ER_SELECT_INPUT, INPUT_CTL_PATH1);
-+	mxc_iomux_set_input(MUX_IN_FEC_FEC_TX_CLK_SELECT_INPUT, INPUT_CTL_PATH1);
-+
-+	imx_gpio_pin_set(CONFIG_SYS_PHY_RESET_GPIO,1);
++	mxc_iomux_set_input(MX51_FEC_FEC_COL_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_CRS_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_MDI_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_RDATA_0_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_RDATA_1_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_RDATA_2_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_RDATA_3_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_RX_CLK_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_RX_DV_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_RX_ER_SELECT_INPUT, INPUT_CTL_PATH1);
++	mxc_iomux_set_input(MX51_FEC_FEC_TX_CLK_SELECT_INPUT, INPUT_CTL_PATH1);
++
++	/* Ethernet PHY leave Reset state (POR only)*/
++	gpio_set_value(CONFIG_SYS_PHY_RESET_GPIO, 1);
++	gpio_direction_output(CONFIG_SYS_PHY_RESET_GPIO, 1);
 +#endif
 +}
 +
-+#ifdef CONFIG_NET_MULTI
 +int board_eth_init(bd_t *bis)
 +{
++#define STR_ENV_ETHADDR	"ethaddr"
 +	int rc = -ENODEV;
++
++#if defined(CONFIG_FEC_MXC)
++	struct eth_device *dev;
++	uchar eth_addr[6];
++
++	rc = fecmxc_initialize(bis);
++	
++	if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
++		dev = eth_get_dev_by_index(0);
++		if (dev) {
++			eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
++		} else {
++			printf("FEC APF51: Couldn't get eth device\n");
++			rc = -1;
++		}
++	}
++#endif
++
 +	return rc;
 +}
-+#endif
 +
 +#ifdef CONFIG_FSL_MMC
 +volatile u32 *esdhc_base_pointer;
@@ -903,17 +886,17 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +}
 +#endif
 +
-+int board_init(void)
++int board_early_init_f(void)
 +{
-+	system_rev = get_cpu_rev();
++	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
++	struct src *src = (struct src *)SRC_BASE_ADDR;
 +
 +	/* Increase freq to CONFIG_ARM_CLK_FREQ (800MHz) */
 +	writel((CONFIG_PLL1_FREQ/CONFIG_ARM_CLK_FREQ)-1,
-+		CCM_BASE_ADDR + CLKCTL_CACRR);
++		&mxc_ccm->cacrr);
 +
-+	gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
-+	/* address of boot parameters */
-+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_1_BASE + 0x100;
++	/* Disable warm reset */
++	writel(0x560, &src->scr);
 +
 +	setup_misc();
 +	setup_uart();
@@ -922,7 +905,6 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	setup_fec();
 +#ifdef CONFIG_I2C_MXC
 +	setup_i2c(I2C2_BASE_ADDR);
-+	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 +#endif
 +	setup_display();
 +	setup_usb();
@@ -933,6 +915,15 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +#ifdef CONFIG_FPGA
 +	setup_fpga();
 +#endif
++
++	return 0;
++}
++
++int board_init(void)
++{
++	/* address of boot parameters */
++	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_1_BASE + 0x100;
++
 +	return 0;
 +}
 +
@@ -942,6 +933,15 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +int
 +misc_init_r (void)
 +{
++#ifdef CONFIG_I2C_MXC
++	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
++#endif
++	return 0;
++}
++
++#ifdef BOARD_LATE_INIT
++int board_late_init(void)
++{
 +	char *s;
 +	u_char * firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
 +	size_t end	= 0;
@@ -974,12 +974,6 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +
 +	return 0;
 +}
-+
-+#ifdef BOARD_LATE_INIT
-+int board_late_init(void)
-+{
-+	return 0;
-+}
 +#endif
 +
 +/*************************************************************************
@@ -991,37 +985,149 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +#if defined(CONFIG_HW_WATCHDOG)
 +void hw_watchdog_reset(void)
 +{
-+	struct wdog *imx_wdog1 = (struct wdog *)WDOG1_BASE_ADDR;
-+	__raw_writew(0x5555, &imx_wdog1->wsr);
-+	__raw_writew(0xaaaa, &imx_wdog1->wsr);
++	struct wdog_regs *imx_wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR;
++	writew(0x5555, &imx_wdog1->wsr);
++	writew(0xaaaa, &imx_wdog1->wsr);
 +}
 +#endif
 +
 +int checkboard(void)
 +{
-+	printf("Board: Armadeus APF51 ");
++	printf("Board: Armadeus APF51\n");
++	return 0;
++}
 +
-+	puts("[");
-+	switch (__raw_readl(SRC_BASE_ADDR + 0x8)) {
-+	case 0x0001:
-+		puts("POR");
-+		break;
-+	case 0x0009:
-+		puts("RST");
-+		break;
-+	case 0x0010:
-+	case 0x0011:
-+		puts("WDOG");
-+		break;
-+	default:
-+		puts("unknown");
-+	}
-+	puts("]\n");
++#define cache_flush(void)	\
++{	\
++	asm volatile (	\
++		"stmfd sp!, {r0-r5, r7, r9-r11};"	\
++		"mrc        p15, 1, r0, c0, c0, 1;" /*@ read clidr*/	\
++		/* @ extract loc from clidr */       \
++		"ands       r3, r0, #0x7000000;"	\
++		/* @ left align loc bit field*/      \
++		"mov        r3, r3, lsr #23;"	\
++		/* @ if loc is 0, then no need to clean*/    \
++		"beq        555f;" /* finished;" */	\
++		/* @ start clean at cache level 0*/  \
++		"mov        r10, #0;"	\
++		"111:" /*"loop1: */	\
++		/* @ work out 3x current cache level */	\
++		"add        r2, r10, r10, lsr #1;"	\
++		/* @ extract cache type bits from clidr */    \
++		"mov        r1, r0, lsr r2;"	\
++		/* @ mask of the bits for current cache only */	\
++		"and        r1, r1, #7;"	\
++		/* @ see what cache we have at this level*/  \
++		"cmp        r1, #2;"	\
++		/* @ skip if no cache, or just i-cache*/	\
++		"blt        444f;" /* skip;" */	\
++		/* @ select current cache level in cssr*/   \
++		"mcr        p15, 2, r10, c0, c0, 0;"	\
++		/* @ isb to sych the new cssr&csidr */	\
++		"mcr        p15, 0, r10, c7, c5, 4;"	\
++		/* @ read the new csidr */    \
++		"mrc        p15, 1, r1, c0, c0, 0;"	\
++		/* @ extract the length of the cache lines */ \
++		"and        r2, r1, #7;"	\
++		/* @ add 4 (line length offset) */   \
++		"add        r2, r2, #4;"	\
++		"ldr        r4, =0x3ff;"	\
++		/* @ find maximum number on the way size*/   \
++		"ands       r4, r4, r1, lsr #3;"	\
++		/*"clz  r5, r4;" @ find bit position of way size increment*/ \
++		".word 0xE16F5F14;"	\
++		"ldr        r7, =0x7fff;"	\
++		/* @ extract max number of the index size*/  \
++		"ands       r7, r7, r1, lsr #13;"	\
++		"222:" /* loop2:"  */	\
++		/* @ create working copy of max way size*/   \
++		"mov        r9, r4;"	\
++		"333:" /* loop3:"  */	\
++		/* @ factor way and cache number into r11*/  \
++		"orr        r11, r10, r9, lsl r5;"	\
++		/* @ factor index number into r11*/  \
++		"orr        r11, r11, r7, lsl r2;"	\
++		/* @ clean & invalidate by set/way */	\
++		"mcr        p15, 0, r11, c7, c14, 2;"	\
++		/* @ decrement the way */	\
++		"subs       r9, r9, #1;"	\
++		"bge        333b;" /* loop3;" */	\
++		/* @ decrement the index */	\
++		"subs       r7, r7, #1;"	\
++		"bge        222b;" /* loop2;" */	\
++		"444:" /* skip: */	\
++		/*@ increment cache number */	\
++		"add        r10, r10, #2;"	\
++		"cmp        r3, r10;" 	\
++		"bgt        111b;" /* loop1; */	\
++		"555:" /* "finished:" */	\
++		/* @ swith back to cache level 0 */	\
++		"mov        r10, #0;"	\
++		/* @ select current cache level in cssr */	\
++		"mcr        p15, 2, r10, c0, c0, 0;"	\
++		/* @ isb to sych the new cssr&csidr */	\
++		"mcr        p15, 0, r10, c7, c5, 4;" 	\
++		"ldmfd 	    sp!, {r0-r5, r7, r9-r11};"	\
++		"666:" /* iflush:" */	\
++		"mov        r0, #0x0;"	\
++		/* @ invalidate I+BTB */	\
++		"mcr        p15, 0, r0, c7, c5, 0;" 	\
++		/* @ drain WB */	\
++		"mcr        p15, 0, r0, c7, c10, 4;"	\
++		:	\
++		:	\
++		: "r0" /* Clobber list */	\
++	);	\
++}
 +
-+	return 0;
++#ifndef CONFIG_SYS_DCACHE_OFF
++void enable_caches(void)
++{
++	/* Enable D-cache. I-cache is already enabled in start.S */
++	//dcache_enable();
++#ifndef CONFIG_L2_OFF
++	//v7_outer_cache_enable();
++#endif
++}
++
++#endif
++
++#ifndef CONFIG_L2_OFF
++void v7_outer_cache_enable(void)
++{
++	asm("mrc 15, 0, r0, c1, c0, 1");
++	asm("orr r0, r0, #0x2");
++	asm("mcr 15, 0, r0, c1, c0, 1");
++}
++
++void v7_outer_cache_disable(void)
++{
++	asm("mrc 15, 0, r0, c1, c0, 1");
++	asm("bic r0, r0, #0x2");
++	asm("mcr 15, 0, r0, c1, c0, 1");
 +}
 +
 +/*
++void v7_outer_cache_flush_all(void)
++{
++}
++
++void v7_outer_cache_inval_all(void)
++{
++}
++
++void v7_outer_cache_flush_range(u32 start, u32 end)
++{
++}
++
++void v7_outer_cache_inval_range(u32 start, u32 end)
++{
++}
++*/
++#endif
++
++
++/*
 + * display dcd table. to delete
 + */
 +int do_mx51_show_dcd_tab(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -1160,18 +1266,11 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +);
 +
 +
-Index: u-boot-2010.03/board/armadeus/apf51/config.mk
+Index: u-boot-2011.12/board/armadeus/apf51/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/config.mk	2011-06-21 16:03:13.000000000 +0200
-@@ -0,0 +1,2 @@
-+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
-+TEXT_BASE = 0x9FF00000
-Index: u-boot-2010.03/board/armadeus/apf51/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/Makefile	2011-06-21 16:03:13.000000000 +0200
-@@ -0,0 +1,50 @@
++++ u-boot-2011.12/board/armadeus/apf51/Makefile	2011-06-21 16:03:13.000000000 +0200
+@@ -0,0 +1,43 @@
 +#
 +# Copyright (C) 2007, Guennadi Liakhovetski <lg...@de...>
 +#
@@ -1196,23 +1295,16 @@ Index: u-boot-2010.03/board/armadeus/apf51/Makefile
 +
 +include $(TOPDIR)/config.mk
 +
-+LIB	 = $(obj)lib$(BOARD).a
++LIB	 = $(obj)lib$(BOARD).o
 +
 +COBJS	:= apf51.o fpga.o
-+SOBJS	:=
 +
 +SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 +OBJS	:= $(addprefix $(obj),$(COBJS))
 +SOBJS	:= $(addprefix $(obj),$(SOBJS))
 +
 +$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
-+	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
-+
-+clean:
-+	rm -f $(SOBJS) $(OBJS)
-+
-+distclean:	clean
-+	rm -f $(LIB) core *.bak .depend
++	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
 +
 +#########################################################################
 +
@@ -1222,136 +1314,21 @@ Index: u-boot-2010.03/board/armadeus/apf51/Makefile
 +sinclude $(obj).depend
 +
 +#########################################################################
-Index: u-boot-2010.03/board/armadeus/apf51/u-boot.lds
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/u-boot.lds	2011-06-21 16:03:13.000000000 +0200
-@@ -0,0 +1,64 @@
-+/*
-+ * January 2004 - Changed to support H4 device
-+ * Copyright (c) 2004 Texas Instruments
-+ *
-+ * (C) Copyright 2002
-+ * Gary Jennejohn, DENX Software Engineering, <gj...@de...>
-+ *
-+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
-+ * (C) Copyright 2010 Eric Jarrige, Armadeus Project
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-+OUTPUT_ARCH(arm)
-+ENTRY(_start)
-+SECTIONS
-+{
-+	. = 0x00000000;
-+
-+	. = ALIGN(4);
-+	.text	   :
-+	{
-+	  /* WARNING - the following is hand-optimized to fit within	*/
-+	  /* the sector layout of our flash chips!	XXX FIXME XXX	*/
-+	  cpu/arm_cortexa8/start.o
-+	  *(.text)
-+	}
-+
-+	. = ALIGN(4);
-+	.rodata : { *(.rodata) }
-+
-+	. = ALIGN(4);
-+	.data : { *(.data) }
-+
-+	. = ALIGN(4);
-+	.got : { *(.got) }
-+
-+	. = .;
-+	__u_boot_cmd_start = .;
-+	.u_boot_cmd : { *(.u_boot_cmd) }
-+	__u_boot_cmd_end = .;
-+
-+	. = ALIGN(4);
-+	__bss_start = .;
-+	.bss : { *(.bss) }
-+	_end = .;
-+}
-Index: u-boot-2010.03/include/asm-arm/mach-types.h
-===================================================================
---- u-boot-2010.03.orig/include/asm-arm/mach-types.h	2010-03-31 23:54:39.000000000 +0200
-+++ u-boot-2010.03/include/asm-arm/mach-types.h	2011-06-21 16:03:13.000000000 +0200
-@@ -2699,6 +2699,7 @@
- #define MACH_TYPE_MX53_EVK             2716
- #define MACH_TYPE_IGEP0030             2717
- #define MACH_TYPE_AXELL_H40_H50_CTRL   2718
-+#define MACH_TYPE_APF51                2795
- 
- #ifdef CONFIG_ARCH_EBSA110
- # ifdef machine_arch_type
-@@ -34944,6 +34945,18 @@
- # define machine_is_axell_h40_h50_ctrl()	(0)
- #endif
- 
-+#ifdef CONFIG_MACH_APF51
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type	__machine_arch_type
-+# else
-+#  define machine_arch_type	MACH_TYPE_APF51
-+# endif
-+# define machine_is_apf51()	(machine_arch_type == MACH_TYPE_APF51)
-+#else
-+# define machine_is_apf51()	(0)
-+#endif
-+
- /*
-  * These have not yet been registered
-  */
-Index: u-boot-2010.03/MAKEALL
-===================================================================
---- u-boot-2010.03.orig/MAKEALL	2011-06-21 16:03:13.000000000 +0200
-+++ u-boot-2010.03/MAKEALL	2011-06-21 16:03:13.000000000 +0200
-@@ -549,6 +549,7 @@
- 	ap946es			\
- 	ap966			\
- 	apf27			\
-+	apf51			\
- 	cp920t			\
- 	cp922_XA10		\
- 	cp926ejs		\
-Index: u-boot-2010.03/Makefile
-===================================================================
---- u-boot-2010.03.orig/Makefile	2011-06-21 16:03:13.000000000 +0200
-+++ u-boot-2010.03/Makefile	2011-06-21 16:03:13.000000000 +0200
-@@ -2735,6 +2735,9 @@
- apf27_config		:	unconfig
- 	@$(MKCONFIG) $(@:_config=) arm arm926ejs apf27 armadeus mx27
- 
-+apf51_config		:	unconfig
-+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 apf51 armadeus mx51
-+
- at91cap9adk_config	:	unconfig
- 	@$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91
- 
-Index: u-boot-2010.03/board/armadeus/apf51/fpga.h
+diff -purN u-boot-custom.ori/boards.cfg u-boot-custom/boards.cfg
+--- u-boot-custom.ori/boards.cfg	2011-12-21 11:22:35.456221000 +0100
++++ u-boot-custom/boards.cfg	2011-12-21 15:12:40.283499253 +0100
+@@ -187,6 +187,7 @@ am335x_evm                   arm        
+ highbank                     arm         armv7       highbank            -              highbank
+ efikamx                      arm         armv7       efikamx             -              mx5		efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg
+ efikasb                      arm         armv7       efikamx             -              mx5		efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/efikamx/imximage_sb.cfg
++apf51                        arm         armv7       apf51               armadeus       mx5
+ mx51evk                      arm         armv7       mx51evk             freescale      mx5		mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
+ mx53ard                      arm         armv7       mx53ard             freescale      mx5		mx53ard:IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg
+ mx53evk                      arm         armv7       mx53evk             freescale      mx5		mx53evk:IMX_CONFIG=board/freescale/mx53evk/imximage.cfg
+Index: u-boot-2011.12/board/armadeus/apf51/fpga.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/fpga.h	2011-06-21 17:00:43.000000000 +0200
++++ u-boot-2011.12/board/armadeus/apf51/fpga.h	2011-06-21 17:00:43.000000000 +0200
 @@ -0,0 +1,39 @@
 +/*
 + * (C) Copyright 2002-2010
@@ -1392,10 +1369,10 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.h
 +extern int fpga_abort_fn (int cookie);
 +extern int fpga_post_fn (int cookie);
 +extern int fpga_busy_fn (int cookie);
-Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
+Index: u-boot-2011.12/board/armadeus/apf51/fpga.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/board/armadeus/apf51/fpga.c	2011-06-21 17:10:59.000000000 +0200
++++ u-boot-2011.12/board/armadeus/apf51/fpga.c	2012-01-09 20:37:14.781633420 +0100
 @@ -0,0 +1,271 @@
 +/*
 + * (C) Copyright 2002-2010
@@ -1426,8 +1403,10 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
 +
 +#if defined(CONFIG_FPGA)
 +
++#include <asm/arch/crm_regs.h>
 +#include <asm/arch/imx-regs.h>
-+#include <asm/arch/asm-offsets.h>
++#include <asm/gpio.h>
++#include <generated/asm-offsets.h>
 +#include <asm/io.h>
 +#include <command.h>
 +#include <config.h>
@@ -1441,10 +1420,6 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
 +#define		PRINTF(fmt,args...)
 +#endif
 +
-+extern void imx_gpio_pin_set(unsigned int pin, int value);
-+extern void imx_gpio_pin_cfg_dir(unsigned int pin, int dir);
-+extern int imx_gpio_pin_get(unsigned int pin);
-+
 +u32 temp_clk; /* use to restore the emi_clk_sel after donwload */
 +u32 temp_rcr1;
 +u32 temp_wcr1;
@@ -1485,6 +1460,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
 +fpga_pre_fn (int cookie)
 +{
 +#define EMI_CLK_SEL		1<<26
++	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
 +
 +	temp_rcr1 = __REG(CONFIG_CS1RCR1_ADDR);
 +	__REG(CONFIG_CS1RCR1_ADDR) = 0x01000010;
@@ -1493,26 +1469,26 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
 +	__REG(CONFIG_CS1WCR1_ADDR) = 0x01000008;
 +
 +	/* change emi_clk_sel to ensure blck smaller than 50MHz */
-+	temp_clk = __REG(CCM_BASE_ADDR + CLKCTL_CBCDR);
-+	__REG(CCM_BASE_ADDR + CLKCTL_CBCDR) = temp_clk | EMI_CLK_SEL;
++	temp_clk = readl(&mxc_ccm->cbcdr); //__REG(CCM_BASE_ADDR + CLKCTL_CBCDR);
++	writel(temp_clk | EMI_CLK_SEL, &mxc_ccm->cbcdr); //__REG(CCM_BASE_ADDR + CLKCTL_CBCDR) = temp_clk | EMI_CLK_SEL;
 +
 +	/* FPGA PROG */
-+	imx_gpio_pin_set(CONFIG_SYS_FPGA_PRG, 1);
-+	imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_PRG, 1);
++	gpio_set_value(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_PRG), 1);
++	gpio_direction_output(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_PRG), 1);
 +
 +	/* FPGA SUSPEND */
-+	imx_gpio_pin_set(CONFIG_SYS_FPGA_SUSPEND, 1);
-+	imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_SUSPEND, 1);
++	gpio_set_value(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_SUSPEND), 1);
++	gpio_direction_output(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_SUSPEND), 1);
 +
 +	/* FPGA DONE */
-+	imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_DONE, 0);
++	gpio_direction_input(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_DONE));
 +
 +	/* FPGA INIT# */
-+	imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_INIT, 0);
++	gpio_direction_input(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_INIT));
 +
 +	/* FPGA PWR */
-+	imx_gpio_pin_set(CONFIG_SYS_FPGA_PWR, 1);
-+	imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_PWR, 1);
++	gpio_set_value(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_PWR), 1);
++	gpio_direction_output(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_PWR), 1);
 +
 +	PRINTF("FPGA power enabled\n");
 +
@@ -1527,7 +1503,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
 +{
 +	PRINTF ("%s:%d: FPGA PROGRAM %s\n", __FUNCTION__, __LINE__,
 +					assert?"high":"low");
-+	imx_gpio_pin_set(CONFIG_SYS_FPGA_PRG, !assert);
++	gpio_set_value(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_PRG), !assert);
 +	return assert;
 +}
 +
@@ -1549,7 +1525,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
 +{
 +	int value;
 +	PRINTF ("%s:%d: INIT check... \n", __FUNCTION__, __LINE__);
-+	value = imx_gpio_pin_get(CONFIG_SYS_FPGA_INIT);
++	value = gpio_get_value(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_INIT));
 +	PRINTF ("init value read %x\n",value);
 +	if (value)
 +		return 0;
@@ -1563,7 +1539,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
 +fpga_done_fn (int cookie)
 +{
 +	int value;
-+	value = imx_gpio_pin_get(CONFIG_SYS_FPGA_DONE);
++	value = gpio_get_value(IOMUX_TO_GPIO(CONFIG_SYS_FPGA_DONE));
 +	PRINTF ("%s:%d: DONE check... %s", __FUNCTION__, __LINE__,
 +					value?"high":"low");
 +	return(value?FPGA_SUCCESS:FPGA_FAIL);
@@ -1630,9 +1606,10 @@ Index: u-boot-2010.03/board/armadeus/apf51/fpga.c
 +int
 +fpga_post_fn (int cookie)
 +{
++	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
 +	PRINTF ("%s:%d: FPGA POST \n", __FUNCTION__, __LINE__);
 +	/* restore emi_clk_sel */
-+	__REG(CCM_BASE_ADDR + CLKCTL_CBCDR) = temp_clk;
++	writel(temp_clk | EMI_CLK_SEL, &mxc_ccm->cbcdr); //__REG(CCM_BASE_ADDR + CLKCTL_CBCDR) = temp_clk;
 +	udelay(10); /* wait a few us after emi_clk_sel change */
 +	__REG(CONFIG_CS1RCR1_ADDR) = temp_rcr1;
 +	__REG(CONFIG_CS1WCR1_ADDR) = temp_wcr1;
diff --git a/patches/u-boot/2011.12/403-apf51-wdog.patch b/patches/u-boot/2011.12/403-apf51-wdog.patch
new file mode 100644
index 0000000..840b7f8
--- /dev/null
+++ b/patches/u-boot/2011.12/403-apf51-wdog.patch
@@ -0,0 +1,20 @@
+Index: u-boot-2010.03/include/asm-arm/arch-mx51/imx-regs.h
+===================================================================
+--- u-boot-2010.03.orig/arch/arm/include/asm/arch-mx5/imx-regs.h	2011-01-05 18:10:42.000000000 +0100
++++ u-boot-2010.03/arch/arm/include/asm/arch-mx5/imx-regs.h	2011-01-05 18:11:20.000000000 +0100
+@@ -605,6 +605,15 @@ struct fuse_bank1_regs {
+ 	u32	fuse15_31[0x11];
+ };
+ 
++/* WDOG registers */
++struct wdog_regs {
++	u16	wcr;
++	u16	wsr;
++	u16	wrsr;
++	u16	wicr;
++	u16	wmcr;
++};
++
+ #endif /* __ASSEMBLER__*/
+ 
+ #endif				/* __ASM_ARCH_MX5_IMX_REGS_H__ */
diff --git a/patches/u-boot/2011.12/405-remove_extra_printk.patch b/patches/u-boot/2011.12/405-remove_extra_printk.patch
new file mode 100644
index 0000000..960bce9
--- /dev/null
+++ b/patches/u-boot/2011.12/405-remove_extra_printk.patch
@@ -0,0 +1,25 @@
+U-Boot-2011-12: remove extra printk in
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- u-boot-2011.12/drivers/mtd/nand/nand_bbt.c	2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/drivers/mtd/nand/nand_bbt.c	2012-01-12 19:01:14.890416390 +0100
+@@ -179,7 +179,7 @@ static int read_bbt(struct mtd_info *mtd
+ 				}
+ 				/* Leave it for now, if its matured we can move this
+ 				 * message to MTD_DEBUG_LEVEL0 */
+-				printk(KERN_DEBUG "nand_read_bbt: Bad block at 0x%012llx\n",
++				debug(KERN_DEBUG "nand_read_bbt: Bad block at 0x%012llx\n",
+ 					(loff_t)((offs << 2) + (act >> 1)) <<
+ 					this->bbt_erase_shift);
+ 				/* Factory marked bad or worn out ? */
+@@ -513,7 +513,7 @@ static int search_bbt(struct mtd_info *m
+ 		if (td->pages[i] == -1)
+ 			printk(KERN_WARNING "Bad block table not found for chip %d\n", i);
+ 		else
+-			printk(KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td->pages[i],
++			debug(KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td->pages[i],
+ 			       td->version[i]);
+ 	}
+ 	return 0;
+
diff --git a/patches/u-boot/2010.03/u-boot-2010.03-407-imx51-nand.patch b/patches/u-boot/2011.12/407-imx51-nand.patch
similarity index 99%
copy from patches/u-boot/2010.03/u-boot-2010.03-407-imx51-nand.patch
copy to patches/u-boot/2011.12/407-imx51-nand.patch
index b7a7c8b..06a9838 100644
--- a/patches/u-boot/2010.03/u-boot-2010.03-407-imx51-nand.patch
+++ b/patches/u-boot/2011.12/407-imx51-nand.patch
@@ -2,14 +2,14 @@ Index: u-boot-2010.03/drivers/mtd/nand/Makefile
 ===================================================================
 --- u-boot-2010.03.orig/drivers/mtd/nand/Makefile	2011-01-05 18:05:11.000000000 +0100
 +++ u-boot-2010.03/drivers/mtd/nand/Makefile	2011-01-05 18:11:26.000000000 +0100
-@@ -43,6 +43,7 @@
+@@ -54,6 +54,7 @@ COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwoo
  COBJS-$(CONFIG_NAND_KMETER1) += kmeter1_nand.o
  COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o
  COBJS-$(CONFIG_NAND_MXC) += mxc_nand.o
 +COBJS-$(CONFIG_NAND_MXC_V2) += mx51_nand.o
+ COBJS-$(CONFIG_NAND_MXS) += mxs_nand.o
  COBJS-$(CONFIG_NAND_NDFC) += ndfc.o
  COBJS-$(CONFIG_NAND_NOMADIK) += nomadik.o
- COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.o
 Index: u-boot-2010.03/drivers/mtd/nand/mx51_nand.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1000,10 +1000,10 @@ Index: u-boot-2010.03/drivers/mtd/nand/mx51_nand.c
 +
 +	return err;
 +}
-Index: u-boot-2010.03/include/asm-arm/arch-mx51/mxc_nand.h
+Index: u-boot-2010.03/arch/arm/include/asm/arch-mx5/mxc_nand.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/include/asm-arm/arch-mx51/mxc_nand.h	2011-01-05 18:11:26.000000000 +0100
++++ u-boot-2010.03/arch/arm/include/asm/arch-mx5/mxc_nand.h	2011-01-05 18:11:26.000000000 +0100
 @@ -0,0 +1,368 @@
 +/*
 + * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
diff --git a/patches/u-boot/2010.03/u-boot-2010.03-409-apf51-nand-spl.patch b/patches/u-boot/2011.12/409-apf51-nand-spl.patch
similarity index 77%
copy from patches/u-boot/2010.03/u-boot-2010.03-409-apf51-nand-spl.patch
copy to patches/u-boot/2011.12/409-apf51-nand-spl.patch
index 401df9d..0468427 100644
--- a/patches/u-boot/2010.03/u-boot-2010.03-409-apf51-nand-spl.patch
+++ b/patches/u-boot/2011.12/409-apf51-nand-spl.patch
@@ -74,7 +74,7 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf51/flash_header.S
 +
 +#include <config.h>
 +#include <asm/arch/imx-regs.h>
-+#include <asm/arch/asm-offsets.h>
++#include <generated/asm-offsets.h>
 +
 +#ifdef	CONFIG_FLASH_HEADER
 +#ifndef CONFIG_FLASH_HEADER_OFFSET
@@ -271,7 +271,7 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf51/Makefile
 +AFLAGS	+= -DCONFIG_NAND_SPL
 +CFLAGS	+= -DCONFIG_NAND_SPL
 +
-+SOBJS	= flash_header.o mxc_nand_load.o
++SOBJS	= flash_header.o
 +COBJS	=
 +
 +SRCS	:= $(addprefix $(src),$(SOBJS:.o=.S) $(COBJS:.o=.c))
@@ -317,181 +317,6 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf51/Makefile
 +sinclude $(obj).depend
 +
 +#########################################################################
-Index: u-boot-2010.03/nand_spl/board/armadeus/apf51/mxc_nand_load.S
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/nand_spl/board/armadeus/apf51/mxc_nand_load.S	2011-01-05 18:11:55.000000000 +0100
-@@ -0,0 +1,170 @@
-+/*
-+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <config.h>
-+//#include <asm/arch/mx51.h>
-+#include <asm/arch/imx-regs.h>
-+#include <asm/arch/asm-offsets.h>
-+
-+.macro do_wait_op_done
-+1: 	ldr r7, [r3, #0x2C]
-+	ands r7, r7, #0x80000000
-+	beq 1b
-+	mov r7, #0x0
-+	str r7, [r3, #0x2C]
-+.endm   // do_wait_op_done
-+
-+//.section ".text.load", "x"
-+.globl mxc_nand_load
-+/*
-+ * R0:	NFC BUF base address
-+ * R1:	NFC BUF data end address
-+ * R2: RAM destination offset address
-+ * R3: NFC IP control register base
-+ * R4: NAND block address
-+ * R5: RAM destination end address
-+ * R6: NFC DATA register base
-+ * R7 - r14: 8 working buffer registers
-+ */
-+mxc_nand_load:
-+	ldr r0, =NFC_BASE_ADDR_AXI
-+	add r1, r0, #NFC_BUF_SIZE
-+
-+	/* For non-nand-boot, directly quit */
-+	cmp pc, r0
-+	blo _end	//movlo pc, lr
-+	cmp pc, r1
-+	bhi _end	//movhi pc, lr
-+
-+	mov r4, #NFC_BUF_SIZE
-+	/* Get NAND page size */
-+	ldr r3, =NFC_BASE_ADDR
-+	ldr r2, [r3, #0x24]
-+	and r2, r2, #0x3
-+	cmp r2, #1
-+	moveq r2, #0x800
-+	movlt r2, #0x200
-+	adrls r5, NFC_PAGE_MODE
-+	strls r2, [r5]
-+	/* Get actually pre-loading size*/
-+	subls r1, r1, #0x800
-+	subls r4, r4, #0x800
-+
-+	/* r1 ~ r3, r12, lr(r14) must not change in relocated operation */
-+	ldr r2, U_BOOT_NAND_START
-+1:	ldmia r0!, {r5-r11, r13}
-+	stmia r2!, {r5-r11, r13}
-+	cmp r0, r1
-+	blo 1b
-+
-+	ldr r0, CONST_0X0FFF
-+	ldr r5, U_BOOT_NAND_START
-+	and lr, lr, r0
-+	add lr, lr, r5
-+	and r12, r12, r0
-+	add r12, r12, r5
-+	add r5, r5, #0x8
-+	and r0, pc, r0
-+	add pc, r5, r0
-+	nop
-+	nop
-+	nop
-+	nop
-+	nop
-+	adr r0, SAVE_REGS	/* Save r12 & R14(lr) */
-+	str r12, [r0]
-+	str lr, [r0, #4]
-+Copy_Main:
-+	ldr r0, =NFC_BASE_ADDR_AXI
-+
-+	add r6, r0, #0x1E00
-+	ldr r5, =_end		/* Try get right image size */
-+	add r5, r2, #0x00040000 /* Fixme to get actual image size */
-+
-+	mov r7, #0xFF000000
-+	add r7, r7, #0x00FF0000
-+	str r7, [r3, #0x4]
-+	str r7, [r3, #0x8]
-+	str r7, [r3, #0xC]
-+	str r7, [r3, #0x10]
-+	str r7, [r3, #0x14]
-+	str r7, [r3, #0x18]
-+	str r7, [r3, #0x1C]
-+	str r7, [r3, #0x20]
-+	mov r8, #0x7
-+	mov r7, #0x84
-+1:	add r9, r7, r8, lsr #3
-+	str r9, [r3, #0x0]
-+	subs r8, r8, #0x01
-+	bne 1b
-+
-+	mov r7, #0
-+	str r7, [r3, #0x2C]
-+
-+	ldr r7, NFC_PAGE_MODE
-+Read_Page:
-+	/* start_nfc_addr_ops1(pg_no, pg_off) */
-+	cmp r7, #0x800
-+	movgt r7, r4, lsr #12	/* Get the page number for 4K page */
-+	moveq r7, r4, lsr #11	/* Get the page number for 2K page */
-+	mov r7, r7, lsl #16
-+	str r7, [r6, #0x04]	/* Set the address */
-+
-+	/* writel((FLASH_Read_Mode1_LG << 8) | FLASH_Read_Mode1, NAND_CMD_REG)*/
-+	mov r7, #0x3000
-+	str r7, [r6,#0x0]
-+
-+	/* writel(0x00000000, NAND_CONFIGURATION1_REG) */
-+	mov r7, #0x0
-+	str r7, [r6, #0x34]
-+
-+	/* start auto-read
-+    	 * writel(NAND_LAUNCH_AUTO_READ, NAND_LAUNCH_REG);
-+	 */
-+	mov r7, #0x80
-+	str r7, [r6, #0x40]
-+
-+	do_wait_op_done
-+
-+Copy_Good_Blk:
-+1:	ldmia r0!, {r7-r14}
-+	stmia r2!, {r7-r14}
-+	cmp r0, r1
-+	blo 1b
-+	cmp r2, r5
-+	bge Copy_Main_done
-+	ldr r7, NFC_PAGE_MODE
-+	add r4, r4, r7
-+	ldr r0, =NFC_BASE_ADDR_AXI
-+	b	Read_Page
-+
-+Copy_Main_done:
-+	adr r0, SAVE_REGS
-+	ldr r12, [r0]
-+	ldr lr,	[r0, #4]
-+	mov pc, lr
-+
-+U_BOOT_NAND_START: .word TEXT_BASE
-+CONST_0X0FFF:	.word 0x0FFF
-+NFC_PAGE_MODE:	.word 0x1000
-+SAVE_REGS:	.word 0x0
-+		.word 0x0
 Index: u-boot-2010.03/nand_spl/board/armadeus/apf51/u-boot.lds
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/u-boot/2010.03/u-boot-2010.03-410-imx-iim.patch b/patches/u-boot/2011.12/410-imx-iim.patch
similarity index 82%
copy from patches/u-boot/2010.03/u-boot-2010.03-410-imx-iim.patch
copy to patches/u-boot/2011.12/410-imx-iim.patch
index 6fbec8f..f134a61 100644
--- a/patches/u-boot/2010.03/u-boot-2010.03-410-imx-iim.patch
+++ b/patches/u-boot/2011.12/410-imx-iim.patch
@@ -1,7 +1,7 @@
-Index: u-boot-2010.03/common/cmd_iim.c
+Index: u-boot-2011.12/common/cmd_iim.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot-2010.03/common/cmd_iim.c	2011-01-05 18:11:58.000000000 +0100
++++ u-boot-2011.12/common/cmd_iim.c	2011-01-05 18:11:58.000000000 +0100
 @@ -0,0 +1,95 @@
 +/*
 + * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
@@ -98,22 +98,22 @@ Index: u-boot-2010.03/common/cmd_iim.c
 +	"iim blow fecmac <0x##:0x##:0x##:0x##:0x##:0x##>"
 +	"- Blow FEC Mac address");
 +
-Index: u-boot-2010.03/common/Makefile
+Index: u-boot-2011.12/common/Makefile
 ===================================================================
---- u-boot-2010.03.orig/common/Makefile	2011-01-05 18:05:11.000000000 +0100
-+++ u-boot-2010.03/common/Makefile	2011-01-05 18:11:58.000000000 +0100
-@@ -99,6 +99,7 @@
- ifdef CONFIG_FPGA
+--- u-boot-2011.12/common/Makefile	2011-12-23 20:25:35.000000...
 
[truncated message content]

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2672-g2310cbb

From: Julien B a. A. <ar...@us...> - 2012-01-12 17:40:55

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  2310cbb7c81f94b304eaf5936871c7a041183280 (commit)
       via  447ddf43fbc769438fce88f54017c4e0b0fedb10 (commit)
      from  5851568a9a1e7fcb8ee45c46e7809e33643d969b (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 2310cbb7c81f94b304eaf5936871c7a041183280
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 12 17:31:21 2012 +0100

    [BUILDROOT] Improve as_devices package integration/build in BR

commit 447ddf43fbc769438fce88f54017c4e0b0fedb10
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 12 16:37:03 2012 +0100

    Indentation

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

Summary of changes:
 buildroot/package/armadeus/as_devices/Config.in    |   26 ++--
 .../package/armadeus/as_devices/as_devices.mk      |  150 +++++++-------------
 ...buildroot-Adding_copy_method_for_download.patch |    2 +-
 target/packages/as_devices/Makefile                |   15 ++-
 4 files changed, 76 insertions(+), 117 deletions(-)

diff --git a/buildroot/package/armadeus/as_devices/Config.in b/buildroot/package/armadeus/as_devices/Config.in
index 7791781..db1b4e0 100644
--- a/buildroot/package/armadeus/as_devices/Config.in
+++ b/buildroot/package/armadeus/as_devices/Config.in
@@ -5,27 +5,33 @@ config BR2_PACKAGE_AS_DEVICES
           Library that drives armadeus specific devices.
 
 config BR2_PACKAGE_AS_DEVICES_TESTS
-	bool "as_device test"
+	bool "as_devices test tool"
 	depends on BR2_PACKAGE_AS_DEVICES
 	help
-	  Executable that can test all as_devices
+	  Executable that can test all as_devices modules.
 
 config BR2_PACKAGE_AS_DEVICES_CPP
-    depends on BR2_PACKAGE_AS_DEVICES
-    bool "wrapper C++"
-    default n
-    help
-        C++ wrapper for as_devices library
+	depends on BR2_PACKAGE_AS_DEVICES
+	depends on BR2_TOOLCHAIN_BUILDROOT_CXX
+	bool "C++ wrapper"
+	help
+	  C++ wrapper for as_devices library.
 
 config BR2_PACKAGE_AS_DEVICES_TESTS_CPP
-	bool "as_device C++ wrappers test"
+	bool "as_devices C++ wrapper test tool"
 	depends on BR2_PACKAGE_AS_DEVICES_CPP
 	help
-	  Executable that can test as_devices C++ wrappers
+	  Executable that can test as_devices C++ wrappers.
 
 config BR2_PACKAGE_AS_DEVICES_PYTHON
 	depends on BR2_PACKAGE_AS_DEVICES
 	depends on BR2_PACKAGE_PYTHON
 	bool "Python wrapper"
 	help
-	  Python wrapper for as_devices library. needs python.
+	  Python wrapper for as_devices library. Needs python.
+
+comment "C++ wrapper requires a toolchain with C++ support"
+	depends on !BR2_TOOLCHAIN_BUILDROOT_CXX
+
+comment "Python wrapper requires python interpreter"
+	depends on BR2_PACKAGE_AS_DEVICES && !BR2_PACKAGE_PYTHON
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index f18fe06..5c631ca 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -4,126 +4,74 @@
 #
 #############################################################
 
-PYTHON:=python2.7
+AS_DEVICES_VERSION = 0.16
+AS_DEVICES_SITE = $(TOPDIR)/../target/packages/as_devices
+AS_DEVICES_SITE_METHOD = copy
+AS_DEVICES_INSTALL_STAGING = YES
 
-AS_DEVICES_VER:=0.16
-AS_DEVICES_SOURCE:=$(TOPDIR)/../target/packages/as_devices
-AS_DEVICES_DIR:=$(BUILD_DIR)/as_devices-$(AS_DEVICES_VER)
-AS_DEVICES_CAT:=zcat
-
-AS_DEVICES_BINARY:=libas_devices.so
-AS_DEVICES_TARGET_DIR:=usr/lib
-AS_DEVICES_TARGET_BINARY:=$(AS_DEVICES_TARGET_DIR)/$(AS_DEVICES_BINARY)
-
-# C++ wrapper variables
-AS_DEVICES_CPP_BINARY:=libas_devices_cpp.so
-AS_DEVICES_CPP_TARGET_DIR:=usr/lib
-AS_DEVICES_CPP_TARGET_BINARY:=$(AS_DEVICES_CPP_TARGET_DIR)/$(AS_DEVICES_CPP_BINARY)
-
-# Python wrapper variables
-AS_DEVICES_PYTHON_BINARY:=AsGpio_wrap.so
-AS_DEVICES_PYTHON_MODULE:=AsDevices
-AS_DEVICES_PYTHON_TARGET_DIR:=usr/lib/$(PYTHON)/
-AS_DEVICES_PYTHON_TARGET_BINARY:=$(AS_DEVICES_PYTHON_TARGET_DIR)/$(AS_DEVICES_PYTHON_MODULE)
-
-AS_DEVICES_TEST_BINARY:=test_cdevices
-AS_DEVICES_TEST_TARGET_DIR:=/usr/bin
-AS_DEVICES_TEST_TARGET_BINARY:=$(AS_DEVICES_TEST_TARGET_DIR)/$(AS_DEVICES_TEST_BINARY)
-
-AS_DEVICES_TEST_CPP_BINARY:=test_cppdevices
-AS_DEVICES_TEST_CPP_TARGET_DIR:=/usr/bin
-AS_DEVICES_TEST_CPP_TARGET_BINARY:=$(AS_DEVICES_TEST_CPP_TARGET_DIR)/$(AS_DEVICES_TEST_CPP_BINARY)
-
-AS_DEVICES_BINARIES=$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
-ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS)),y)
-AS_DEVICES_BINARIES+= $(TARGET_DIR)/$(AS_DEVICES_TEST_TARGET_BINARY)
-endif
+AS_DEVICES_BUILD_TARGET = c_target
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_CPP)),y)
-AS_DEVICES_BINARIES+= $(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY)
-ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS_CPP)),y)
-AS_DEVICES_BINARIES+= $(TARGET_DIR)/$(AS_DEVICES_TEST_CPP_TARGET_BINARY)
-endif
+AS_DEVICES_BUILD_TARGET += cpp_target
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_PYTHON)),y)
-AS_DEVICES_BINARIES+= $(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_BINARY)
+AS_DEVICES_DEPENDENCIES += python
+AS_DEVICES_BUILD_TARGET += python_target
 endif
 
-# Copy directory in build_armâ¦
-$(AS_DEVICES_DIR)/Makefile:
-	mkdir -p $(AS_DEVICES_DIR)/
-	cp -rf $(AS_DEVICES_SOURCE)/* $(AS_DEVICES_DIR)
-
-# Compile as_devices library using the makefile
-$(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY): $(AS_DEVICES_DIR)/Makefile
-	#XXX: BR2_TARGET_UBOOT_BOARDNAME  is wrong, to be fixed
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(AS_DEVICES_DIR)/c ARMADEUS_BOARD_NAME=$(BR2_TARGET_UBOOT_BOARDNAME)
+AS_DEVICES_MAKE_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)"
+ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_PYTHON)),y)
+AS_DEVICES_MAKE_ENV += PYINC="$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)"
+AS_DEVICES_MAKE_ENV += PYLIB="$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)"
+endif
+#XXX: BR2_TARGET_UBOOT_BOARDNAME  is wrong, to be fixed
+AS_DEVICES_MAKE_ENV += ARMADEUS_BOARD_NAME=$(BR2_TARGET_UBOOT_BOARDNAME)
 
-# Install library on staging dir
-$(STAGING_DIR)/$(AS_DEVICES_TARGET_BINARY): $(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY)
-	$(MAKE) INSTALL_DIR=$(STAGING_DIR) -C $(AS_DEVICES_DIR) install
+define AS_DEVICES_BUILD_CMDS
+	$(MAKE) $(AS_DEVICES_MAKE_ENV) -C $(@D) $(AS_DEVICES_BUILD_TARGET)
+endef
 
-# install library on target
-$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY): $(STAGING_DIR)/$(AS_DEVICES_TARGET_BINARY)
-	$(MAKE) INSTALL_DIR=$(TARGET_DIR) STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" -C $(AS_DEVICES_DIR) install-exe
+define AS_DEVICES_INSTALL_STAGING_CMDS
+	$(MAKE) INSTALL_DIR=$(STAGING_DIR) -C $(@D) install
+endef
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS)),y)
-
-$(TARGET_DIR)/$(AS_DEVICES_TEST_TARGET_BINARY): $(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_BINARY)
-	cp -rf $(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_BINARY) $(TARGET_DIR)/$(AS_DEVICES_TEST_TARGET_BINARY)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_TEST_TARGET_BINARY)
-
-$(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_BINARY): $(AS_DEVICES_DIR)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" $(AS_DEVICES_TEST_BINARY) -C $(AS_DEVICES_DIR)
+define AS_DEVICES_INSTALL_TEST
+	cp -rf $(@D)/test_cdevices $(TARGET_DIR)/usr/bin/
+endef
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_CPP)),y)
-$(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY): $(AS_DEVICES_DIR)/cpp/$(AS_DEVICES_CPP_BINARY)
-	install -D $< $@
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY)
-
-$(AS_DEVICES_DIR)/cpp/$(AS_DEVICES_CPP_BINARY): $(AS_DEVICES_DIR)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" -C $(AS_DEVICES_DIR)/cpp
-
-ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS_CPP)),y)
-
-$(TARGET_DIR)/$(AS_DEVICES_TEST_CPP_TARGET_BINARY): $(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_CPP_BINARY)
-	cp -rf $(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_CPP_BINARY) $(TARGET_DIR)/$(AS_DEVICES_TEST_CPP_TARGET_BINARY)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_TEST_CPP_TARGET_BINARY)
-
-$(AS_DEVICES_DIR)/$(AS_DEVICES_TEST_CPP_BINARY): $(AS_DEVICES_DIR)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" $(AS_DEVICES_TEST_CPP_BINARY) -C $(AS_DEVICES_DIR)
+define AS_DEVICES_INSTALL_CPP_LIB
+	install -D $(@D)/cpp/libas_devices_cpp.so $(TARGET_DIR)/usr/lib/
+endef
 endif
 
+ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_TESTS_CPP)),y)
+define AS_DEVICES_INSTALL_CPP_TEST
+	cp -rf $(@D)/test_cppdevices $(TARGET_DIR)/usr/bin/
+endef
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_PYTHON)),y)
-
-$(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_BINARY): python $(AS_DEVICES_DIR)/python/AsDevices/wrappers/$(AS_DEVICES_PYTHON_BINARY)
-	cp -rf $(AS_DEVICES_DIR)/python/AsDevices $(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_DIR)
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_PYTHON_TARGET_BINARY)/wrappers/*.so
-
-$(AS_DEVICES_DIR)/python/AsDevices/wrappers/$(AS_DEVICES_PYTHON_BINARY): python $(AS_DEVICES_DIR)/python/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" -C $(AS_DEVICES_DIR)/python STAGING_DIR=$(STAGING_DIR)
-
-endif
-
-as_devices: $(AS_DEVICES_BINARIES)
-
-as_devices-clean:
-	rm -f $(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
-	-$(MAKE) -C $(AS_DEVICES_DIR)/c clean
-
-as_devices-dirclean:
-	rm -rf $(AS_DEVICES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES)),y)
-TARGETS+=as_devices
+define AS_DEVICES_INSTALL_PYTHON
+	cp -rf $(@D)/python/AsDevices $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/
+endef
 endif
 
+define AS_DEVICES_INSTALL_TARGET_CMDS
+	$(MAKE) INSTALL_DIR=$(TARGET_DIR) \
+		STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" \
+		-C $(@D) install-exe
+	$(AS_DEVICES_INSTALL_TEST)
+	$(AS_DEVICES_INSTALL_CPP_LIB)
+	$(AS_DEVICES_INSTALL_CPP_TEST)
+	$(AS_DEVICES_INSTALL_PYTHON)
+endef
+
+define AS_DEVICES_CLEAN_CMDS
+	$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package/armadeus,as_devices))
diff --git a/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch b/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
index 8ceab75..dd2af1b 100644
--- a/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
+++ b/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
@@ -49,7 +49,7 @@ Index: buildroot/package/Makefile.package.in
 +endef
 +
 +define SHOW_EXTERNAL_DEPS_COPY
-+  echo $(2)
++	echo $(2)
 +endef
 +
 +
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index d014f88..f59943a 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -24,8 +24,13 @@ CPP_INCLUDE=cpp
 
 .PHONY: all install install-exe clean
 
-all: $(C_BINARY) $(P_WRAPPER)
-	#$(CPP_BINARY)
+all: $(C_BINARY) $(P_WRAPPER) $(CPP_BINARY)
+
+c_target: $(C_BINARY)
+
+cpp_target: $(CPP_BINARY)
+
+python_target: $(P_WRAPPER)
 
 $(C_BINARY): main.c test_c.h $(C_LIB)
 	$(CC) $(CFLAGS) main.c $(C_LIB) -o $(C_BINARY) -I$(C_INCLUDE) -lm
@@ -39,8 +44,8 @@ $(CPP_LIB): $(C_LIB)
 $(C_LIB):
 	make -C c/
 
-$(P_WRAPPER):
-	make -C python/ STAGING_DIR=$(STAGING_DIR)
+$(P_WRAPPER): $(C_LIB)
+	make -C python/ STAGING_DIR=$(ARMADEUS_STAGING_DIR)
 	touch $(P_WRAPPER)
 
 install:
@@ -57,5 +62,5 @@ clean:
 	make -C cpp/ clean
 	rm -f $(P_WRAPPER)
 	make -C python/ clean
-	rm -f $(C_BINARY) # $(CPP_BINARY)
+	rm -f $(C_BINARY) $(CPP_BINARY)
 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2670-g5851568

From: Julien B a. A. <ar...@us...> - 2012-01-12 09:55:14

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  5851568a9a1e7fcb8ee45c46e7809e33643d969b (commit)
      from  db782fcd5332a5f0188ce3860cbad28e9f0d1870 (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 5851568a9a1e7fcb8ee45c46e7809e33643d969b
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 12 10:54:48 2012 +0100

    [BUILDROOT] apf51test_defconfig: add gdb for target, gstreamer, pygame and pyserial to config

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

Summary of changes:
 buildroot/configs/apf51test_defconfig |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 44ec864..cd18c4c 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -13,6 +13,7 @@ BR2_UCLIBC_VERSION_0_9_30=y
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
 BR2_BINUTILS_VERSION_2_20=y
 BR2_GCC_VERSION_4_4_X=y
+BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
 BR2_GDB_VERSION_6_7_1=y
@@ -66,6 +67,17 @@ BR2_PACKAGE_ALSA_UTILS=y
 BR2_PACKAGE_ALSA_UTILS_AMIXER=y
 BR2_PACKAGE_ALSA_UTILS_APLAY=y
 BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_GSTREAMER=y
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
+BR2_PACKAGE_GST_PLUGINS_GOOD=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST_PLUGINS_BAD=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
+BR2_PACKAGE_GST_PLUGINS_UGLY=y
+BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
 BR2_PACKAGE_MADPLAY=y
 BR2_PACKAGE_MPLAYER=y
 BR2_PACKAGE_SPEEX=y
@@ -78,6 +90,10 @@ BR2_PACKAGE_DOOM_WAD=y
 BR2_PACKAGE_FBGRAB=y
 BR2_PACKAGE_FBTEST=y
 BR2_PACKAGE_FBV=y
+BR2_PACKAGE_PYGAME=y
+BR2_PACKAGE_PYGAME_FONT=y
+BR2_PACKAGE_PYGAME_MIXER=y
+BR2_PACKAGE_PYGAME_MIXER_MUSIC=y
 BR2_PACKAGE_SDL_IMAGE_GIF=y
 BR2_PACKAGE_SDL_IMAGE_JPEG=y
 BR2_PACKAGE_SDL_IMAGE_PNG=y
@@ -102,9 +118,9 @@ BR2_PACKAGE_LUA_INTERPRETER=y
 BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
 BR2_PACKAGE_PYTHON=y
 BR2_PACKAGE_PYTHON_READLINE=y
-BR2_PACKAGE_PYSERIAL=y
 BR2_PACKAGE_MESALIB=y
 BR2_PACKAGE_TSLIB=y
+BR2_PACKAGE_PYTHON_SERIAL=y
 BR2_PACKAGE_LIBXML2=y
 BR2_PACKAGE_BOA=y
 BR2_PACKAGE_BLUEZ3_UTILS=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2669-gdb782fc

From: Julien B a. A. <ar...@us...> - 2012-01-11 15:58:59

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  db782fcd5332a5f0188ce3860cbad28e9f0d1870 (commit)
       via  078a59104047f8d609c9f4bdc33a3d22b50f832d (commit)
       via  6ef478dab5b2f5c92d4a01f018db29ccad054a99 (commit)
       via  604887284d975eed8f62d286bf21d9dfb9f89241 (commit)
      from  31b1647ad9f1b128e738beb85bfe7070d6b3d556 (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 db782fcd5332a5f0188ce3860cbad28e9f0d1870
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 11 16:58:27 2012 +0100

    [BUILD] merge buildroot-clean with clean target and update help of main Makefile

commit 078a59104047f8d609c9f4bdc33a3d22b50f832d
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 11 16:55:06 2012 +0100

    [BUILD] Updates cleanup_buildroot.sh

commit 6ef478dab5b2f5c92d4a01f018db29ccad054a99
Merge: 6048872 31b1647
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 11 15:21:37 2012 +0100

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

commit 604887284d975eed8f62d286bf21d9dfb9f89241
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 11 15:21:05 2012 +0100

    [BUILDROOT] Update python package to BR state of the art

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

Summary of changes:
 Makefile                                           |   25 +-
 .../169-python-update_from_BR_mainline.patch       | 1356 ++++++++++++++++++++
 patches/buildroot/2011.05/cleanup_buildroot.sh     |    1 +
 3 files changed, 1371 insertions(+), 11 deletions(-)
 create mode 100644 patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch

diff --git a/Makefile b/Makefile
index db47cc3..fdb3385 100644
--- a/Makefile
+++ b/Makefile
@@ -56,26 +56,25 @@ ARMADEUS_BSP_VERSION=$(shell cat $(BUILDROOT_DIR)/target/device/armadeus/rootfs/
 default: all
 
 help:
-	@echo 'First, choose the platform:'
+	@echo
+	@echo 'First, choose your platform and adjust configuration:'
 	@echo '  apf9328_defconfig  - get default config for an APF9328+Dev kit'
 	@echo '  apf28_defconfig    - get default config for an APF28+Dev kit'
 	@echo '  apf27_defconfig    - get default config for an APF27+Dev kit'
 	@echo '  pps_defconfig      - get default config for an APF27+PPS system'
 	@echo '  apf51_defconfig    - get default config for an APF51+Dev kit'
 	@echo ''
+	@echo 'Build:'
+	@echo '  all                - make world '
+	@echo '  <package>          - a single package (ex: u-boot, linux, sdl, etc...)'
+	@echo
 	@echo 'Cleaning:'
-	@echo '  buildroot-clean    - delete all non-source files in buildroot'
-	@echo '  clean              - delete temporary files created by build'
+	@echo '  clean              - delete files created by build'
 	@echo '  distclean          - delete all non-source files (including .config)'
 	@echo
-	@echo 'Build:'
-	@echo '  all            - make world '
-	@echo '  <Package>      - a single package (ex: u-boot linux or buildroot'
-	@echo
 	@echo 'Configuration:'
 	@echo ' Global:'
 	@echo '  menuconfig           - interactive curses-based configurator'
-	@echo '  oldconfig            - resolve any unresolved symbols in .config'
 	@echo ' Specific (after first build was successful):'
 	@echo '  linux-menuconfig     - configure Linux parameters'
 	@echo '  uclibc-menuconfig    - configure uClibc library parameters'
@@ -86,8 +85,8 @@ help:
 	@echo '  source-check           - check all packages for valid download URLs'
 	@echo
 	@echo 'See http://www.armadeus.org for further details'
-	@echo 'See ./buildroot/docs/README and ./buildroot/docs/buildroot.html'
-	@echo '  for further Buildroot details'
+	@echo 'See http://www.buildroot.net/downloads/buildroot.html for'
+	@echo 'further Buildroot details'
 	@echo
 
 
@@ -178,8 +177,12 @@ menuconfig: $(BUILDROOT_DIR)/.configured
 	fi
 	@$(MAKE) -C $(BUILDROOT_DIR) $@
 
-buildroot-clean:
+clean:
+	@echo "Are you sure you want to delete all generated files (toolchain, kernel & Co) ?"
+	@echo " Ctrl+c to stop now"
+	@read answer
 	rm -rf $(BUILDROOT_DIR)/output
+	rm -f armadeus_env.sh
 
 buildroot-dirclean:
 	rm -rf $(BUILDROOT_DIR)	
diff --git a/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch b/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch
new file mode 100644
index 0000000..8cd7039
--- /dev/null
+++ b/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch
@@ -0,0 +1,1356 @@
+Updates python package by taking BR mainline as reference
+
+Can be removed when migrating BR to 2012.02
+
+diff -urN buildroot/package/python/python-2.7-001-support-for-build.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch
+--- buildroot/package/python/python-2.7-001-support-for-build.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -22,11 +22,11 @@
+  configure.in    |   17 +++++++++++++++++
+  2 files changed, 34 insertions(+), 15 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -178,7 +178,8 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -181,7 +181,8 @@
+  UNICODE_OBJS=   @UNICODE_OBJS@
+  
+  PYTHON=		python$(EXE)
+@@ -36,7 +36,7 @@
+  
+  # The task to run while instrument when building the profile-opt target
+  PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
+-@@ -210,7 +211,8 @@
++@@ -213,7 +214,8 @@
+  
+  ##########################################################################
+  # Parser
+@@ -46,7 +46,7 @@
+  
+  POBJS=		\
+  		Parser/acceler.o \
+-@@ -404,8 +406,8 @@
++@@ -407,8 +409,8 @@
+  # Build the shared modules
+  sharedmods: $(BUILDPYTHON)
+  	@case $$MAKEFLAGS in \
+@@ -57,15 +57,16 @@
+  	esac
+  
+  # Build static library
+-@@ -536,12 +538,12 @@
+- 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
++@@ -540,13 +542,13 @@
+  
+- 
+--$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+-+$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT)
++ # Use a stamp file to prevent make -j invoking pgen twice
++ $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
++-Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
+++Parser/pgen.stamp: $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT)
+  		-@$(INSTALL) -d Include
+--		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+-+		-$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+++		$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++ 		-touch Parser/pgen.stamp
+  
+ -$(PGEN):	$(PGENOBJS)
+ -		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -74,7 +75,7 @@
+  
+  Parser/grammar.o:	$(srcdir)/Parser/grammar.c \
+  				$(srcdir)/Include/token.h \
+-@@ -921,25 +923,25 @@
++@@ -926,25 +928,25 @@
+  	done
+  	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+  	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+@@ -105,7 +106,7 @@
+  
+  # Create the PLATDIR source directory, if one wasn't distributed..
+  $(srcdir)/Lib/$(PLATDIR):
+-@@ -1044,7 +1046,7 @@
++@@ -1049,7 +1051,7 @@
+  # Install the dynamically loadable modules
+  # This goes into $(exec_prefix)
+  sharedinstall: sharedmods
+@@ -114,20 +115,20 @@
+  	   	--prefix=$(prefix) \
+  		--install-scripts=$(BINDIR) \
+  		--install-platlib=$(DESTSHARED) \
+-@@ -1183,7 +1185,7 @@
++@@ -1188,7 +1190,7 @@
+  	find . -name '*.gc??' -exec rm -f {} ';'
+  
+  clobber: clean profile-removal
+ -	-rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
+ +	-rm -f $(BUILDPYTHON) $(BUILDPGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
+- 		tags TAGS \
++ 		tags TAGS Parser/pgen.stamp \
+  		config.cache config.log pyconfig.h Modules/config.c
+  	-rm -rf build platform
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -4291,6 +4291,23 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -4305,6 +4305,23 @@
+  done
+  AC_MSG_RESULT(done)
+  
+diff -urN buildroot/package/python/python-2.7-002-cross-compile-variable.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch
+--- buildroot/package/python/python-2.7-002-cross-compile-variable.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -15,11 +15,11 @@
+  configure.in    |    3 +++
+  2 files changed, 6 insertions(+), 3 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -406,8 +406,8 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -409,8 +409,8 @@
+  # Build the shared modules
+  sharedmods: $(BUILDPYTHON)
+  	@case $$MAKEFLAGS in \
+@@ -30,7 +30,7 @@
+  	esac
+  
+  # Build static library
+-@@ -1046,7 +1046,7 @@
++@@ -1051,7 +1051,7 @@
+  # Install the dynamically loadable modules
+  # This goes into $(exec_prefix)
+  sharedinstall: sharedmods
+@@ -39,11 +39,11 @@
+  	   	--prefix=$(prefix) \
+  		--install-scripts=$(BINDIR) \
+  		--install-platlib=$(DESTSHARED) \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -4308,6 +4308,9 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -4322,6 +4322,9 @@
+  AC_ARG_VAR(PYTHON_FOR_BUILD,[build system Python])
+  AC_ARG_VAR(PGEN_FOR_BUILD,[build system Python pgen])
+  
+diff -urN buildroot/package/python/python-2.7-003-no-import-when-cross-compiling.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch
+--- buildroot/package/python/python-2.7-003-no-import-when-cross-compiling.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -9,10 +9,10 @@
+  setup.py |    4 ++++
+  1 file changed, 4 insertions(+)
+ 
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
+ @@ -304,6 +304,10 @@
+              self.announce('WARNING: skipping import check for Cygwin-based "%s"'
+                  % ext.name)
+diff -urN buildroot/package/python/python-2.7-004-no-host-headers-libs.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch
+--- buildroot/package/python/python-2.7-004-no-host-headers-libs.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -10,23 +10,37 @@
+  setup.py |   39 +++++++++++++++++++++------------------
+  1 file changed, 21 insertions(+), 18 deletions(-)
+ 
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
+-@@ -351,8 +351,9 @@
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
++@@ -373,9 +373,10 @@
+  
+      def detect_modules(self):
+          # Ensure that /usr/local is always used
+ -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+ -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++-        self.add_multiarch_paths()
+ +        if os.environ.get('CROSS_COMPILING') != 'yes':
+ +            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+ +            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+++            self.add_multiarch_paths()
+  
+          # Add paths specified in the environment variables LDFLAGS and
+          # CPPFLAGS for header and library files.
+-@@ -388,17 +389,6 @@
++@@ -383,10 +384,7 @@
++         # directly since an inconsistently reproducible issue comes up where
++         # the environment variable is not set even though the value were passed
++         # into configure and stored in the Makefile (issue found on OS X 10.3).
++-        for env_var, arg_name, dir_list in (
++-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
++-                ('LDFLAGS', '-L', self.compiler.library_dirs),
++-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
+++        for env_var, arg_name, dir_list in ():
++             env_val = sysconfig.get_config_var(env_var)
++             if env_val:
++                 # To prevent optparse from raising an exception about any
++@@ -411,17 +409,6 @@
+                      for directory in reversed(options.dirs):
+                          add_dir_to_list(dir_list, directory)
+  
+@@ -44,7 +58,7 @@
+          try:
+              have_unicode = unicode
+          except NameError:
+-@@ -407,11 +397,16 @@
++@@ -430,11 +417,16 @@
+          # lib_dirs and inc_dirs are used to search for files;
+          # if a file is found in one of those directories, it can
+          # be assumed that no additional -I,-L directives are needed.
+@@ -66,7 +80,7 @@
+          exts = []
+          missing = []
+  
+-@@ -844,6 +839,9 @@
++@@ -867,6 +859,9 @@
+              db_inc_paths.append('/pkg/db-3.%d/include' % x)
+              db_inc_paths.append('/opt/db-3.%d/include' % x)
+  
+@@ -76,7 +90,7 @@
+          # Add some common subdirectories for Sleepycat DB to the list,
+          # based on the standard include directories. This way DB3/4 gets
+          # picked up when it is installed in a non-standard prefix and
+-@@ -996,6 +994,9 @@
++@@ -1019,6 +1014,9 @@
+          MIN_SQLITE_VERSION = ".".join([str(x)
+                                      for x in MIN_SQLITE_VERSION_NUMBER])
+  
+@@ -86,7 +100,7 @@
+          # Scan the default include directories before the SQLite specific
+          # ones. This allows one to override the copy of sqlite on OSX,
+          # where /usr/include contains an old version of sqlite.
+-@@ -1095,6 +1096,8 @@
++@@ -1118,6 +1116,8 @@
+          # the more recent berkeleydb's db.h file first in the include path
+          # when attempting to compile and it will fail.
+          f = "/usr/include/db.h"
+diff -urN buildroot/package/python/python-2.7-005-staging-headers-libs.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch
+--- buildroot/package/python/python-2.7-005-staging-headers-libs.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -12,12 +12,12 @@
+  setup.py |   13 +++++++++++++
+  1 file changed, 13 insertions(+)
+ 
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
+-@@ -350,6 +350,19 @@
+-         return sys.platform
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
++@@ -372,6 +372,19 @@
++             os.unlink(tmpfile)
+  
+      def detect_modules(self):
+ +        try:
+diff -urN buildroot/package/python/python-2.7-006-disable-extensions.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch
+--- buildroot/package/python/python-2.7-006-disable-extensions.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -38,11 +38,11 @@
+  setup.py        |    5 ++++-
+  3 files changed, 11 insertions(+), 4 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -141,6 +141,8 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -144,6 +144,8 @@
+  # configure script arguments
+  CONFIG_ARGS=	@CONFIG_ARGS@
+  
+@@ -51,7 +51,7 @@
+  
+  # Subdirectories with code
+  SRCDIRS= 	@SRCDIRS@
+-@@ -406,8 +408,8 @@
++@@ -409,8 +411,8 @@
+  # Build the shared modules
+  sharedmods: $(BUILDPYTHON)
+  	@case $$MAKEFLAGS in \
+@@ -62,7 +62,7 @@
+  	esac
+  
+  # Build static library
+-@@ -1046,7 +1048,7 @@
++@@ -1051,7 +1053,7 @@
+  # Install the dynamically loadable modules
+  # This goes into $(exec_prefix)
+  sharedinstall: sharedmods
+@@ -71,11 +71,11 @@
+  	   	--prefix=$(prefix) \
+  		--install-scripts=$(BINDIR) \
+  		--install-platlib=$(DESTSHARED) \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2084,6 +2084,8 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2098,6 +2098,8 @@
+  
+  AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+  
+@@ -84,10 +84,10 @@
+  # Check for use of the system expat library
+  AC_MSG_CHECKING(for --with-system-expat)
+  AC_ARG_WITH(system_expat,
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
+ @@ -21,7 +21,10 @@
+  COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+  
+diff -urN buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch
+--- buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -13,11 +13,11 @@
+  Makefile.pre.in |    9 ---------
+  1 file changed, 9 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -929,20 +929,11 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -934,20 +934,11 @@
+  		-d $(LIBDEST) -f \
+  		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+  		$(DESTDIR)$(LIBDEST)
+diff -urN buildroot/package/python/python-2.7-008-reread-environment.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch
+--- buildroot/package/python/python-2.7-008-reread-environment.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -25,11 +25,11 @@
+  setup.py        |    3 +++
+  2 files changed, 6 insertions(+), 3 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -408,8 +408,8 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -411,8 +411,8 @@
+  # Build the shared modules
+  sharedmods: $(BUILDPYTHON)
+  	@case $$MAKEFLAGS in \
+@@ -40,7 +40,7 @@
+  	esac
+  
+  # Build static library
+-@@ -1039,7 +1039,7 @@
++@@ -1044,7 +1044,7 @@
+  # Install the dynamically loadable modules
+  # This goes into $(exec_prefix)
+  sharedinstall: sharedmods
+@@ -49,10 +49,10 @@
+  	   	--prefix=$(prefix) \
+  		--install-scripts=$(BINDIR) \
+  		--install-platlib=$(DESTSHARED) \
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
+ @@ -20,6 +20,9 @@
+  # Were we compiled --with-pydebug or with #define Py_DEBUG?
+  COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+diff -urN buildroot/package/python/python-2.7-009-python-symlink.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch
+--- buildroot/package/python/python-2.7-009-python-symlink.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -10,11 +10,11 @@
+  Makefile.pre.in |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -791,7 +791,7 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -796,7 +796,7 @@
+  	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+  	else true; \
+  	fi
+diff -urN buildroot/package/python/python-2.7-010-change-pyconfig-h-location.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch
+--- buildroot/package/python/python-2.7-010-change-pyconfig-h-location.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -26,10 +26,10 @@
+  Makefile.pre.in            |    3 ++-
+  3 files changed, 5 insertions(+), 3 deletions(-)
+ 
+-Index: Python-2.7.1/Lib/distutils/sysconfig.py
++Index: Python-2.7.2/Lib/distutils/sysconfig.py
+ ===================================================================
+---- Python-2.7.1.orig/Lib/distutils/sysconfig.py
+-+++ Python-2.7.1/Lib/distutils/sysconfig.py
++--- Python-2.7.2.orig/Lib/distutils/sysconfig.py
+++++ Python-2.7.2/Lib/distutils/sysconfig.py
+ @@ -193,7 +193,8 @@
+          else:
+              inc_dir = project_base
+@@ -40,11 +40,11 @@
+      if get_python_version() < '2.2':
+          config_h = 'config.h'
+      else:
+-Index: Python-2.7.1/Lib/sysconfig.py
++Index: Python-2.7.2/Lib/sysconfig.py
+ ===================================================================
+---- Python-2.7.1.orig/Lib/sysconfig.py
+-+++ Python-2.7.1/Lib/sysconfig.py
+-@@ -371,7 +371,7 @@
++--- Python-2.7.2.orig/Lib/sysconfig.py
+++++ Python-2.7.2/Lib/sysconfig.py
++@@ -356,7 +356,7 @@
+          else:
+              inc_dir = _PROJECT_BASE
+      else:
+@@ -53,11 +53,11 @@
+      return os.path.join(inc_dir, 'pyconfig.h')
+  
+  def get_scheme_names():
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -967,7 +967,6 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -972,7 +972,6 @@
+  		echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
+  		$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
+  	done
+@@ -65,7 +65,7 @@
+  
+  # Install the library and miscellaneous stuff needed for extending/embedding
+  # This goes into $(exec_prefix)
+-@@ -1001,6 +1000,8 @@
++@@ -1006,6 +1005,8 @@
+  	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
+  	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
+  	$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
+diff -urN buildroot/package/python/python-2.7-011-no-rpath.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch
+--- buildroot/package/python/python-2.7-011-no-rpath.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -13,11 +13,11 @@
+  setup.py |   21 ++++++++++++++++++---
+  1 file changed, 18 insertions(+), 3 deletions(-)
+ 
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
+-@@ -977,6 +977,12 @@
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
++@@ -997,6 +997,12 @@
+                  print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
+              db_incs = [db_incdir]
+              dblibs = [dblib]
+@@ -30,7 +30,7 @@
+              # We add the runtime_library_dirs argument because the
+              # BerkeleyDB lib we're linking against often isn't in the
+              # system dynamic library search path.  This is usually
+-@@ -986,7 +992,7 @@
++@@ -1006,7 +1012,7 @@
+              exts.append(Extension('_bsddb', ['_bsddb.c'],
+                                    depends = ['bsddb.h'],
+                                    library_dirs=dblib_dir,
+@@ -39,7 +39,7 @@
+                                    include_dirs=db_incs,
+                                    libraries=dblibs))
+          else:
+-@@ -1092,12 +1098,17 @@
++@@ -1112,12 +1118,17 @@
+              else:
+                  sqlite_extra_link_args = ()
+  
+@@ -58,7 +58,7 @@
+                                    extra_link_args=sqlite_extra_link_args,
+                                    libraries=["sqlite3",]))
+          else:
+-@@ -1198,9 +1209,13 @@
++@@ -1218,9 +1229,13 @@
+                  elif cand == "bdb":
+                      if db_incs is not None:
+                          print "building dbm using bdb"
+diff -urN buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch
+--- buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -16,10 +16,10 @@
+  setup.py |   12 ++++++++++--
+  1 file changed, 10 insertions(+), 2 deletions(-)
+ 
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
+ @@ -29,6 +29,14 @@
+  except KeyError:
+      disabled_module_list = list()
+@@ -35,7 +35,7 @@
+  def add_dir_to_list(dirlist, dir):
+      """Add the directory 'dir' to the list 'dirlist' (at the front) if
+      1) 'dir' is not already in 'dirlist'
+-@@ -608,7 +616,7 @@
++@@ -628,7 +636,7 @@
+          exts.append( Extension('audioop', ['audioop.c']) )
+  
+          # Disabled on 64-bit platforms
+@@ -44,7 +44,7 @@
+              # Operations on images
+              exts.append( Extension('imageop', ['imageop.c']) )
+          else:
+-@@ -1424,7 +1432,7 @@
++@@ -1444,7 +1452,7 @@
+                  missing.append('_codecs_%s' % loc)
+  
+          # Dynamic loading module
+diff -urN buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch
+--- buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch	1970-01-01 01:00:00.000000000 +0100
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -0,0 +1,24 @@
++Index: Python-2.7.2/configure
++===================================================================
++--- Python-2.7.2.orig/configure
+++++ Python-2.7.2/configure
++@@ -3007,6 +3007,7 @@
++ 	darwin*) MACHDEP="darwin";;
++ 	atheos*) MACHDEP="atheos";;
++         irix646) MACHDEP="irix6";;
+++        linux*) MACHDEP="linux2";;
++ 	'')	MACHDEP="unknown";;
++ 	esac
++ fi
++Index: Python-2.7.2/configure.in
++===================================================================
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -297,6 +297,7 @@
++ 	darwin*) MACHDEP="darwin";;
++ 	atheos*) MACHDEP="atheos";;
++         irix646) MACHDEP="irix6";;
+++        linux*) MACHDEP="linux2";;
++ 	'')	MACHDEP="unknown";;
++ 	esac
++ fi
+diff -urN buildroot/package/python/python-2.7-014-verbose-module-build.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch
+--- buildroot/package/python/python-2.7-014-verbose-module-build.patch	1970-01-01 01:00:00.000000000 +0100
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -0,0 +1,19 @@
++Enables verbose output when building modules
++
++Patch borrowed from OpenBricks.
++
++Signed-off-by: Thomas Petazzoni <tho...@fr...>
++
++Index: Python-2.7.2/Makefile.pre.in
++===================================================================
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -411,7 +411,7 @@
++ # Build the shared modules
++ sharedmods: $(BUILDPYTHON)
++ 	@case $$MAKEFLAGS in \
++-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" CONFIG_ARGS="$(CONFIG_ARGS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py -q build;; \
+++	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" CONFIG_ARGS="$(CONFIG_ARGS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
++ 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" CONFIG_ARGS="$(CONFIG_ARGS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
++ 	esac
++ 
+diff -urN buildroot/package/python/python-2.7-015-distutils-cross-compilation-support.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch
+--- buildroot/package/python/python-2.7-015-distutils-cross-compilation-support.patch	1970-01-01 01:00:00.000000000 +0100
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -0,0 +1,84 @@
++Add some cross-compilation fixes to distutils
++
++Inspired by work done by Marc Kleine-Budde <mk...@pe...> in
++PTXdist.
++
++Signed-off-by: Thomas Petazzoni <tho...@fr...>
++---
++ Lib/distutils/sysconfig.py |    7 ++++---
++ 1 files changed, 4 insertions(+), 3 deletions(-)
++
++Index: Python-2.7.2/Lib/distutils/sysconfig.py
++===================================================================
++--- Python-2.7.2.orig/Lib/distutils/sysconfig.py
+++++ Python-2.7.2/Lib/distutils/sysconfig.py
++@@ -19,13 +19,22 @@
++ from distutils.errors import DistutilsPlatformError
++ 
++ # These are needed in a couple of spots, so just compute them once.
++-PREFIX = os.path.normpath(sys.prefix)
++-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+++EXECUTABLE_DIRNAME = os.path.dirname(os.path.realpath(sys.executable))
+++if os.environ.get('CROSS_COMPILING') == 'yes':
+++    _sysroot=os.environ.get('_python_sysroot')
+++    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
+++    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
+++    if '_python_srcdir' in os.environ:
+++        EXECUTABLE_DIRNAME = os.path.normpath(os.environ['_python_srcdir'])
+++else:
+++    PREFIX = os.path.normpath(sys.prefix)
+++    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+++
++ 
++ # Path to the base directory of the project. On Windows the binary may
++ # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
++ # it'll live in project/PCbuild/amd64.
++-project_base = os.path.dirname(os.path.abspath(sys.executable))
+++project_base = EXECUTABLE_DIRNAME
++ if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
++     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
++ # PC/VS7.1
++@@ -74,7 +83,7 @@
++ 
++     if os.name == "posix":
++         if python_build:
++-            buildir = os.path.dirname(sys.executable)
+++            buildir = EXECUTABLE_DIRNAME
++             if plat_specific:
++                 # python.h is located in the buildir
++                 inc_dir = buildir
++@@ -206,7 +215,7 @@
++ def get_makefile_filename():
++     """Return full pathname of installed Makefile from the Python build."""
++     if python_build:
++-        return os.path.join(os.path.dirname(sys.executable), "Makefile")
+++        return os.path.join(EXECUTABLE_DIRNAME, "Makefile")
++     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
++     return os.path.join(lib_dir, "config", "Makefile")
++ 
++Index: Python-2.7.2/configure.in
++===================================================================
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -4328,6 +4328,21 @@
++ CROSS_COMPILING=$cross_compiling
++ AC_SUBST(CROSS_COMPILING)
++ 
+++#
+++# Cross compiling
+++#
+++# special RUNSHARED
+++if test "$cross_compiling" = "yes"; then
+++    RUNSHARED="\
+++               CROSS_COMPILING=yes \
+++               _python_cross_host=${ac_cv_host} \
+++               _python_sysroot=\"\$(sysroot)\" \
+++               _python_srcdir=\"\$(srcdir)\" \
+++               _python_prefix=\"\$(prefix)\" \
+++               _python_exec_prefix=\"\$(exec_prefix)\""
+++fi
+++
+++
++ # generate output files
++ AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
++ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
+diff -urN buildroot/package/python/python-2.7-100-optional-test-modules.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch
+--- buildroot/package/python/python-2.7-100-optional-test-modules.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -10,20 +10,19 @@
+  configure.in    |    6 ++++++
+  2 files changed, 33 insertions(+), 13 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -851,23 +851,37 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -856,23 +856,30 @@
+  	plat-mac/lib-scriptpackages/SystemEvents \
+  	plat-mac/lib-scriptpackages/Terminal 
+  PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
+ -LIBSUBDIRS=	lib-tk lib-tk/test lib-tk/test/test_tkinter \
+--                lib-tk/test/test_ttk site-packages test test/data \
+--		test/decimaltestdata test/xmltestdata \
++-		lib-tk/test/test_ttk site-packages test test/data \
++-		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ -		test/tracedmodules \
+-+LIBSUBDIRS=	lib-tk \
+-+                site-packages \
+++LIBSUBDIRS=	lib-tk  site-packages \
+  		encodings compiler hotshot \
+ -		email email/mime email/test email/test/data \
+ -		json json/tests \
+@@ -38,8 +37,8 @@
+ +		sqlite3 \
+ +		logging bsddb csv importlib wsgiref \
+ +		lib2to3 lib2to3/fixes lib2to3/pgen2 \
+-+		ctypes ctypes/macholib idlelib idlelib/Icons \
+-+		distutils distutils/command $(XMLLIBSUBDIRS) \
+++		ctypes  ctypes/macholib idlelib idlelib/Icons \
+++		distutils distutils/command  $(XMLLIBSUBDIRS) \
+  		multiprocessing multiprocessing/dummy \
+ -		unittest unittest/test \
+ +		unittest \
+@@ -47,29 +46,23 @@
+  		curses pydoc_data $(MACHDEPS)
+ +
+ +ifeq (@TEST_MODULES@,yes)
+-+LIBSUBDIRS +=	lib-tk/test lib-tk/test/test_tkinter	\
+-+	      	lib-tk/test/test_ttk test test/data	\
+-+		test/decimaltestdata test/xmltestdata 	\
+-+		test/tracedmodules   			\
+-+		email/test email/test/data		\
+-+		sqlite3/test				\
+-+		bsddb/test				\
+-+		lib2to3/tests				\
+-+		lib2to3/tests/data			\
+-+		lib2to3/tests/data/fixers		\
+-+		lib2to3/tests/data/fixers/myfixes	\
+-+		ctypes/test distutils/tests		\
+-+		unittest/test
+++LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
+++		lib-tk/test/test_ttk test test/data \
+++		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+++		test/tracedmodules email/test email/test/data \
+++		json/tests sqlite3/test bsddb/test lib2to3/tests \
+++		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+++		ctypes/test distutils/tests unittest/test
+ +endif
+ +
+  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+  	@for i in $(SCRIPTDIR) $(LIBDEST); \
+  	do \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2393,6 +2393,12 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2408,6 +2408,12 @@
+  fi
+  
+  
+diff -urN buildroot/package/python/python-2.7-101-optional-pydoc.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch
+--- buildroot/package/python/python-2.7-101-optional-pydoc.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -11,11 +11,11 @@
+  setup.py        |   10 +++++++---
+  3 files changed, 17 insertions(+), 4 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -864,7 +864,7 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -868,7 +868,7 @@
+  		multiprocessing multiprocessing/dummy \
+  		unittest \
+  		lib-old \
+@@ -23,9 +23,9 @@
+ +		curses $(MACHDEPS)
+  
+  ifeq (@TEST_MODULES@,yes)
+- LIBSUBDIRS +=	lib-tk/test lib-tk/test/test_tkinter	\
+-@@ -882,6 +882,10 @@
+- 		unittest/test
++ LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
++@@ -880,6 +880,10 @@
++ 		ctypes/test distutils/tests unittest/test
+  endif
+  
+ +ifeq (@PYDOC@,yes)
+@@ -35,11 +35,11 @@
+  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+  	@for i in $(SCRIPTDIR) $(LIBDEST); \
+  	do \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2392,6 +2392,11 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2407,6 +2407,11 @@
+          esac])
+  fi
+  
+@@ -51,11 +51,11 @@
+  
+  AC_SUBST(TEST_MODULES)
+  
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
+-@@ -2072,6 +2072,12 @@
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
++@@ -2092,6 +2092,12 @@
+      # turn off warnings when deprecated modules are imported
+      import warnings
+      warnings.filterwarnings("ignore",category=DeprecationWarning)
+@@ -68,7 +68,7 @@
+      setup(# PyPI Metadata (PEP 301)
+            name = "Python",
+            version = sys.version.split()[0],
+-@@ -2092,9 +2098,7 @@
++@@ -2112,9 +2118,7 @@
+            ext_modules=[Extension('_struct', ['_struct.c'])],
+  
+            # Scripts to install
+diff -urN buildroot/package/python/python-2.7-102-optional-2to3.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch
+--- buildroot/package/python/python-2.7-102-optional-2to3.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -11,34 +11,29 @@
+  setup.py        |    5 +++--
+  3 files changed, 26 insertions(+), 9 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -856,9 +856,7 @@
+- 		encodings compiler hotshot \
+- 		email email/mime \
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -862,7 +862,6 @@
+  		json \
+--		sqlite3 \
++ 		sqlite3 \
+  		logging bsddb csv importlib wsgiref \
+ -		lib2to3 lib2to3/fixes lib2to3/pgen2 \
+- 		ctypes ctypes/macholib idlelib idlelib/Icons \
+- 		distutils distutils/command $(XMLLIBSUBDIRS) \
++ 		ctypes  ctypes/macholib idlelib idlelib/Icons \
++ 		distutils distutils/command  $(XMLLIBSUBDIRS) \
+  		multiprocessing multiprocessing/dummy \
+-@@ -872,12 +870,7 @@
+- 		test/decimaltestdata test/xmltestdata 	\
+- 		test/tracedmodules   			\
+- 		email/test email/test/data		\
+--		sqlite3/test				\
+- 		bsddb/test				\
+--		lib2to3/tests				\
+--		lib2to3/tests/data			\
+--		lib2to3/tests/data/fixers		\
+--		lib2to3/tests/data/fixers/myfixes	\
+- 		ctypes/test distutils/tests		\
+- 		unittest/test
++@@ -875,8 +874,7 @@
++ 		lib-tk/test/test_ttk test test/data \
++ 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
++ 		test/tracedmodules email/test email/test/data \
++-		json/tests sqlite3/test bsddb/test lib2to3/tests \
++-		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+++		json/tests sqlite3/test bsddb/test \
++ 		ctypes/test distutils/tests unittest/test
+  endif
+-@@ -886,6 +879,23 @@
++ 
++@@ -884,6 +882,23 @@
+  LIBSUBDIRS += pydoc_data
+  endif
+  
+@@ -62,11 +57,11 @@
+  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+  	@for i in $(SCRIPTDIR) $(LIBDEST); \
+  	do \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2404,6 +2404,12 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2419,6 +2419,12 @@
+  	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
+  	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
+  
+@@ -79,11 +74,11 @@
+  # Check for enable-ipv6
+  AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+  AC_MSG_CHECKING([if --enable-ipv6 is specified])
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
+-@@ -2073,10 +2073,11 @@
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
++@@ -2093,10 +2093,11 @@
+      import warnings
+      warnings.filterwarnings("ignore",category=DeprecationWarning)
+  
+diff -urN buildroot/package/python/python-2.7-103-optional-sqlite.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch
+--- buildroot/package/python/python-2.7-103-optional-sqlite.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -6,11 +6,11 @@
+  configure.in |    9 +++++++++
+  1 file changed, 9 insertions(+)
+ 
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2392,6 +2392,15 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2407,6 +2407,15 @@
+          esac])
+  fi
+  
+diff -urN buildroot/package/python/python-2.7-104-optional-tk.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch
+--- buildroot/package/python/python-2.7-104-optional-tk.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -7,31 +7,30 @@
+  configure.in    |    9 +++++++++
+  2 files changed, 19 insertions(+), 4 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -851,8 +851,7 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -856,7 +856,7 @@
+  	plat-mac/lib-scriptpackages/SystemEvents \
+  	plat-mac/lib-scriptpackages/Terminal 
+  PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
+--LIBSUBDIRS=	lib-tk \
+--                site-packages \
++-LIBSUBDIRS=	lib-tk  site-packages \
+ +LIBSUBDIRS=	site-packages \
+  		encodings compiler hotshot \
+  		email email/mime \
+  		json \
+-@@ -865,8 +864,7 @@
++@@ -870,8 +870,7 @@
+  		curses $(MACHDEPS)
+  
+  ifeq (@TEST_MODULES@,yes)
+--LIBSUBDIRS +=	lib-tk/test lib-tk/test/test_tkinter	\
+--	      	lib-tk/test/test_ttk test test/data	\
+-+LIBSUBDIRS +=	test test/data	\
+- 		test/decimaltestdata test/xmltestdata 	\
+- 		test/tracedmodules   			\
+- 		email/test email/test/data		\
+-@@ -896,6 +894,14 @@
++-LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
++-		lib-tk/test/test_ttk test test/data \
+++LIBSUBDIRS +=   test test/data \
++ 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
++ 		test/tracedmodules email/test email/test/data \
++ 		json/tests sqlite3/test bsddb/test \
++@@ -899,6 +898,14 @@
+  endif
+  endif
+  
+@@ -46,11 +45,11 @@
+  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+  	@for i in $(SCRIPTDIR) $(LIBDEST); \
+  	do \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2401,6 +2401,15 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2416,6 +2416,15 @@
+     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
+  fi
+  
+diff -urN buildroot/package/python/python-2.7-105-optional-curses.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch
+--- buildroot/package/python/python-2.7-105-optional-curses.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -7,11 +7,11 @@
+  configure.in    |    9 +++++++++
+  2 files changed, 14 insertions(+), 1 deletion(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -861,7 +861,7 @@
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -867,7 +867,7 @@
+  		multiprocessing multiprocessing/dummy \
+  		unittest \
+  		lib-old \
+@@ -19,8 +19,8 @@
+ +		$(MACHDEPS)
+  
+  ifeq (@TEST_MODULES@,yes)
+- LIBSUBDIRS +=	test test/data	\
+-@@ -902,6 +902,10 @@
++ LIBSUBDIRS +=   test test/data \
++@@ -906,6 +906,10 @@
+  endif
+  endif
+  
+@@ -31,11 +31,11 @@
+  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+  	@for i in $(SCRIPTDIR) $(LIBDEST); \
+  	do \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2410,6 +2410,15 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2425,6 +2425,15 @@
+     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
+  fi
+  
+diff -urN buildroot/package/python/python-2.7-106-optional-expat.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch
+--- buildroot/package/python/python-2.7-106-optional-expat.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -14,20 +14,20 @@
+  setup.py        |    2 +-
+  3 files changed, 19 insertions(+), 7 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -857,7 +857,7 @@
+- 		json \
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -863,7 +863,7 @@
++ 		sqlite3 \
+  		logging bsddb csv importlib wsgiref \
+- 		ctypes ctypes/macholib idlelib idlelib/Icons \
+--		distutils distutils/command $(XMLLIBSUBDIRS) \
++ 		ctypes  ctypes/macholib idlelib idlelib/Icons \
++-		distutils distutils/command  $(XMLLIBSUBDIRS) \
+ +		distutils distutils/command \
+  		multiprocessing multiprocessing/dummy \
+  		unittest \
+  		lib-old \
+-@@ -906,6 +906,10 @@
++@@ -910,6 +910,10 @@
+  LIBSUBDIRS += curses
+  endif
+  
+@@ -38,11 +38,11 @@
+  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+  	@for i in $(SCRIPTDIR) $(LIBDEST); \
+  	do \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2087,13 +2087,21 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2102,13 +2102,21 @@
+  AC_SUBST(DISABLED_EXTENSIONS)
+  
+  # Check for use of the system expat library
+@@ -69,11 +69,11 @@
+  
+  # Check for use of the system libffi library
+  AC_MSG_CHECKING(for --with-system-ffi)
+-Index: Python-2.7.1/setup.py
++Index: Python-2.7.2/setup.py
+ ===================================================================
+---- Python-2.7.1.orig/setup.py
+-+++ Python-2.7.1/setup.py
+-@@ -1383,7 +1383,7 @@
++--- Python-2.7.2.orig/setup.py
+++++ Python-2.7.2/setup.py
++@@ -1403,7 +1403,7 @@
+          #
+          # More information on Expat can be found at www.libexpat.org.
+          #
+diff -urN buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch
+--- buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -6,11 +6,11 @@
+  configure.in |    6 ++++++
+  1 file changed, 6 insertions(+)
+ 
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2409,6 +2409,12 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2424,6 +2424,12 @@
+     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
+  fi
+  
+diff -urN buildroot/package/python/python-2.7-108-optional-nis.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch
+--- buildroot/package/python/python-2.7-108-optional-nis.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -9,11 +9,11 @@
+  configure.in |    6 ++++++
+  1 file changed, 6 insertions(+)
+ 
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2415,6 +2415,12 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2430,6 +2430,12 @@
+      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
+    	  fi])
+  
+diff -urN buildroot/package/python/python-2.7-109-optional-unicodedata.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch
+--- buildroot/package/python/python-2.7-109-optional-unicodedata.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -6,11 +6,11 @@
+  configure.in |    6 ++++++
+  1 file changed, 6 insertions(+)
+ 
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2421,6 +2421,12 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2436,6 +2436,12 @@
+      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
+    	  fi])
+  
+diff -urN buildroot/package/python/python-2.7-110-optional-db.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-110-optional-db.patch
+--- buildroot/package/python/python-2.7-110-optional-db.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-110-optional-db.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -11,28 +11,29 @@
+  configure.in    |   22 ++++++++++++++++++++++
+  2 files changed, 30 insertions(+), 2 deletions(-)
+ 
+-Index: Python-2.7.1/Makefile.pre.in
++Index: Python-2.7.2/Makefile.pre.in
+ ===================================================================
+---- Python-2.7.1.orig/Makefile.pre.in
+-+++ Python-2.7.1/Makefile.pre.in
+-@@ -855,7 +855,7 @@
+- 		encodings compiler hotshot \
++--- Python-2.7.2.orig/Makefile.pre.in
+++++ Python-2.7.2/Makefile.pre.in
++@@ -861,7 +861,7 @@
+  		email email/mime \
+  		json \
++ 		sqlite3 \
+ -		logging bsddb csv importlib wsgiref \
+ +		logging csv importlib wsgiref \
+- 		ctypes ctypes/macholib idlelib idlelib/Icons \
++ 		ctypes  ctypes/macholib idlelib idlelib/Icons \
+  		distutils distutils/command \
+  		multiprocessing multiprocessing/dummy \
+-@@ -868,7 +868,6 @@
+- 		test/decimaltestdata test/xmltestdata 	\
+- 		test/tracedmodules   			\
+- 		email/test email/test/data		\
+--		bsddb/test				\
+- 		ctypes/test distutils/tests		\
+- 		unittest/test
++@@ -873,7 +873,7 @@
++ LIBSUBDIRS +=   test test/data \
++ 		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
++ 		test/tracedmodules email/test email/test/data \
++-		json/tests sqlite3/test bsddb/test \
+++		json/tests sqlite3/test \
++ 		ctypes/test distutils/tests unittest/test
+  endif
+-@@ -910,6 +909,13 @@
++ 
++@@ -914,6 +914,13 @@
+  LIBSUBDIRS += $(XMLLIBSUBDIRS)
+  endif
+  
+@@ -46,11 +47,11 @@
+  libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+  	@for i in $(SCRIPTDIR) $(LIBDEST); \
+  	do \
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2421,6 +2421,28 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2436,6 +2436,28 @@
+      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
+    	  fi])
+  
+diff -urN buildroot/package/python/python-2.7-111-optional-ssl.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch
+--- buildroot/package/python/python-2.7-111-optional-ssl.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -6,11 +6,11 @@
+  configure.in |    6 ++++++
+  1 file changed, 6 insertions(+)
+ 
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2421,6 +2421,12 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2436,6 +2436,12 @@
+      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
+    	  fi])
+  
+diff -urN buildroot/package/python/python-2.7-112-optional-bzip2.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch
+--- buildroot/package/python/python-2.7-112-optional-bzip2.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -5,11 +5,11 @@
+  configure.in |    6 ++++++
+  1 file changed, 6 insertions(+)
+ 
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2427,6 +2427,12 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2442,6 +2442,12 @@
+      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
+    	  fi])
+  
+diff -urN buildroot/package/python/python-2.7-113-optional-zlib.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch
+--- buildroot/package/python/python-2.7-113-optional-zlib.patch	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch	2011-09-30 17:12:38.000000000 +0200
+@@ -5,11 +5,11 @@
+  configure.in |    6 ++++++
+  1 file changed, 6 insertions(+)
+ 
+-Index: Python-2.7.1/configure.in
++Index: Python-2.7.2/configure.in
+ ===================================================================
+---- Python-2.7.1.orig/configure.in
+-+++ Python-2.7.1/configure.in
+-@@ -2433,6 +2433,12 @@
++--- Python-2.7.2.orig/configure.in
+++++ Python-2.7.2/configure.in
++@@ -2448,6 +2448,12 @@
+              DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
+           fi])
+  
+diff -urN buildroot/package/python/python.mk /home/julien/workspace/buildroot_git_dev/package/python/python.mk
+--- buildroot/package/python/python.mk	2011-05-27 16:18:21.000000000 +0200
++++ /home/julien/workspace/buildroot_git_dev/package/python/python.mk	2012-01-10 16:28:47.000000000 +0100
+@@ -4,7 +4,7 @@
+ #
+ #############################################################
+ PYTHON_VERSION_MAJOR = 2.7
+-PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).1
++PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).2
+ PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.bz2
+ PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
+ 
+@@ -28,7 +28,6 @@
+ 	--disable-bsddb		\
+ 	--disable-test-modules	\
+ 	--disable-bz2		\
+-	--disable-zlib		\
+ 	--disable-ssl
+ 
+ HOST_PYTHON_MAKE_ENV = \
+@@ -37,9 +36,22 @@
+ 
+ HOST_PYTHON_AUTORECONF = YES
+ 
++define HOST_PYTHON_CONFIGURE_CMDS
++	(cd $(@D) && rm -rf config.cache; \
++	        $(HOST_CONFIGURE_OPTS) \
++		CFLAGS="$(HOST_CFLAGS)" \
++		LDFLAGS="$(HOST_LDFLAGS)" \
++                $(HOST_PYTHON_CONF_ENV) \
++		./configure \
++		--prefix="$(HOST_DIR)/usr" \
++		--sysconfdir="$(HOST_DIR)/etc" \
++		$(HOST_PYTHON_CONF_OPT) \
++	)
++endef
++
+ PYTHON_DEPENDENCIES  = host-python libffi
+ 
+-HOST_PYTHON_DEPENDENCIES = host-expat
++HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
+ 
+ PYTHON_INSTALL_STAGING = YES
+ 
diff --git a/patche...
 
[truncated message content]

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2665-g31b1647

From: Fabien M <fa...@us...> - 2012-01-11 09:15:00

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  31b1647ad9f1b128e738beb85bfe7070d6b3d556 (commit)
      from  d6d4d8bba6f9b33caf6da28674384ee37f7cd3d8 (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 31b1647ad9f1b128e738beb85bfe7070d6b3d556
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jan 11 10:14:40 2012 +0100

    [OTHER] spelling mistake

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

Summary of changes:
 .../linux/modules/fpga/dev_tools/loader/load_fpga  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index d417e0f..da3e454 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -17,7 +17,7 @@ fi
 
 if [ "$PLATFORM" == "APF51" ]; then
 	if [ "${1#*.}" != "bin" ]; then
-		echo "Wrong bitstream format, binany *.bin format must be used."
+		echo "Wrong bitstream format, binary file in *.bin format must be used."
 		exit 1
 	fi
 fi


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2664-gd6d4d8b

From: Fabien M <fa...@us...> - 2012-01-11 09:10:35

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  d6d4d8bba6f9b33caf6da28674384ee37f7cd3d8 (commit)
       via  586368c370ef3c00fa1a3eab181438ac80c040a0 (commit)
      from  2cc750fd3f6f5edf90cbd9ed9f45af9f5c72126a (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 d6d4d8bba6f9b33caf6da28674384ee37f7cd3d8
Merge: 586368c 2cc750f
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jan 11 09:51:19 2012 +0100

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

commit 586368c370ef3c00fa1a3eab181438ac80c040a0
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jan 11 09:50:49 2012 +0100

    [OTHER] Check if bitstream is in .bin format for APF51

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

Summary of changes:
 .../linux/modules/fpga/dev_tools/loader/load_fpga  |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index 708d7df..d417e0f 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -2,6 +2,7 @@
 #
 # Loads APFxx's FPGA by using fpgaloader driver
 #
+PLATFORM=`cat /etc/machine`
 
 if [ "$1" == "" ]; then
 	echo "Usage: `basename $0` <filename>"
@@ -14,6 +15,13 @@ if [ ! -f "$1" ]; then
 	exit 1
 fi
 
+if [ "$PLATFORM" == "APF51" ]; then
+	if [ "${1#*.}" != "bin" ]; then
+		echo "Wrong bitstream format, binany *.bin format must be used."
+		exit 1
+	fi
+fi
+
 if [ ! -c /dev/fpgaloader ]; then
 	modprobe fpgaloader
 	if [ "$?" != 0 ]; then
@@ -32,7 +40,6 @@ while [ ! -c /dev/fpgaloader ]; do
 	fi
 done
 
-PLATFORM=`cat /etc/machine`
 if [ "$PLATFORM" == "APF51" ]; then
 	# On APF51 FPGA loading shares NAND bus so it's safer to load
 	# firmware from RAM


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2662-g2cc750f

From: Julien B a. A. <ar...@us...> - 2012-01-05 17:56:33

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  2cc750fd3f6f5edf90cbd9ed9f45af9f5c72126a (commit)
       via  58045a00453c4194e6c7f4c029f3eefbd47aaaa4 (commit)
      from  5a96900829e6e6f3b5eff8a81d763c3d5d9cde43 (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 2cc750fd3f6f5edf90cbd9ed9f45af9f5c72126a
Merge: 58045a0 5a96900
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 18:55:37 2012 +0100

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

commit 58045a00453c4194e6c7f4c029f3eefbd47aaaa4
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 16:03:28 2012 +0100

    [BUILDROOT] Updates pygame to 1.9 and rework BR makefile while we are at it

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

Summary of changes:
 .../2011.05/083-adds_pygame_package.patch          |  272 +++++++-------------
 1 files changed, 98 insertions(+), 174 deletions(-)

diff --git a/patches/buildroot/2011.05/083-adds_pygame_package.patch b/patches/buildroot/2011.05/083-adds_pygame_package.patch
index 79544fe..a9f6fc7 100644
--- a/patches/buildroot/2011.05/083-adds_pygame_package.patch
+++ b/patches/buildroot/2011.05/083-adds_pygame_package.patch
@@ -1,10 +1,10 @@
-
 This patch adds PyGame package to buildroot.
 Currently added to "graphic libraries".
 
 Movie and Scrap modules are NOT tested: movie requires spmeg (SDL MPEG library)
 and Scrap needs X11.
-numeric*array modules requires Numeric Python package which is not in BR yet.
+numeric*array modules requires Numeric or numpy Python package which is not
+in BR yet.
 
 Inspired by a patch from Jean Schurger and the work of the OpenEmbedded team.
 
@@ -13,16 +13,17 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 Index: buildroot/package/pygame/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Config.in	2011-08-08 12:14:50.000000000 +0200
-@@ -0,0 +1,92 @@
++++ buildroot/package/pygame/Config.in	2012-01-05 15:13:40.000000000 +0100
+@@ -0,0 +1,85 @@
 +config BR2_PACKAGE_PYGAME
 +	bool "pygame"
 +	depends on BR2_PACKAGE_PYTHON
 +	select BR2_PACKAGE_SDL
-+	default n
 +	help
-+	  Pygame is a set of Python modules designed for writing games.
-+	  Pygame adds functionality on top of the excellent SDL library.
++	  Pygame is a cross-platfrom library designed to make it easy to write
++	  multimedia software, such as games, in Python. Pygame requires the
++	  Python language and SDL multimedia library.
++	  It can also make use of several other popular libraries.
 +
 +	  http://www.pygame.org/
 +
@@ -32,49 +33,41 @@ Index: buildroot/package/pygame/Config.in
 +config BR2_PACKAGE_PYGAME_IMAGE
 +	bool "pygame.image"
 +	default y
-+	select BR2_PACKAGE_SDL_IMAGE
++	depends on BR2_PACKAGE_SDL_IMAGE
++	depends on BR2_PACKAGE_SDL_IMAGE_PNG
++	depends on BR2_PACKAGE_SDL_IMAGE_JPEG
 +	help
-+	  pygame module for image transfer
-+
-+menu "Image formats"
-+	depends on BR2_PACKAGE_PYGAME_IMAGE
++	  pygame module for loading, saving and transfering images
 +
-+config BR2_PACKAGE_PYGAME_IMAGE_PNG
-+	bool "png"
-+	default y
-+	select BR2_PACKAGE_SDL_IMAGE_PNG
-+
-+config BR2_PACKAGE_PYGAME_IMAGE_JPEG
-+	bool "jpeg"
-+	default n
-+	select BR2_PACKAGE_SDL_IMAGE_JPEG
-+
-+endmenu
++comment "pygame.image requires sdl_image with png and jpeg support"
++	depends on !BR2_PACKAGE_PYGAME_IMAGE
 +
 +config BR2_PACKAGE_PYGAME_FONT
 +	bool "pygame.font"
-+	default n
-+	select BR2_PACKAGE_SDL_TTF
++	depends on BR2_PACKAGE_SDL_TTF
 +	help
 +	  pygame module for loading and rendering fonts
 +
++comment "pygame.font requires sdl_ttf"
++	depends on !BR2_PACKAGE_PYGAME_FONT
++
 +config BR2_PACKAGE_PYGAME_MIXER
 +	bool "pygame.mixer"
-+	default n
-+	select BR2_PACKAGE_SDL_MIXER
++	depends on BR2_PACKAGE_SDL_MIXER
 +	help
 +	  pygame module for loading and playing sounds
 +
++comment "pygame.mixer requires sdl_mixer"
++	depends on !BR2_PACKAGE_PYGAME_MIXER
++
 +config BR2_PACKAGE_PYGAME_MIXER_MUSIC
 +	bool "pygame.mixer.music"
-+	default n
 +	depends on BR2_PACKAGE_PYGAME_MIXER
 +	help
 +	  pygame module for controlling streamed audio
 +
 +config BR2_PACKAGE_PYGAME_SNDARRAY
 +	bool "pygame.sndarray"
-+	default n
 +	depends on BR2_PACKAGE_PYGAME_MIXER && BR2_PACKAGE_PYTHON_NUMERIC
 +	help
 +	  pygame module for accessing sound sample data
@@ -84,7 +77,6 @@ Index: buildroot/package/pygame/Config.in
 +
 +config BR2_PACKAGE_PYGAME_SURFARRAY
 +	bool "pygame.surfarray"
-+	default n
 +	depends on BR2_PACKAGE_PYTHON_NUMERIC
 +	help
 +	  pygame module for accessing surface pixel data using array interfaces
@@ -94,14 +86,15 @@ Index: buildroot/package/pygame/Config.in
 +
 +config BR2_PACKAGE_PYGAME_MOVIE
 +	bool "pygame.movie"
-+	default n
-+	select BR2_PACKAGE_SMPEG
++	depends on BR2_PACKAGE_SMPEG
 +	help
 +	  pygame module for playback of mpeg video
 +
++comment "pygame.movie depends on smpeg"
++	depends on !BR2_PACKAGE_PYGAME_MOVIE
++
 +config BR2_PACKAGE_PYGAME_SCRAP
 +	bool "pygame.scrap"
-+	default n
 +	depends on BR2_PACKAGE_SDL_X11
 +	help
 +	  pygame module for clipboard support (X11 needed)
@@ -110,19 +103,16 @@ Index: buildroot/package/pygame/Config.in
 Index: buildroot/package/pygame/pygame.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/pygame.mk	2011-08-08 12:14:50.000000000 +0200
++++ buildroot/package/pygame/pygame.mk	2012-01-05 15:45:16.000000000 +0100
 @@ -0,0 +1,100 @@
++######################################################################
 +#
 +# Pygame
 +#
++######################################################################
 +
-+PYGAME_VERSION:= 1.8.1release
-+PYGAME_SOURCE:= pygame-$(PYGAME_VERSION).tar.gz
++PYGAME_VERSION:= 1.9.1release
 +PYGAME_SITE:= http://www.pygame.org/ftp/
-+PYGAME_DIR:= $(BUILD_DIR)/pygame-$(PYGAME_VERSION)
-+PYGAME_BINARY:= pygame
-+PYGAME_CAT:= $(ZCAT)
-+
 +
 +ifeq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
 +PYGAME_OPT_DEPENDS += sdl_image
@@ -136,86 +126,89 @@ Index: buildroot/package/pygame/pygame.mk
 +ifeq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
 +PYGAME_OPT_DEPENDS += smpeg
 +endif
-+ifeq ($(BR2_PACKAGE_PYGAME_SCRAP),y)
-+PYGAME_OPT_DEPENDS += ?X11?
-+endif
-+PYGAME_SDL_CFLAGS=$(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
-+
-+
-+$(DL_DIR)/$(PYGAME_SOURCE):
-+	$(WGET) -P $(DL_DIR) $(PYGAME_SITE)/$(PYGAME_SOURCE)
-+
-+pygame-source: $(DL_DIR)/$(PYGAME_SOURCE)
++PYGAME_DEPENDENCIES = python sdl $(PYGAME_OPT_DEPENDS)
 +
-+$(PYGAME_DIR)/.unpacked: $(DL_DIR)/$(PYGAME_SOURCE)
-+	$(PYGAME_CAT) $(DL_DIR)/$(PYGAME_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+	touch $@
-+
-+$(PYGAME_DIR)/.configured: $(PYGAME_DIR)/.unpacked
-+	cp -f package/pygame/Setup $(PYGAME_DIR)
-+	echo "$(PYGAME_SDL_INCLUDES)"
-+	$(SED) 's#SDL_CUSTOM_CFLAGS_REPLACE_ME#$(PYGAME_SDL_CFLAGS)#' $(PYGAME_DIR)/Setup
-+ifeq ($(BR2_PACKAGE_SDL_X11),y)
-+	sed -i "s/-DDISABLE_X11//" $(PYGAME_DIR)/Setup
-+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
-+	sed -i "s/#image/image/" $(PYGAME_DIR)/Setup
++ifneq ($(BR2_PACKAGE_PYGAME_IMAGE),y)
++define PYGAME_CONFIGURE_IMAGE
++	$(SED) 's/^imageext/#imageext/' $(@D)/Setup
++endef
 +endif
-+ifeq ($(BR2_PACKAGE_PYGAME_FONT),y)
-+	sed -i "s/#font/font/" $(PYGAME_DIR)/Setup
-+endif
-+ifeq ($(BR2_PACKAGE_PYGAME_MIXER),y)
-+	sed -i "s/#mixer/mixer/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_FONT),y)
++define PYGAME_CONFIGURE_FONT
++	$(SED) 's/^font/#font/' $(@D)/Setup
++endef
 +endif
-+ifeq ($(BR2_PACKAGE_PYGAME_SNDARRAY),y)
-+	sed -i "s/#_numericsndarray/_numericsndarray/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_MIXER),y)
++define PYGAME_CONFIGURE_MIXER
++	$(SED) 's/^mixer/#mixer/g' $(@D)/Setup
++endef
 +endif
-+ifeq ($(BR2_PACKAGE_PYGAME_SURFARRAY),y)
-+	sed -i "s/#_numericsurfarray/_numericsurfarray/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_SNDARRAY),y)
++define PYGAME_CONFIGURE_SNDARRAY
++	$(SED) 's/^_numericsndarray/#_numericsndarray/' $(@D)/Setup
++endef
 +endif
-+ifeq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
-+	sed -i "s/#movie/movie/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_SURFARRAY),y)
++define PYGAME_CONFIGURE_SURFARRAY
++	$(SED) 's/^_numericsurfarray/#_numericsurfarray/' $(@D)/Setup
++endef
 +endif
-+ifeq ($(BR2_PACKAGE_PYGAME_SCRAP),y)
-+	sed -i "s/#scrap/scrap/" $(PYGAME_DIR)/Setup
++
++ifneq ($(BR2_PACKAGE_PYGAME_MOVIE),y)
++define PYGAME_CONFIGURE_MOVIE
++	$(SED) 's/^movie/#movie/' $(@D)/Setup
++endef
 +endif
 +
-+$(PYGAME_DIR)/.built: $(PYGAME_DIR)/.configured
-+	(cd $(PYGAME_DIR); \
-+		$(TARGET_CONFIGURE_OPTS) \
-+		CFLAGS="$(TARGET_CFLAGS)" \
-+		LDSHARED="$(TARGET_CROSS)gcc -shared" \
-+		$(PYTHON_DIR)/hostpython setup.py build );
-+	touch $@
++ifneq ($(BR2_PACKAGE_PYGAME_SCRAP),y)
++define PYGAME_CONFIGURE_SCRAP
++	$(SED) 's/^scrap/#scrap/' $(@D)/Setup
++endef
++endif
 +
-+$(PYGAME_DIR)/.installed: $(PYGAME_DIR)/.built
-+	(cd $(PYGAME_DIR); \
-+		$(TARGET_CONFIGURE_OPTS) \
-+		CFLAGS="$(TARGET_CFLAGS)" \
++PYGAME_SDL_FLAGS = $(shell $(STAGING_DIR)/usr/bin/sdl-config --cflags)
++PYGAME_SDL_FLAGS += $(shell $(STAGING_DIR)/usr/bin/sdl-config --libs)
++
++# Pygame needs a Setup file where options should be commented out if
++# dependencies are not available
++define PYGAME_CONFIGURE_CMDS
++	cp -f $(@D)/Setup.in $(@D)/Setup
++	$(SED) 's<^SDL = <SDL = $(PYGAME_SDL_FLAGS) \n#<' $(@D)/Setup
++	$(SED) 's/^pypm/#pypm/' $(@D)/Setup
++	$(PYGAME_CONFIGURE_IMAGE)
++	$(PYGAME_CONFIGURE_FONT)
++	$(PYGAME_CONFIGURE_MIXER)
++	$(PYGAME_CONFIGURE_SNDARRAY)
++	$(PYGAME_CONFIGURE_SURFARRAY)
++	$(PYGAME_CONFIGURE_MOVIE)
++	$(PYGAME_CONFIGURE_SCRAP)
++endef
++
++define PYGAME_BUILD_CMDS
++	(cd $(@D); CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 +		LDSHARED="$(TARGET_CROSS)gcc -shared" \
-+		$(PYTHON_DIR)/hostpython setup.py install --prefix=$(TARGET_DIR)/usr);
-+	touch $@
-+
-+pygame: python sdl $(PYGAME_OPT_DEPENDS) $(PYGAME_DIR)/.installed
++		$(HOST_DIR)/usr/bin/python setup.py build)
++endef
 +
-+pygame-clean:
-+	rm -rf $(TARGET_DIR)/usr/lib/python2.4/pygame/site-packages/
++define PYGAME_INSTALL_TARGET_CMDS
++	(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr && \
++	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs && \
++	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests)
++endef
 +
-+pygame-dirclean:
-+	rm -rf $(PYGAME_DIR)
++define PYGAME_UNINSTALL_TARGET_CMDS
++	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame*
++endef
 +
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_PYGAME)),y)
-+TARGETS+=pygame
-+endif
++$(eval $(call GENTARGETS,package,pygame))
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2011-08-08 12:14:46.000000000 +0200
-+++ buildroot/package/Config.in	2011-08-08 12:14:50.000000000 +0200
+--- buildroot.orig/package/Config.in	2012-01-03 19:24:08.000000000 +0100
++++ buildroot/package/Config.in	2012-01-05 15:45:47.000000000 +0100
 @@ -112,6 +112,7 @@
  source "package/imagemagick/Config.in"
  source "package/linux-fusion/Config.in"
@@ -224,72 +217,3 @@ Index: buildroot/package/Config.in
  source "package/sawman/Config.in"
  source "package/sdl/Config.in"
  source "package/sdl_image/Config.in"
-Index: buildroot/package/pygame/Setup
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Setup	2011-08-08 12:14:50.000000000 +0200
-@@ -0,0 +1,64 @@
-+#This Setup file is used by the setup.py script to configure the
-+#python extensions. You will likely use the "config.py" which will
-+#build a correct Setup file for you based on your system settings.
-+#If not, the format is simple enough to edit by hand. First change
-+#the needed commandline flags for each dependency, then comment out
-+#any unavailable optional modules in the first optional section.
-+
-+
-+SDL = -lSDL -DDISABLE_X11 SDL_CUSTOM_CFLAGS_REPLACE_ME
-+FONT = -lSDL_ttf
-+IMAGE = -lSDL_image
-+MIXER = -lSDL_mixer
-+SMPEG = -D_REENTRANT -lsmpeg -lSDL
-+PNG = -lpng
-+JPEG = -ljpeg
-+SCRAP = -lX11
-+
-+#DEBUG = -C-W -C-Wall
-+DEBUG =
-+
-+#the following modules are optional. you will want to compile
-+#everything you can, but you can ignore ones you don't have
-+#dependencies for, just comment them out
-+
-+#imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
-+#font src/font.c $(SDL) $(FONT) $(DEBUG)
-+#mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
-+#mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
-+#_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
-+#_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-+#movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-+#scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-+
-+#experimental new movie movie. requires libavcodec and libavformat.
-+#add any necessary compile flags to this line and uncomment.
-+#movieext src/movie.c  src/ffmovie.c $(SDL) -lavcodec -lavformat
-+
-+
-+#these modules are required for pygame to run. they only require
-+#SDL as a dependency. these should not be altered
-+
-+base src/base.c $(SDL) $(DEBUG)
-+cdrom src/cdrom.c $(SDL) $(DEBUG)
-+color src/color.c $(SDL) $(DEBUG)
-+constants src/constants.c $(SDL) $(DEBUG)
-+display src/display.c $(SDL) $(DEBUG)
-+event src/event.c $(SDL) $(DEBUG)
-+fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
-+key src/key.c $(SDL) $(DEBUG)
-+mouse src/mouse.c $(SDL) $(DEBUG)
-+rect src/rect.c $(SDL) $(DEBUG)
-+rwobject src/rwobject.c $(SDL) $(DEBUG)
-+surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
-+surflock src/surflock.c $(SDL) $(DEBUG)
-+time src/time.c $(SDL) $(DEBUG)
-+joystick src/joystick.c $(SDL) $(DEBUG)
-+draw src/draw.c $(SDL) $(DEBUG)
-+image src/image.c $(SDL) $(DEBUG)
-+overlay src/overlay.c $(SDL) $(DEBUG)
-+transform src/transform.c src/rotozoom.c src/scale2x.c $(SDL) $(DEBUG)
-+mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
-+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
-+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
-+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2660-g5a96900

From: Julien B a. A. <ar...@us...> - 2012-01-05 17:49:16

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  5a96900829e6e6f3b5eff8a81d763c3d5d9cde43 (commit)
      from  b1cbb436df958dc518b4f1a4f3ede9346b940bc5 (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 5a96900829e6e6f3b5eff8a81d763c3d5d9cde43
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 18:48:07 2012 +0100

    [LINUX] 3.0: add i.MX I2C mangling

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

Summary of changes:
 ...ing_mangling_capability_on_i2c_imx_driver.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 copy patches/linux/{2.6.38 => 3.0}/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch (93%)

diff --git a/patches/linux/2.6.38/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch b/patches/linux/3.0/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
similarity index 93%
copy from patches/linux/2.6.38/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
copy to patches/linux/3.0/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
index 4b0cca6..d5d0486 100644
--- a/patches/linux/2.6.38/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
+++ b/patches/linux/3.0/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
@@ -2,10 +2,10 @@ Adding Mangling capability to i2c imx bus controller.
 
 Signed-off-by: Fabien Marteau <fab...@ar...>
 ---
-Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
+Index: linux-3.0/drivers/i2c/busses/i2c-imx.c
 ===================================================================
---- linux-2.6.36.orig/drivers/i2c/busses/i2c-imx.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/i2c/busses/i2c-imx.c	2011-01-31 16:23:34.000000000 +0100
+--- linux-3.0.orig/drivers/i2c/busses/i2c-imx.c	2010-10-20 22:30:22.000000000 +0200
++++ linux-3.0/drivers/i2c/busses/i2c-imx.c	2011-01-31 16:23:34.000000000 +0100
 @@ -300,17 +300,28 @@
  {
  	int i, result;


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2659-gb1cbb43

From: Julien B a. A. <ar...@us...> - 2012-01-05 13:10:36

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  b1cbb436df958dc518b4f1a4f3ede9346b940bc5 (commit)
       via  83d66c67f0a4f1b13ef98347fe516e41623cfaf6 (commit)
       via  f4df1b3ea8a0efe7d3343cf1f79d23f2b9801455 (commit)
      from  a9a1cda08a38ab22d76ea73fd4a1d16684f431f0 (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 b1cbb436df958dc518b4f1a4f3ede9346b940bc5
Merge: 83d66c6 a9a1cda
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 14:08:50 2012 +0100

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

commit 83d66c67f0a4f1b13ef98347fe516e41623cfaf6
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 14:01:25 2012 +0100

    [BUILD] Add script that will ease export of our Linux (and U-Boot) patches to a public FTP server (for use in build systems like BR)

commit f4df1b3ea8a0efe7d3343cf1f79d23f2b9801455
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Jan 5 14:00:05 2012 +0100

    [BUILDROOT] Fixes patches/buildroot/2011.05/057-pymysql-add_package.patch

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

Summary of changes:
 .../2011.05/057-pymysql-add_package.patch          |    4 +-
 scripts/publish_patches.sh                         |   76 ++++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100755 scripts/publish_patches.sh

diff --git a/patches/buildroot/2011.05/057-pymysql-add_package.patch b/patches/buildroot/2011.05/057-pymysql-add_package.patch
index 5d42d7d..b60644f 100644
--- a/patches/buildroot/2011.05/057-pymysql-add_package.patch
+++ b/patches/buildroot/2011.05/057-pymysql-add_package.patch
@@ -6,10 +6,10 @@ Index: buildroot/package/Config.in
 ===================================================================
 --- buildroot.orig/package/Config.in	2011-08-08 12:14:30.000000000 +0200
 +++ buildroot/package/Config.in	2011-08-08 12:14:33.000000000 +0200
-@@ -240,6 +240,7 @@
+@@ -239,6 +239,7 @@
+ source "package/microperl/Config.in"
  source "package/php/Config.in"
  source "package/python/Config.in"
- source "package/pyserial/Config.in"
 +source "package/pymysql/Config.in"
  source "package/ruby/Config.in"
  source "package/tcl/Config.in"
diff --git a/scripts/publish_patches.sh b/scripts/publish_patches.sh
new file mode 100755
index 0000000..5ef0405
--- /dev/null
+++ b/scripts/publish_patches.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+help()
+{
+	echo
+	echo "This script will publish Armadeus Linux and U-Boot current/stable patches."
+	echo "This way we ease Armadeus board integration in build systems, like Buildroot for example."
+	echo
+}
+
+if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+	help
+	exit 1
+fi
+
+echo "--- Getting envt variables:"
+THIS_DIR=`dirname $0`
+make -C $THIS_DIR/.. shell_env
+source $THIS_DIR/../armadeus_env.sh
+
+PATCHES_LIST=`ls $LINUX_PATCHES_DIR`
+LINUX_VERSIONS=`ls $ARMADEUS_LINUX_PATCH_DIR/..`
+echo
+PS3="Choose the Linux kernel you want to publish: "
+select LINUX in $LINUX_VERSIONS
+do
+	if [ "$LINUX" == "" ]; then
+		exit 1
+	else
+		echo "You choosed $LINUX"
+		break
+	fi
+done
+
+echo "--- Merging patches:"
+FINAL_PATCH=linux-$LINUX-armadeus.patch
+rm -f $FINAL_PATCH
+touch $FINAL_PATCH
+LINUX_PATCHES=`ls $ARMADEUS_LINUX_PATCH_DIR/../$LINUX`
+for patch in $LINUX_PATCHES; do
+	echo "Merging $patch"
+	cat $ARMADEUS_LINUX_PATCH_DIR/../$LINUX/$patch >> $FINAL_PATCH
+#	sleep 1
+done
+
+echo
+echo "--- Compressing:"
+tar cvzf $FINAL_PATCH.tar.gz $FINAL_PATCH
+if [ "$?" == 0 ]; then
+	rm $FINAL_PATCH
+fi
+
+echo
+echo "--- Uploading archive:"
+HOST=ftp2.armadeus.com
+echo "username for $HOST ?"
+read -p "> " USER
+echo "password ?"
+read -p "> " PASSWD
+if [ "$USER" == "" ] || [ "$PASSWD" == "" ]; then
+	echo "aborting"
+	exit 1
+fi
+ftp -n $HOST <<END_SCRIPT
+quote USER $USER
+quote PASS $PASSWD
+cd download
+put $FINAL_PATCH.tar.gz
+quit
+END_SCRIPT
+
+if [ "$?" == 0 ]; then
+	echo "done !"
+fi
+
+exit 0


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2656-ga9a1cda

From: Fabien M <fa...@us...> - 2012-01-05 11:00:49

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  a9a1cda08a38ab22d76ea73fd4a1d16684f431f0 (commit)
       via  08714d87a7af031b1f9a0fc07d7d368c91ecbbf3 (commit)
      from  a53849a9a4d5aeec27d23c6b44570ae7b4c4d737 (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 a9a1cda08a38ab22d76ea73fd4a1d16684f431f0
Merge: 08714d8 a53849a
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Jan 5 11:59:18 2012 +0100

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

commit 08714d87a7af031b1f9a0fc07d7d368c91ecbbf3
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Jan 5 11:58:47 2012 +0100

    [firmware][linux] update sp_vision_loader for APF51

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

Summary of changes:
 .../apf51_spvision_loader.bin}                     |  Bin 340604 -> 340604 bytes
 ...vision_loader.pod => apf51_spvision_loader.pod} |    4 +-
 firmware/sp_vision_config/README                   |   43 ---
 .../sp_vision_config/bitstream/top_testconfig.bit  |  Bin 149615 -> 0 bytes
 .../sp_vision_config/simulation/apf27_test_pkg.vhd |  157 --------
 .../imx27_wb16_wrapper/imx27_wb16_wrapper.vhd      |   92 -----
 .../imx27_wb16_wrapper00_mwb16_intercon.vhd        |  102 ------
 .../synthesis/rstgen_syscon/rstgen_syscon.vhd      |   61 ----
 .../spartan_select_map/spartan_selectmap.vhd       |  211 -----------
 firmware/sp_vision_config/synthesis/testconfig.tcl |   21 --
 firmware/sp_vision_config/synthesis/testconfig.ucf |   69 ----
 .../sp_vision_config/synthesis/top_testconfig.vhd  |  372 --------------------
 .../spvision_loader/sploader_prober.c              |    2 +-
 .../fpga/virtual_components/sploader/sp-loader.c   |    2 -
 14 files changed, 3 insertions(+), 1133 deletions(-)
 copy firmware/{wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin => pod_scripts/apf51_spvision_loader.bin} (88%)
 copy firmware/pod_scripts/{apf27_spvision_loader.pod => apf51_spvision_loader.pod} (80%)
 delete mode 100644 firmware/sp_vision_config/README
 delete mode 100644 firmware/sp_vision_config/bitstream/top_testconfig.bit
 delete mode 100644 firmware/sp_vision_config/simulation/apf27_test_pkg.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/imx27_wb16_wrapper/imx27_wb16_wrapper.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/imx27_wb16_wrapper00_mwb16/imx27_wb16_wrapper00_mwb16_intercon.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/rstgen_syscon/rstgen_syscon.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/spartan_select_map/spartan_selectmap.vhd
 delete mode 100644 firmware/sp_vision_config/synthesis/testconfig.tcl
 delete mode 100644 firmware/sp_vision_config/synthesis/testconfig.ucf
 delete mode 100644 firmware/sp_vision_config/synthesis/top_testconfig.vhd

diff --git a/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin b/firmware/pod_scripts/apf51_spvision_loader.bin
similarity index 88%
copy from firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin
copy to firmware/pod_scripts/apf51_spvision_loader.bin
index 35c6ba7..5950723 100644
Binary files a/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin and b/firmware/pod_scripts/apf51_spvision_loader.bin differ
diff --git a/firmware/pod_scripts/apf27_spvision_loader.pod b/firmware/pod_scripts/apf51_spvision_loader.pod
similarity index 80%
copy from firmware/pod_scripts/apf27_spvision_loader.pod
copy to firmware/pod_scripts/apf51_spvision_loader.pod
index b4a15bb..e560635 100644
--- a/firmware/pod_scripts/apf27_spvision_loader.pod
+++ b/firmware/pod_scripts/apf51_spvision_loader.pod
@@ -1,9 +1,9 @@
 create spvision_loader 
-selectplatform standard.apf27
+selectplatform standard.apf51
 delinstance irq_mngr00
 addinstance components.sp_vision_configure.wb16
 autoconnectbus
-generateintercon imx27_wb16_wrapper00.mwb16
+generateintercon imx51_wb16_wrapper00.mwb16
 generateintercon rstgen_syscon00.candroutput
 generatetop
 driver.selecttoolchain armadeus
diff --git a/firmware/sp_vision_config/README b/firmware/sp_vision_config/README
deleted file mode 100644
index f831609..0000000
--- a/firmware/sp_vision_config/README
+++ /dev/null
@@ -1,43 +0,0 @@
-sp_vision_config
-=======================
-
-This is a minimum design used to configure second fpga on sp_vision daugther
-board.
-This design is designed to configure a spartan6 with SelectMap Slave
-protocol.
-
-FPGA component
---------------
-
-Output component is composed of four 16 bits registers:
-
-|   offset   | name        | description                            |
-|:-----------|:-----------:|:--------------------------------------:|
-|    0x00    | ID          | component identifiant                  |
-|    0x02    | CONFIG      | configuration for control signals      |
-|    0x04    | STATUS      | control signals status                 |
-|    0x06    | DATA        | bitstream 16bits data sent to spartan6 |
-
-* ID : unique number to identify component.
-
-* CONFIG : Drive control signals
-
-| 15 downto 5 |  4  |  3   |  2  |    1    |   0   |
-|:-----------:|:---:|:----:|:---:|:-------:|:-----:|
-|     void    | CLK | void |CSI_n|PROGRAM_n|RDWR_n |
-
-CLK flag is used to switch composant in configuration mode :
-- When CLK=1, component is in idle mode, CCLK output drive general clock and
-	all other output signals are High impedance.
-- When CLK=0, the component is in fpga configuration mode.
-
-* STATUS : read input signal from fpga
-
-| 15 downto 3 |  2   | 1  |   0  |
-|:-----------:|:----:|:--:|:----:|
-|     void    |INIT_n|BUSY|RDWR_n|
-
-* DATA : 16 bits data wrote for configuring FPGA. 
-When a data is written in this register, the value is placed on data output
-port, and one cclk pulse is generated.
-
diff --git a/firmware/sp_vision_config/bitstream/top_testconfig.bit b/firmware/sp_vision_config/bitstream/top_testconfig.bit
deleted file mode 100644
index 288f718..0000000
Binary files a/firmware/sp_vision_config/bitstream/top_testconfig.bit and /dev/null differ
diff --git a/firmware/sp_vision_config/simulation/apf27_test_pkg.vhd b/firmware/sp_vision_config/simulation/apf27_test_pkg.vhd
deleted file mode 100644
index 232cdbd..0000000
--- a/firmware/sp_vision_config/simulation/apf27_test_pkg.vhd
+++ /dev/null
@@ -1,157 +0,0 @@
-----------------------------------------------
--- Design Name : Test bench utils for apf27
--- File Name : apf27_test_pkg.vhd
--- Function : Defines communication functions between imx and fpga
--- Author   : Fabien Marteau <fab...@ar...>
--- Version  : 1.00
----------------------------------------------
------------------------------------------------------------------------------------
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2, or (at your option)
--- any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-----------------------------------------------------------------------------------
-
-
-library ieee;
-use ieee.std_logic_1164.all;
-
-package apf27_test_pkg is
-
-    CONSTANT CS_MIN : time := 13.6 ns;
-    CONSTANT CLOCK_PERIOD : time := 7.5188 ns;
-    CONSTANT WE3 : time := 2.25 ns;
-    CONSTANT WE4 : time := 2.25 ns;
-
-    -- write procedures
-    -- Params :
-    --    address      : Write address 
-    --    value        : value to write 
-    --    gls_clk      : clock signal
-    --    imx_cs_n     : Chip select 
-    --    imx_oe_n     : Read signal
-    --    imx_eb3_n    : Write signal
-    --    imx_address  : Address signal
-    --    imx_data     : Data signal
-    --    WSC          : Value of imx WSC (see MC9328MXLRM.pdf p169) for sync=0
- 
-    procedure imx_write(
-    address     : in std_logic_vector (15 downto 0);
-    value       : in std_logic_vector (15 downto 0);
-    signal   gls_clk     : in std_logic ;
-    signal   imx_cs_n    : out std_logic ;
-    signal   imx_oe_n    : out std_logic ;
-    signal   imx_eb3_n   : out std_logic ;
-    signal   imx_address : out std_logic_vector (12 downto 1);
-    signal   imx_data    : out std_logic_vector (15 downto 0);
-    WSC         : natural
-);
-    -- read procedures
-    -- Params :
-    --    address      : Write address 
-    --    value        : value returned
-    --    gls_clk      : clock signal
-    --    imx_cs_n     : Chip select 
-    --    imx_oe_n     : Read signal
-    -

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2654-ga53849a

From: Julien B a. A. <ar...@us...> - 2012-01-04 14:10:56

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  a53849a9a4d5aeec27d23c6b44570ae7b4c4d737 (commit)
      from  d4438cc0d2181073bfee030009086df485137fe9 (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 a53849a9a4d5aeec27d23c6b44570ae7b4c4d737
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 4 15:04:09 2012 +0100

    [BUILDROOT] Remove our custom pyserial package as it is now integrated (in another way) to BR

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

Summary of changes:
 .../2011.05/055-pyserial-add_package.patch         |   64 --------------------
 patches/buildroot/2011.05/cleanup_buildroot.sh     |    1 -
 2 files changed, 0 insertions(+), 65 deletions(-)
 delete mode 100644 patches/buildroot/2011.05/055-pyserial-add_package.patch

diff --git a/patches/buildroot/2011.05/055-pyserial-add_package.patch b/patches/buildroot/2011.05/055-pyserial-add_package.patch
deleted file mode 100644
index a701440..0000000
--- a/patches/buildroot/2011.05/055-pyserial-add_package.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Add pyserial package to BR
-
-Signed-off-by: Fabien Marteau <fab...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in	2011-11-17 10:00:45.000000000 +0100
-+++ buildroot/package/Config.in	2011-11-23 14:46:48.000000000 +0100
-@@ -239,6 +239,7 @@
- source "package/microperl/Config.in"
- source "package/php/Config.in"
- source "package/python/Config.in"
-+source "package/pyserial/Config.in"
- source "package/ruby/Config.in"
- source "package/tcl/Config.in"
- endmenu
-Index: buildroot/package/pyserial/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pyserial/Config.in	2011-11-23 14:35:13.000000000 +0100
-@@ -0,0 +1,5 @@
-+config BR2_PACKAGE_PYSERIAL
-+	bool "pyserial"
-+	depends on BR2_PACKAGE_PYTHON
-+	help
-+	  Installs the python pyserial extension
-Index: buildroot/package/pyserial/pyserial.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pyserial/pyserial.mk	2011-11-23 14:47:04.000000000 +0100
-@@ -0,0 +1,33 @@
-+PYSERIAL_VERSION=2.2
-+PYSERIAL_SOURCE=pyserial-$(PYSERIAL_VERSION).zip
-+PYSERIAL_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pyserial
-+PYSERIAL_DIR=$(BUILD_DIR)/pyserial-$(PYSERIAL_VERSION)
-+PYSERIAL_TARGET_PKG=$(TARGET_DIR)/usr/lib/python2.7/site-packages/serial
-+PYSERIAL_TARGET_BINARY=$(PYSERIAL_TARGET_PKG)/serialutil.py
-+
-+$(DL_DIR)/$(PYSERIAL_SOURCE):
-+	$(call DOWNLOAD,$(PYSERIAL_SITE),$(PYSERIAL_SOURCE))
-+
-+$(PYSERIAL_DIR)/.unpacked: $(DL_DIR)/$(PYSERIAL_SOURCE)
-+	unzip -o $(DL_DIR)/$(PYSERIAL_SOURCE) -d $(BUILD_DIR)
-+	touch $@
-+
-+$(PYSERIAL_TARGET_BINARY): $(PYSERIAL_DIR)/.unpacked
-+	mkdir -p $(PYSERIAL_TARGET_PKG)
-+	for module in __init__.py serialposix.py serialutil.py; do \
-+		cp $(PYSERIAL_DIR)/serial/$$module $(PYSERIAL_TARGET_PKG)/ ; \
-+		done
-+
-+pyserial-source: $(DL_DIR)/$(PYSERIAL_SOURCE)
-+
-+pyserial-clean:
-+	rm -rf $(PYSERIAL_TARGET_PKG)
-+
-+pyserial-dirclean:
-+	rm -rf $(PYSERIAL_DIR)
-+
-+pyserial: python $(PYSERIAL_TARGET_BINARY)
-+
-+ifeq ($(strip $(BR2_PACKAGE_PYSERIAL)),y)
-+TARGETS+=pyserial
-+endif
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index b0a8a7f..91f20e3 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -26,7 +26,6 @@ rm -rf buildroot/package/openssh/
 rm -rf buildroot/package/sdl/
 rm -rf buildroot/package/sdlwater/
 rm -rf buildroot/package/slideshow/
-rm -rf buildroot/package/pyserial/
 rm -rf buildroot/package/pymysql/
 rm -rf buildroot/package/socketcan/
 rm -rf buildroot/package/lcd4linux/


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2653-gd4438cc

From: Julien B a. A. <ar...@us...> - 2012-01-04 09:01:30

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  d4438cc0d2181073bfee030009086df485137fe9 (commit)
       via  88f3dd818d6667597de656412d468b78c012dea4 (commit)
       via  beb1de77ca9bd33299a572285d05f18de818f734 (commit)
      from  c5726e6540e23497a09314343936baba3d9d4e99 (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 d4438cc0d2181073bfee030009086df485137fe9
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 4 10:00:05 2012 +0100

    [BUILD] scripts/quiltify.sh: check if quilt is installed before launching the beast

commit 88f3dd818d6667597de656412d468b78c012dea4
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 4 09:58:33 2012 +0100

    [BUILDROOT] Add CanFestival package

commit beb1de77ca9bd33299a572285d05f18de818f734
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 4 09:55:34 2012 +0100

    [BUILDROOT] Get mainlined mercurial download method for packages

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

Summary of changes:
 ...7-buildroot-add_mercurial_download_method.patch |   84 +++++++++++
 .../2011.05/168-libcanfestival-add_package.patch   |  149 ++++++++++++++++++++
 patches/buildroot/2011.05/cleanup_buildroot.sh     |    1 +
 scripts/quiltify.sh                                |    6 +
 4 files changed, 240 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2011.05/167-buildroot-add_mercurial_download_method.patch
 create mode 100644 patches/buildroot/2011.05/168-libcanfestival-add_package.patch

diff --git a/patches/buildroot/2011.05/167-buildroot-add_mercurial_download_method.patch b/patches/buildroot/2011.05/167-buildroot-add_mercurial_download_method.patch
new file mode 100644
index 0000000..38c3182
--- /dev/null
+++ b/patches/buildroot/2011.05/167-buildroot-add_mercurial_download_method.patch
@@ -0,0 +1,84 @@
+From f694c0761d15901b74e972b08938fecfda3b510b Mon Sep 17 00:00:00 2001
+From: Thomas De Schampheleire <pat...@gm...>
+Date: Wed, 19 Oct 2011 07:25:47 +0000
+Subject: Add support for packages stored in Mercurial (hg) repositories
+
+Add support for packages stored in Mercurial (hg) repositories.
+
+Signed-off-by: Thomas De Schampheleire <tho...@gm...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+(limited to 'package/Makefile.package.in')
+
+Index: buildroot/package/Makefile.package.in
+===================================================================
+--- buildroot.orig/package/Makefile.package.in	2012-01-03 19:24:09.000000000 +0100
++++ buildroot/package/Makefile.package.in	2012-01-03 19:24:09.000000000 +0100
+@@ -73,6 +73,7 @@
+ SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET)
+ BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET)
+ GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
++HG:=$(call qstrip,$(BR2_HG)) $(QUIET)
+ COPY:=$(call qstrip,$(BR2_COPY)) $(QUIET)
+ 
+ # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
+@@ -158,6 +159,27 @@
+ endef
+ 
+ 
++define DOWNLOAD_HG
++	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
++	(pushd $(DL_DIR) > /dev/null && \
++	$(HG) clone --noupdate --rev $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
++	$(HG) archive --repository $($(PKG)_BASE_NAME) --type tgz --prefix $($(PKG)_BASE_NAME)/ \
++	              --rev $($(PKG)_DL_VERSION) $(DL_DIR)/$($(PKG)_SOURCE) && \
++	rm -rf $($(PKG)_DL_DIR) && \
++	popd > /dev/null)
++endef
++
++# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
++# repository
++define SOURCE_CHECK_HG
++  $(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null
++endef
++
++define SHOW_EXTERNAL_DEPS_HG
++  echo $($(PKG)_SOURCE)
++endef
++
++
+ define DOWNLOAD_WGET
+ 	test -e $(DL_DIR)/$(2) || \
+ 	$(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2)
+@@ -212,6 +234,7 @@
+ 			svn) $($(DL_MODE)_SVN) && exit ;; \
+ 			bzr) $($(DL_MODE)_BZR) && exit ;; \
+ 			copy) $($(DL_MODE)_COPY) && exit ;; \
++			hg) $($(DL_MODE)_HG) && exit ;; \
+ 			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
+ 		esac ; \
+ 	fi ; \
+@@ -535,6 +558,8 @@
+ DL_TOOLS_DEPENDENCIES += git
+ else ifeq ($$($(2)_SITE_METHOD),bzr)
+ DL_TOOLS_DEPENDENCIES += bzr
++else ifeq ($$($(2)_SITE_METHOD),hg)
++DL_TOOLS_DEPENDENCIES += hg
+ endif # SITE_METHOD
+ 
+ endif # BR2_PACKAGE_$(2)
+Index: buildroot/Config.in
+===================================================================
+--- buildroot.orig/Config.in	2012-01-03 19:38:35.000000000 +0100
++++ buildroot/Config.in	2012-01-03 19:39:07.000000000 +0100
+@@ -36,6 +36,10 @@
+ 	string "Git command"
+ 	default "git"
+ 
++config BR2_HG
++	string "Mercurial (hg) command"
++	default "hg"
++
+ config BR2_ZCAT
+ 	string "zcat command"
+ 	default "gzip -d -c"
diff --git a/patches/buildroot/2011.05/168-libcanfestival-add_package.patch b/patches/buildroot/2011.05/168-libcanfestival-add_package.patch
new file mode 100644
index 0000000..788254f
--- /dev/null
+++ b/patches/buildroot/2011.05/168-libcanfestival-add_package.patch
@@ -0,0 +1,149 @@
+Index: buildroot/package/libcanfestival/Config.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcanfestival/Config.in	2012-01-04 09:39:30.000000000 +0100
+@@ -0,0 +1,83 @@
++config BR2_PACKAGE_LIBCANFESTIVAL
++	bool "CanFestival"
++	help
++	  CanFestival is an OpenSource CANOpen framework, licensed with GPLv2
++	  and LGPLv2.
++
++	  http://www.canfestival.org
++
++if BR2_PACKAGE_LIBCANFESTIVAL
++menu "CanFestival configuration options"
++	config BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN
++		string "Number of can bus to use"
++		default "4"
++
++	choice
++		prompt "Driver to use"
++		default BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
++		bool "anagate_linux"
++		help
++		  AnaGate CAN(duo) driver for linux
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
++		bool "peak_linux"
++		help
++		  Linux build host installed Peak driver and library
++		  http://www.peak-system.com/linux/
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
++		bool "virtual"
++		help
++		  Unix pipe based virtual can driver
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
++		bool "virtual_kernel"
++		help
++		  Kernel module virtual can driver
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++		bool "socket"
++		help
++		  Socket-can
++		  http://developer.berlios.de/projects/socketcan/
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
++		bool "lincan"
++		help
++		  Lincan driver
++		  http://www.ocera.org/download/components/WP7/lincan-0.3.3.html
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
++		bool "can4linux"
++		help
++		  Can4linux driver
++		  http://www.port.de/engl/canprod/hw_can4linux.html
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_LINUX
++		bool "copcican_linux"
++		help
++		  User space driver interface for CO-PCICAN card
++		  http://www.cosateq.com/
++
++	config	BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
++		bool "copcican_comedi"
++		help
++		  COMEDI driver interface for CO-PCICAN card
++		  http://www.cosateq.com/
++	endchoice
++
++	config BR2_PACKAGE_LIBCANFESTIVAL_DRIVER
++		string
++		default "anagate_linux"   if BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
++		default "peak_linux" 	  if BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
++		default "virtual" 	  if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
++		default "virtual_kernel"  if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
++		default "socket" 	  if BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
++		default "lincan" 	  if BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
++		default "can4linux" 	  if BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
++		default "copcican_linux"  if BR2_PACKAGE_LIBCANFESTIVAL_COCPICAN_LINUX
++		default "copcican_comedi" if BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
++endmenu
++endif
+Index: buildroot/package/libcanfestival/libcanfestival.mk
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcanfestival/libcanfestival.mk	2012-01-04 09:41:43.000000000 +0100
+@@ -0,0 +1,44 @@
++#############################################################
++#
++# libcanfestival
++#
++#############################################################
++# Revision 705:
++LIBCANFESTIVAL_VERSION = 3bbc9aeba925
++LIBCANFESTIVAL_SITE_METHOD = hg
++LIBCANFESTIVAL_SITE = http://dev.automforge.net/CanFestival-3
++LIBCANFESTIVAL_INSTALL_STAGING = YES
++
++define LIBCANFESTIVAL_CONFIGURE_CMDS
++	cd $(@D) && \
++	./configure --binutils=$(TARGET_CROSS) --cc="$(TARGET_CC)" \
++	--cxx="$(TARGET_CC)" --ld="$(TARGET_CC)" --prefix=$(TARGET_DIR)/usr \
++	--can=$(BR2_PACKAGE_LIBCANFESTIVAL_DRIVER) \
++	--MAX_CAN_BUS_ID=$(BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN)
++endef
++
++define LIBCANFESTIVAL_BUILD_CMDS
++	$(MAKE) -C $(@D) all
++endef
++
++define LIBCANFESTIVAL_INSTALL_TARGET_CMDS
++	$(MAKE) -C $(@D)/src install
++	$(MAKE) -C $(@D)/drivers install
++	$(MAKE) -C $(@D)/examples install
++endef
++
++define LIBCANFESTIVAL_INSTALL_STAGING_CMDS
++	$(MAKE) -C $(@D)/src install PREFIX=$(STAGING_DIR)
++	$(MAKE) -C $(@D)/drivers install PREFIX=$(STAGING_DIR)
++	$(MAKE) -C $(@D)/examples install PREFIX=$(STAGING_DIR)
++endef
++
++define LIBCANFESTIVAL_CLEAN_CMDS
++	$(MAKE) -C $(@D) mrproper
++endef
++
++define LIBCANFESTIVAL_UNINSTALL_TARGET_CMDS
++	$(MAKE) -C $(@D) uninstall
++endef
++
++$(eval $(call GENTARGETS,package,libcanfestival))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in	2012-01-04 09:12:44.000000000 +0100
++++ buildroot/package/Config.in	2012-01-04 09:14:15.000000000 +0100
+@@ -339,6 +339,7 @@
+ #endif
+ 
+ menu "Networking"
++source "package/libcanfestival/Config.in"
+ source "package/libcgi/Config.in"
+ source "package/libcgicc/Config.in"
+ source "package/libcurl/Config.in"
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index e1018c9..b0a8a7f 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -61,3 +61,4 @@ rm -rf buildroot/package/libmodbus
 rm -rf buildroot/package/nanocom
 rm -rf buildroot/package/elftosb
 rm -rf buildroot/package/rt-tests
+rm -rf buildroot/package/libcanfestival
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index f46920b..2cf7e2d 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -41,6 +41,12 @@ ask_user_choice()
 }
 
 
+QUILT=`which quilt`
+if [ "$QUILT" == "" ]; then
+	echo "Please install quilt before trying to use this script"
+	exit 1
+fi
+
 # Get useful envt variables
 make shell_env
 . armadeus_env.sh


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2650-gc5726e6

From: jorasse <jo...@us...> - 2011-12-21 09:25:12

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  c5726e6540e23497a09314343936baba3d9d4e99 (commit)
      from  20cfac9e9ab4baa659db09f1750053f375e03977 (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 c5726e6540e23497a09314343936baba3d9d4e99
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 20 15:56:44 2011 +0100

    [UBOOT][APF28] update U-Boot version

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

Summary of changes:
 buildroot/configs/apf28_defconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 2baba3e..d0910ad 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -60,7 +60,7 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
 BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12-rc1.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12-rc2.tar.bz2"
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
 BR2_TARGET_UBOOT_TOOL_ENV=y
 # BR2_TARGET_UBOOT_NETWORK is not set


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2649-g20cfac9

From: jorasse <jo...@us...> - 2011-12-21 09:00:45

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  20cfac9e9ab4baa659db09f1750053f375e03977 (commit)
       via  33ac58e24af82158cc30d4b64f06d40cfcc1d152 (commit)
      from  78ee74f0c890d0aaeaa167b8649079f32da8f89f (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 20cfac9e9ab4baa659db09f1750053f375e03977
Merge: 33ac58e 78ee74f
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 20 15:31:43 2011 +0100

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

commit 33ac58e24af82158cc30d4b64f06d40cfcc1d152
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 20 15:31:21 2011 +0100

    [UBOOT][APF28] Fix ethernet 0 FEC identifier

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

Summary of changes:
 patches/u-boot/2011.12/01-uboot-apf28.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/u-boot/2011.12/01-uboot-apf28.patch b/patches/u-boot/2011.12/01-uboot-apf28.patch
index dbe893a..72fd3c1 100644
--- a/patches/u-boot/2011.12/01-uboot-apf28.patch
+++ b/patches/u-boot/2011.12/01-uboot-apf28.patch
@@ -118,10 +118,10 @@
 +
 +int fecmxc_mii_postcall(int phy)
 +{
-+	miiphy_write("FEC", phy, MII_BMCR, 0x9000);
-+	miiphy_write("FEC", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
++	miiphy_write("FEC0", phy, MII_BMCR, 0x9000);
++	miiphy_write("FEC0", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
 +	if (phy == 3)
-+		miiphy_write("FEC", 3, MII_PHY_CTRL2, 0x8180);
++		miiphy_write("FEC0", 3, MII_PHY_CTRL2, 0x8180);
 +	return 0;
 +}
 +


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2647-g78ee74f

From: Fabien M <fa...@us...> - 2011-12-13 14:24:47

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  78ee74f0c890d0aaeaa167b8649079f32da8f89f (commit)
      from  2fb02b9b068a037baa77c09c1d802e24c154b4c4 (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 78ee74f0c890d0aaeaa167b8649079f32da8f89f
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Dec 13 15:19:55 2011 +0100

    [package][as_devices] change irq mode macros

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

Summary of changes:
 target/packages/as_devices/c/as_gpio.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index 1352f6f..35e1a10 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -28,10 +28,10 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define GPIO_IRQ_MODE_NOINT    (0)
-#define GPIO_IRQ_MODE_RISING   (1)
-#define GPIO_IRQ_MODE_FALLING  (2)
-#define GPIO_IRQ_MODE_BOTH     (3)
+#define GPIO_IRQ_MODE_NOINT     "none"
+#define GPIO_IRQ_MODE_RISING    "rising"
+#define GPIO_IRQ_MODE_FALLING   "falling"
+#define GPIO_IRQ_MODE_BOTH      "both"
 
 #define PORT_SIZE (32)
 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2646-g2fb02b9

From: Fabien M <fa...@us...> - 2011-12-13 10:18:36

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  2fb02b9b068a037baa77c09c1d802e24c154b4c4 (commit)
       via  7a49037a599ecd23e3137b32f43baf02c0924330 (commit)
       via  dd0534ac0c63e3bc5189a0a41880f50f396cec92 (commit)
       via  0be5a7d930253174f1357129f4fa9136fcfbb215 (commit)
       via  679afd2ad4d1d3c9f3ec3176429a33f4ae80f7a6 (commit)
      from  c3ce1a39a0e50dd7ffa35a51bd64ceb7c03f7724 (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 2fb02b9b068a037baa77c09c1d802e24c154b4c4
Merge: 7a49037 c3ce1a3
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Dec 13 11:18:05 2011 +0100

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

commit 7a49037a599ecd23e3137b32f43baf02c0924330
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Dec 13 11:15:10 2011 +0100

    [linux][driver][fpga][wishbone_example] adding test program for button and led

commit dd0534ac0c63e3bc5189a0a41880f50f396cec92
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Dec 13 11:00:25 2011 +0100

    [linux][driver][fpga][button] adding test program for wishbone_example button

commit 0be5a7d930253174f1357129f4fa9136fcfbb215
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Dec 13 10:56:43 2011 +0100

    [firmware][wishbone_example] Update bitstream for apf51 to work with board drivers

commit 679afd2ad4d1d3c9f3ec3176429a33f4ae80f7a6
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Dec 13 10:52:54 2011 +0100

    [linux][driver][fpga][led] adding testled program

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

Summary of changes:
 .../binaries/top_wishbone_example51_lx9.bin        |  Bin 340604 -> 340604 bytes
 .../fpga/board_designs/wishbone_example/Makefile   |    7 ++-
 .../fpga/board_designs/wishbone_example/push-led.c |   39 ++++++--------
 .../wishbone_example/wb_button/Makefile            |    5 +--
 .../wishbone_example/wb_button}/testbutton.c       |   57 +++++++++-----------
 .../board_designs/wishbone_example/wb_led/Makefile |    5 +--
 .../wishbone_example/wb_led}/testled.c             |    1 +
 7 files changed, 52 insertions(+), 62 deletions(-)
 copy {firmware/wishbone_example/wishbone_example51/components/button00/drivers_templates/armadeus => target/linux/modules/fpga/board_designs/wishbone_example/wb_button}/testbutton.c (66%)
 copy target/linux/modules/fpga/{virtual_components/led => board_designs/wishbone_example/wb_led}/testled.c (99%)

diff --git a/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin b/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin
index 96c84f8..35c6ba7 100644
Binary files a/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin and b/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin differ
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index 7300da2..f463ee8 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -13,11 +13,16 @@ obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE) +=  wb_button/ wb_irq
 else
 
 # Armadeus custom drivers common targets (default, clean, etc...)
-include ../../../Makefile.in
+ARMADEUS_BASE_DIR=../../../../../../
+include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 install:
 	echo "Installing Armadeus drivers..."
 	$(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
 
+test:
+	$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc push-led.c -o push-led 
+
+
 endif
 
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/push-led.c b/target/linux/modules/fpga/board_designs/wishbone_example/push-led.c
index 20ac3ba..6b6bc2f 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/push-led.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/push-led.c
@@ -63,41 +63,36 @@ int main(int argc, char *argv[])
     exit(EXIT_FAILURE);
   }
 
-  fbutton=open(argv[1],O_RDWR);
-  if(fbutton<0){
-    perror("can't open button file\n");
-    exit(EXIT_FAILURE);
-  }
 
   while(1){
 
+    fbutton=open(argv[1],O_RDWR);
+    if(fbutton<0){
+      perror("can't open button file\n");
+      exit(EXIT_FAILURE);
+    }
+
     /* read button value */
     if(read(fbutton,&j,1)<0){
       perror("read error\n");
       exit(EXIT_FAILURE);
     }
 
-    if(lseek(fbutton,0,SEEK_SET)<0){
-      perror("lseek error\n");
+    /* write led value */
+    fled=open(argv[2],O_RDWR);
+    if(fbutton<0){
+      perror("can't open led file\n");
       exit(EXIT_FAILURE);
     }
-
-	/* write led value */
-	fled=open(argv[2],O_RDWR);
-	if(fbutton<0){
-	  perror("can't open led file\n");
-	  exit(EXIT_FAILURE);
-	}
-
-	if(write(fled,&j,2)<=0){
-		perror("LED write error\n");
-		exit(EXIT_FAILURE);
-	}
-	close(fled);
+    
+    if(write(fled,&j,2)<=0){
+    	perror("LED write error\n");
+    	exit(EXIT_FAILURE);
+    }
+    close(fled);
+    close(fbutton);
   }
 
-  close(fbutton);
-  close(fled);
   exit(0);
 }
 
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
index 3dae375..cef6f50 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
@@ -8,15 +8,12 @@ obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += wb_e
 wb_example_buttons-objs := board_buttons.o
 else
 
-ARMADEUS_BASE_DIR=../../../../../..
+ARMADEUS_BASE_DIR=../../../../../../../
 include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 KDIR := $(ARMADEUS_LINUX_DIR)
 PWD  := $(shell pwd)
 
-# Armadeus custom drivers common targets (default, clean, etc...)
-include ../../../Makefile.in
-
 test:
 	$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc testbutton.c -o testbutton
 
diff --git a/firmware/wishbone_example/wishbone_example51/components/button00/drivers_templates/armadeus/testbutton.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/testbutton.c
similarity index 66%
copy from firmware/wishbone_example/wishbone_example51/components/button00/drivers_templates/armadeus/testbutton.c
copy to target/linux/modules/fpga/board_designs/wishbone_example/wb_button/testbutton.c
index 8765669..520dd17 100644
--- a/firmware/wishbone_example/wishbone_example51/components/button00/drivers_templates/armadeus/testbutton.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/testbutton.c
@@ -1,14 +1,9 @@
-/* a program to write/read values on fpga address map
- * Fabien Marteau <fab...@ar...>
- * 7 april 2008
- * fpgaaccess.h
+/* 
+ * A simple program to test Wishbone button driver
  *
  * (c) Copyright 2008    Armadeus project
  * Fabien Marteau <fab...@ar...>
  *
- * A simple driver for reading and writing on
- * fpga throught a character file /dev/fpgaaccess
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
@@ -38,53 +33,53 @@
 /* sleep */
 #include <unistd.h>
 
-int fled;
+int fbutton;
 
-void quit(int pouet){
-  close(fled);
+void quit(int pouet) {
+  close(fbutton);
   exit(0);
 }
 
+void usage(char *exe) {
+  if (exe) {
+    printf("\nUsage:\n");
+    printf("%s <button_device>\n", exe);
+  }
+}
+
 int main(int argc, char *argv[])
 {
-  unsigned short i,j;
+  unsigned short i, j=0;
 
   /* quit when Ctrl-C pressed */
   signal(SIGINT, quit);
 
-  j=0;
-
   printf( "Testing button driver\n" );
 
-  if(argc < 2){
-    perror("invalide arguments number\ntestled <button_filename>\n");
-    exit(EXIT_FAILURE);
-  }
-
-  fled=open(argv[1],O_RDWR);
-  if(fled<0){
-    perror("can't open file\n");
+  if (argc < 2) {
+    printf("invalid arguments number\n");
+    usage(argv[0]);
     exit(EXIT_FAILURE);
   }
 
-  while(1){
-    i = (i==0)?1:0;
-    fflush(stdout);
+  while (1) {
+    fbutton = open(argv[1], O_RDWR);
+    if (fbutton < 0) {
+      perror("can't open file");
+      exit(EXIT_FAILURE);
+    }
 
     /* read value */
-    if(read(fled,&j,1)<0){
-      perror("read error\n");
+    if (read(fbutton, &j, 1) < 0) {
+      perror("read error");
       exit(EXIT_FAILURE);
     }
     printf("Read %d\n",j);
 
-    if(lseek(fled,0,SEEK_SET)<0){
-      perror("lseek error\n");
-      exit(EXIT_FAILURE);
-    }
+    close(fbutton);
   }
 
-  close(fled);
   exit(0);
 }
 
+
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
index eae0571..7bf86a5 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
@@ -9,15 +9,12 @@ wb_example_led-objs := board_leds.o
 
 else
 
-ARMADEUS_BASE_DIR=../../../../../..
+ARMADEUS_BASE_DIR=../../../../../../../
 include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 KDIR := $(ARMADEUS_LINUX_DIR)
 PWD  := $(shell pwd)
 
-# Armadeus custom drivers common targets (default, clean, etc...)
-include ../../../Makefile.in
-
 test:
 	$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testled.c -o testled
 	chmod 755 testled
diff --git a/target/linux/modules/fpga/virtual_components/led/testled.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/testled.c
similarity index 99%
copy from target/linux/modules/fpga/virtual_components/led/testled.c
copy to target/linux/modules/fpga/board_designs/wishbone_example/wb_led/testled.c
index 0c399b9..191a030 100644
--- a/target/linux/modules/fpga/virtual_components/led/testled.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/testled.c
@@ -130,3 +130,4 @@ int main(int argc, char *argv[])
     close(fled);
     exit(0);
 }
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2641-gc3ce1a3

From: jorasse <jo...@us...> - 2011-12-13 00:20:41

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  c3ce1a39a0e50dd7ffa35a51bd64ceb7c03f7724 (commit)
       via  fa5c9461b06f9302e26bd0fcbf6b2300b9a25798 (commit)
       via  cbb292543d9c0045c96d6d3985d8b57edabf1b0a (commit)
      from  8fa619e4fc8623a86d0c4b283c292da5732a7d1d (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 c3ce1a39a0e50dd7ffa35a51bd64ceb7c03f7724
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 13 00:18:42 2011 +0100

    [UBOOT][APF28] fix patch hunk

commit fa5c9461b06f9302e26bd0fcbf6b2300b9a25798
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 13 00:10:01 2011 +0100

    [BUILDROOT][APF28] Add U-Boot compilation

commit cbb292543d9c0045c96d6d3985d8b57edabf1b0a
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 13 00:03:32 2011 +0100

    [UBOOT][APF28] Update to the latest U-Boot 2011.12 RC1

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

Summary of changes:
 buildroot/configs/apf28_defconfig                  |    5 +-
 .../target/device/armadeus/apf28/apf28-u-boot-.h   |    6 +-
 patches/u-boot/2011.11/01-uboot-apf28.patch        | 2113 --------------------
 patches/u-boot/2011.12/01-uboot-apf28.patch        |  527 +++++
 .../02-uboot-apf28-update-makefile.patch           |    2 +-
 5 files changed, 535 insertions(+), 2118 deletions(-)
 delete mode 100644 patches/u-boot/2011.11/01-uboot-apf28.patch
 create mode 100644 patches/u-boot/2011.12/01-uboot-apf28.patch
 rename patches/u-boot/{2011.11 => 2011.12}/02-uboot-apf28-update-makefile.patch (90%)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index a4f6559..2baba3e 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -58,9 +58,10 @@ BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_UBIFS=y
 BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
 BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_UBOOT=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_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12-rc1.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
 BR2_TARGET_UBOOT_TOOL_ENV=y
 # BR2_TARGET_UBOOT_NETWORK is not set
 BR2_LINUX_KERNEL=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
index c7084fc..e42b37b 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
@@ -54,8 +54,10 @@
  */
 #define	CONFIG_SPL
 #define	CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define	CONFIG_SPL_START_S_PATH		"board/armadeus/apf28"
-#define	CONFIG_SPL_LDSCRIPT		"board/armadeus/apf28/u-boot-spl.lds"
+#define	CONFIG_SPL_START_S_PATH		"arch/arm/cpu/arm926ejs/mx28"
+#define	CONFIG_SPL_LDSCRIPT		"arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
+#define	CONFIG_SPL_LIBCOMMON_SUPPORT
+#define	CONFIG_SPL_LIBGENERIC_SUPPORT
 
 /*
  * U-Boot Commands
diff --git a/patches/u-boot/2011.11/01-uboot-apf28.patch b/patches/u-boot/2011.11/01-uboot-apf28.patch
deleted file mode 100644
index 5675014..0000000
--- a/patches/u-boot/2011.11/01-uboot-apf28.patch
+++ /dev/null
@@ -1,2113 +0,0 @@
---- u-boot-orig/board/armadeus/apf28/apf28.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/apf28.c	2011-12-01 19:05:09.737024396 +0100
-@@ -0,0 +1,216 @@
-+/*
-+ * APF28 motherboard based on DENX M28 module
-+ *
-+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
-+ * on behalf of DENX Software Engineering GmbH
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <asm/gpio.h>
-+#include <asm/io.h>
-+#include <asm/arch/imx-regs.h>
-+#include <asm/arch/iomux-mx28.h>
-+#include <asm/arch/clock.h>
-+#include <asm/arch/sys_proto.h>
-+#include <linux/mii.h>
-+#include <miiphy.h>
-+#include <netdev.h>
-+#include <errno.h>
-+
-+DECLARE_GLOBAL_DATA_PTR;
-+
-+/*
-+ * Functions
-+ */
-+int board_early_init_f(void)
-+{
-+	/* IO0 clock at 480MHz */
-+	mx28_set_ioclk(MXC_IOCLK0, 480000);
-+	/* IO1 clock at 480MHz */
-+	mx28_set_ioclk(MXC_IOCLK1, 480000);
-+
-+	/* SSP0 clock at 96MHz */
-+	mx28_set_sspclk(MXC_SSPCLK0, 96000, 0);
-+	/* SSP2 clock at 96MHz */
-+	mx28_set_sspclk(MXC_SSPCLK2, 96000, 0);
-+
-+#ifdef	CONFIG_CMD_USB
-+	mxs_iomux_setup_pad(MX28_PAD_LCD_D23__GPIO_1_23 |
-+			MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_NOPULL);
-+	gpio_direction_output(MX28_PAD_LCD_D23__GPIO_1_23, 0);
-+#endif
-+
-+	return 0;
-+}
-+
-+int board_init(void)
-+{
-+	/* Adress of boot parameters */
-+	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-+
-+	return 0;
-+}
-+
-+#define	HW_DIGCTRL_SCRATCH0	0x8001c280
-+#define	HW_DIGCTRL_SCRATCH1	0x8001c290
-+int dram_init(void)
-+{
-+	uint32_t sz[2];
-+
-+	sz[0] = readl(HW_DIGCTRL_SCRATCH0);
-+	sz[1] = readl(HW_DIGCTRL_SCRATCH1);
-+
-+	if (sz[0] != sz[1]) {
-+		printf("MX28:\n"
-+			"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n"
-+			"HW_DIGCTRL_SCRATCH1 is not the same. Please\n"
-+			"verify these two registers contain valid RAM size!\n");
-+		hang();
-+	}
-+
-+	gd->ram_size = sz[0];
-+	return 0;
-+}
-+
-+#ifdef	CONFIG_CMD_MMC
-+static int m28_mmc_wp(int id)
-+{
-+	if (id != 0) {
-+		printf("MXS MMC: Invalid card selected (card id = %d)\n", id);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+int board_mmc_init(bd_t *bis)
-+{
-+	return mxsmmc_initialize(bis, 0, m28_mmc_wp);
-+}
-+#endif
-+
-+#ifdef	CONFIG_CMD_NET
-+
-+#define	MII_OPMODE_STRAP_OVERRIDE	0x16
-+#define	MII_PHY_CTRL1			0x1e
-+#define	MII_PHY_CTRL2			0x1f
-+
-+int fecmxc_mii_postcall(int phy)
-+{
-+	miiphy_write("FEC", phy, MII_BMCR, 0x9000);
-+	miiphy_write("FEC", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
-+	if (phy == 3)
-+		miiphy_write("FEC", 3, MII_PHY_CTRL2, 0x8180);
-+	return 0;
-+}
-+
-+int board_eth_init(bd_t *bis)
-+{
-+	struct mx28_clkctrl_regs *clkctrl_regs =
-+		(struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
-+	struct eth_device *dev;
-+	int ret;
-+
-+	ret = cpu_eth_init(bis);
-+
-+	clrsetbits_le32(&clkctrl_regs->hw_clkctrl_enet,
-+		CLKCTRL_ENET_TIME_SEL_MASK | CLKCTRL_ENET_CLK_OUT_EN,
-+		CLKCTRL_ENET_TIME_SEL_RMII_CLK);
-+
-+	gpio_direction_output(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 0);
-+	udelay(100);
-+	gpio_set_value(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 1);
-+
-+	ret = fecmxc_initialize_multi(bis, 0, 0, MXS_ENET0_BASE);
-+	if (ret) {
-+		printf("FEC MXS: Unable to init FEC0\n");
-+		return ret;
-+	}
-+
-+/*	ret = fecmxc_initialize_multi(bis, 1, 3, MXS_ENET1_BASE);
-+	if (ret) {
-+		printf("FEC MXS: Unable to init FEC1\n");
-+		return ret;
-+	}
-+*/
-+	dev = eth_get_dev_by_name("FEC0");
-+	if (!dev) {
-+		printf("FEC MXS: Unable to get FEC0 device entry\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = fecmxc_register_mii_postcall(dev, fecmxc_mii_postcall);
-+	if (ret) {
-+		printf("FEC MXS: Unable to register FEC0 mii postcall\n");
-+		return ret;
-+	}
-+
-+/*	dev = eth_get_dev_by_name("FEC1");
-+	if (!dev) {
-+		printf("FEC MXS: Unable to get FEC1 device entry\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = fecmxc_register_mii_postcall(dev, fecmxc_mii_postcall);
-+	if (ret) {
-+		printf("FEC MXS: Unable to register FEC1 mii postcall\n");
-+		return ret;
-+	}
-+*/
-+	return ret;
-+}
-+
-+#ifdef	CONFIG_M28_FEC_MAC_IN_OCOTP
-+
-+#define	MXS_OCOTP_MAX_TIMEOUT	1000000
-+void imx_get_mac_from_fuse(char *mac)
-+{
-+	struct mx28_ocotp_regs *ocotp_regs =
-+		(struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
-+	uint32_t data;
-+
-+	memset(mac, 0, 6);
-+
-+	writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
-+
-+	if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
-+				MXS_OCOTP_MAX_TIMEOUT)) {
-+		printf("MXS FEC: Can't get MAC from OCOTP\n");
-+		return;
-+	}
-+
-+	data = readl(&ocotp_regs->hw_ocotp_cust0);
-+
-+	mac[0] = 0x00;
-+	mac[1] = 0x1E;
-+	mac[2] = (data >> 24) & 0xff;
-+	mac[3] = (data >> 16) & 0xff;
-+	mac[4] = (data >> 8) & 0xff;
-+	mac[5] = data & 0xff;
-+}
-+#else
-+void imx_get_mac_from_fuse(char *mac)
-+{
-+	memset(mac, 0, 6);
-+}
-+#endif
-+
-+#endif
---- u-boot-orig/board/armadeus/apf28/m28_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/m28_init.h	2011-11-27 11:31:22.299138403 +0100
-@@ -0,0 +1,41 @@
-+/*
-+ * Freescale i.MX28 SPL functions
-+ *
-+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
-+ * on behalf of DENX Software Engineering GmbH
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#ifndef	__M28_INIT_H__
-+#define	__M28_INIT_H__
-+
-+void early_delay(int delay);
-+
-+void mx28_power_init(void);
-+
-+#ifdef	CONFIG_SPL_MX28_PSWITCH_WAIT
-+void mx28_power_wait_pswitch(void);
-+#else
-+static inline void mx28_power_wait_pswitch(void) { }
-+#endif
-+
-+void mx28_mem_init(void);
-+
-+#endif	/* __M28_INIT_H__ */
---- u-boot-orig/board/armadeus/apf28/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/Makefile	2011-11-27 11:31:22.299138403 +0100
-@@ -0,0 +1,56 @@
-+#
-+# (C) Copyright 2000-2006
-+# Wolfgang Denk, DENX Software Engineering, wd...@de....
-+#
-+# See file CREDITS for list of people who contributed to this
-+# project.
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
-+#
-+
-+include $(TOPDIR)/config.mk
-+
-+LIB	= $(obj)lib$(BOARD).o
-+
-+ifndef	CONFIG_SPL_BUILD
-+COBJS	:= apf28.o
-+endif
-+
-+ifdef	CONFIG_SPL_BUILD
-+COBJS	:= mem_init.o mmc_boot.o power_init.o memsize.o
-+endif
-+
-+SRCS	:= $(COBJS:.o=.c)
-+OBJS	:= $(addprefix $(obj),$(COBJS))
-+
-+$(LIB):	$(obj).depend $(OBJS)
-+	$(call cmd_link_o_target, $(OBJS))
-+
-+all:	$(ALL)
-+
-+ifdef	CONFIG_SPL_BUILD
-+memsize.c:
-+	ln -sf $(TOPDIR)/common/memsize.c $@
-+endif
-+
-+#########################################################################
-+
-+# defines $(obj).depend target
-+include $(SRCTREE)/rules.mk
-+
-+sinclude $(obj).depend
-+
-+#########################################################################
---- u-boot-orig/board/armadeus/apf28/mem_init.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/mem_init.c	2011-11-27 11:31:22.299138403 +0100
-@@ -0,0 +1,240 @@
-+/*
-+ * Freescale i.MX28 RAM init
-+ *
-+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
-+ * on behalf of DENX Software Engineering GmbH
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <config.h>
-+#include <asm/io.h>
-+#include <asm/arch/iomux-mx28.h>
-+#include <asm/arch/imx-regs.h>
-+
-+#include "m28_init.h"
-+
-+uint32_t dram_vals[] = {
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00010101, 0x01010101, 0x000f0f01, 0x0f02020a,
-+	0x00000000, 0x00010101, 0x00000100, 0x00000100, 0x00000000,
-+	0x00000002, 0x01010000, 0x05060302, 0x06005003, 0x0a0000c8,
-+	0x02009c40, 0x0000030c, 0x0036a609, 0x031a0612, 0x02030202,
-+	0x00c8001c, 0x00000000, 0x00000000, 0x00012100, 0xffff0303,
-+	0x00012100, 0xffff0303, 0x00012100, 0xffff0303, 0x00012100,
-+	0xffff0303, 0x00000003, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000612, 0x01000F02, 0x06120612, 0x00000200,
-+	0x00020007, 0xf5014b27, 0xf5014b27, 0xf5014b27, 0xf5014b27,
-+	0x07000300, 0x07000300, 0x07000300, 0x07000300, 0x00000006,
-+	0x00000000, 0x00000000, 0x01000000, 0x01020408, 0x08040201,
-+	0x000f1133, 0x00000000, 0x00001f04, 0x00001f04, 0x00001f04,
-+	0x00001f04, 0x00001f04, 0x00001f04, 0x00001f04, 0x00001f04,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00010000, 0x00020304, 0x00000004,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x01010000, 0x01000000, 0x03030000, 0x00010303,
-+	0x01020202, 0x00000000, 0x02040303, 0x21002103, 0x00061200,
-+	0x06120612, 0x04320432, 0x04320432, 0x00040004, 0x00040004,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010001
-+};
-+
-+void init_m28_200mhz_ddr2(void)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(dram_vals); i++)
-+		writel(dram_vals[i], MXS_DRAM_BASE + (4 * i));
-+}
-+
-+void mx28_mem_init_clock(void)
-+{
-+	struct mx28_clkctrl_regs *clkctrl_regs =
-+		(struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
-+
-+	/* Gate EMI clock */
-+	writel(CLKCTRL_FRAC0_CLKGATEEMI,
-+		&clkctrl_regs->hw_clkctrl_frac0_set);
-+
-+	/* EMI = 205MHz */
-+	writel(CLKCTRL_FRAC0_EMIFRAC_MASK,
-+		&clkctrl_regs->hw_clkctrl_frac0_set);
-+	writel((0x2a << CLKCTRL_FRAC0_EMIFRAC_OFFSET) &
-+		CLKCTRL_FRAC0_EMIFRAC_MASK,
-+		&clkctrl_regs->hw_clkctrl_frac0_clr);
-+
-+	/* Ungate EMI clock */
-+	writel(CLKCTRL_FRAC0_CLKGATEEMI,
-+		&clkctrl_regs->hw_clkctrl_frac0_clr);
-+
-+	early_delay(11000);
-+
-+	writel((2 << CLKCTRL_EMI_DIV_EMI_OFFSET) |
-+		(1 << CLKCTRL_EMI_DIV_XTAL_OFFSET),
-+		&clkctrl_regs->hw_clkctrl_emi);
-+
-+	/* Unbypass EMI */
-+	writel(CLKCTRL_CLKSEQ_BYPASS_EMI,
-+		&clkctrl_regs->hw_clkctrl_clkseq_clr);
-+
-+	early_delay(10000);
-+}
-+
-+void mx28_mem_setup_cpu_and_hbus(void)
-+{
-+	struct mx28_clkctrl_regs *clkctrl_regs =
-+		(struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
-+
-+	/* CPU = 454MHz and ungate CPU clock */
-+	clrsetbits_le32(&clkctrl_regs->hw_clkctrl_frac0,
-+		CLKCTRL_FRAC0_CPUFRAC_MASK | CLKCTRL_FRAC0_CLKGATECPU,
-+		19 << CLKCTRL_FRAC0_CPUFRAC_OFFSET);
-+
-+	/* Set CPU bypass */
-+	writel(CLKCTRL_CLKSEQ_BYPASS_CPU,
-+		&clkctrl_regs->hw_clkctrl_clkseq_set);
-+
-+	/* HBUS = 151MHz */
-+	writel(CLKCTRL_HBUS_DIV_MASK, &clkctrl_regs->hw_clkctrl_hbus_set);
-+	writel(((~3) << CLKCTRL_HBUS_DIV_OFFSET) & CLKCTRL_HBUS_DIV_MASK,
-+		&clkctrl_regs->hw_clkctrl_hbus_clr);
-+
-+	early_delay(10000);
-+
-+	/* CPU clock divider = 1 */
-+	clrsetbits_le32(&clkctrl_regs->hw_clkctrl_cpu,
-+			CLKCTRL_CPU_DIV_CPU_MASK, 1);
-+
-+	/* Disable CPU bypass */
-+	writel(CLKCTRL_CLKSEQ_BYPASS_CPU,
-+		&clkctrl_regs->hw_clkctrl_clkseq_clr);
-+}
-+
-+void mx28_mem_setup_vdda(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	writel((0xc << POWER_VDDACTRL_TRG_OFFSET) |
-+		(0x7 << POWER_VDDACTRL_BO_OFFSET_OFFSET) |
-+		POWER_VDDACTRL_LINREG_OFFSET_1STEPS_BELOW,
-+		&power_regs->hw_power_vddactrl);
-+}
-+
-+void mx28_mem_setup_vddd(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	writel((0x1c << POWER_VDDDCTRL_TRG_OFFSET) |
-+		(0x7 << POWER_VDDDCTRL_BO_OFFSET_OFFSET) |
-+		POWER_VDDDCTRL_LINREG_OFFSET_1STEPS_BELOW,
-+		&power_regs->hw_power_vdddctrl);
-+}
-+
-+#define	HW_DIGCTRL_SCRATCH0	0x8001c280
-+#define	HW_DIGCTRL_SCRATCH1	0x8001c290
-+void data_abort_memdetect_handler(void) __attribute__((naked));
-+void data_abort_memdetect_handler(void)
-+{
-+	asm volatile("subs pc, r14, #4");
-+}
-+
-+void mx28_mem_get_size(void)
-+{
-+	uint32_t sz, da;
-+	uint32_t *vt = (uint32_t *)0x20;
-+
-+	/* Replace the DABT handler. */
-+	da = vt[4];
-+	vt[4] = (uint32_t)&data_abort_memdetect_handler;
-+
-+	sz = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
-+	writel(sz, HW_DIGCTRL_SCRATCH0);
-+	writel(sz, HW_DIGCTRL_SCRATCH1);
-+
-+	/* Restore the old DABT handler. */
-+	vt[4] = da;
-+}
-+
-+void mx28_mem_init(void)
-+{
-+	struct mx28_clkctrl_regs *clkctrl_regs =
-+		(struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
-+	struct mx28_pinctrl_regs *pinctrl_regs =
-+		(struct mx28_pinctrl_regs *)MXS_PINCTRL_BASE;
-+
-+	/* Set DDR2 mode */
-+	writel(PINCTRL_EMI_DS_CTRL_DDR_MODE_DDR2,
-+		&pinctrl_regs->hw_pinctrl_emi_ds_ctrl_set);
-+
-+	/* Power up PLL0 */
-+	writel(CLKCTRL_PLL0CTRL0_POWER,
-+		&clkctrl_regs->hw_clkctrl_pll0ctrl0_set);
-+
-+	early_delay(11000);
-+
-+	mx28_mem_init_clock();
-+
-+	mx28_mem_setup_vdda();
-+
-+	/*
-+	 * Configure the DRAM registers
-+	 */
-+
-+	/* Clear START bit from DRAM_CTL16 */
-+	clrbits_le32(MXS_DRAM_BASE + 0x40, 1);
-+
-+	init_m28_200mhz_ddr2();
-+
-+	/* Clear SREFRESH bit from DRAM_CTL17 */
-+	clrbits_le32(MXS_DRAM_BASE + 0x44, 1);
-+
-+	/* Set START bit in DRAM_CTL16 */
-+	setbits_le32(MXS_DRAM_BASE + 0x40, 1);
-+
-+	/* Wait for bit 20 (DRAM init complete) in DRAM_CTL58 */
-+	while (!(readl(MXS_DRAM_BASE + 0xe8) & (1 << 20)))
-+		;
-+
-+	mx28_mem_setup_vddd();
-+
-+	early_delay(10000);
-+
-+	mx28_mem_setup_cpu_and_hbus();
-+
-+	mx28_mem_get_size();
-+}
---- u-boot-orig/board/armadeus/apf28/mmc_boot.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/mmc_boot.c	2011-12-01 19:32:00.022103665 +0100
-@@ -0,0 +1,275 @@
-+/*
-+ * Freescale i.MX28 Boot setup
-+ *
-+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
-+ * on behalf of DENX Software Engineering GmbH
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <config.h>
-+#include <asm/io.h>
-+#include <asm/arch/iomux-mx28.h>
-+
-+#include "m28_init.h"
-+
-+/*
-+ * This delay function is intended to be used only in early stage of boot, where
-+ * clock are not set up yet. The timer used here is reset on every boot and
-+ * takes a few seconds to roll. The boot doesn't take that long, so to keep the
-+ * code simple, it doesn't take rolling into consideration.
-+ */
-+#define	HW_DIGCTRL_MICROSECONDS	0x8001c0c0
-+void early_delay(int delay)
-+{
-+	uint32_t st = readl(HW_DIGCTRL_MICROSECONDS);
-+	st += delay;
-+	while (st > readl(HW_DIGCTRL_MICROSECONDS))
-+		;
-+}
-+
-+#define	MUX_CONFIG_LED	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL)
-+#define	MUX_CONFIG_LCD	(MXS_PAD_3V3 | MXS_PAD_4MA)
-+#define	MUX_CONFIG_TSC	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
-+#define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
-+#define	MUX_CONFIG_SSP2	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
-+#define	MUX_CONFIG_GPMI	(MXS_PAD_1V8 | MXS_PAD_4MA | MXS_PAD_NOPULL)
-+#define	MUX_CONFIG_ENET	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
-+#define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL)
-+
-+const iomux_cfg_t iomux_setup[] = {
-+	/* LED */
-+	MX28_PAD_GPMI_RDY1__GPIO_0_21 | MUX_CONFIG_LED,
-+
-+	/* framebuffer */
-+/*	MX28_PAD_LCD_D00__LCD_D0 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D01__LCD_D1 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D02__LCD_D2 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D03__LCD_D3 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D04__LCD_D4 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D05__LCD_D5 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D06__LCD_D6 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D07__LCD_D7 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D08__LCD_D8 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D09__LCD_D9 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D10__LCD_D10 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D11__LCD_D11 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D12__LCD_D12 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D13__LCD_D13 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D14__LCD_D14 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D15__LCD_D15 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D16__LCD_D16 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D17__LCD_D17 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D18__LCD_D18 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D19__LCD_D19 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D20__LCD_D20 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D21__LCD_D21 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D22__LCD_D22 | MUX_CONFIG_LCD,*/
-+/*	MX28_PAD_LCD_D23__LCD_D23 | MUX_CONFIG_LCD,*/
-+/*	MX28_PAD_LCD_RD_E__LCD_VSYNC | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_WR_RWN__LCD_HSYNC | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_RS__LCD_DOTCLK | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_CS__LCD_CS | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_VSYNC__LCD_VSYNC | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_HSYNC__LCD_HSYNC | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_DOTCLK__LCD_DOTCLK | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_ENABLE__GPIO_1_31 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_RESET__GPIO_3_30 | MUX_CONFIG_LCD,*/
-+
-+	/* UART1 */
-+	MX28_PAD_PWM0__DUART_RX,
-+	MX28_PAD_PWM1__DUART_TX,
-+/*	MX28_PAD_AUART0_TX__DUART_RTS,
-+	MX28_PAD_AUART0_RX__DUART_CTS,*/
-+
-+	/* UART2 */
-+/*	MX28_PAD_AUART1_RX__AUART1_RX,
-+	MX28_PAD_AUART1_TX__AUART1_TX,
-+	MX28_PAD_AUART1_RTS__AUART1_RTS,
-+	MX28_PAD_AUART1_CTS__AUART1_CTS,*/
-+
-+	/* CAN */
-+/*	MX28_PAD_GPMI_RDY2__CAN0_TX,
-+	MX28_PAD_GPMI_RDY3__CAN0_RX,*/
-+
-+	/* I2C */
-+/*	MX28_PAD_I2C0_SCL__I2C0_SCL,
-+	MX28_PAD_I2C0_SDA__I2C0_SDA,*/
-+
-+	/* TSC2007 */
-+	/*MX28_PAD_SAIF0_MCLK__GPIO_3_20 | MUX_CONFIG_TSC,*/
-+
-+	/* MMC0 */
-+	MX28_PAD_SSP0_DATA0__SSP0_D0 | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_DATA1__SSP0_D1 | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_DATA2__SSP0_D2 | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_DATA3__SSP0_D3 | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_DATA4__SSP0_D4 | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_DATA5__SSP0_D5 | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_DATA6__SSP0_D6 | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_DATA7__SSP0_D7 | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_CMD__SSP0_CMD | MUX_CONFIG_SSP0,
-+	MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT |
-+		(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL),
-+	MX28_PAD_SSP0_SCK__SSP0_SCK |
-+		(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL),
-+	/*MX28_PAD_PWM3__GPIO_3_28 | MUX_CONFIG_SSP0,*/	/* Power .. FIXME */
-+	/*MX28_PAD_AUART2_CTS__GPIO_3_10,*/	/* WP ... FIXME */
-+
-+	/* GPMI NAND */
-+	MX28_PAD_GPMI_D00__GPMI_D0 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_D01__GPMI_D1 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_D02__GPMI_D2 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_D03__GPMI_D3 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_D04__GPMI_D4 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_D05__GPMI_D5 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_D06__GPMI_D6 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_D07__GPMI_D7 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_CE0N__GPMI_CE0N | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_RDY0__GPMI_READY0 | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_RDN__GPMI_RDN |
-+		(MXS_PAD_1V8 | MXS_PAD_8MA | MXS_PAD_PULLUP),
-+	MX28_PAD_GPMI_WRN__GPMI_WRN | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_ALE__GPMI_ALE | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_CLE__GPMI_CLE | MUX_CONFIG_GPMI,
-+	MX28_PAD_GPMI_RESETN__GPMI_RESETN | MUX_CONFIG_GPMI,
-+
-+	/* FEC Ethernet */
-+	MX28_PAD_ENET0_MDC__ENET0_MDC | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_MDIO__ENET0_MDIO | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_RX_EN__ENET0_RX_EN | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_TX_EN__ENET0_TX_EN | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_RXD0__ENET0_RXD0 | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_RXD1__ENET0_RXD1 | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_TXD0__ENET0_TXD0 | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_TXD1__ENET0_TXD1 | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET_CLK__CLKCTRL_ENET | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_TX_CLK__GPIO_4_5 | MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
-+	MX28_PAD_ENET0_RX_CLK__GPIO_4_13 | MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
-+
-+/*	MX28_PAD_ENET0_COL__ENET1_TX_EN | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_CRS__ENET1_RX_EN | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_RXD2__ENET1_RXD0 | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_RXD3__ENET1_RXD1 | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_TXD2__ENET1_TXD0 | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_TXD3__ENET1_TXD1 | MUX_CONFIG_ENET,*/
-+
-+	/* I2C */
-+/*	MX28_PAD_I2C0_SCL__I2C0_SCL,
-+	MX28_PAD_I2C0_SDA__I2C0_SDA,*/
-+
-+	/* EMI */
-+	MX28_PAD_EMI_D00__EMI_DATA0 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D01__EMI_DATA1 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D02__EMI_DATA2 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D03__EMI_DATA3 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D04__EMI_DATA4 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D05__EMI_DATA5 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D06__EMI_DATA6 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D07__EMI_DATA7 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D08__EMI_DATA8 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D09__EMI_DATA9 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D10__EMI_DATA10 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D11__EMI_DATA11 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D12__EMI_DATA12 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D13__EMI_DATA13 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D14__EMI_DATA14 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_D15__EMI_DATA15 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_ODT0__EMI_ODT0 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_DQM0__EMI_DQM0 | MUX_CONFIG_EMI,
-+/*	MX28_PAD_EMI_ODT1__EMI_ODT1 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_DQM1__EMI_DQM1 | MUX_CONFIG_EMI,*/
-+	MX28_PAD_EMI_DDR_OPEN_FB__EMI_DDR_OPEN_FEEDBACK | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_CLK__EMI_CLK | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_DQS0__EMI_DQS0 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_DQS1__EMI_DQS1 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_DDR_OPEN__EMI_DDR_OPEN | MUX_CONFIG_EMI,
-+
-+	MX28_PAD_EMI_A00__EMI_ADDR0 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A01__EMI_ADDR1 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A02__EMI_ADDR2 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A03__EMI_ADDR3 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A04__EMI_ADDR4 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A05__EMI_ADDR5 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A06__EMI_ADDR6 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A07__EMI_ADDR7 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A08__EMI_ADDR8 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A09__EMI_ADDR9 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A10__EMI_ADDR10 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A11__EMI_ADDR11 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A12__EMI_ADDR12 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A13__EMI_ADDR13 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_A14__EMI_ADDR14 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_BA0__EMI_BA0 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_BA1__EMI_BA1 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_BA2__EMI_BA2 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_CASN__EMI_CASN | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_RASN__EMI_RASN | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_WEN__EMI_WEN | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_CE0N__EMI_CE0N | MUX_CONFIG_EMI,
-+/*	MX28_PAD_EMI_CE1N__EMI_CE1N | MUX_CONFIG_EMI,*/
-+	MX28_PAD_EMI_CKE__EMI_CKE | MUX_CONFIG_EMI,
-+
-+	/* SPI2 (for flash) */
-+/*	MX28_PAD_SSP2_SCK__SSP2_SCK | MUX_CONFIG_SSP2,
-+	MX28_PAD_SSP2_MOSI__SSP2_CMD | MUX_CONFIG_SSP2,
-+	MX28_PAD_SSP2_MISO__SSP2_D0 | MUX_CONFIG_SSP2,
-+	MX28_PAD_SSP2_SS0__SSP2_D3 |
-+		(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),*/
-+};
-+
-+void board_init_ll(void)
-+{
-+	mxs_iomux_setup_multiple_pads(iomux_setup, ARRAY_SIZE(iomux_setup));
-+	mx28_power_init();
-+	mx28_mem_init();
-+	mx28_power_wait_pswitch();
-+}
-+
-+/* Support aparatus */
-+inline void board_init_f(unsigned long bootflag)
-+{
-+	for (;;)
-+		;
-+}
-+
-+inline void board_init_r(gd_t *id, ulong dest_addr)
-+{
-+	for (;;)
-+		;
-+}
-+
-+inline int printf(const char *fmt, ...)
-+{
-+	return 0;
-+}
-+
-+inline void __coloured_LED_init(void) {}
-+inline void __red_LED_on(void) {}
-+void coloured_LED_init(void)
-+	__attribute__((weak, alias("__coloured_LED_init")));
-+void red_LED_on(void)
-+	__attribute__((weak, alias("__red_LED_on")));
-+void hang(void) __attribute__ ((noreturn));
-+void hang(void)
-+{
-+	for (;;)
-+		;
-+}
---- u-boot-orig/board/armadeus/apf28/power_init.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/power_init.c	2011-11-27 11:31:22.299138403 +0100
-@@ -0,0 +1,913 @@
-+/*
-+ * Freescale i.MX28 Boot PMIC init
-+ *
-+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
-+ * on behalf of DENX Software Engineering GmbH
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <config.h>
-+#include <asm/io.h>
-+#include <asm/arch/imx-regs.h>
-+
-+#include "m28_init.h"
-+
-+void mx28_power_clock2xtal(void)
-+{
-+	struct mx28_clkctrl_regs *clkctrl_regs =
-+		(struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
-+
-+	/* Set XTAL as CPU reference clock */
-+	writel(CLKCTRL_CLKSEQ_BYPASS_CPU,
-+		&clkctrl_regs->hw_clkctrl_clkseq_set);
-+}
-+
-+void mx28_power_clock2pll(void)
-+{
-+	struct mx28_clkctrl_regs *clkctrl_regs =
-+		(struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
-+
-+	writel(CLKCTRL_PLL0CTRL0_POWER,
-+		&clkctrl_regs->hw_clkctrl_pll0ctrl0_set);
-+	early_delay(100);
-+	writel(CLKCTRL_CLKSEQ_BYPASS_CPU,
-+		&clkctrl_regs->hw_clkctrl_clkseq_clr);
-+}
-+
-+void mx28_power_clear_auto_restart(void)
-+{
-+	struct mx28_rtc_regs *rtc_regs =
-+		(struct mx28_rtc_regs *)MXS_RTC_BASE;
-+
-+	writel(RTC_CTRL_SFTRST, &rtc_regs->hw_rtc_ctrl_clr);
-+	while (readl(&rtc_regs->hw_rtc_ctrl) & RTC_CTRL_SFTRST)
-+		;
-+
-+	writel(RTC_CTRL_CLKGATE, &rtc_regs->hw_rtc_ctrl_clr);
-+	while (readl(&rtc_regs->hw_rtc_ctrl) & RTC_CTRL_CLKGATE)
-+		;
-+
-+	/*
-+	 * Due to the hardware design bug of mx28 EVK-A
-+	 * we need to set the AUTO_RESTART bit.
-+	 */
-+	if (readl(&rtc_regs->hw_rtc_persistent0) & RTC_PERSISTENT0_AUTO_RESTART)
-+		return;
-+
-+	while (readl(&rtc_regs->hw_rtc_stat) & RTC_STAT_NEW_REGS_MASK)
-+		;
-+
-+	setbits_le32(&rtc_regs->hw_rtc_persistent0,
-+			RTC_PERSISTENT0_AUTO_RESTART);
-+	writel(RTC_CTRL_FORCE_UPDATE, &rtc_regs->hw_rtc_ctrl_set);
-+	writel(RTC_CTRL_FORCE_UPDATE, &rtc_regs->hw_rtc_ctrl_clr);
-+	while (readl(&rtc_regs->hw_rtc_stat) & RTC_STAT_NEW_REGS_MASK)
-+		;
-+	while (readl(&rtc_regs->hw_rtc_stat) & RTC_STAT_STALE_REGS_MASK)
-+		;
-+}
-+
-+void mx28_power_set_linreg(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	/* Set linear regulator 25mV below switching converter */
-+	clrsetbits_le32(&power_regs->hw_power_vdddctrl,
-+			POWER_VDDDCTRL_LINREG_OFFSET_MASK,
-+			POWER_VDDDCTRL_LINREG_OFFSET_1STEPS_BELOW);
-+
-+	clrsetbits_le32(&power_regs->hw_power_vddactrl,
-+			POWER_VDDACTRL_LINREG_OFFSET_MASK,
-+			POWER_VDDACTRL_LINREG_OFFSET_1STEPS_BELOW);
-+
-+	clrsetbits_le32(&power_regs->hw_power_vddioctrl,
-+			POWER_VDDIOCTRL_LINREG_OFFSET_MASK,
-+			POWER_VDDIOCTRL_LINREG_OFFSET_1STEPS_BELOW);
-+}
-+
-+void mx28_power_setup_5v_detect(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	/* Start 5V detection */
-+	clrsetbits_le32(&power_regs->hw_power_5vctrl,
-+			POWER_5VCTRL_VBUSVALID_TRSH_MASK,
-+			POWER_5VCTRL_VBUSVALID_TRSH_4V4 |
-+			POWER_5VCTRL_PWRUP_VBUS_CMPS);
-+}
-+
-+void mx28_src_power_init(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	/* Improve efficieny and reduce transient ripple */
-+	writel(POWER_LOOPCTRL_TOGGLE_DIF | POWER_LOOPCTRL_EN_CM_HYST |
-+		POWER_LOOPCTRL_EN_DF_HYST, &power_regs->hw_power_loopctrl_set);
-+
-+	clrsetbits_le32(&power_regs->hw_power_dclimits,
-+			POWER_DCLIMITS_POSLIMIT_BUCK_MASK,
-+			0x30 << POWER_DCLIMITS_POSLIMIT_BUCK_OFFSET);
-+
-+	setbits_le32(&power_regs->hw_power_battmonitor,
-+			POWER_BATTMONITOR_EN_BATADJ);
-+
-+	/* Increase the RCSCALE level for quick DCDC response to dynamic load */
-+	clrsetbits_le32(&power_regs->hw_power_loopctrl,
-+			POWER_LOOPCTRL_EN_RCSCALE_MASK,
-+			POWER_LOOPCTRL_RCSCALE_THRESH |
-+			POWER_LOOPCTRL_EN_RCSCALE_8X);
-+
-+	clrsetbits_le32(&power_regs->hw_power_minpwr,
-+			POWER_MINPWR_HALFFETS, POWER_MINPWR_DOUBLE_FETS);
-+
-+	/* 5V to battery handoff ... FIXME */
-+	setbits_le32(&power_regs->hw_power_5vctrl, POWER_5VCTRL_DCDC_XFER);
-+	early_delay(30);
-+	clrbits_le32(&power_regs->hw_power_5vctrl, POWER_5VCTRL_DCDC_XFER);
-+}
-+
-+void mx28_power_init_4p2_params(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	/* Setup 4P2 parameters */
-+	clrsetbits_le32(&power_regs->hw_power_dcdc4p2,
-+		POWER_DCDC4P2_CMPTRIP_MASK | POWER_DCDC4P2_TRG_MASK,
-+		POWER_DCDC4P2_TRG_4V2 | (31 << POWER_DCDC4P2_CMPTRIP_OFFSET));
-+
-+	clrsetbits_le32(&power_regs->hw_power_5vctrl,
-+		POWER_5VCTRL_HEADROOM_ADJ_MASK,
-+		0x4 << POWER_5VCTRL_HEADROOM_ADJ_OFFSET);
-+
-+	clrsetbits_le32(&power_regs->hw_power_dcdc4p2,
-+		POWER_DCDC4P2_DROPOUT_CTRL_MASK,
-+		POWER_DCDC4P2_DROPOUT_CTRL_100MV |
-+		POWER_DCDC4P2_DROPOUT_CTRL_SRC_SEL);
-+
-+	clrsetbits_le32(&power_regs->hw_power_5vctrl,
-+		POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK,
-+		0x3f << POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET);
-+}
-+
-+void mx28_enable_4p2_dcdc_input(int xfer)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t tmp, vbus_thresh, vbus_5vdetect, pwd_bo;
-+	uint32_t prev_5v_brnout, prev_5v_droop;
-+
-+	prev_5v_brnout = readl(&power_regs->hw_power_5vctrl) &
-+				POWER_5VCTRL_PWDN_5VBRNOUT;
-+	prev_5v_droop = readl(&power_regs->hw_power_ctrl) &
-+				POWER_CTRL_ENIRQ_VDD5V_DROOP;
-+
-+	clrbits_le32(&power_regs->hw_power_5vctrl, POWER_5VCTRL_PWDN_5VBRNOUT);
-+	writel(POWER_RESET_UNLOCK_KEY | POWER_RESET_PWD_OFF,
-+		&power_regs->hw_power_reset);
-+
-+	clrbits_le32(&power_regs->hw_power_ctrl, POWER_CTRL_ENIRQ_VDD5V_DROOP);
-+
-+	if (xfer && (readl(&power_regs->hw_power_5vctrl) &
-+			POWER_5VCTRL_ENABLE_DCDC)) {
-+		return;
-+	}
-+
-+	/*
-+	 * Recording orignal values that will be modified temporarlily
-+	 * to handle a chip bug. See chip errata for CQ ENGR00115837
-+	 */
-+	tmp = readl(&power_regs->hw_power_5vctrl);
-+	vbus_thresh = tmp & POWER_5VCTRL_VBUSVALID_TRSH_MASK;
-+	vbus_5vdetect = tmp & POWER_5VCTRL_VBUSVALID_5VDETECT;
-+
-+	pwd_bo = readl(&power_regs->hw_power_minpwr) & POWER_MINPWR_PWD_BO;
-+
-+	/*
-+	 * Disable mechanisms that get erroneously tripped by when setting
-+	 * the DCDC4P2 EN_DCDC
-+	 */
-+	clrbits_le32(&power_regs->hw_power_5vctrl,
-+		POWER_5VCTRL_VBUSVALID_5VDETECT |
-+		POWER_5VCTRL_VBUSVALID_TRSH_MASK);
-+
-+	writel(POWER_MINPWR_PWD_BO, &power_regs->hw_power_minpwr_set);
-+
-+	if (xfer) {
-+		setbits_le32(&power_regs->hw_power_5vctrl,
-+				POWER_5VCTRL_DCDC_XFER);
-+		early_delay(20);
-+		clrbits_le32(&power_regs->hw_power_5vctrl,
-+				POWER_5VCTRL_DCDC_XFER);
-+
-+		setbits_le32(&power_regs->hw_power_5vctrl,
-+				POWER_5VCTRL_ENABLE_DCDC);
-+	} else {
-+		setbits_le32(&power_regs->hw_power_dcdc4p2,
-+				POWER_DCDC4P2_ENABLE_DCDC);
-+	}
-+
-+	early_delay(25);
-+
-+	clrsetbits_le32(&power_regs->hw_power_5vctrl,
-+			POWER_5VCTRL_VBUSVALID_TRSH_MASK, vbus_thresh);
-+
-+	if (vbus_5vdetect)
-+		writel(vbus_5vdetect, &power_regs->hw_power_5vctrl_set);
-+
-+	if (!pwd_bo)
-+		clrbits_le32(&power_regs->hw_power_minpwr, POWER_MINPWR_PWD_BO);
-+
-+	while (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VBUS_VALID_IRQ)
-+		clrbits_le32(&power_regs->hw_power_ctrl,
-+				POWER_CTRL_VBUS_VALID_IRQ);
-+
-+	if (prev_5v_brnout) {
-+		writel(POWER_5VCTRL_PWDN_5VBRNOUT,
-+			&power_regs->hw_power_5vctrl_set);
-+		writel(POWER_RESET_UNLOCK_KEY,
-+			&power_regs->hw_power_reset);
-+	} else {
-+		writel(POWER_5VCTRL_PWDN_5VBRNOUT,
-+			&power_regs->hw_power_5vctrl_clr);
-+		writel(POWER_RESET_UNLOCK_KEY | POWER_RESET_PWD_OFF,
-+			&power_regs->hw_power_reset);
-+	}
-+
-+	while (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VDD5V_DROOP_IRQ)
-+		clrbits_le32(&power_regs->hw_power_ctrl,
-+				POWER_CTRL_VDD5V_DROOP_IRQ);
-+
-+	if (prev_5v_droop)
-+		clrbits_le32(&power_regs->hw_power_ctrl,
-+				POWER_CTRL_ENIRQ_VDD5V_DROOP);
-+	else
-+		setbits_le32(&power_regs->hw_power_ctrl,
-+				POWER_CTRL_ENIRQ_VDD5V_DROOP);
-+}
-+
-+void mx28_power_init_4p2_regulator(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t tmp, tmp2;
-+
-+	setbits_le32(&power_regs->hw_power_dcdc4p2, POWER_DCDC4P2_ENABLE_4P2);
-+
-+	writel(POWER_CHARGE_ENABLE_LOAD, &power_regs->hw_power_charge_set);
-+
-+	writel(POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK,
-+		&power_regs->hw_power_5vctrl_clr);
-+	clrbits_le32(&power_regs->hw_power_dcdc4p2, POWER_DCDC4P2_TRG_MASK);
-+
-+	/* Power up the 4p2 rail and logic/control */
-+	writel(POWER_5VCTRL_PWD_CHARGE_4P2_MASK,
-+		&power_regs->hw_power_5vctrl_clr);
-+
-+	/*
-+	 * Start charging up the 4p2 capacitor. We ramp of this charge
-+	 * gradually to avoid large inrush current from the 5V cable which can
-+	 * cause transients/problems
-+	 */
-+	mx28_enable_4p2_dcdc_input(0);
-+
-+	if (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VBUS_VALID_IRQ) {
-+		/*
-+		 * If we arrived here, we were unable to recover from mx23 chip
-+		 * errata 5837. 4P2 is disabled and sufficient battery power is
-+		 * not present. Exiting to not enable DCDC power during 5V
-+		 * connected state.
-+		 */
-+		clrbits_le32(&power_regs->hw_power_dcdc4p2,
-+			POWER_DCDC4P2_ENABLE_DCDC);
-+		writel(POWER_5VCTRL_PWD_CHARGE_4P2_MASK,
-+			&power_regs->hw_power_5vctrl_set);
-+		hang();
-+	}
-+
-+	/*
-+	 * Here we set the 4p2 brownout level to something very close to 4.2V.
-+	 * We then check the brownout status. If the brownout status is false,
-+	 * the voltage is already close to the target voltage of 4.2V so we
-+	 * can go ahead and set the 4P2 current limit to our max target limit.
-+	 * If the brownout status is true, we need to ramp us the current limit
-+	 * so that we don't cause large inrush current issues. We step up the
-+	 * current limit until the brownout status is false or until we've
-+	 * reached our maximum defined 4p2 current limit.
-+	 */
-+	clrsetbits_le32(&power_regs->hw_power_dcdc4p2,
-+			POWER_DCDC4P2_BO_MASK,
-+			22 << POWER_DCDC4P2_BO_OFFSET);	/* 4.15V */
-+
-+	if (!(readl(&power_regs->hw_power_sts) & POWER_STS_DCDC_4P2_BO)) {
-+		setbits_le32(&power_regs->hw_power_5vctrl,
-+			0x3f << POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET);
-+	} else {
-+		tmp = (readl(&power_regs->hw_power_5vctrl) &
-+			POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK) >>
-+			POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET;
-+		while (tmp < 0x3f) {
-+			if (!(readl(&power_regs->hw_power_sts) &
-+					POWER_STS_DCDC_4P2_BO)) {
-+				tmp = readl(&power_regs->hw_power_5vctrl);
-+				tmp |= POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK;
-+				early_delay(100);
-+				writel(tmp, &power_regs->hw_power_5vctrl);
-+				break;
-+			} else {
-+				tmp++;
-+				tmp2 = readl(&power_regs->hw_power_5vctrl);
-+				tmp2 &= ~POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK;
-+				tmp2 |= tmp <<
-+					POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET;
-+				writel(tmp2, &power_regs->hw_power_5vctrl);
-+				early_delay(100);
-+			}
-+		}
-+	}
-+
-+	clrbits_le32(&power_regs->hw_power_dcdc4p2, POWER_DCDC4P2_BO_MASK);
-+	writel(POWER_CTRL_DCDC4P2_BO_IRQ, &power_regs->hw_power_ctrl_clr);
-+}
-+
-+void mx28_power_init_dcdc_4p2_source(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	if (!(readl(&power_regs->hw_power_dcdc4p2) &
-+		POWER_DCDC4P2_ENABLE_DCDC)) {
-+		hang();
-+	}
-+
-+	mx28_enable_4p2_dcdc_input(1);
-+
-+	if (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VBUS_VALID_IRQ) {
-+		clrbits_le32(&power_regs->hw_power_dcdc4p2,
-+			POWER_DCDC4P2_ENABLE_DCDC);
-+		writel(POWER_5VCTRL_ENABLE_DCDC,
-+			&power_regs->hw_power_5vctrl_clr);
-+		writel(POWER_5VCTRL_PWD_CHARGE_4P2_MASK,
-+			&power_regs->hw_power_5vctrl_set);
-+	}
-+}
-+
-+void mx28_power_enable_4p2(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t vdddctrl, vddactrl, vddioctrl;
-+	uint32_t tmp;
-+
-+	vdddctrl = readl(&power_regs->hw_power_vdddctrl);
-+	vddactrl = readl(&power_regs->hw_power_vddactrl);
-+	vddioctrl = readl(&power_regs->hw_power_vddioctrl);
-+
-+	setbits_le32(&power_regs->hw_power_vdddctrl,
-+		POWER_VDDDCTRL_DISABLE_FET | POWER_VDDDCTRL_ENABLE_LINREG |
-+		POWER_VDDDCTRL_PWDN_BRNOUT);
-+
-+	setbits_le32(&power_regs->hw_power_vddactrl,
-+		POWER_VDDACTRL_DISABLE_FET | POWER_VDDACTRL_ENABLE_LINREG |
-+		POWER_VDDACTRL_PWDN_BRNOUT);
-+
-+	setbits_le32(&power_regs->hw_power_vddioctrl,
-+		POWER_VDDIOCTRL_DISABLE_FET | POWER_VDDIOCTRL_PWDN_BRNOUT);
-+
-+	mx28_power_init_4p2_params();
-+	mx28_power_init_4p2_regulator();
-+
-+	/* Shutdown battery (none present) */
-+	clrbits_le32(&power_regs->hw_power_dcdc4p2, POWER_DCDC4P2_BO_MASK);
-+	writel(POWER_CTRL_DCDC4P2_BO_IRQ, &power_regs->hw_power_ctrl_clr);
-+	writel(POWER_CTRL_ENIRQ_DCDC4P2_BO, &power_regs->hw_power_ctrl_clr);
-+
-+	mx28_power_init_dcdc_4p2_source();
-+
-+	writel(vdddctrl, &power_regs->hw_power_vdddctrl);
-+	early_delay(20);
-+	writel(vddactrl, &power_regs->hw_power_vddactrl);
-+	early_delay(20);
-+	writel(vddioctrl, &power_regs->hw_power_vddioctrl);
-+
-+	/*
-+	 * Check if FET is enabled on either powerout and if so,
-+	 * disable load.
-+	 */
-+	tmp = 0;
-+	tmp |= !(readl(&power_regs->hw_power_vdddctrl) &
-+			POWER_VDDDCTRL_DISABLE_FET);
-+	tmp |= !(readl(&power_regs->hw_power_vddactrl) &
-+			POWER_VDDACTRL_DISABLE_FET);
-+	tmp |= !(readl(&power_regs->hw_power_vddioctrl) &
-+			POWER_VDDIOCTRL_DISABLE_FET);
-+	if (tmp)
-+		writel(POWER_CHARGE_ENABLE_LOAD,
-+			&power_regs->hw_power_charge_clr);
-+}
-+
-+void mx28_boot_valid_5v(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	/*
-+	 * Use VBUSVALID level instead of VDD5V_GT_VDDIO level to trigger a 5V
-+	 * disconnect event. FIXME
-+	 */
-+	writel(POWER_5VCTRL_VBUSVALID_5VDETECT,
-+		&power_regs->hw_power_5vctrl_set);
-+
-+	/* Configure polarity to check for 5V disconnection. */
-+	writel(POWER_CTRL_POLARITY_VBUSVALID |
-+		POWER_CTRL_POLARITY_VDD5V_GT_VDDIO,
-+		&power_regs->hw_power_ctrl_clr);
-+
-+	writel(POWER_CTRL_VBUS_VALID_IRQ | POWER_CTRL_VDD5V_GT_VDDIO_IRQ,
-+		&power_regs->hw_power_ctrl_clr);
-+
-+	mx28_power_enable_4p2();
-+}
-+
-+void mx28_powerdown(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	writel(POWER_RESET_UNLOCK_KEY, &power_regs->hw_power_reset);
-+	writel(POWER_RESET_UNLOCK_KEY | POWER_RESET_PWD_OFF,
-+		&power_regs->hw_power_reset);
-+}
-+
-+void mx28_handle_5v_conflict(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t tmp;
-+
-+	setbits_le32(&power_regs->hw_power_vddioctrl,
-+			POWER_VDDIOCTRL_BO_OFFSET_MASK);
-+
-+	for (;;) {
-+		tmp = readl(&power_regs->hw_power_sts);
-+
-+		if (tmp & POWER_STS_VDDIO_BO) {
-+			mx28_powerdown();
-+			break;
-+		}
-+
-+		if (tmp & POWER_STS_VDD5V_GT_VDDIO) {
-+			mx28_boot_valid_5v();
-+			break;
-+		} else {
-+			mx28_powerdown();
-+			break;
-+		}
-+	}
-+}
-+
-+int mx28_get_batt_volt(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t volt = readl(&power_regs->hw_power_battmonitor);
-+	volt &= POWER_BATTMONITOR_BATT_VAL_MASK;
-+	volt >>= POWER_BATTMONITOR_BATT_VAL_OFFSET;
-+	volt *= 8;
-+	return volt;
-+}
-+
-+int mx28_is_batt_ready(void)
-+{
-+	return (mx28_get_batt_volt() >= 3600);
-+}
-+
-+void mx28_5v_boot(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	/*
-+	 * NOTE: In original IMX-Bootlets, this also checks for VBUSVALID,
-+	 * but their implementation always returns 1 so we omit it here.
-+	 */
-+	if (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO) {
-+		mx28_boot_valid_5v();
-+		return;
-+	}
-+
-+	early_delay(1000);
-+	if (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO) {
-+		mx28_boot_valid_5v();
-+		return;
-+	}
-+
-+	mx28_handle_5v_conflict();
-+}
-+
-+void mx28_init_batt_bo(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	/* Brownout at 3V */
-+	clrsetbits_le32(&power_regs->hw_power_battmonitor,
-+		POWER_BATTMONITOR_BRWNOUT_LVL_MASK,
-+		15 << POWER_BATTMONITOR_BRWNOUT_LVL_OFFSET);
-+
-+	writel(POWER_CTRL_BATT_BO_IRQ, &power_regs->hw_power_ctrl_clr);
-+	writel(POWER_CTRL_ENIRQ_BATT_BO, &power_regs->hw_power_ctrl_clr);
-+}
-+
-+void mx28_switch_vddd_to_dcdc_source(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	clrsetbits_le32(&power_regs->hw_power_vdddctrl,
-+		POWER_VDDDCTRL_LINREG_OFFSET_MASK,
-+		POWER_VDDDCTRL_LINREG_OFFSET_1STEPS_BELOW);
-+
-+	clrbits_le32(&power_regs->hw_power_vdddctrl,
-+		POWER_VDDDCTRL_DISABLE_FET | POWER_VDDDCTRL_ENABLE_LINREG |
-+		POWER_VDDDCTRL_DISABLE_STEPPING);
-+}
-+
-+int mx28_is_batt_good(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t volt;
-+
-+	volt = readl(&power_regs->hw_power_battmonitor);
-+	volt &= POWER_BATTMONITOR_BATT_VAL_MASK;
-+	volt >>= POWER_BATTMONITOR_BATT_VAL_OFFSET;
-+	volt *= 8;
-+
-+	if ((volt >= 2400) && (volt <= 4300))
-+		return 1;
-+
-+	clrsetbits_le32(&power_regs->hw_power_5vctrl,
-+		POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK,
-+		0x3 << POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET);
-+	writel(POWER_5VCTRL_PWD_CHARGE_4P2_MASK,
-+		&power_regs->hw_power_5vctrl_clr);
-+
-+	clrsetbits_le32(&power_regs->hw_power_charge,
-+		POWER_CHARGE_STOP_ILIMIT_MASK | POWER_CHARGE_BATTCHRG_I_MASK,
-+		POWER_CHARGE_STOP_ILIMIT_10MA | 0x3);
-+
-+	writel(POWER_CHARGE_PWD_BATTCHRG, &power_regs->hw_power_charge_clr);
-+	writel(POWER_5VCTRL_PWD_CHARGE_4P2_MASK,
-+		&power_regs->hw_power_5vctrl_clr);
-+
-+	early_delay(500000);
-+
-+	volt = readl(&power_regs->hw_power_battmonitor);
-+	volt &= POWER_BATTMONITOR_BATT_VAL_MASK;
-+	volt >>= POWER_BATTMONITOR_BATT_VAL_OFFSET;
-+	volt *= 8;
-+
-+	if (volt >= 3500)
-+		return 0;
-+
-+	if (volt >= 2400)
-+		return 1;
-+
-+	writel(POWER_CHARGE_STOP_ILIMIT_MASK | POWER_CHARGE_BATTCHRG_I_MASK,
-+		&power_regs->hw_power_charge_clr);
-+	writel(POWER_CHARGE_PWD_BATTCHRG, &power_regs->hw_power_charge_set);
-+
-+	return 0;
-+}
-+
-+void mx28_power_configure_power_source(void)
-+{
-+	mx28_src_power_init();
-+
-+	mx28_5v_boot();
-+	mx28_power_clock2pll();
-+
-+	mx28_init_batt_bo();
-+	mx28_switch_vddd_to_dcdc_source();
-+}
-+
-+void mx28_enable_output_rail_protection(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ |
-+		POWER_CTRL_VDDIO_BO_IRQ, &power_regs->hw_power_ctrl_clr);
-+
-+	setbits_le32(&power_regs->hw_power_vdddctrl,
-+			POWER_VDDDCTRL_PWDN_BRNOUT);
-+
-+	setbits_le32(&power_regs->hw_power_vddactrl,
-+			POWER_VDDACTRL_PWDN_BRNOUT);
-+
-+	setbits_le32(&power_regs->hw_power_vddioctrl,
-+			POWER_VDDIOCTRL_PWDN_BRNOUT);
-+}
-+
-+int mx28_get_vddio_power_source_off(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t tmp;
-+
-+	if (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO) {
-+		tmp = readl(&power_regs->hw_power_vddioctrl);
-+		if (tmp & POWER_VDDIOCTRL_DISABLE_FET) {
-+			if ((tmp & POWER_VDDIOCTRL_LINREG_OFFSET_MASK) ==
-+				POWER_VDDDCTRL_LINREG_OFFSET_0STEPS) {
-+				return 1;
-+			}
-+		}
-+
-+		if (!(readl(&power_regs->hw_power_5vctrl) &
-+			POWER_5VCTRL_ENABLE_DCDC)) {
-+			if ((tmp & POWER_VDDIOCTRL_LINREG_OFFSET_MASK) ==
-+				POWER_VDDDCTRL_LINREG_OFFSET_0STEPS) {
-+				return 1;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+
-+}
-+
-+int mx28_get_vddd_power_source_off(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t tmp;
-+
-+	tmp = readl(&power_regs->hw_power_vdddctrl);
-+	if (tmp & POWER_VDDDCTRL_DISABLE_FET) {
-+		if ((tmp & POWER_VDDDCTRL_LINREG_OFFSET_MASK) ==
-+			POWER_VDDDCTRL_LINREG_OFFSET_0STEPS) {
-+			return 1;
-+		}
-+	}
-+
-+	if (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO) {
-+		if (!(readl(&power_regs->hw_power_5vctrl) &
-+			POWER_5VCTRL_ENABLE_DCDC)) {
-+			return 1;
-+		}
-+	}
-+
-+	if (!(tmp & POWER_VDDDCTRL_ENABLE_LINREG)) {
-+		if ((tmp & POWER_VDDDCTRL_LINREG_OFFSET_MASK) ==
-+			POWER_VDDDCTRL_LINREG_OFFSET_1STEPS_BELOW) {
-+			return 1;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+void mx28_power_set_vddio(uint32_t new_target, uint32_t new_brownout)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t cur_target, diff, bo_int = 0;
-+	uint32_t powered_by_linreg = 0;
-+
-+	new_brownout = new_target - new_brownout;
-+
-+	cur_target = readl(&power_regs->hw_power_vddioctrl);
-+	cur_target &= POWER_VDDIOCTRL_TRG_MASK;
-+	cur_target *= 50;	/* 50 mV step*/
-+	cur_target += 2800;	/* 2800 mV lowest */
-+
-+	powered_by_linreg = mx28_get_vddio_power_source_off();
-+	if (new_target > cur_target) {
-+
-+		if (powered_by_linreg) {
-+			bo_int = readl(&power_regs->hw_power_vddioctrl);
-+			clrbits_le32(&power_regs->hw_power_vddioctrl,
-+					POWER_CTRL_ENIRQ_VDDIO_BO);
-+		}
-+
-+		setbits_le32(&power_regs->hw_power_vddioctrl,
-+				POWER_VDDIOCTRL_BO_OFFSET_MASK);
-+		do {
-+			if (new_target - cur_target > 100)
-+				diff = cur_target + 100;
-+			else
-+				diff = new_target;
-+
-+			diff -= 2800;
-+			diff /= 50;
-+
-+			clrsetbits_le32(&power_regs->hw_power_vddioctrl,
-+				POWER_VDDIOCTRL_TRG_MASK, diff);
-+
-+			if (powered_by_linreg)
-+				early_delay(1500);
-+			else {
-+				while (!(readl(&power_regs->hw_power_sts) &
-+					POWER_STS_DC_OK))
-+					;
-+
-+			}
-+
-+			cur_target = readl(&power_regs->hw_power_vddioctrl);
-+			cur_target &= POWER_VDDIOCTRL_TRG_MASK;
-+			cur_target *= 50;	/* 50 mV step*/
-+			cur_target += 2800;	/* 2800 mV lowest */
-+		} while (new_target > cur_target);
-+
-+		if (powered_by_linreg) {
-+			writel(POWER_CTRL_VDDIO_BO_IRQ,
-+				&power_regs->hw_power_ctrl_clr);
-+			if (bo_int & POWER_CTRL_ENIRQ_VDDIO_BO)
-+				setbits_le32(&power_regs->hw_power_vddioctrl,
-+						POWER_CTRL_ENIRQ_VDDIO_BO);
-+		}
-+	} else {
-+		do {
-+			if (cur_target - new_target > 100)
-+				diff = cur_target - 100;
-+			else
-+				diff = new_target;
-+
-+			diff -= 2800;
-+			diff /= 50;
-+
-+			clrsetbits_le32(&power_regs->hw_power_vddioctrl,
-+				POWER_VDDIOCTRL_TRG_MASK, diff);
-+
-+			if (powered_by_linreg)
-+				early_delay(1500);
-+			else {
-+				while (!(readl(&power_regs->hw_power_sts) &
-+					POWER_STS_DC_OK))
-+					;
-+
-+			}
-+
-+			cur_target = readl(&power_regs->hw_power_vddioctrl);
-+			cur_target &= POWER_VDDIOCTRL_TRG_MASK;
-+			cur_target *= 50;	/* 50 mV step*/
-+			cur_target += 2800;	/* 2800 mV lowest */
-+		} while (new_target < cur_target);
-+	}
-+
-+	clrsetbits_le32(&power_regs->hw_power_vddioctrl,
-+			POWER_VDDDCTRL_BO_OFFSET_MASK,
-+			new_brownout << POWER_VDDDCTRL_BO_OFFSET_OFFSET);
-+}
-+
-+void mx28_power_set_vddd(uint32_t new_target, uint32_t new_brownout)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+	uint32_t cur_target, diff, bo_int = 0;
-+	uint32_t powered_by_linreg = 0;
-+
-+	new_brownout = new_target - new_brownout;
-+
-+	cur_target = readl(&power_regs->hw_power_vdddctrl);
-+	cur_target &= POWER_VDDDCTRL_TRG_MASK;
-+	cur_target *= 25;	/* 25 mV step*/
-+	cur_target += 800;	/* 800 mV lowest */
-+
-+	powered_by_linreg = mx28_get_vddd_power_source_off();
-+	if (new_target > cur_target) {
-+		if (powered_by_linreg) {
-+			bo_int = readl(&power_regs->hw_power_vdddctrl);
-+			clrbits_le32(&power_regs->hw_power_vdddctrl,
-+					POWER_CTRL_ENIRQ_VDDD_BO);
-+		}
-+
-+		setbits_le32(&power_regs->hw_power_vdddctrl,
-+				POWER_VDDDCTRL_BO_OFFSET_MASK);
-+
-+		do {
-+			if (new_target - cur_target > 100)
-+				diff = cur_target + 100;
-+			else
-+				diff = new_target;
-+
-+			diff -= 800;
-+			diff /= 25;
-+
-+			clrsetbits_le32(&power_regs->hw_power_vdddctrl,
-+				POWER_VDDDCTRL_TRG_MASK, diff);
-+
-+			if (powered_by_linreg)
-+				early_delay(1500);
-+			else {
-+				while (!(readl(&power_regs->hw_power_sts) &
-+					POWER_STS_DC_OK))
-+					;
-+
-+			}
-+
-+			cur_target = readl(&power_regs->hw_power_vdddctrl);
-+			cur_target &= POWER_VDDDCTRL_TRG_MASK;
-+			cur_target *= 25;	/* 25 mV step*/
-+			cur_target += 800;	/* 800 mV lowest */
-+		} while (new_target > cur_target);
-+
-+		if (powered_by_linreg) {
-+			writel(POWER_CTRL_VDDD_BO_IRQ,
-+				&power_regs->hw_power_ctrl_clr);
-+			if (bo_int & POWER_CTRL_ENIRQ_VDDD_BO)
-+				setbits_le32(&power_regs->hw_power_vdddctrl,
-+						POWER_CTRL_ENIRQ_VDDD_BO);
-+		}
-+	} else {
-+		do {
-+			if (cur_target - new_target > 100)
-+				diff = cur_target - 100;
-+			else
-+				diff = new_target;
-+
-+			diff -= 800;
-+			diff /= 25;
-+
-+			clrsetbits_le32(&power_regs->hw_power_vdddctrl,
-+					POWER_VDDDCTRL_TRG_MASK, diff);
-+
-+			if (powered_by_linreg)
-+				early_delay(1500);
-+			else {
-+				while (!(readl(&power_regs->hw_power_sts) &
-+					POWER_STS_DC_OK))
-+					;
-+
-+			}
-+
-+			cur_target = readl(&power_regs->hw_power_vdddctrl);
-+			cur_target &= POWER_VDDDCTRL_TRG_MASK;
-+			cur_target *= 25;	/* 25 mV step*/
-+			cur_target += 800;	/* 800 mV lowest */
-+		} while (new_target < cur_target);
-+	}
-+
-+	clrsetbits_le32(&power_regs->hw_power_vdddctrl,
-+			POWER_VDDDCTRL_BO_OFFSET_MASK,
-+			new_brownout << POWER_VDDDCTRL_BO_OFFSET_OFFSET);
-+}
-+
-+void mx28_power_init(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	mx28_power_clock2xtal();
-+	mx28_power_clear_auto_restart();
-+	mx28_power_set_linreg();
-+	mx28_power_setup_5v_detect();
-+	mx28_power_configure_power_source();
-+	mx28_enable_output_rail_protection();
-+
-+	mx28_power_set_vddio(3300, 3150);
-+
-+	mx28_power_set_vddd(1350, 1200);
-+
-+	writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ |
-+		POWER_CTRL_VDDIO_BO_IRQ | POWER_CTRL_VDD5V_DROOP_IRQ |
-+		POWER_CTRL_VBUS_VALID_IRQ | POWER_CTRL_BATT_BO_IRQ |
-+		POWER_CTRL_DCDC4P2_BO_IRQ, &power_regs->hw_power_ctrl_clr);
-+
-+	writel(POWER_5VCTRL_PWDN_5VBRNOUT, &power_regs->hw_power_5vctrl_set);
-+
-+	early_delay(1000);
-+}
-+
-+#ifdef	CONFIG_SPL_MX28_PSWITCH_WAIT
-+void mx28_power_wait_pswitch(void)
-+{
-+	struct mx28_power_regs *power_regs =
-+		(struct mx28_power_regs *)MXS_POWER_BASE;
-+
-+	while (!(readl(&power_regs->hw_power_sts) & POWER_STS_PSWITCH_MASK))
-+		;
-+}
-+#endif
---- u-boot-orig/board/armadeus/apf28/start.S	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/start.S	2011-11-27 11:31:22.299138403 +0100
-@@ -0,0 +1,234 @@
-+/*
-+ *  armboot - Startup Code for ARM926EJS CPU-core
-+ *
-+ *  Copyright (c) 2003  Texas Instruments
-+ *
-+ *  ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------
-+ *
-+ *  Copyright (c) 2001	Marius Groger <ma...@sy...>
-+ *  Copyright (c) 2002	Alex Zupke <az...@sy...>
-+ *  Copyright (c) 2002	Gary Jennejohn <ga...@de...>
-+ *  Copyright (c) 2003	Richard Woodruff <r-w...@ti...>
-+ *  Copyright (c) 2003	Kshitij <ks...@ti...>
-+ *  Copyright (c) 2010	Albert Aribaud <alb...@ar...>
-+ *
-+ * Change to support call back into iMX28 bootrom
-+ * Copyright (c) 2011 Marek Vasut <mar...@gm...>
-+ * on behalf of DENX Software Engineering GmbH
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <asm-offsets.h>
-+#include <config.h>
-+#include <common.h>
-+#include <version.h>
-+
-+#if defined(CONFIG_OMAP1610)
-+#include <./configs/omap1510.h>
-+#elif defined(CONFIG_OMAP730)
-+#include <./configs/omap730.h>
-+#endif
-+
-+/*
-+ *************************************************************************
-+ *
-+ * Jump vec...
 
[truncated message content]

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2638-g8fa619e

From: jorasse <jo...@us...> - 2011-12-12 22:36:14

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  8fa619e4fc8623a86d0c4b283c292da5732a7d1d (commit)
       via  ced26c4d2110c09939184296b303c8b597f0c950 (commit)
      from  198d23a6cd25420f5fbf0a61a50afa56369a47d9 (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 8fa619e4fc8623a86d0c4b283c292da5732a7d1d
Merge: ced26c4 198d23a
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Dec 12 22:34:13 2011 +0100

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

commit ced26c4d2110c09939184296b303c8b597f0c950
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Dec 12 22:33:30 2011 +0100

    [UBOOT][APF28] Update iomux minimal config and FEC0 reset

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

Summary of changes:
 .../target/device/armadeus/apf28/apf28-u-boot-.h   |    5 +-
 patches/u-boot/2011.11/01-uboot-apf28.patch        |   72 +++++++++++---------
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
index 3482f05..c7084fc 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
@@ -70,7 +70,7 @@
 #define	CONFIG_CMD_EXT2
 #define	CONFIG_CMD_FAT
 #define	CONFIG_CMD_GPIO
-#define	CONFIG_CMD_I2C
+/*#define	CONFIG_CMD_I2C*/
 #define	CONFIG_CMD_MII
 #define	CONFIG_CMD_MMC
 #define	CONFIG_CMD_NAND
@@ -78,7 +78,7 @@
 #define	CONFIG_CMD_NFS
 #define	CONFIG_CMD_PING
 #define	CONFIG_CMD_SETEXPR
-#define	CONFIG_CMD_SPI
+/*#define	CONFIG_CMD_SPI*/
 #define	CONFIG_CMD_USB
 
 /*
@@ -188,6 +188,7 @@
 #define	CONFIG_MII
 #define	CONFIG_DISCOVER_PHY
 #define	CONFIG_FEC_XCV_TYPE		RMII
+#define CONFIG_M28_FEC_MAC_IN_OCOTP
 #endif
 
 /*
diff --git a/patches/u-boot/2011.11/01-uboot-apf28.patch b/patches/u-boot/2011.11/01-uboot-apf28.patch
index 6118f1a..5675014 100644
--- a/patches/u-boot/2011.11/01-uboot-apf28.patch
+++ b/patches/u-boot/2011.11/01-uboot-apf28.patch
@@ -1,6 +1,6 @@
 --- u-boot-orig/board/armadeus/apf28/apf28.c	1970-01-01 01:00:00.000000000 +0100
 +++ u-boot-custom/board/armadeus/apf28/apf28.c	2011-12-01 19:05:09.737024396 +0100
-@@ -0,0 +1,212 @@
+@@ -0,0 +1,216 @@
 +/*
 + * APF28 motherboard based on DENX M28 module
 + *
@@ -57,7 +57,7 @@
 +
 +#ifdef	CONFIG_CMD_USB
 +	mxs_iomux_setup_pad(MX28_PAD_LCD_D23__GPIO_1_23 |
-+			MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_PULLUP);
++			MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_NOPULL);
 +	gpio_direction_output(MX28_PAD_LCD_D23__GPIO_1_23, 0);
 +#endif
 +
@@ -118,10 +118,10 @@
 +
 +int fecmxc_mii_postcall(int phy)
 +{
-+	miiphy_write("FEC1", phy, MII_BMCR, 0x9000);
-+	miiphy_write("FEC1", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
++	miiphy_write("FEC", phy, MII_BMCR, 0x9000);
++	miiphy_write("FEC", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
 +	if (phy == 3)
-+		miiphy_write("FEC1", 3, MII_PHY_CTRL2, 0x8180);
++		miiphy_write("FEC", 3, MII_PHY_CTRL2, 0x8180);
 +	return 0;
 +}
 +
@@ -138,18 +138,22 @@
 +		CLKCTRL_ENET_TIME_SEL_MASK | CLKCTRL_ENET_CLK_OUT_EN,
 +		CLKCTRL_ENET_TIME_SEL_RMII_CLK);
 +
++	gpio_direction_output(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 0);
++	udelay(100);
++	gpio_set_value(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 1);
++
 +	ret = fecmxc_initialize_multi(bis, 0, 0, MXS_ENET0_BASE);
 +	if (ret) {
 +		printf("FEC MXS: Unable to init FEC0\n");
 +		return ret;
 +	}
 +
-+	ret = fecmxc_initialize_multi(bis, 1, 3, MXS_ENET1_BASE);
++/*	ret = fecmxc_initialize_multi(bis, 1, 3, MXS_ENET1_BASE);
 +	if (ret) {
 +		printf("FEC MXS: Unable to init FEC1\n");
 +		return ret;
 +	}
-+
++*/
 +	dev = eth_get_dev_by_name("FEC0");
 +	if (!dev) {
 +		printf("FEC MXS: Unable to get FEC0 device entry\n");
@@ -162,7 +166,7 @@
 +		return ret;
 +	}
 +
-+	dev = eth_get_dev_by_name("FEC1");
++/*	dev = eth_get_dev_by_name("FEC1");
 +	if (!dev) {
 +		printf("FEC MXS: Unable to get FEC1 device entry\n");
 +		return -EINVAL;
@@ -173,7 +177,7 @@
 +		printf("FEC MXS: Unable to register FEC1 mii postcall\n");
 +		return ret;
 +	}
-+
++*/
 +	return ret;
 +}
 +
@@ -561,7 +565,7 @@
 +}
 --- u-boot-orig/board/armadeus/apf28/mmc_boot.c	1970-01-01 01:00:00.000000000 +0100
 +++ u-boot-custom/board/armadeus/apf28/mmc_boot.c	2011-12-01 19:32:00.022103665 +0100
-@@ -0,0 +1,273 @@
+@@ -0,0 +1,275 @@
 +/*
 + * Freescale i.MX28 Boot setup
 + *
@@ -615,15 +619,15 @@
 +#define	MUX_CONFIG_SSP0	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP)
 +#define	MUX_CONFIG_SSP2	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
 +#define	MUX_CONFIG_GPMI	(MXS_PAD_1V8 | MXS_PAD_4MA | MXS_PAD_NOPULL)
-+#define	MUX_CONFIG_ENET	(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP)
++#define	MUX_CONFIG_ENET	(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP)
 +#define	MUX_CONFIG_EMI	(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL)
 +
 +const iomux_cfg_t iomux_setup[] = {
 +	/* LED */
-+	/*MX28_PAD_ENET0_RXD3__GPIO_4_10 | MUX_CONFIG_LED,*/
++	MX28_PAD_GPMI_RDY1__GPIO_0_21 | MUX_CONFIG_LED,
 +
 +	/* framebuffer */
-+	MX28_PAD_LCD_D00__LCD_D0 | MUX_CONFIG_LCD,
++/*	MX28_PAD_LCD_D00__LCD_D0 | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_D01__LCD_D1 | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_D02__LCD_D2 | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_D03__LCD_D3 | MUX_CONFIG_LCD,
@@ -645,9 +649,9 @@
 +	MX28_PAD_LCD_D19__LCD_D19 | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_D20__LCD_D20 | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_D21__LCD_D21 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_D22__LCD_D22 | MUX_CONFIG_LCD,
++	MX28_PAD_LCD_D22__LCD_D22 | MUX_CONFIG_LCD,*/
 +/*	MX28_PAD_LCD_D23__LCD_D23 | MUX_CONFIG_LCD,*/
-+	MX28_PAD_LCD_RD_E__LCD_VSYNC | MUX_CONFIG_LCD,
++/*	MX28_PAD_LCD_RD_E__LCD_VSYNC | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_WR_RWN__LCD_HSYNC | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_RS__LCD_DOTCLK | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_CS__LCD_CS | MUX_CONFIG_LCD,
@@ -655,27 +659,27 @@
 +	MX28_PAD_LCD_HSYNC__LCD_HSYNC | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_DOTCLK__LCD_DOTCLK | MUX_CONFIG_LCD,
 +	MX28_PAD_LCD_ENABLE__GPIO_1_31 | MUX_CONFIG_LCD,
-+	MX28_PAD_LCD_RESET__GPIO_3_30 | MUX_CONFIG_LCD,
++	MX28_PAD_LCD_RESET__GPIO_3_30 | MUX_CONFIG_LCD,*/
 +
 +	/* UART1 */
 +	MX28_PAD_PWM0__DUART_RX,
 +	MX28_PAD_PWM1__DUART_TX,
-+	MX28_PAD_AUART0_TX__DUART_RTS,
-+	MX28_PAD_AUART0_RX__DUART_CTS,
++/*	MX28_PAD_AUART0_TX__DUART_RTS,
++	MX28_PAD_AUART0_RX__DUART_CTS,*/
 +
 +	/* UART2 */
-+	MX28_PAD_AUART1_RX__AUART1_RX,
++/*	MX28_PAD_AUART1_RX__AUART1_RX,
 +	MX28_PAD_AUART1_TX__AUART1_TX,
 +	MX28_PAD_AUART1_RTS__AUART1_RTS,
-+	MX28_PAD_AUART1_CTS__AUART1_CTS,
++	MX28_PAD_AUART1_CTS__AUART1_CTS,*/
 +
 +	/* CAN */
-+	MX28_PAD_GPMI_RDY2__CAN0_TX,
-+	MX28_PAD_GPMI_RDY3__CAN0_RX,
++/*	MX28_PAD_GPMI_RDY2__CAN0_TX,
++	MX28_PAD_GPMI_RDY3__CAN0_RX,*/
 +
 +	/* I2C */
-+	MX28_PAD_I2C0_SCL__I2C0_SCL,
-+	MX28_PAD_I2C0_SDA__I2C0_SDA,
++/*	MX28_PAD_I2C0_SCL__I2C0_SCL,
++	MX28_PAD_I2C0_SDA__I2C0_SDA,*/
 +
 +	/* TSC2007 */
 +	/*MX28_PAD_SAIF0_MCLK__GPIO_3_20 | MUX_CONFIG_TSC,*/
@@ -725,17 +729,19 @@
 +	MX28_PAD_ENET0_TXD0__ENET0_TXD0 | MUX_CONFIG_ENET,
 +	MX28_PAD_ENET0_TXD1__ENET0_TXD1 | MUX_CONFIG_ENET,
 +	MX28_PAD_ENET_CLK__CLKCTRL_ENET | MUX_CONFIG_ENET,
++	MX28_PAD_ENET0_TX_CLK__GPIO_4_5 | MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
++	MX28_PAD_ENET0_RX_CLK__GPIO_4_13 | MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL,
 +
-+	MX28_PAD_ENET0_COL__ENET1_TX_EN | MUX_CONFIG_ENET,
++/*	MX28_PAD_ENET0_COL__ENET1_TX_EN | MUX_CONFIG_ENET,
 +	MX28_PAD_ENET0_CRS__ENET1_RX_EN | MUX_CONFIG_ENET,
 +	MX28_PAD_ENET0_RXD2__ENET1_RXD0 | MUX_CONFIG_ENET,
 +	MX28_PAD_ENET0_RXD3__ENET1_RXD1 | MUX_CONFIG_ENET,
 +	MX28_PAD_ENET0_TXD2__ENET1_TXD0 | MUX_CONFIG_ENET,
-+	MX28_PAD_ENET0_TXD3__ENET1_TXD1 | MUX_CONFIG_ENET,
++	MX28_PAD_ENET0_TXD3__ENET1_TXD1 | MUX_CONFIG_ENET,*/
 +
 +	/* I2C */
-+	MX28_PAD_I2C0_SCL__I2C0_SCL,
-+	MX28_PAD_I2C0_SDA__I2C0_SDA,
++/*	MX28_PAD_I2C0_SCL__I2C0_SCL,
++	MX28_PAD_I2C0_SDA__I2C0_SDA,*/
 +
 +	/* EMI */
 +	MX28_PAD_EMI_D00__EMI_DATA0 | MUX_CONFIG_EMI,
@@ -756,8 +762,8 @@
 +	MX28_PAD_EMI_D15__EMI_DATA15 | MUX_CONFIG_EMI,
 +	MX28_PAD_EMI_ODT0__EMI_ODT0 | MUX_CONFIG_EMI,
 +	MX28_PAD_EMI_DQM0__EMI_DQM0 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_ODT1__EMI_ODT1 | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_DQM1__EMI_DQM1 | MUX_CONFIG_EMI,
++/*	MX28_PAD_EMI_ODT1__EMI_ODT1 | MUX_CONFIG_EMI,
++	MX28_PAD_EMI_DQM1__EMI_DQM1 | MUX_CONFIG_EMI,*/
 +	MX28_PAD_EMI_DDR_OPEN_FB__EMI_DDR_OPEN_FEEDBACK | MUX_CONFIG_EMI,
 +	MX28_PAD_EMI_CLK__EMI_CLK | MUX_CONFIG_EMI,
 +	MX28_PAD_EMI_DQS0__EMI_DQS0 | MUX_CONFIG_EMI,
@@ -786,15 +792,15 @@
 +	MX28_PAD_EMI_RASN__EMI_RASN | MUX_CONFIG_EMI,
 +	MX28_PAD_EMI_WEN__EMI_WEN | MUX_CONFIG_EMI,
 +	MX28_PAD_EMI_CE0N__EMI_CE0N | MUX_CONFIG_EMI,
-+	MX28_PAD_EMI_CE1N__EMI_CE1N | MUX_CONFIG_EMI,
++/*	MX28_PAD_EMI_CE1N__EMI_CE1N | MUX_CONFIG_EMI,*/
 +	MX28_PAD_EMI_CKE__EMI_CKE | MUX_CONFIG_EMI,
 +
 +	/* SPI2 (for flash) */
-+	MX28_PAD_SSP2_SCK__SSP2_SCK | MUX_CONFIG_SSP2,
++/*	MX28_PAD_SSP2_SCK__SSP2_SCK | MUX_CONFIG_SSP2,
 +	MX28_PAD_SSP2_MOSI__SSP2_CMD | MUX_CONFIG_SSP2,
 +	MX28_PAD_SSP2_MISO__SSP2_D0 | MUX_CONFIG_SSP2,
 +	MX28_PAD_SSP2_SS0__SSP2_D3 |
-+		(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
++		(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),*/
 +};
 +
 +void board_init_ll(void)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2636-g198d23a

From: Julien B a. A. <ar...@us...> - 2011-12-12 20:25:23

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  198d23a6cd25420f5fbf0a61a50afa56369a47d9 (commit)
      from  ac6aec2aecac47f2286dc2edaa312b27e79339ee (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 198d23a6cd25420f5fbf0a61a50afa56369a47d9
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Dec 12 21:24:08 2011 +0100

    [LINUX] load_fpga: Add a sync just before to try to download FPGA on APF51

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

Summary of changes:
 .../linux/modules/fpga/dev_tools/loader/load_fpga  |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index 1a923da..708d7df 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -42,6 +42,7 @@ if [ "$PLATFORM" == "APF51" ]; then
 		echo "Error while making bitfile copy in RAM !"
 		exit 1
 	fi
+	sync
 else
 	BITFILE=$1
 fi


hooks/post-receive
-- 
armadeus

Flat | Threaded

<< < 1 .. 82 83 84 85 86 .. 153 > >> (Page 84 of 153)