armadeus-commitlog — Armadeus GIT commit logs

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-421-g7a1c774

[jorasse <jo...@us...>]

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  7a1c774b3a3b583567a7fb846e3188445e33b382 (commit)
      from  a409f2c8c84f4de478cbe30f96f2318dc1c70c81 (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 7a1c774b3a3b583567a7fb846e3188445e33b382
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jun 26 11:25:16 2012 +0200

    [UBOOT] apf9328: fix typo

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

Summary of changes:
 .../armadeus/apf9328/apf9328-u-boot-2012.04.h      |  410 ++++++++++++--------
 1 files changed, 238 insertions(+), 172 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
index afeb415..ca95091 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
@@ -23,7 +23,7 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"5.3"
+#define CONFIG_ENV_VERSION	"5.3"
 #define CONFIG_IDENT_STRING	" apf9328 patch 5.5"
 #define CONFIG_BOARD_NAME	apf9328
 
@@ -32,7 +32,7 @@
  */
 #define CONFIG_ARM920T			/* this is an ARM920T CPU */
 #define CONFIG_IMX			/* in a Motorola MC9328MXL Chip */
-#define CONFIG_MACH_TYPE 	906	/* APF9328 */
+#define CONFIG_MACH_TYPE	906	/* APF9328 */
 
 /*
  * Enable the call to miscellaneous platform dependent initialization.
@@ -132,8 +132,8 @@
 #define MTDIDS_DEFAULT	"nor0=" CONFIG_MTDMAP
 #define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP \
 		":256k(u-boot)ro,"	\
-		"128k(env),"	\
-		"128k(env2),"	\
+		"128k(env),"		\
+		"128k(env2),"		\
 		"256k(firmware),"	\
 		"2048k(kernel),"	\
 		"-(rootfs)"
@@ -143,8 +143,8 @@
  */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT		"BIOS> "	/* prompt string */
-#define CONFIG_SYS_CBSIZE		2048		/* console I/O buffer */
-#define CONFIG_SYS_PBSIZE 		\
+#define CONFIG_SYS_CBSIZE		2048		/* console I/O buffer*/
+#define CONFIG_SYS_PBSIZE		\
 				(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 						/* Print buffer size */
 #define CONFIG_SYS_MAXARGS		16		/* max command args */
@@ -159,7 +159,7 @@
  * Boot Linux
  */
 #define CONFIG_CMDLINE_TAG		/* send commandline to Kernel	*/
-#define CONFIG_SETUP_MEMORY_TAGS 	/* send memory definition to kernel */
+#define CONFIG_SETUP_MEMORY_TAGS	/* send memory definition to kernel */
 #define CONFIG_INITRD_TAG		/* send initrd params	*/
 /*
 #define CONFIG_REVISION_TAG
@@ -168,7 +168,7 @@
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS 	"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
+#define CONFIG_BOOTARGS		"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
 				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
 				" root=/dev/mtdblock5 rootfstype=jffs2 "
 
@@ -189,7 +189,7 @@
 	"env_version="		CONFIG_ENV_VERSION		"\0"	\
 	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)	"\0"	\
 	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
-	"partition=nor0,5\0"				\
+	"partition=nor0,5\0"						\
 	"uboot_addr="		MK_STR(CONFIG_SYS_MONITOR_BASE)	"\0"	\
 	"firmware_addr="	MK_STR(CONFIG_FIRMWARE_ADDR)	"\0"	\
 	"kernel_addr="		MK_STR(CONFIG_KERNEL_ADDR)	"\0"	\
@@ -209,44 +209,44 @@
 		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs; "\
 		"nfs ${loadaddr} "					\
 		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
-		"bootm ${loadaddr}\0"				\
+		"bootm ${loadaddr}\0"					\
 	"jffsboot=setenv bootargs console=${consoledev},${baudrate} "	\
 		"${mtdparts} ${extrabootargs}; run addjffsargs addipargs; "\
 		"bootm ${kernel_addr}\0"				\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
 		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs; "\
-		"bootm ${kernel_addr}\0"	\
-	"flash_uboot=protect off nor0,0;"		\
+		"bootm ${kernel_addr}\0"				\
+	"flash_uboot=protect off nor0,0;"				\
 		"echo Erasing FLASH;"					\
-		"era nor0,0;"			\
+		"era nor0,0;"						\
 		"if cp.b ${fileaddr} ${uboot_addr} ${filesize};"	\
-			"then protect on nor0,0;"	\
+			"then protect on nor0,0;"			\
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
 	"flash_firmware=echo Erasing FLASH;"				\
-		"era nor0,3;"		\
+		"era nor0,3;"						\
 		"if cp.b ${fileaddr} ${firmware_addr} ${filesize} ;"	\
 			"then echo Flashing of Firmware succeed;"	\
 			"else echo Flashing of Firmware failed;"	\
 		"fi\0"							\
 	"flash_kernel=echo Erasing FLASH;"				\
-		"era nor0,4;"			\
+		"era nor0,4;"						\
 		"if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;"	\
 			"then echo Flashing of kernel succeed;"		\
 			"else echo Flashing of kernel failed;"		\
 		"fi\0"							\
 	"flash_rootfs=echo Erasing FLASH;"				\
-		"era nor0,5;"			\
+		"era nor0,5;"						\
 		"if cp.b ${fileaddr} ${rootfs_addr} ${filesize};"	\
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.bin\0" \
-	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
-	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.jffs2\0" \
+	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.bin\0"\
+	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
+	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.jffs2\0"\
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
@@ -260,7 +260,7 @@
 #define CONFIG_IMX_SERIAL
 #define CONFIG_IMX_SERIAL1
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE 	115200
+#define CONFIG_BAUDRATE		115200
 
 /*
  * GPIO
@@ -271,7 +271,7 @@
  */
 #define CONFIG_SYS_MAX_FLASH_BANKS	1	/* FLASH banks count */
 #define CONFIG_SYS_MAX_FLASH_SECT	256	/* max 32MB of FLASH memory */
-#define CONFIG_SYS_FLASH_BASE		0x10000000 /* location of flash memory*/
+#define CONFIG_SYS_FLASH_BASE		0x10000000
 
 #define	CONFIG_SYS_FLASH_CFI
 #define CONFIG_FLASH_CFI_DRIVER
@@ -369,35 +369,35 @@
 #define CONFIG_SYS_OSC32	32768	/* 32768 or 32000 Hz crystal */
 #undef	CONFIG_SYS_OSC16	/* there is no external 16MHz external clock */
 
-/* MPU CLOCK source before PLL	(should be named CONFIG_SYS_SYS_CLK_FREQ) */
+/* MPU CLOCK source before PLL */
 #define CONFIG_SYS_CLK_FREQ	(512*CONFIG_SYS_OSC32)
 #define CONFIG_SYS_MPCTL0_VAL		0x07B32DA5	/* 192.000017 MHz */
 #define CONFIG_SYS_MPCTL1_VAL		0
 
-/* system clock source before PLL (should be named CONFIG_SYS_SYSPLL_CLK_FREQ)*/
+/* system clock source before PLL */
 #ifndef CONFIG_SYS_OSC16
 #define CONFIG_SYSPLL_CLK_FREQ		(512*CONFIG_SYS_OSC32)
 #if (CONFIG_SYS_OSC32 == 32000)
 #define CONFIG_SYS_SPCTL0_VAL		0x043F1437	/* 96 MHz */
 #define CONFIG_SYS_SPCTL1_VAL		0
-#define CONFIG_SYS_FREQ			96	/* MHz */
+#define CONFIG_SYS_FREQ			96		/* MHz */
 #else /* CONFIG_SYS_OSC32 == 32768 */
 #define CONFIG_SYS_SPCTL0_VAL		0x0FB32DA5	/* 96.000009 MHz */
 #define CONFIG_SYS_SPCTL1_VAL		0
-#define CONFIG_SYS_FREQ			96	/* MHz */
+#define CONFIG_SYS_FREQ			96		/* MHz */
 #endif /* CONFIG_SYS_OSC32 */
 #else /* CONFIG_SYS_OSC16 in use */
 #define CONFIG_SYSPLL_CLK_FREQ		CONFIG_SYS_OSC16
 #define CONFIG_SYS_SPCTL0_VAL		0x04001401	/* 96 MHz */
 #define CONFIG_SYS_SPCTL1_VAL		0x0C000040
-#define CONFIG_SYS_FREQ			96	/* MHz */
+#define CONFIG_SYS_FREQ			96		/* MHz */
 #endif /* CONFIG_SYS_OSC16 */
 
-/* external bus frequency (have to be a CONFIG_SYS_FREQ ratio) */
-#define CONFIG_SYS_BUS_FREQ 	96	/* 96|48... MHz (BCLOCK and HCLOCK) */
+/* external bus frequency */
+#define CONFIG_SYS_BUS_FREQ	96	/* 96|48... MHz (BCLOCK and HCLOCK) */
 #define CONFIG_USB_FREQ		48	/* 48 MHz */
 #define CONFIG_PERIF1_FREQ	16	/* 16 MHz UART, Timer PWM */
-#define CONFIG_PERIF2_FREQ 	48	/* 48 MHz LCD SD SPI */
+#define CONFIG_PERIF2_FREQ	48	/* 48 MHz LCD SD SPI */
 #define CONFIG_PERIF3_FREQ	16	/* 16 MHz SSI */
 
 /*
@@ -478,15 +478,15 @@
 #define CONFIG_SYS_CS0_CHIP_SELECT_ENABLE	1 /* 1 : enable CS0 */
 #define CONFIG_SYS_CS0_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] */
 					/* 3=8bits on D[7:0] 6=32 bits..*/
-#define CONFIG_SYS_CS0_SUPERVISOR_PROTECT	0 /* 1: user access prohibited*/
-#define CONFIG_SYS_CS0_WRITE_PROTECT		0 /* 1: write prohibited*/
-#define CONFIG_SYS_CS0_EB_SIGNAL_CONTROL_WRITE	1 /* 1 EB is as write signal */
+#define CONFIG_SYS_CS0_SUPERVISOR_PROTECT	0 /* 1 user access prohibited*/
+#define CONFIG_SYS_CS0_WRITE_PROTECT		0 /* 1 wr access prohibited*/
+#define CONFIG_SYS_CS0_EB_SIGNAL_CONTROL_WRITE	1 /* 1 EB used as wr signal*/
 #define CONFIG_SYS_CS0_READ_CYC_LGTH		150	/* ns */
 #define CONFIG_SYS_CS0_OE_ASSERT_DLY		0	/* ns */
 #define CONFIG_SYS_CS0_OE_NEG_DLY		0	/* ns */
 
-#define CONFIG_SYS_CS0_CS_NEG_LGTH 	0	/* ns CS HIGH to CS LOW : tCWH*/
-#define CONFIG_SYS_CS0_XTRA_DEAD_CYC	35	/* ns from CS HIGH to tristate*/
+#define CONFIG_SYS_CS0_CS_NEG_LGTH		0 /* max 30ns CS HIGH to LOW */
+#define CONFIG_SYS_CS0_XTRA_DEAD_CYC		35 /* ns CS HIGH to tristate */
 
 #define CONFIG_SYS_CS0_WRITE_XTRA_LGTH		0	/* ns */
 #define CONFIG_SYS_CS0_EB_ASSERT_DLY		0	/* ns */
@@ -494,155 +494,155 @@
 #define CONFIG_SYS_CS0_CS_ASSERT_NEG_DLY	0	/* ns */
 
 #define CONFIG_SYS_CS0_SYNC_ENABLE		1 /* enable sync burst mode */
-#define CONFIG_SYS_CS0_SYNC_PAGE_MODE_EMUL	1 /* enable page mode emulation*/
-#define CONFIG_SYS_CS0_SYNC_PAGE_SIZE		0 /* 4 words page size (8bytes)*/
+#define CONFIG_SYS_CS0_SYNC_PAGE_MODE_EMUL	1
+#define CONFIG_SYS_CS0_SYNC_PAGE_SIZE		0 /* 4 words page size */
 #define CONFIG_SYS_CS0_SYNC_BURST_CLK_START	0 /* 0 ns burst clock delay */
 #define CONFIG_SYS_CS0_SYNC_BURST_CLK_DIV	0 /* 0 : divider is 1 */
 #define CONFIG_SYS_CS0_SYNC_DAT_OUT_LGTH	25	/* ns */
 
 /* CS1 configuration for */
-#define CONFIG_SYS_CS1_CHIP_SELECT_ENABLE	1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS1_PIN_ASSERT		0 /* chip select pin state when */
-						/* chip select disabled */
-#define CONFIG_SYS_CS1_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] pins */
-						/* 3=8bits on D[7:0] 6=32 bits.. */
-#define CONFIG_SYS_CS1_SUPERVISOR_PROTECT	0 /* 1 : user mode access prohibited */
-#define CONFIG_SYS_CS1_WRITE_PROTECT		0 /* 1 : write access prohibited */
-#define CONFIG_SYS_CS1_EB_SIGNAL_CONTROL_WRITE	1 /* 1 when EB is used as write signal */
+#define CONFIG_SYS_CS1_CHIP_SELECT_ENABLE	1 /* 1: enable CS1 */
+#define CONFIG_SYS_CS1_PIN_ASSERT		0 /* chip select pin state */
+						/* when chip select disabled */
+#define CONFIG_SYS_CS1_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] */
+					/* 3=8bits on D[7:0] 6=32 bits.. */
+#define CONFIG_SYS_CS1_SUPERVISOR_PROTECT	0 /* 1 user access prohibited*/
+#define CONFIG_SYS_CS1_WRITE_PROTECT		0 /* 1 wr access prohibited */
+#define CONFIG_SYS_CS1_EB_SIGNAL_CONTROL_WRITE	1 /* 1 EB used as wr signal*/
 
 #define CONFIG_SYS_CS1_READ_CYC_LGTH		50	/* ns */
 #define CONFIG_SYS_CS1_OE_ASSERT_DLY		0	/* ns */
 #define CONFIG_SYS_CS1_OE_NEG_DLY		0	/* ns */
 
-#define CONFIG_SYS_CS1_CS_NEG_LGTH 	0	/* max 30 ns CS HIGH to CS LOW at 100MHz */
-#define CONFIG_SYS_CS1_XTRA_DEAD_CYC	0	/* ns from CS HIGH to tristate bus */
+#define CONFIG_SYS_CS1_CS_NEG_LGTH		0 /* max 30ns CS HIGH to LOW*/
+#define CONFIG_SYS_CS1_XTRA_DEAD_CYC		0 /* ns CS HIGH to tristate */
 
 #define CONFIG_SYS_CS1_WRITE_XTRA_LGTH		0	/* ns */
 #define CONFIG_SYS_CS1_EB_ASSERT_DLY		0	/* ns */
 #define CONFIG_SYS_CS1_EB_NEG_DLY		0	/* ns */
 #define CONFIG_SYS_CS1_CS_ASSERT_NEG_DLY	0	/* ns */
 
-#define CONFIG_SYS_CS1_SYNC_ENABLE		0 /* enable synchronous burst mode */
-#define CONFIG_SYS_CS1_SYNC_PAGE_MODE_EMUL	0 /* enable page mode emulation */
-#define CONFIG_SYS_CS1_SYNC_PAGE_SIZE		0 /* 4 words page size (8bytes) */
+#define CONFIG_SYS_CS1_SYNC_ENABLE		0 /* enable sync burst mode */
+#define CONFIG_SYS_CS1_SYNC_PAGE_MODE_EMUL	0
+#define CONFIG_SYS_CS1_SYNC_PAGE_SIZE		0 /* 4 words page size */
 #define CONFIG_SYS_CS1_SYNC_BURST_CLK_START	0 /* 0 ns burst clock delay */
 #define CONFIG_SYS_CS1_SYNC_BURST_CLK_DIV	0 /* 0 : divider is 1 */
 #define CONFIG_SYS_CS1_SYNC_DAT_OUT_LGTH	0 /* ns */
 
 /* CS2 configuration for */
-#define CONFIG_SYS_CS2_CHIP_SELECT_ENABLE	0 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS2_PIN_ASSERT		0 /* chip select pin state when */
-						/*chip select disabled */
-#define CONFIG_SYS_CS2_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] pins */
-						/* 3=8bits on D[7:0] 6=32 bits.. */
-#define CONFIG_SYS_CS2_SUPERVISOR_PROTECT	0 /* 1 : user mode access prohibited */
-#define CONFIG_SYS_CS2_WRITE_PROTECT		0 /* 1 : write access prohibited */
-#define CONFIG_SYS_CS2_EB_SIGNAL_CONTROL_WRITE	1 /* 1 when EB is used as write signal */
+#define CONFIG_SYS_CS2_CHIP_SELECT_ENABLE	0 /* 1 : enable CS0 */
+#define CONFIG_SYS_CS2_PIN_ASSERT		0 /* chip select pin state */
+						/* when chip select disabled */
+#define CONFIG_SYS_CS2_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] */
+					/* 3=8bits on D[7:0] 6=32 bits.. */
+#define CONFIG_SYS_CS2_SUPERVISOR_PROTECT	0 /* 1 user access prohibited*/
+#define CONFIG_SYS_CS2_WRITE_PROTECT		0 /* 1 wr access prohibited */
+#define CONFIG_SYS_CS2_EB_SIGNAL_CONTROL_WRITE	1 /* 1 EB used as wr signal*/
 
 #define CONFIG_SYS_CS2_READ_CYC_LGTH		0	/* ns */
 #define CONFIG_SYS_CS2_OE_ASSERT_DLY		0	/* ns */
 #define CONFIG_SYS_CS2_OE_NEG_DLY		0	/* ns */
 
-#define CONFIG_SYS_CS2_CS_NEG_LGTH 	0	/* max 30 ns CS HIGH to CS LOW at 100MHz */
-#define CONFIG_SYS_CS2_XTRA_DEAD_CYC	0	/* ns from CS HIGH to tristate bus */
+#define CONFIG_SYS_CS2_CS_NEG_LGTH		0 /* max 30ns CS HIGH to LOW*/
+#define CONFIG_SYS_CS2_XTRA_DEAD_CYC		0 /* ns CS HIGH to tristate */
 
 #define CONFIG_SYS_CS2_WRITE_XTRA_LGTH		0	/* ns */
 #define CONFIG_SYS_CS2_EB_ASSERT_DLY		0	/* ns */
 #define CONFIG_SYS_CS2_EB_NEG_DLY		0	/* ns */
 #define CONFIG_SYS_CS2_CS_ASSERT_NEG_DLY	0	/* ns */
 
-#define CONFIG_SYS_CS2_SYNC_ENABLE		0 /* enable synchronous burst mode */
-#define CONFIG_SYS_CS2_SYNC_PAGE_MODE_EMUL	0 /* enable page mode emulation */
-#define CONFIG_SYS_CS2_SYNC_PAGE_SIZE		0 /* 4 words page size (8bytes) */
+#define CONFIG_SYS_CS2_SYNC_ENABLE		0 /* enable sync burst mode */
+#define CONFIG_SYS_CS2_SYNC_PAGE_MODE_EMUL	0
+#define CONFIG_SYS_CS2_SYNC_PAGE_SIZE		0 /* 4 words page size */
 #define CONFIG_SYS_CS2_SYNC_BURST_CLK_START	0 /* 0 ns burst clock delay */
 #define CONFIG_SYS_CS2_SYNC_BURST_CLK_DIV	0 /* 0 : divider is 1 */
 #define CONFIG_SYS_CS2_SYNC_DAT_OUT_LGTH	0 /* ns */
 
 /* CS3 configuration for ISP1760 */
-#define CONFIG_SYS_CS3_CHIP_SELECT_ENABLE	1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS3_PIN_ASSERT		0 /* chip select pin state when */
-						/* chip select disabled */
-#define CONFIG_SYS_CS3_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] pins */
-						/* 3=8bits on D[7:0] 6=32 bits.. */
-#define CONFIG_SYS_CS3_SUPERVISOR_PROTECT	0 /* 1: user mode access prohibited */
-#define CONFIG_SYS_CS3_WRITE_PROTECT		0 /* 1: write access prohibited */
-#define CONFIG_SYS_CS3_EB_SIGNAL_CONTROL_WRITE	1 /* 1 when EB is used as write signal */
+#define CONFIG_SYS_CS3_CHIP_SELECT_ENABLE	1 /* 1 : enable CS0 */
+#define CONFIG_SYS_CS3_PIN_ASSERT		0 /* chip select pin state */
+						/* when chip select disabled */
+#define CONFIG_SYS_CS3_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] */
+					/* 3=8bits on D[7:0] 6=32 bits.. */
+#define CONFIG_SYS_CS3_SUPERVISOR_PROTECT	0 /* 1 user access prohibited*/
+#define CONFIG_SYS_CS3_WRITE_PROTECT		0 /* 1 wr access prohibited */
+#define CONFIG_SYS_CS3_EB_SIGNAL_CONTROL_WRITE	1 /* 1 EB used as wr signal*/
 
 #define CONFIG_SYS_CS3_READ_CYC_LGTH		110	/* ns */
 #define CONFIG_SYS_CS3_OE_ASSERT_DLY		45	/* ns */
 #define CONFIG_SYS_CS3_OE_NEG_DLY		40	/* ns */
 
-#define CONFIG_SYS_CS3_CS_NEG_LGTH 	30	/* max 30 ns CS HIGH to CS LOW at 100MHz */
-#define CONFIG_SYS_CS3_XTRA_DEAD_CYC	0	/* ns from CS HIGH to tristate bus */
+#define CONFIG_SYS_CS3_CS_NEG_LGTH		30 /* max 30ns CS HIGH to LOW*/
+#define CONFIG_SYS_CS3_XTRA_DEAD_CYC		0 /* ns CS HIGH to tristate */
 
 #define CONFIG_SYS_CS3_WRITE_XTRA_LGTH		0	/* ns */
 #define CONFIG_SYS_CS3_EB_ASSERT_DLY		45	/* ns */
 #define CONFIG_SYS_CS3_EB_NEG_DLY		45	/* ns */
 #define CONFIG_SYS_CS3_CS_ASSERT_NEG_DLY	35	/* ns */
 
-#define CONFIG_SYS_CS3_SYNC_ENABLE		0 /* enable synchronous burst mode */
-#define CONFIG_SYS_CS3_SYNC_PAGE_MODE_EMUL	0 /* enable page mode emulation */
-#define CONFIG_SYS_CS3_SYNC_PAGE_SIZE		0 /* 4 words page size (8bytes) */
+#define CONFIG_SYS_CS3_SYNC_ENABLE		0 /* enable sync burst mode */
+#define CONFIG_SYS_CS3_SYNC_PAGE_MODE_EMUL	0
+#define CONFIG_SYS_CS3_SYNC_PAGE_SIZE		0 /* 4 words page size */
 #define CONFIG_SYS_CS3_SYNC_BURST_CLK_START	0 /* 0 ns burst clock delay */
 #define CONFIG_SYS_CS3_SYNC_BURST_CLK_DIV	0 /* 0 : divider is 1 */
 #define CONFIG_SYS_CS3_SYNC_DAT_OUT_LGTH	0 /* ns */
 
 /* CS4 configuration for DM9000 ethernet chipset */
-#define CONFIG_SYS_CS4_CHIP_SELECT_ENABLE	1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS4_PIN_ASSERT		0 /* chip select pin state when */
-						/* chip select disabled */
-#define CONFIG_SYS_CS4_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] pins */
-						/* 3=8bits on D[7:0] 6=32 bits.. */
-#define CONFIG_SYS_CS4_SUPERVISOR_PROTECT	0 /* 1 : user mode access prohibited */
-#define CONFIG_SYS_CS4_WRITE_PROTECT		0 /* 1 : write access prohibited */
-#define CONFIG_SYS_CS4_EB_SIGNAL_CONTROL_WRITE	1 /* 1 when EB is used as write signal */
+#define CONFIG_SYS_CS4_CHIP_SELECT_ENABLE	1 /* 1 : enable CS0 */
+#define CONFIG_SYS_CS4_PIN_ASSERT		0 /* chip select pin state */
+						/* when chip select disabled */
+#define CONFIG_SYS_CS4_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] */
+					/* 3=8bits on D[7:0] 6=32 bits.. */
+#define CONFIG_SYS_CS4_SUPERVISOR_PROTECT	0 /* 1 user access prohibited*/
+#define CONFIG_SYS_CS4_WRITE_PROTECT		0 /* 1 wr access prohibited */
+#define CONFIG_SYS_CS4_EB_SIGNAL_CONTROL_WRITE	1 /* 1 EB used as wr signal*/
 
 #define CONFIG_SYS_CS4_READ_CYC_LGTH		72 /* ns */
 #define CONFIG_SYS_CS4_OE_ASSERT_DLY		5 /* ns */
 #define CONFIG_SYS_CS4_OE_NEG_DLY		45 /* ns */
 
-#define CONFIG_SYS_CS4_CS_NEG_LGTH 	30	/* max 30 ns CS HIGH to CS LOW at 100MHz */
-#define CONFIG_SYS_CS4_XTRA_DEAD_CYC	0	/* ns from CS HIGH to tristate bus */
+#define CONFIG_SYS_CS4_CS_NEG_LGTH		30 /* max 30ns CS HIGH to LOW*/
+#define CONFIG_SYS_CS4_XTRA_DEAD_CYC		0 /* ns CS HIGH to tristate */
 
 #define CONFIG_SYS_CS4_WRITE_XTRA_LGTH		0	/* ns */
 #define CONFIG_SYS_CS4_EB_ASSERT_DLY		5	/* ns */
 #define CONFIG_SYS_CS4_EB_NEG_DLY		45	/* ns */
 #define CONFIG_SYS_CS4_CS_ASSERT_NEG_DLY	0	/* ns */
 
-#define CONFIG_SYS_CS4_SYNC_ENABLE		0 /* enable synchronous burst mode */
-#define CONFIG_SYS_CS4_SYNC_PAGE_MODE_EMUL	0 /* enable page mode emulation */
-#define CONFIG_SYS_CS4_SYNC_PAGE_SIZE		0 /* 4 words page size (8bytes) */
+#define CONFIG_SYS_CS4_SYNC_ENABLE		0 /* enable sync burst mode */
+#define CONFIG_SYS_CS4_SYNC_PAGE_MODE_EMUL	0
+#define CONFIG_SYS_CS4_SYNC_PAGE_SIZE		0 /* 4 words page size */
 #define CONFIG_SYS_CS4_SYNC_BURST_CLK_START	0 /* 0 ns burst clock delay */
 #define CONFIG_SYS_CS4_SYNC_BURST_CLK_DIV	0 /* 0 : divider is 1 */
 #define CONFIG_SYS_CS4_SYNC_DAT_OUT_LGTH	0 /* ns */
 
 /* CS5 configuration for */
-#define CONFIG_SYS_CS5_CHIP_SELECT_ENABLE	1 /* 1 : enable CS0 peripherals */
-#define CONFIG_SYS_CS5_PIN_ASSERT		0 /* chip select pin state when */
-						/* chip select disabled */
-#define CONFIG_SYS_CS5_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] pins */
-						/* 3=8bits on D[7:0] 6=32 bits.. */
-#define CONFIG_SYS_CS5_SUPERVISOR_PROTECT	0 /* 1: user mode access prohibited */
-#define CONFIG_SYS_CS5_WRITE_PROTECT		0 /* 1 : write access prohibited */
-#define CONFIG_SYS_CS5_EB_SIGNAL_CONTROL_WRITE	1 /* 1 when EB is used as write signal */
+#define CONFIG_SYS_CS5_CHIP_SELECT_ENABLE	1 /* 1 : enable CS0 */
+#define CONFIG_SYS_CS5_PIN_ASSERT		0 /* chip select pin state */
+						/* when chip select disabled */
+#define CONFIG_SYS_CS5_DATA_PORT_SIZE		0x5 /* 5=16 bits on D[15:0] */
+					/* 3=8bits on D[7:0] 6=32 bits.. */
+#define CONFIG_SYS_CS5_SUPERVISOR_PROTECT	0 /* 1 user access prohibited*/
+#define CONFIG_SYS_CS5_WRITE_PROTECT		0 /* 1 wr access prohibited */
+#define CONFIG_SYS_CS5_EB_SIGNAL_CONTROL_WRITE	1 /* 1 EB used as wr signal*/
 #define CONFIG_SYS_CS5_DTACK_SELECT		1 /* Activate DTACK fonction */
 						/* (asynchrone bus) */
 
-#define CONFIG_SYS_CS5_READ_CYC_LGTH		-1 /* ns or -1 to DTACK function */
+#define CONFIG_SYS_CS5_READ_CYC_LGTH		-1 /* ns or -1 DTACK function*/
 #define CONFIG_SYS_CS5_OE_ASSERT_DLY		10	/* ns */
 #define CONFIG_SYS_CS5_OE_NEG_DLY		10	/* ns */
 
-#define CONFIG_SYS_CS5_CS_NEG_LGTH 		10 /* max 30 ns CS HIGH to CS LOW at 100MHz */
-#define CONFIG_SYS_CS5_XTRA_DEAD_CYC		0 /* ns from CS HIGH to tristate bus */
+#define CONFIG_SYS_CS5_CS_NEG_LGTH		10 /* max 30ns CS HIGH to LOW*/
+#define CONFIG_SYS_CS5_XTRA_DEAD_CYC		0 /* ns CS HIGH to tristate */
 
 #define CONFIG_SYS_CS5_WRITE_XTRA_LGTH		0	/* ns */
 #define CONFIG_SYS_CS5_EB_ASSERT_DLY		10	/* ns */
 #define CONFIG_SYS_CS5_EB_NEG_DLY		10	/* ns */
 #define CONFIG_SYS_CS5_CS_ASSERT_NEG_DLY	0	/* ns */
 
-#define CONFIG_SYS_CS5_SYNC_ENABLE		0 /* enable synchron burst mode */
-#define CONFIG_SYS_CS5_SYNC_PAGE_MODE_EMUL	0 /* enable page mode emulation */
-#define CONFIG_SYS_CS5_SYNC_PAGE_SIZE		0 /* 4 words page size (8bytes) */
+#define CONFIG_SYS_CS5_SYNC_ENABLE		0 /* enable sync burst mode */
+#define CONFIG_SYS_CS5_SYNC_PAGE_MODE_EMUL	0
+#define CONFIG_SYS_CS5_SYNC_PAGE_SIZE		0 /* 4 words page size */
 #define CONFIG_SYS_CS5_SYNC_BURST_CLK_START	0 /* 0 ns burst clock delay */
 #define CONFIG_SYS_CS5_SYNC_BURST_CLK_DIV	0 /* 0 : divider is 1 */
 #define CONFIG_SYS_CS5_SYNC_DAT_OUT_LGTH	0	/* ns */
@@ -726,7 +726,7 @@
  * All Equations are automatic
  */
 
-#define CONFIG_SYS_HCLK_LGTH		(1000/CONFIG_SYS_BUS_FREQ)	/* ns */
+#define CONFIG_SYS_HCLK_LGTH		(1000/CONFIG_SYS_BUS_FREQ) /* ns */
 
 /* USB 48 MHz ; BUS 96MHz*/
 #ifdef CONFIG_SYS_OSC16
@@ -735,7 +735,7 @@
 #define CSCR_MASK 0x23000003
 #endif
 #define CONFIG_SYS_CSCR_VAL\
-	(CSCR_MASK 						\
+	(CSCR_MASK						\
 	|((((CONFIG_SYS_FREQ/CONFIG_USB_FREQ)-1)&0x07)<<26)	\
 	|((((CONFIG_SYS_FREQ/CONFIG_SYS_BUS_FREQ)-1)&0x0F)<<10))
 
@@ -801,7 +801,7 @@
 
 /* Issue Precharge all Command to SDRAM*/
 #define CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL\
-	(((CONFIG_SYS_SDRAM_SINGLE_ACCESS)&0x1)<<(CONFIG_SYS_SDRAM_NUM_COL+4+9))
+	(((CONFIG_SYS_SDRAM_SINGLE_ACCESS)&0x1)<<(CONFIG_SYS_SDRAM_NUM_COL+13))
 
 /*
  * CSxU_VAL:
@@ -818,15 +818,21 @@
  *   |  CSA  |EBC|  DSZ  | 0|SP|0|WP|0 0|PA |CSEN |
  */
 #define CONFIG_SYS_CS0U_VAL\
-	((((CONFIG_SYS_CS0_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
-	|((((CONFIG_SYS_CS0_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
-	|(((((CONFIG_SYS_CS0_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
-	|((((CONFIG_SYS_CS0_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
-	|((((CONFIG_SYS_CS0_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	((((CONFIG_SYS_CS0_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)\
+	|((((CONFIG_SYS_CS0_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
+	|(((((CONFIG_SYS_CS0_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
+	|((((CONFIG_SYS_CS0_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
+	|((((CONFIG_SYS_CS0_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
 	|((CONFIG_SYS_CS0_SYNC_ENABLE&0x01)<<20)\
 	|((CONFIG_SYS_CS0_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
 	|((CONFIG_SYS_CS0_SYNC_PAGE_SIZE&0x03)<<22)\
-	|((((CONFIG_SYS_CS0_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|((((CONFIG_SYS_CS0_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
 	|((CONFIG_SYS_CS0_SYNC_BURST_CLK_DIV&0x03)<<28))
 
 #define CONFIG_SYS_CS0L_VAL\
@@ -835,22 +841,33 @@
 	|((CONFIG_SYS_CS0_SUPERVISOR_PROTECT&0x01)<<6)\
 	|((CONFIG_SYS_CS0_DATA_PORT_SIZE&0x07)<<8)\
 	|((CONFIG_SYS_CS0_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
-	|((((CONFIG_SYS_CS0_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
-	|(((((CONFIG_SYS_CS0_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
-	|(((((CONFIG_SYS_CS0_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
-	|(((((CONFIG_SYS_CS0_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
-	|(((((CONFIG_SYS_CS0_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
+	|((((CONFIG_SYS_CS0_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
+	|(((((CONFIG_SYS_CS0_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	|(((((CONFIG_SYS_CS0_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
+	|(((((CONFIG_SYS_CS0_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|(((((CONFIG_SYS_CS0_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
 
 #define CONFIG_SYS_CS1U_VAL\
-	((((CONFIG_SYS_CS1_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
-	|((((CONFIG_SYS_CS1_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
-	|(((((CONFIG_SYS_CS1_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
-	|((((CONFIG_SYS_CS1_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
-	|((((CONFIG_SYS_CS1_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	((((CONFIG_SYS_CS1_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)\
+	|((((CONFIG_SYS_CS1_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
+	|(((((CONFIG_SYS_CS1_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
+	|((((CONFIG_SYS_CS1_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
+	|((((CONFIG_SYS_CS1_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
 	|((CONFIG_SYS_CS1_SYNC_ENABLE&0x01)<<20)\
 	|((CONFIG_SYS_CS1_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
 	|((CONFIG_SYS_CS1_SYNC_PAGE_SIZE&0x03)<<22)\
-	|((((CONFIG_SYS_CS1_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|((((CONFIG_SYS_CS1_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
 	|((CONFIG_SYS_CS1_SYNC_BURST_CLK_DIV&0x03)<<28))
 
 #define CONFIG_SYS_CS1L_VAL\
@@ -860,22 +877,33 @@
 	|((CONFIG_SYS_CS1_SUPERVISOR_PROTECT&0x01)<<6)\
 	|((CONFIG_SYS_CS1_DATA_PORT_SIZE&0x07)<<8)\
 	|((CONFIG_SYS_CS1_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
-	|((((CONFIG_SYS_CS1_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
-	|(((((CONFIG_SYS_CS1_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
-	|(((((CONFIG_SYS_CS1_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
-	|(((((CONFIG_SYS_CS1_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
-	|(((((CONFIG_SYS_CS1_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
+	|((((CONFIG_SYS_CS1_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
+	|(((((CONFIG_SYS_CS1_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	|(((((CONFIG_SYS_CS1_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
+	|(((((CONFIG_SYS_CS1_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|(((((CONFIG_SYS_CS1_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
 
 #define CONFIG_SYS_CS2U_VAL\
-	(((((CONFIG_SYS_CS2_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
-	|((((CONFIG_SYS_CS2_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
-	|(((((CONFIG_SYS_CS2_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
-	|((((CONFIG_SYS_CS2_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
-	|(((CONFIG_SYS_CS2_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	(((((CONFIG_SYS_CS2_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)\
+	|((((CONFIG_SYS_CS2_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
+	|(((((CONFIG_SYS_CS2_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
+	|((((CONFIG_SYS_CS2_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
+	|(((CONFIG_SYS_CS2_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
 	|((CONFIG_SYS_CS2_SYNC_ENABLE&0x01)<<20)\
 	|((CONFIG_SYS_CS2_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
 	|((CONFIG_SYS_CS2_SYNC_PAGE_SIZE&0x03)<<22)\
-	|((((CONFIG_SYS_CS2_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|((((CONFIG_SYS_CS2_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
 	|((CONFIG_SYS_CS2_SYNC_BURST_CLK_DIV&0x03)<<28))
 
 #define CONFIG_SYS_CS2L_VAL\
@@ -885,22 +913,33 @@
 	|((CONFIG_SYS_CS2_SUPERVISOR_PROTECT&0x01)<<6)\
 	|((CONFIG_SYS_CS2_DATA_PORT_SIZE&0x07)<<8)\
 	|((CONFIG_SYS_CS2_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
-	|((((CONFIG_SYS_CS2_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
-	|(((((CONFIG_SYS_CS2_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
-	|(((((CONFIG_SYS_CS2_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
-	|(((((CONFIG_SYS_CS2_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
-	|(((((CONFIG_SYS_CS2_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
+	|((((CONFIG_SYS_CS2_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
+	|(((((CONFIG_SYS_CS2_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	|(((((CONFIG_SYS_CS2_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
+	|(((((CONFIG_SYS_CS2_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|(((((CONFIG_SYS_CS2_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
 
 #define CONFIG_SYS_CS3U_VAL\
-	((((CONFIG_SYS_CS3_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
-	|((((CONFIG_SYS_CS3_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
-	|(((((CONFIG_SYS_CS3_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
-	|((((CONFIG_SYS_CS3_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
-	|((((CONFIG_SYS_CS3_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	((((CONFIG_SYS_CS3_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)\
+	|((((CONFIG_SYS_CS3_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
+	|(((((CONFIG_SYS_CS3_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
+	|((((CONFIG_SYS_CS3_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
+	|((((CONFIG_SYS_CS3_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
 	|((CONFIG_SYS_CS3_SYNC_ENABLE&0x01)<<20)\
 	|((CONFIG_SYS_CS3_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
 	|((CONFIG_SYS_CS3_SYNC_PAGE_SIZE&0x03)<<22)\
-	|((((CONFIG_SYS_CS3_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|((((CONFIG_SYS_CS3_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
 	|((CONFIG_SYS_CS3_SYNC_BURST_CLK_DIV&0x03)<<28))
 
 #define CONFIG_SYS_CS3L_VAL\
@@ -910,22 +949,33 @@
 	|((CONFIG_SYS_CS3_SUPERVISOR_PROTECT&0x01)<<6)\
 	|((CONFIG_SYS_CS3_DATA_PORT_SIZE&0x07)<<8)\
 	|((CONFIG_SYS_CS3_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
-	|((((CONFIG_SYS_CS3_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
-	|(((((CONFIG_SYS_CS3_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
-	|(((((CONFIG_SYS_CS3_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
-	|(((((CONFIG_SYS_CS3_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
-	|(((((CONFIG_SYS_CS3_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
+	|((((CONFIG_SYS_CS3_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
+	|(((((CONFIG_SYS_CS3_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	|(((((CONFIG_SYS_CS3_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
+	|(((((CONFIG_SYS_CS3_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|(((((CONFIG_SYS_CS3_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
 
 #define CONFIG_SYS_CS4U_VAL\
-	(((((CONFIG_SYS_CS4_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
-	|((((CONFIG_SYS_CS4_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
-	|(((((CONFIG_SYS_CS4_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
-	|((((CONFIG_SYS_CS4_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
-	|((((CONFIG_SYS_CS4_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16))\
+	(((((CONFIG_SYS_CS4_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)\
+	|((((CONFIG_SYS_CS4_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
+	|(((((CONFIG_SYS_CS4_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
+	|((((CONFIG_SYS_CS4_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
+	|((((CONFIG_SYS_CS4_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16))\
 	|((CONFIG_SYS_CS4_SYNC_ENABLE&0x01)<<20)\
 	|((CONFIG_SYS_CS4_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
 	|((CONFIG_SYS_CS4_SYNC_PAGE_SIZE&0x03)<<22)\
-	|((((CONFIG_SYS_CS4_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|((((CONFIG_SYS_CS4_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
 	|((CONFIG_SYS_CS4_SYNC_BURST_CLK_DIV&0x03)<<28))
 
 #define CONFIG_SYS_CS4L_VAL\
@@ -935,22 +985,33 @@
 	|((CONFIG_SYS_CS4_SUPERVISOR_PROTECT&0x01)<<6)\
 	|((CONFIG_SYS_CS4_DATA_PORT_SIZE&0x07)<<8)\
 	|((CONFIG_SYS_CS4_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
-	|((((CONFIG_SYS_CS4_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
-	|(((((CONFIG_SYS_CS4_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
-	|(((((CONFIG_SYS_CS4_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
-	|(((((CONFIG_SYS_CS4_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
-	|(((((CONFIG_SYS_CS4_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
+	|((((CONFIG_SYS_CS4_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
+	|(((((CONFIG_SYS_CS4_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	|(((((CONFIG_SYS_CS4_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
+	|(((((CONFIG_SYS_CS4_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|(((((CONFIG_SYS_CS4_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
 
 #define CONFIG_SYS_CS5U_VAL\
-	((((CONFIG_SYS_CS5_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)\
-	|((((CONFIG_SYS_CS5_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
-	|(((((CONFIG_SYS_CS5_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
-	|((((CONFIG_SYS_CS5_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
-	|((((CONFIG_SYS_CS5_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	((((CONFIG_SYS_CS5_XTRA_DEAD_CYC+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)\
+	|((((CONFIG_SYS_CS5_WRITE_XTRA_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<4)\
+	|(((((CONFIG_SYS_CS5_READ_CYC_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)-1)&0x3F)<<8)\
+	|((((CONFIG_SYS_CS5_CS_NEG_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x03)<<14)\
+	|((((CONFIG_SYS_CS5_SYNC_DAT_OUT_LGTH+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
 	|((CONFIG_SYS_CS5_SYNC_ENABLE&0x01)<<20)\
 	|((CONFIG_SYS_CS5_SYNC_PAGE_MODE_EMUL&0x01)<<21)\
 	|((CONFIG_SYS_CS5_SYNC_PAGE_SIZE&0x03)<<22)\
-	|((((CONFIG_SYS_CS5_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|((((CONFIG_SYS_CS5_SYNC_BURST_CLK_START+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
 	|((CONFIG_SYS_CS5_SYNC_BURST_CLK_DIV&0x03)<<28)\
 	|((CONFIG_SYS_CS5_DTACK_SELECT&0x01)<<31))
 
@@ -961,10 +1022,15 @@
 	|((CONFIG_SYS_CS5_SUPERVISOR_PROTECT&0x01)<<6)\
 	|((CONFIG_SYS_CS5_DATA_PORT_SIZE&0x07)<<8)\
 	|((CONFIG_SYS_CS5_EB_SIGNAL_CONTROL_WRITE&0x01)<<11)\
-	|((((CONFIG_SYS_CS5_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
-	|(((((CONFIG_SYS_CS5_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
-	|(((((CONFIG_SYS_CS5_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
-	|(((((CONFIG_SYS_CS5_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
-	|(((((CONFIG_SYS_CS5_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
+	|((((CONFIG_SYS_CS5_CS_ASSERT_NEG_DLY+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<12)\
+	|(((((CONFIG_SYS_CS5_EB_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<16)\
+	|(((((CONFIG_SYS_CS5_EB_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<20)\
+	|(((((CONFIG_SYS_CS5_OE_NEG_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<24)\
+	|(((((CONFIG_SYS_CS5_OE_ASSERT_DLY*2)+CONFIG_SYS_HCLK_LGTH-1)\
+		/CONFIG_SYS_HCLK_LGTH)&0x0F)<<28))
 
 #endif /* __CONFIG_H */


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-420-ga409f2c

[jorasse <jo...@us...>]

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  a409f2c8c84f4de478cbe30f96f2318dc1c70c81 (commit)
      from  3da68edb55e2da1289437c5928c3c8d70f6ded8a (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 a409f2c8c84f4de478cbe30f96f2318dc1c70c81
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jun 26 00:29:39 2012 +0200

    [UBOOT] apf28: fix typo / checkpatch

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

Summary of changes:
 .../u-boot/2012.04/501-imx28-update-and-fix.patch  |    2 +-
 patches/u-boot/2012.04/502-add-apf28.patch         |  104 ++++++++++----------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/patches/u-boot/2012.04/501-imx28-update-and-fix.patch b/patches/u-boot/2012.04/501-imx28-update-and-fix.patch
index ecb9f6c..0cddc29 100644
--- a/patches/u-boot/2012.04/501-imx28-update-and-fix.patch
+++ b/patches/u-boot/2012.04/501-imx28-update-and-fix.patch
@@ -36,7 +36,7 @@ index 963e4f3..112ae6e 100644
  		return (0);
  	}
  
-+	sync ();
++	sync();
 +	*addr = save[i];
  	for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
  		addr = base + cnt;	/* pointer arith! */
diff --git a/patches/u-boot/2012.04/502-add-apf28.patch b/patches/u-boot/2012.04/502-add-apf28.patch
index c1831cd..b80c581 100644
--- a/patches/u-boot/2012.04/502-add-apf28.patch
+++ b/patches/u-boot/2012.04/502-add-apf28.patch
@@ -51,7 +51,7 @@ index 0000000..30906a0
 +
 +ifndef	CONFIG_SPL_BUILD
 +COBJS-$(CONFIG_IMX_OCOTP) += cmd_ocotp.o
-+COBJS	:= $(COBJS-y) mx28_bcb.o apf28.o 
++COBJS	:= $(COBJS-y) mx28_bcb.o apf28.o
 +else
 +COBJS	:= spl_boot.o
 +endif
@@ -81,7 +81,7 @@ index 0000000..c00b55c
 +/*
 + * APF28 motherboard based on DENX M28 module
 + *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...> 
++ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
 + * Copyright (C) 2011 Marek Vasut <mar...@gm...>
 + * on behalf of DENX Software Engineering GmbH
 + *
@@ -260,8 +260,8 @@ index 0000000..c00b55c
 +
 +	writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_clr);
 +
-+	mac[0] = (ACFG_OUI>> 16) & 0xff;
-+	mac[1] = (ACFG_OUI>> 8) & 0xff;
++	mac[0] = (ACFG_OUI >> 16) & 0xff;
++	mac[1] = (ACFG_OUI >> 8) & 0xff;
 +
 +	if (dev_id == 1) /* Let MAC1 be MAC0 + 1 by default */
 +		mac[5] += 1;
@@ -274,9 +274,9 @@ new file mode 100644
 index 0000000..e025334
 --- /dev/null
 +++ b/board/armadeus/apf28/cmd_ocotp.c
-@@ -0,0 +1,275 @@
+@@ -0,0 +1,269 @@
 +/*
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...> 
++ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
 + *
 + * See file CREDITS for list of people who contributed to this
 + * project.
@@ -314,16 +314,14 @@ index 0000000..e025334
 +	u32 otpctrl;
 +
 +	if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
-+				MXS_OCOTP_MAX_TIMEOUT))
-+	{
-+		printf("OCOTP still busy after timeout \n");
++				MXS_OCOTP_MAX_TIMEOUT)) {
++		printf("OCOTP still busy after timeout\n");
 +		return -1;
 +	}
 +
 +	otpctrl = readl(&ocotp_regs->hw_ocotp_ctrl_reg);
 +
-+	if (otpctrl & OCOTP_CTRL_ERROR)
-+	{
++	if (otpctrl & OCOTP_CTRL_ERROR) {
 +		printf("OCOTP error: CTRL register value: 0x%x\n", otpctrl);
 +		return -1;
 +	}
@@ -335,24 +333,21 @@ index 0000000..e025334
 +{
 +	u32 val = 0, otpctrl;
 +
-+	if ((addr < 0) || (addr > 0x27))
-+	{
++	if ((addr < 0) || (addr > 0x27)) {
 +		printf("Invalid address! (should be between 0 and 0x27)\n");
 +		return val;
 +	}
-+	
++
 +	if (otp_error())
-+	{
 +		return val;
-+	}
++
 +	otpctrl = readl(&ocotp_regs->hw_ocotp_ctrl_reg);
 +
-+	if (otpctrl & OCOTP_CTRL_ERROR)
-+	{
++	if (otpctrl & OCOTP_CTRL_ERROR) {
 +		printf("OCOTP in error: CTRL register value: 0x%x\n", otpctrl);
 +		return val;
 +	}
-+	
++
 +	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,
@@ -377,8 +372,7 @@ index 0000000..e025334
 +	struct mx28_power_regs *power_regs =
 +		(struct mx28_power_regs *)MXS_POWER_BASE;
 +
-+	if ((addr < 0) || (addr > 0x27))
-+	{
++	if ((addr < 0) || (addr > 0x27)) {
 +		printf("Invalid address! (should be between 0 and 0x27)\n");
 +		return -1;
 +	}
@@ -390,7 +384,8 @@ index 0000000..e025334
 +
 +	/* Force HBUS and CPU down to 24 MHz */
 +	writel(CLKCTRL_CLKSEQ_BYPASS_CPU, &clkctrl_regs->hw_clkctrl_clkseq_set);
-+	writel(1 << CLKCTRL_HBUS_DIV_OFFSET, &clkctrl_regs->hw_clkctrl_hbus_set);
++	writel(1 << CLKCTRL_HBUS_DIV_OFFSET,
++		&clkctrl_regs->hw_clkctrl_hbus_set);
 +	writel(CLKCTRL_HBUS_DIV_MASK - 1, &clkctrl_regs->hw_clkctrl_hbus_clr);
 +
 +	/* Change VDDIO to 2.8V while burning the fuses */
@@ -399,9 +394,8 @@ index 0000000..e025334
 +	/* Disable read bank */
 +	writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_clr);
 +
-+ 	/* Check ocotp status busy and error */
-+	if (!otp_error())
-+	{
++	/* Check ocotp status busy and error */
++	if (!otp_error()) {
 +		/* initiate fuse blow at addr.. */
 +		writel(OCOTP_CTRL_WR_UNLOCK_KEY | (addr & OCOTP_CTRL_ADDR_MASK),
 +		&ocotp_regs->hw_ocotp_ctrl);
@@ -410,21 +404,21 @@ index 0000000..e025334
 +		writel(data, &ocotp_regs->hw_ocotp_data);
 +
 +		/* wait end of blowing process + 2us wrtie postamble*/
-+		if (otp_error())
-+		{
-+			printf("OCOTP blow failed!\n");	
++		if (otp_error()) {
++			printf("OCOTP blow failed!\n");
 +			err = -1;
 +		}
 +		udelay(2);
 +
-+	} else err = -1;
++	} else
++		err = -1;
 +
 +
 +	/* restore HBUS, CLKSEQ and VDDIO */
 +	writel(vddio, &power_regs->hw_power_vddioctrl);
 +	writel(hbus, &clkctrl_regs->hw_clkctrl_hbus);
 +	writel(clkseq, &clkctrl_regs->hw_clkctrl_clkseq);
-+	
++
 +	return err;
 +}
 +
@@ -433,7 +427,7 @@ index 0000000..e025334
 +	s32 err = 0;
 +
 +	if (0 == strncmp(func_name, "fecmac", 6)) {
-+		s32 addr  = func_name[6] -'0';
++		s32 addr = func_name[6] - '0';
 +
 +		if ((addr >= 0) && (addr < 2)) {
 +			/* Read the Mac address and print it */
@@ -441,7 +435,7 @@ index 0000000..e025334
 +
 +			printf("%s address: ", func_name);
 +			printf("0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n\n",
-+				(ACFG_OUI>> 16) & 0xff, (ACFG_OUI>> 8) & 0xff,
++				(ACFG_OUI >> 16) & 0xff, (ACFG_OUI >> 8) & 0xff,
 +				(val >> 24) & 0xff, (val >> 16) & 0xff,
 +				(val >> 8) & 0xff, val & 0xff);
 +		} else {
@@ -461,7 +455,7 @@ index 0000000..e025334
 +	s32 err = 0;
 +
 +	if (0 == strncmp(func_name, "fecmac", 6)) {
-+		s32 addr  = func_name[6] -'0';
++		s32 addr  = func_name[6] - '0';
 +
 +		if ((addr >= 0) && (addr < 2)) {
 +			u8 ea[6] = { 0 };
@@ -555,11 +549,11 @@ new file mode 100644
 index 0000000..b69513a
 --- /dev/null
 +++ b/board/armadeus/apf28/mx28_bcb.c
-@@ -0,0 +1,554 @@
+@@ -0,0 +1,559 @@
 +/*
 + * i.MX28 NAND Boot Control Blocks generator
 + *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...> 
++ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
 + *
 + * Based on code from mxsboot:
 + * Freescale i.MX28 image generator
@@ -758,14 +752,16 @@ index 0000000..b69513a
 +static inline uint32_t mx28_nand_mark_byte_offset(nand_info_t *nand)
 +{
 +	uint32_t ecc_strength;
-+	ecc_strength = mx28_nand_get_ecc_strength(nand->writesize, nand->oobsize);
++	ecc_strength =
++		mx28_nand_get_ecc_strength(nand->writesize, nand->oobsize);
 +	return mx28_nand_get_mark_offset(nand->writesize, ecc_strength) >> 3;
 +}
 +
 +static inline uint32_t mx28_nand_mark_bit_offset(nand_info_t *nand)
 +{
 +	uint32_t ecc_strength;
-+	ecc_strength = mx28_nand_get_ecc_strength(nand->writesize, nand->oobsize);
++	ecc_strength =
++		mx28_nand_get_ecc_strength(nand->writesize, nand->oobsize);
 +	return mx28_nand_get_mark_offset(nand->writesize, ecc_strength) & 0x7;
 +}
 +
@@ -908,7 +904,8 @@ index 0000000..b69513a
 +	return parity;
 +}
 +
-+static uint8_t *mx28_nand_fcb_block(nand_info_t *nand, struct mx28_nand_fcb *fcb)
++static uint8_t *mx28_nand_fcb_block
++		(nand_info_t *nand, struct mx28_nand_fcb *fcb)
 +{
 +	uint8_t *block;
 +	uint8_t *ecc;
@@ -971,7 +968,8 @@ index 0000000..b69513a
 +
 +		printf("Writing FCB...\n");
 +
-+		for (i = 0; i < stride_pages * stride_count; i += stride_pages) {
++		for (i = 0; i < stride_pages * stride_count;
++				i += stride_pages) {
 +			offset = i * nand->writesize;
 +			ret = nand->write_oob(nand, offset, &ops);
 +		}
@@ -1026,14 +1024,16 @@ index 0000000..b69513a
 +	nand_info_t *nand = &nand_info[0];
 +	struct mx28_ocotp_regs *ocotp_regs =
 +		(struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
-+	char buf [12];
++	char buf[12];
 +
 +	stride_pages = ((readl(&ocotp_regs->hw_ocotp_rom1) >> 4) & 0x0f) * 64;
-+	if (stride_pages < 64) stride_pages = 64;
-+	
++	if (stride_pages < 64)
++		stride_pages = 64;
++
 +	stride_count = 1 << ((readl(&ocotp_regs->hw_ocotp_rom1) >> 8) & 0x0f);
-+	if (stride_count < 2) stride_count = 4;
-+	
++	if (stride_count < 2)
++		stride_count = 4;
++
 +	if (firmware_max_size <= nand->erasesize)
 +		firmware_max_size = 1 * 1024 * 1024;
 +
@@ -1066,9 +1066,11 @@ index 0000000..b69513a
 +		goto err2;
 +	}
 +
-+	sprintf(buf, "0x%08x", fcb->firmware1_starting_sector * nand->writesize);
++	sprintf(buf, "0x%08x",
++		fcb->firmware1_starting_sector * nand->writesize);
 +	setenv("u-boot_addr", buf);
-+	sprintf(buf, "0x%08x", fcb->firmware2_starting_sector * nand->writesize);
++	sprintf(buf, "0x%08x",
++		fcb->firmware2_starting_sector * nand->writesize);
 +	setenv("u-boot2_addr", buf);
 +
 +	printf("NAND BCB tables updated\n");
@@ -1091,13 +1093,11 @@ index 0000000..b69513a
 +		goto usage;
 +
 +	if (strcmp(argv[1], "nand.write") == 0) {
-+		if (argc == 3) {
++		if (argc == 3)
 +			arg = simple_strtoul(argv[2], NULL, 16);
-+		}
 +		err = mx28_update_nand_bcb(arg);
-+	} else {
++	} else
 +		goto usage;
-+	}
 +
 +	return err;
 +usage:
@@ -1119,7 +1119,7 @@ index 0000000..3769d44
 +/*
 + * Freescale i.MX28 Boot setup for the APF28 board
 + *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...> 
++ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
 + * Copyright (C) 2011 Marek Vasut <mar...@gm...>
 + * on behalf of DENX Software Engineering GmbH
 + *
@@ -1318,7 +1318,7 @@ index 0000000..3769d44
 +	A logic reset is more appropriate */
 +	setbits_le32(&clkctrl_regs->hw_clkctrl_reset,
 +			CLKCTRL_RESET_WDOG_POR_DISABLE);
-+	
++
 +	mx28_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
 +}
 +


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-419-g3da68ed

[jorasse <jo...@us...>]

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  3da68edb55e2da1289437c5928c3c8d70f6ded8a (commit)
      from  70f2d2053678126596e6f72890fc12edde06b824 (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 3da68edb55e2da1289437c5928c3c8d70f6ded8a
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jun 25 18:34:23 2012 +0200

    [UBOOT] add extrabootargs variable to linux boot usual parameters in order to simplify the kernel boot customization

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2012.04.h   |    8 ++++----
 .../device/armadeus/apf28/apf28-u-boot-2012.04.h   |    8 ++++----
 .../device/armadeus/apf51/apf51-u-boot-2012.04.h   |    8 ++++----
 .../armadeus/apf9328/apf9328-u-boot-2012.04.h      |    8 ++++----
 .../device/armadeus/pps/pps-u-boot-2012.04.h       |    8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index ae4e989..fe53929 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -24,7 +24,7 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"3.1"
+#define CONFIG_ENV_VERSION 	"3.2"
 #define CONFIG_IDENT_STRING	" apf27 patch 3.6"
 #define CONFIG_BOARD_NAME	apf27
 
@@ -218,20 +218,20 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off \0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs;"		\
+		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
 		"nfs ${kernel_addr_r} "					\
 		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts};run addubifsargs addipargs;"		\
+		"${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"nboot ${kernel_addr_r} kernel;"			\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addmmcargs addipargs;"		\
+		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index c33f3a5..0154045 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -25,7 +25,7 @@
 #include <asm/arch/regs-base.h>
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"1.1"
+#define CONFIG_ENV_VERSION 	"1.2"
 #define CONFIG_IDENT_STRING	" apf28 patch 1.5"
 #define CONFIG_BOARD_NAME	apf28
 
@@ -247,20 +247,20 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs;"		\
+		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
 		"nfs ${kernel_addr_r} "					\
 		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts};run addubifsargs addipargs;"		\
+		"${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"nboot ${kernel_addr_r} kernel;"			\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addmmcargs addipargs;"		\
+		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index ec6515b..6b9d2ed 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -24,7 +24,7 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"1.1"
+#define CONFIG_ENV_VERSION 	"1.2"
 #define CONFIG_IDENT_STRING	" apf51 patch 1.5"
 #define CONFIG_BOARD_NAME	apf51
 
@@ -226,20 +226,20 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs;"		\
+		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
 		"nfs ${kernel_addr_r} "					\
 		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts};run addubifsargs addipargs;"		\
+		"${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"nboot ${kernel_addr_r} kernel;"			\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
+		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"nboot ${kernel_addr_r} kernel;"			\
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
index ff052a1..afeb415 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
@@ -23,7 +23,7 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"5.2"
+#define CONFIG_ENV_VERSION 	"5.3"
 #define CONFIG_IDENT_STRING	" apf9328 patch 5.5"
 #define CONFIG_BOARD_NAME	apf9328
 
@@ -206,15 +206,15 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off \0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs; "		\
+		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs; "\
 		"nfs ${loadaddr} "					\
 		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
 		"bootm ${loadaddr}\0"				\
 	"jffsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addjffsargs addipargs; "		\
+		"${mtdparts} ${extrabootargs}; run addjffsargs addipargs; "\
 		"bootm ${kernel_addr}\0"				\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addmmcargs addipargs; "		\
+		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs; "\
 		"bootm ${kernel_addr}\0"	\
 	"flash_uboot=protect off nor0,0;"		\
 		"echo Erasing FLASH;"					\
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index 1f0b366..d399c3a 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -24,7 +24,7 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"3.1"
+#define CONFIG_ENV_VERSION 	"3.2"
 #define CONFIG_IDENT_STRING	" pps patch 3.5"
 #define CONFIG_BOARD_NAME	pps
 
@@ -218,20 +218,20 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off \0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs;"		\
+		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
 		"nfs ${kernel_addr_r} "					\
 		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts};run addubifsargs addipargs;"		\
+		"${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"nboot ${kernel_addr_r} kernel;"			\
 		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addmmcargs addipargs;"		\
+		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
 		"if test -n ${fdt_addr_r}  ; then "			\
 			"nand read ${fdt_addr_r} dtb; fi;"		\
 		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-418-g70f2d20

[jorasse <jo...@us...>]

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  70f2d2053678126596e6f72890fc12edde06b824 (commit)
      from  b7bd19e786a2b24a3c1e10f22201bd670f346c2a (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 70f2d2053678126596e6f72890fc12edde06b824
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jun 25 16:41:07 2012 +0200

    [UBOOT] apf9328: fix typo / checkpatch

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

Summary of changes:
 patches/u-boot/2012.04/102-mx1-i2c.patch |   26 +++++++++++++-------------
 patches/u-boot/2012.04/103-apf9328.patch |   17 ++++++++---------
 patches/u-boot/2012.04/108-DM9000.patch  |    2 +-
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/patches/u-boot/2012.04/102-mx1-i2c.patch b/patches/u-boot/2012.04/102-mx1-i2c.patch
index 6919c81..13720d6 100644
--- a/patches/u-boot/2012.04/102-mx1-i2c.patch
+++ b/patches/u-boot/2012.04/102-mx1-i2c.patch
@@ -26,19 +26,19 @@ index 0c26a36..a7b3404 100644
 +#define I2SR   __REG(IMX_I2C_BASE + 0x00C) /* I2C Status Register */
 +#define I2DR   __REG(IMX_I2C_BASE + 0x010) /* I2C Data I/O Register */
 +/* I2C Control Register Bit Fields */
-+#define I2CR_IEN 	(1<<7)		/* I2C Enable */
-+#define I2CR_IIEN 	(1<<6)		/* I2C Interrupt Enable */
-+#define I2CR_MSTA 	(1<<5)		/* I2C Master/Slave Mode Select */
-+#define I2CR_MTX 	(1<<4)		/* I2C Transmit/Receive Mode Select */
-+#define I2CR_TXAK 	(1<<3)		/* I2C Transmit Acknowledge Enable */
-+#define I2CR_RSTA 	(1<<2)		/* I2C Repeated START */
-+#define I2SR_ICF 	(1<<7)		/* I2C Data Transfer */
-+#define I2SR_IAAS 	(1<<6)		/* I2C Addressed As a Slave */
-+#define I2SR_IBB 	(1<<5)		/* I2C Bus Busy */
-+#define I2SR_IAL 	(1<<4)		/* I2C Arbitration Lost */
-+#define I2SR_SRW 	(1<<2)		/* I2C Slave Read/Write	*/
-+#define I2SR_IIF 	(1<<1)		/* I2C interrupt */
-+#define I2SR_RXAK 	(1<<0)		/* I2C Received Acknowledge */
++#define I2CR_IEN	(1<<7)		/* I2C Enable */
++#define I2CR_IIEN	(1<<6)		/* I2C Interrupt Enable */
++#define I2CR_MSTA	(1<<5)		/* I2C Master/Slave Mode Select */
++#define I2CR_MTX	(1<<4)		/* I2C Transmit/Receive Mode Select */
++#define I2CR_TXAK	(1<<3)		/* I2C Transmit Acknowledge Enable */
++#define I2CR_RSTA	(1<<2)		/* I2C Repeated START */
++#define I2SR_ICF	(1<<7)		/* I2C Data Transfer */
++#define I2SR_IAAS	(1<<6)		/* I2C Addressed As a Slave */
++#define I2SR_IBB	(1<<5)		/* I2C Bus Busy */
++#define I2SR_IAL	(1<<4)		/* I2C Arbitration Lost */
++#define I2SR_SRW	(1<<2)		/* I2C Slave Read/Write	*/
++#define I2SR_IIF	(1<<1)		/* I2C interrupt */
++#define I2SR_RXAK	(1<<0)		/* I2C Received Acknowledge */
 +
  #endif				/* _IMX_REGS_H */
 -- 
diff --git a/patches/u-boot/2012.04/103-apf9328.patch b/patches/u-boot/2012.04/103-apf9328.patch
index edd07ea..5be9d3d 100644
--- a/patches/u-boot/2012.04/103-apf9328.patch
+++ b/patches/u-boot/2012.04/103-apf9328.patch
@@ -201,7 +201,7 @@ new file mode 100644
 index 0000000..4c63c4e
 --- /dev/null
 +++ b/board/armadeus/apf9328/apf9328fpga.c
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,100 @@
 +/*
 + * (C) Copyright 2005-2011
 + * Nicolas Colombin <th...@us...>
@@ -285,9 +285,8 @@ index 0000000..4c63c4e
 +	}
 +
 +	if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+		if (mtdparts_init() == 0)
-+		if (find_dev_and_part("firmware", &dev, &pnum, &part) == 0)
-+		{
++		if ((mtdparts_init() == 0) &&
++		(find_dev_and_part("firmware", &dev, &pnum, &part) == 0)) {
 +			if (ctrlc()) {
 +				printf("Firmware download stopped!\n");
 +				lout = 0;
@@ -429,11 +428,11 @@ index 0000000..8f2ad9a
 +}
 +
 +U_BOOT_CMD(dm9000ee, 4, 1, do_dm9000_eeprom,
-+	   "Read/Write eeprom connected to Ethernet Controller",
-+	   "\ndm9000ee write <word offset> <value> \n"
-+	   "\tdm9000ee read \n"
-+	   "\tword:\t\t00-02 : MAC Address\n"
-+	   "\t\t\t03-07 : DM9000 Configuration\n" "\t\t\t08-63 : User data");
++	"Read/Write eeprom connected to Ethernet Controller",
++	"\ndm9000ee write <word offset> <value>\n"
++	"\tdm9000ee read\n"
++	"\tword:\t\t00-02 : MAC Address\n"
++	"\t\t\t03-07 : DM9000 Configuration\n" "\t\t\t08-63 : User data");
 diff --git a/board/armadeus/apf9328/fpga.c b/board/armadeus/apf9328/fpga.c
 new file mode 100644
 index 0000000..f3d4f03
diff --git a/patches/u-boot/2012.04/108-DM9000.patch b/patches/u-boot/2012.04/108-DM9000.patch
index e6a18d7..e3f9c1c 100644
--- a/patches/u-boot/2012.04/108-DM9000.patch
+++ b/patches/u-boot/2012.04/108-DM9000.patch
@@ -16,7 +16,7 @@ index 0424110..3e56db5 100644
  	id_val |= DM9000_ior(DM9000_PIDH) << 24;
  	if (id_val == DM9000_ID) {
 -		printf("dm9000 i/o: 0x%x, id: 0x%x \n", CONFIG_DM9000_BASE,
-+		DM9000_DBG("dm9000 i/o: 0x%x, id: 0x%x \n", CONFIG_DM9000_BASE,
++		DM9000_DBG("dm9000 i/o: 0x%x, id: 0x%x\n", CONFIG_DM9000_BASE,
  		       id_val);
  		return 0;
  	} else {


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-417-gb7bd19e

[Gwenhael Goavec-M. <gwe...@us...>]

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  b7bd19e786a2b24a3c1e10f22201bd670f346c2a (commit)
       via  0be6b5c67776fa31fc93bc0a401b1bdaaad0c88f (commit)
       via  9d83d9c80ba844b20aaab6f38f2524de6d67af52 (commit)
      from  28c5f48965af24cc4b4fb2df5128de522a8665dc (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 b7bd19e786a2b24a3c1e10f22201bd670f346c2a
Merge: 0be6b5c 28c5f48
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 16:24:26 2012 +0200

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

commit 0be6b5c67776fa31fc93bc0a401b1bdaaad0c88f
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 16:23:53 2012 +0200

    [LINUX][APF28] 2.6.35: Allows to have three spi slave devices

commit 9d83d9c80ba844b20aaab6f38f2524de6d67af52
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 16:23:13 2012 +0200

    [LINUX][APF28] 2.6.35: Configure Gpio 2_20 and 2_21 as SSPI2 SS

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

Summary of changes:
 ...1-armadeus-add_apf28dev_baseboard_support.patch |   18 +++++++++++++++++-
 ...madeus-spi_mxs-increase_chipselect_number.patch |   18 ++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletions(-)
 create mode 100644 patches/linux/2.6.35/457-armadeus-spi_mxs-increase_chipselect_number.patch

diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index ca4b59f..9ce73f6 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -45,7 +45,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 ===================================================================
 --- /dev/null
 +++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
-@@ -0,0 +1,843 @@
+@@ -0,0 +1,859 @@
 +/*
 + * Copyright (C) 2012 Armadeus systems
 + *
@@ -671,6 +671,22 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
 +		.drive		= 1,
 +	},
 +	{
++		.name		= "SSP2 SS1",
++		.id		= PINID_SSP2_SS1,
++		.fun		= PIN_FUN1,
++		.strength	= PAD_4MA,
++		.voltage	= PAD_3_3V,
++		.drive		= 1,
++	},
++	{
++		.name		= "SSP2 SS2",
++		.id		= PINID_SSP2_SS2,
++		.fun		= PIN_FUN1,
++		.strength	= PAD_4MA,
++		.voltage	= PAD_3_3V,
++		.drive		= 1,
++	},
++	{
 +		.name		= "SSP3 MOSI",
 +		.id		= PINID_SSP3_MOSI,
 +		.fun		= PIN_FUN1,
diff --git a/patches/linux/2.6.35/457-armadeus-spi_mxs-increase_chipselect_number.patch b/patches/linux/2.6.35/457-armadeus-spi_mxs-increase_chipselect_number.patch
new file mode 100644
index 0000000..4f4a18d
--- /dev/null
+++ b/patches/linux/2.6.35/457-armadeus-spi_mxs-increase_chipselect_number.patch
@@ -0,0 +1,18 @@
+Allows to have 3 spi slave devices instead of one
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+
+Index: linux-2.6.35.3/drivers/spi/spi_mxs.c
+===================================================================
+--- linux-2.6.35.3.orig/drivers/spi/spi_mxs.c
++++ linux-2.6.35.3/drivers/spi/spi_mxs.c
+@@ -598,7 +598,7 @@ static int __init mxs_spi_probe(struct p
+ 	}
+ 
+ 	master->bus_num = dev->id + 1;
+-	master->num_chipselect = 1;
++	master->num_chipselect = 3;
+ 
+ 	/* SPI controller initializations */
+ 	err = mxs_spi_init_hw(ss);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-414-g28c5f48

[Gwenhael Goavec-M. <gwe...@us...>]

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  28c5f48965af24cc4b4fb2df5128de522a8665dc (commit)
       via  5d89823ea31b72edd165746442f3d4e27143ac02 (commit)
      from  f1cdec8322ff513486068a20752886e824c39522 (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 28c5f48965af24cc4b4fb2df5128de522a8665dc
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 15:50:38 2012 +0200

    [LINUX][APF9328] 3.4.2: add registration function for UDC

commit 5d89823ea31b72edd165746442f3d4e27143ac02
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 15:45:24 2012 +0200

    [LINUX][APF9328] 3.4.2: adapt patch 029 from 2.6.38

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

Summary of changes:
 .../029-armadeus-add_csi_and_spi_registers.patch   |   43 ++++++++++++++++++++
 ...rmadeus-devices-imx1-add_udc_registration.patch |   17 ++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.4/029-armadeus-add_csi_and_spi_registers.patch
 create mode 100644 patches/linux/3.4/030-armadeus-devices-imx1-add_udc_registration.patch

diff --git a/patches/linux/3.4/029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.4/029-armadeus-add_csi_and_spi_registers.patch
new file mode 100644
index 0000000..71de754
--- /dev/null
+++ b/patches/linux/3.4/029-armadeus-add_csi_and_spi_registers.patch
@@ -0,0 +1,43 @@
+Index: linux-3.3.5/drivers/spi/spi-imx.c
+===================================================================
+--- linux-3.3.5.orig/drivers/spi/spi-imx.c
++++ linux-3.3.5/drivers/spi/spi-imx.c
+@@ -46,6 +46,9 @@
+ #define MXC_CSPITXDATA		0x04
+ #define MXC_CSPICTRL		0x08
+ #define MXC_CSPIINT		0x0c
++#define MXC_TEST		0x10
++#define MXC_PERIOD		0x14
++#define MXC_DMA			0x18
+ #define MXC_RESET		0x1c
+ 
+ /* generic defines to abstract from the different register layouts */
+Index: linux-3.3.5/drivers/media/video/mx1_camera.c
+===================================================================
+--- linux-3.3.5.orig/drivers/media/video/mx1_camera.c
++++ linux-3.3.5/drivers/media/video/mx1_camera.c
+@@ -49,9 +49,13 @@
+  * CSI registers
+  */
+ #define CSICR1		0x00			/* CSI Control Register 1 */
++#define CSICR2		0x04			/* CSI Control Register 2 */
+ #define CSISR		0x08			/* CSI Status Register */
++#define CSISTATR	0x0C
+ #define CSIRXR		0x10			/* CSI RxFIFO Register */
+ 
++#define CSICR1_RXOR_INTEN	(1 << 24)
++#define CSICR1_RXFF_INTEN	(1 << 18)
+ #define CSICR1_RXFF_LEVEL(x)	(((x) & 0x3) << 19)
+ #define CSICR1_SOF_POL		(1 << 17)
+ #define CSICR1_SOF_INTEN	(1 << 16)
+@@ -59,8 +63,10 @@
+ #define CSICR1_MCLKEN		(1 << 9)
+ #define CSICR1_FCC		(1 << 8)
+ #define CSICR1_BIG_ENDIAN	(1 << 7)
++#define CSICR1_CLR_STATINFO	(1 << 6)
+ #define CSICR1_CLR_RXFIFO	(1 << 5)
+ #define CSICR1_GCLK_MODE	(1 << 4)
++#define CSICR1_INV_DATA		(1 << 3)
+ #define CSICR1_DATA_POL		(1 << 2)
+ #define CSICR1_REDGE		(1 << 1)
+ #define CSICR1_EN		(1 << 0)
diff --git a/patches/linux/3.4/030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.4/030-armadeus-devices-imx1-add_udc_registration.patch
new file mode 100644
index 0000000..16b7376
--- /dev/null
+++ b/patches/linux/3.4/030-armadeus-devices-imx1-add_udc_registration.patch
@@ -0,0 +1,17 @@
+Add registration functions for UDC.
+
+Signed-off-by: Gwenhael Goavec-Merou <gw...@tr...>
+---
+
+Index: linux-3.3.5/arch/arm/mach-imx/devices-imx1.h
+===================================================================
+--- linux-3.3.5.orig/arch/arm/mach-imx/devices-imx1.h
++++ linux-3.3.5/arch/arm/mach-imx/devices-imx1.h
+@@ -29,3 +29,7 @@ extern const struct imx_spi_imx_data imx
+ 
+ #define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
+ #define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
++
++extern const struct imx_imx_udc_data imx1_imx_udc_data;
++#define imx1_add_udc(pdata)	\
++	imx_add_imx_udc(&imx1_imx_udc_data, pdata)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-412-gf1cdec8

[Gwenhael Goavec-M. <gwe...@us...>]

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  f1cdec8322ff513486068a20752886e824c39522 (commit)
      from  ff350084b0cb41adf11d944569dd4570184ddf13 (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 f1cdec8322ff513486068a20752886e824c39522
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 15:43:28 2012 +0200

    [LINUX][APF9328] 3.4.2: import patches 030 from 2.6.38

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

Summary of changes:
 .../030-armadeus-imx_udc-change_clk_get.patch      |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 copy patches/linux/{2.6.38 => 3.4}/030-armadeus-imx_udc-change_clk_get.patch (100%)

diff --git a/patches/linux/2.6.38/030-armadeus-imx_udc-change_clk_get.patch b/patches/linux/3.4/030-armadeus-imx_udc-change_clk_get.patch
similarity index 100%
copy from patches/linux/2.6.38/030-armadeus-imx_udc-change_clk_get.patch
copy to patches/linux/3.4/030-armadeus-imx_udc-change_clk_get.patch


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-411-gff35008

[Gwenhael Goavec-M. <gwe...@us...>]

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  ff350084b0cb41adf11d944569dd4570184ddf13 (commit)
      from  92daa7130d8180c96fb0c40bd47a17bccc06e3b5 (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 ff350084b0cb41adf11d944569dd4570184ddf13
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 15:40:33 2012 +0200

    [LINUX][APF9328] 3.4.2: import patches 035, 037, 038, 075, 100, 101 from 2.6.38

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

Summary of changes:
 ...35-armadeus-re_add_pwm_and_correct_driver.patch |  112 ++++++++++++++++++++
 ...7-armadeus-imx_udc-add_printk_when_probed.patch |    0
 ...s-imx_udc-prevent_crash_after_soft_reboot.patch |    0
 .../075-armadeus-spi2-reg-defines.patch            |    0
 ...eus-clock_correct_mxc_decode_pll_for_imx1.patch |    0
 ...madeus-clock-imx1_avoid_crash_with_module.patch |    0
 6 files changed, 112 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.4/035-armadeus-re_add_pwm_and_correct_driver.patch
 copy patches/linux/{2.6.38 => 3.4}/037-armadeus-imx_udc-add_printk_when_probed.patch (100%)
 copy patches/linux/{2.6.38 => 3.4}/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch (100%)
 copy patches/linux/{2.6.38 => 3.4}/075-armadeus-spi2-reg-defines.patch (100%)
 copy patches/linux/{2.6.38 => 3.4}/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch (100%)
 copy patches/linux/{2.6.38 => 3.4}/101-armadeus-clock-imx1_avoid_crash_with_module.patch (100%)

diff --git a/patches/linux/3.4/035-armadeus-re_add_pwm_and_correct_driver.patch b/patches/linux/3.4/035-armadeus-re_add_pwm_and_correct_driver.patch
new file mode 100644
index 0000000..16468ce
--- /dev/null
+++ b/patches/linux/3.4/035-armadeus-re_add_pwm_and_correct_driver.patch
@@ -0,0 +1,112 @@
+Index: linux-3.3.5/arch/arm/mach-imx/clock-imx1.c
+===================================================================
+--- linux-3.3.5.orig/arch/arm/mach-imx/clock-imx1.c
++++ linux-3.3.5/arch/arm/mach-imx/clock-imx1.c
+@@ -535,6 +535,12 @@ static struct clk uart_clk = {
+ 	.set_rate = _clk_parent_set_rate,
+ };
+ 
++static struct clk pwm_clk = {
++	.parent = &perclk[0],
++	.round_rate = _clk_parent_round_rate,
++	.set_rate = _clk_parent_set_rate,
++};
++
+ static struct clk i2c_clk = {
+ 	.parent = &hclk,
+ 	.round_rate = _clk_parent_round_rate,
+@@ -590,6 +596,7 @@ static struct clk_lookup lookups[] __ini
+ 	_REGISTER_CLOCK("imx1-uart.0", NULL, uart_clk)
+ 	_REGISTER_CLOCK("imx1-uart.1", NULL, uart_clk)
+ 	_REGISTER_CLOCK("imx1-uart.2", NULL, uart_clk)
++	_REGISTER_CLOCK(NULL, "pwm", pwm_clk)
+ 	_REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
+ 	_REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk)
+ 	_REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk)
+Index: linux-3.3.5/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
+===================================================================
+--- linux-3.3.5.orig/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
++++ linux-3.3.5/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
+@@ -19,6 +19,11 @@
+ #define imx_mxc_pwm_data_entry(soc, _id, _hwid, _size)			\
+ 	[_id] = imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size)
+ 
++#ifdef CONFIG_SOC_IMX1
++const struct imx_mxc_pwm_data imx1_mxc_pwm_data __initconst =
++	imx_mxc_pwm_data_entry_single(MX1, 0, , SZ_4K);
++#endif /* ifdef CONFIG_SOC_IMX1 */
++
+ #ifdef CONFIG_SOC_IMX21
+ const struct imx_mxc_pwm_data imx21_mxc_pwm_data __initconst =
+ 	imx_mxc_pwm_data_entry_single(MX21, 0, , SZ_4K);
+Index: linux-3.3.5/arch/arm/plat-mxc/pwm.c
+===================================================================
+--- linux-3.3.5.orig/arch/arm/plat-mxc/pwm.c
++++ linux-3.3.5/arch/arm/plat-mxc/pwm.c
+@@ -116,9 +116,35 @@ int pwm_config(struct pwm_device *pwm, i
+ 		 * both the prescaler (/1 .. /128) and then by CLKSEL
+ 		 * (/2 .. /16).
+ 		 */
+-		u32 max = readl(pwm->mmio_base + MX1_PWMP);
+-		u32 p = max * duty_ns / period_ns;
+-		writel(max - p, pwm->mmio_base + MX1_PWMS);
++		unsigned long long c;
++		unsigned long period_cycles, duty_cycles, prescale;
++		u32 cr;
++		c = clk_get_rate(pwm->clk);
++		/* CLKSRC divided by 2 : CLKSEL 0x00 */
++		c /=2;
++		c = c * period_ns;
++		do_div(c, 1000000000);
++		period_cycles = c;
++
++		prescale = period_cycles / 0x10000 + 1;
++
++		period_cycles /= prescale;
++		c = (unsigned long long)period_cycles * duty_ns;
++		do_div(c, period_ns);
++		duty_cycles = c;
++
++		if (period_cycles > 2)
++			period_cycles -= 2;
++		else
++			period_cycles = 0;
++
++		writel(duty_cycles, pwm->mmio_base + MX1_PWMS);
++		writel(period_cycles, pwm->mmio_base + MX1_PWMP);
++
++		cr = readl(pwm->mmio_base+MX1_PWMC);
++		cr |= (((prescale-1)&0xef)<<8)|1<<4;
++		writel(cr, pwm->mmio_base+MX1_PWMC);
++
+ 	} else {
+ 		BUG();
+ 	}
+Index: linux-3.3.5/arch/arm/plat-mxc/include/mach/mx1.h
+===================================================================
+--- linux-3.3.5.orig/arch/arm/plat-mxc/include/mach/mx1.h
++++ linux-3.3.5/arch/arm/plat-mxc/include/mach/mx1.h
+@@ -107,7 +107,7 @@
+ #define MX1_VOICE_DAC_INT	31
+ #define MX1_VOICE_ADC_INT	32
+ #define MX1_PEN_DATA_INT	33
+-#define MX1_PWM_INT		34
++#define MX1_INT_PWM		34
+ #define MX1_SDHC_INT		35
+ #define MX1_INT_I2C		39
+ #define MX1_INT_CSPI2		40
+Index: linux-3.3.5/arch/arm/mach-imx/devices-imx1.h
+===================================================================
+--- linux-3.3.5.orig/arch/arm/mach-imx/devices-imx1.h
++++ linux-3.3.5/arch/arm/mach-imx/devices-imx1.h
+@@ -30,6 +30,10 @@ extern const struct imx_spi_imx_data imx
+ #define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
+ #define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
+ 
++extern struct imx_mxc_pwm_data imx1_mxc_pwm_data[];
++#define imx1_add_mxc_pwm()	\
++	imx_add_mxc_pwm(&imx1_mxc_pwm_data[0])
++
+ extern const struct imx_imx_udc_data imx1_imx_udc_data;
+ #define imx1_add_udc(pdata)	\
+ 	imx_add_imx_udc(&imx1_imx_udc_data, pdata)
diff --git a/patches/linux/2.6.38/037-armadeus-imx_udc-add_printk_when_probed.patch b/patches/linux/3.4/037-armadeus-imx_udc-add_printk_when_probed.patch
similarity index 100%
copy from patches/linux/2.6.38/037-armadeus-imx_udc-add_printk_when_probed.patch
copy to patches/linux/3.4/037-armadeus-imx_udc-add_printk_when_probed.patch
diff --git a/patches/linux/2.6.38/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch b/patches/linux/3.4/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
similarity index 100%
copy from patches/linux/2.6.38/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
copy to patches/linux/3.4/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
diff --git a/patches/linux/2.6.38/075-armadeus-spi2-reg-defines.patch b/patches/linux/3.4/075-armadeus-spi2-reg-defines.patch
similarity index 100%
copy from patches/linux/2.6.38/075-armadeus-spi2-reg-defines.patch
copy to patches/linux/3.4/075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/2.6.38/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch b/patches/linux/3.4/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch
similarity index 100%
copy from patches/linux/2.6.38/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch
copy to patches/linux/3.4/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch
diff --git a/patches/linux/2.6.38/101-armadeus-clock-imx1_avoid_crash_with_module.patch b/patches/linux/3.4/101-armadeus-clock-imx1_avoid_crash_with_module.patch
similarity index 100%
copy from patches/linux/2.6.38/101-armadeus-clock-imx1_avoid_crash_with_module.patch
copy to patches/linux/3.4/101-armadeus-clock-imx1_avoid_crash_with_module.patch


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-410-g92daa71

[Julien B a. A. <ar...@us...>]

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  92daa7130d8180c96fb0c40bd47a17bccc06e3b5 (commit)
       via  482c0159536e05c7b13dac8c6efa3baf141090a4 (commit)
       via  b0a8f515ee23fee6f5dde7350784995040c4e6a4 (commit)
      from  967dd939ccce0d8f36d805f13f87b9da9420d908 (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 92daa7130d8180c96fb0c40bd47a17bccc06e3b5
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jun 22 21:49:54 2012 +0200

    [LINUX] 3.4: refresh APF28 patches

commit 482c0159536e05c7b13dac8c6efa3baf141090a4
Merge: b0a8f51 967dd93
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jun 22 21:46:56 2012 +0200

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

commit b0a8f515ee23fee6f5dde7350784995040c4e6a4
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jun 22 21:46:18 2012 +0200

    (LINUX] Add very preliminary and very light support of 3.4.2 Linux kernel for APF27

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

Summary of changes:
 .../device/armadeus/apf27/apf27-linux-3.4.2.config |    1 +
 ...-linux-2.6.38.config => apf27-linux-3.4.config} |   50 +--
 .../linux/3.4/200-armadeus-add_apf27_module.patch  |  341 ++++++++++++++++++++
 .../450-armadeus-add_apf28_module_support.patch    |   26 +-
 ...1-armadeus-add_apf28dev_baseboard_support.patch |   26 +-
 5 files changed, 386 insertions(+), 58 deletions(-)
 create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
 copy buildroot/target/device/armadeus/apf27/{apf27-linux-2.6.38.config => apf27-linux-3.4.config} (85%)
 create mode 100644 patches/linux/3.4/200-armadeus-add_apf27_module.patch

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
new file mode 120000
index 0000000..7beb63d
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
@@ -0,0 +1 @@
+apf27-linux-3.4.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
similarity index 85%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
index 812e771..ccd6313 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
@@ -4,9 +4,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 CONFIG_PROFILING=y
@@ -14,10 +12,12 @@ CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_BSD_DISKLABEL=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX2=y
-CONFIG_MACH_MX27=y
+CONFIG_ARCH_IMX_V4_V5=y
+CONFIG_MACH_IMX27_DT=y
 CONFIG_MACH_APF27=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -27,9 +27,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CPU_IDLE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-CONFIG_PM_VERBOSE=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -46,12 +44,8 @@ CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_MCP251X=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -68,14 +62,11 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_FW_LOADER=m
 CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
 CONFIG_MTD_UBI=y
-CONFIG_MISC_DEVICES=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
 CONFIG_SCSI=y
@@ -88,11 +79,19 @@ CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
 CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_FEC=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
 CONFIG_RTL8187=m
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_SDIO=m
@@ -103,33 +102,27 @@ CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_IMX=m
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_TSC2102=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_IMX=y
 CONFIG_SPI=y
 CONFIG_SPI_IMX=y
-CONFIG_SPI_MXC_SELECT2=y
 CONFIG_SPI_SPIDEV=m
 CONFIG_GPIO_SYSFS=y
 CONFIG_HWMON=m
 CONFIG_WATCHDOG=y
-CONFIG_IMX2_WDT=m
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_VIDEO_DEV=m
 # CONFIG_RC_CORE is not set
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_SOC_CAMERA=m
-CONFIG_VIDEO_MX2=m
 # CONFIG_RADIO_ADAPTERS is not set
 CONFIG_FB=y
-CONFIG_FB_IMX=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -164,12 +157,8 @@ CONFIG_USB_WDM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
 CONFIG_USB_ULPI=y
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_MAX1027=m
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
 CONFIG_MMC=y
 CONFIG_MMC_MXC=y
 CONFIG_RTC_CLASS=y
@@ -199,12 +188,9 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_DEBUG_FS=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
diff --git a/patches/linux/3.4/200-armadeus-add_apf27_module.patch b/patches/linux/3.4/200-armadeus-add_apf27_module.patch
new file mode 100644
index 0000000..5dd4487
--- /dev/null
+++ b/patches/linux/3.4/200-armadeus-add_apf27_module.patch
@@ -0,0 +1,341 @@
+The APF27 is an i.M27 based SOM (System On Module) that can be plugged on

+several docking/development boards. Here only basic module support

+is added (Ethernet, Serial, NAND Flash, USB OTG).

+

+Signed-off-by: Julien Boibessot <jul...@ar...>

+Signed-off-by: Eric Jarrige <eri...@ar...>

+Signed-off-by: Nicolas Colombain <nic...@ar...>

+---

+ arch/arm/mach-imx/Kconfig                   |   13 ++

+ arch/arm/mach-imx/Makefile                  |    1 +

+ arch/arm/mach-imx/mach-apf27.c              |  258 +++++++++++++++++++++++++++

+ arch/arm/plat-mxc/include/mach/uncompress.h |    1 +

+ 4 files changed, 273 insertions(+), 0 deletions(-)

+ create mode 100644 arch/arm/mach-imx/mach-apf27.c

+

+Index: linux-3.4.2/arch/arm/mach-imx/Kconfig
+===================================================================
+--- linux-3.4.2.orig/arch/arm/mach-imx/Kconfig	2012-06-22 21:18:10.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-imx/Kconfig	2012-06-22 21:18:15.000000000 +0200
+@@ -375,6 +375,20 @@
+ 	  Include support for Freescale i.MX27 based platforms
+ 	  using the device tree for discovery
+ 
++config MACH_APF27
++	bool "Armadeus Systems APF27"
++	select SOC_IMX27
++	select IMX_HAVE_PLATFORM_FSL_USB2_UDC
++	select IMX_HAVE_PLATFORM_MXC_EHCI
++	select IMX_HAVE_PLATFORM_IMX2_WDT
++	select IMX_HAVE_PLATFORM_IMX_I2C
++	select IMX_HAVE_PLATFORM_IMX_UART
++	select IMX_HAVE_PLATFORM_MXC_NAND
++	select MXC_ULPI if USB_ULPI
++	help
++	  Include support for APF27 platform. This includes specific
++	  configurations for the module and its peripherals.
++
+ endif
+ 
+ if ARCH_IMX_V6_V7
+Index: linux-3.4.2/arch/arm/mach-imx/Makefile
+===================================================================
+--- linux-3.4.2.orig/arch/arm/mach-imx/Makefile	2012-06-22 21:18:10.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-imx/Makefile	2012-06-22 21:18:15.000000000 +0200
+@@ -40,6 +40,7 @@
+ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
+ obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
+ obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
++obj-$(CONFIG_MACH_APF27) += mach-apf27.o
+ 
+ # i.MX31 based machines
+ obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
+Index: linux-3.4.2/arch/arm/mach-imx/mach-apf27.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.2/arch/arm/mach-imx/mach-apf27.c	2012-06-22 21:28:41.000000000 +0200
+@@ -0,0 +1,260 @@
++ /*
++ * Support for the APF27 System On Module
++ *
++ * Copyright (C) 2008-2012 Armadeus Systems <su...@ar...>
++ *
++ * Based on code which is:
++ * Copyright 2007 Robert Schwebel <r.s...@pe...>, Pengutronix
++ * Copyright (C) 2008 Juergen Beisert (ke...@pe...)
++ * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * 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., 51 Franklin Street, Fifth Floor, Boston,
++ * MA  02110-1301, USA.
++ */
++
++#include <linux/platform_device.h>
++#include <linux/i2c.h>
++#include <linux/serial.h>
++#include <linux/delay.h>
++#include <linux/clk.h>
++#include <linux/usb/otg.h>
++#include <linux/usb/ulpi.h>
++#include <linux/phy.h>
++
++#include <asm/mach/flash.h>
++#include <asm/mach/arch.h>
++#include <asm/mach-types.h>
++#include <asm/mach/time.h>
++#include <mach/common.h>
++#include <mach/hardware.h>
++#include <mach/iomux-mx27.h>
++#include <mach/gpio.h>
++#include <mach/imx-uart.h>
++#include <mach/mxc_nand.h>
++#include <mach/mxc_ehci.h>
++#include <mach/ulpi.h>
++
++#include "devices-imx27.h"
++
++
++static const int apf27_pins[] __initconst = {
++	/* UART1 */
++	PE12_PF_UART1_TXD,
++	PE13_PF_UART1_RXD,
++	/* USB_OTG */
++	PE0_PF_USBOTG_NXT,
++	PE1_PF_USBOTG_STP,
++	PE2_PF_USBOTG_DIR,
++	PE24_PF_USBOTG_CLK,
++	PE25_PF_USBOTG_DATA7,
++	PC7_PF_USBOTG_DATA5,
++	PC8_PF_USBOTG_DATA6,
++	PC9_PF_USBOTG_DATA0,
++	PC10_PF_USBOTG_DATA2,
++	PC11_PF_USBOTG_DATA1,
++	PC12_PF_USBOTG_DATA4,
++	PC13_PF_USBOTG_DATA3,
++	/* UART3 */
++	PE8_PF_UART3_TXD,
++	PE9_PF_UART3_RXD,
++	PE10_PF_UART3_CTS,
++	PE11_PF_UART3_RTS,
++	/* ETHERNET */
++	PD0_AIN_FEC_TXD0,
++	PD1_AIN_FEC_TXD1,
++	PD2_AIN_FEC_TXD2,
++	PD3_AIN_FEC_TXD3,
++	PD4_AOUT_FEC_RX_ER,
++	PD5_AOUT_FEC_RXD1,
++	PD6_AOUT_FEC_RXD2,
++	PD7_AOUT_FEC_RXD3,
++	PD8_AF_FEC_MDIO,
++	PD9_AIN_FEC_MDC,
++	PD10_AOUT_FEC_CRS,
++	PD11_AOUT_FEC_TX_CLK,
++	PD12_AOUT_FEC_RXD0,
++	PD13_AOUT_FEC_RX_DV,
++	PD14_AOUT_FEC_RX_CLK,
++	PD15_AOUT_FEC_COL,
++	PD16_AIN_FEC_TX_ER,
++	PF23_AIN_FEC_TX_EN,
++	/* I2C2 */
++	PC5_PF_I2C2_SDA,
++	PC6_PF_I2C2_SCL,
++};
++
++/* APF27 has an "on module" Ethernet transceiver */
++int lan8700_wakeup(struct phy_device *phydev)
++{
++#define LAN87xx_SPECIAL_REG 0x12
++
++	int rc = phy_read(phydev, LAN87xx_SPECIAL_REG);
++
++	phy_write(phydev, LAN87xx_SPECIAL_REG, rc | 0xE0);
++	phy_write(phydev, MII_BMCR, BMCR_RESET);
++	udelay(1000);
++	return 0;
++}
++
++/* APF27 has a Micron 128MiB 1,8V NAND flash, 16 bits width */
++static const struct mxc_nand_platform_data apf27_nand_board_info __initconst = {
++	.width = 2,
++	.hw_ecc = 1,
++	.flash_bbt = 1, /* we handle Bad Block Table */
++};
++
++/* APF27 has an I2C EEPROM on I2C2 Bus */
++static const struct imxi2c_platform_data apf27_i2c_1_data __initconst = {
++	.bitrate = 100000,
++};
++
++static struct i2c_board_info apf27_i2c_devices_bus1[] = {
++	{
++		I2C_BOARD_INFO("24c02", 0x50),
++	},
++};
++
++/* APF27 has an RS232 debug port/console on UART1 with "on module"
++   transceiver */
++static struct imxuart_platform_data uart0_pdata = {
++	.flags = 0,
++};
++
++/* APF27 has an "on module" transceiver for UART3 */
++static struct imxuart_platform_data uart2_pdata = {
++	.flags = IMXUART_HAVE_RTSCTS,
++};
++
++/* APF27 has an "on module" transceiver for USB OTG */
++static int otg_mode_host = 1;
++
++static int __init apf27_otg_mode(char *options)
++{
++	if (!strcmp(options, "host"))
++		otg_mode_host = 1;
++	else if (!strcmp(options, "device"))
++		otg_mode_host = 0;
++	else
++		pr_info("otg_mode neither \"host\" nor \"device\". "
++			"Defaulting to host\n");
++
++	return 0;
++}
++__setup("otg_mode=", apf27_otg_mode);
++
++static void apf27_usbotg_phy_init(void)
++{
++#define USBCTRL_OFFSET		0x600
++#define USBCTRL_UIE_BIT		(1 << 28)
++#define USBCTRL_WIE_BIT		(1 << 27)
++#define USBCMD_OFFSET		0x140
++#define USBCMD_RST_BIT		(1 << 1)
++#define PORTSC1_OFFSET		0x184
++#define PORTSC_PTS_MASK		(3 << 30)
++#define PORTSC_PTS_ULPI		(2 << 30)
++
++	unsigned int reg;
++
++	/* Tweak power/wake up handling */
++	reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + USBCTRL_OFFSET);
++	reg |= USBCTRL_WIE_BIT | USBCTRL_UIE_BIT;
++	writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + USBCTRL_OFFSET);
++
++	/* Select ULPI PHY */
++	reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + PORTSC1_OFFSET);
++	reg = (reg & ~PORTSC_PTS_MASK) | PORTSC_PTS_ULPI;
++	writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + PORTSC1_OFFSET);
++	mdelay(10);
++
++	/* Reset PHY */
++	reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + USBCMD_OFFSET);
++	reg |= USBCMD_RST_BIT;
++	writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + USBCMD_OFFSET);
++	mdelay(10);
++}
++
++static int apf27_otg_init(struct platform_device *pdev)
++{
++	int ret;
++
++	ret = mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);
++	apf27_usbotg_phy_init(); /* PHY is in powerdown mode by default */
++
++	return ret;
++}
++
++static struct mxc_usbh_platform_data otg_pdata __initdata = {
++	.init	= apf27_otg_init,
++	.portsc = MXC_EHCI_MODE_ULPI,
++};
++
++static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
++	.operating_mode = FSL_USB2_DR_DEVICE,
++	.phy_mode	= FSL_USB2_PHY_ULPI,
++};
++
++static void __init apf27_init(void)
++{
++	int ret;
++
++	ret = mxc_gpio_setup_multiple_pins(apf27_pins,
++			ARRAY_SIZE(apf27_pins), "APF27");
++	if (ret)
++		printk(KERN_ERR "apf27: Failed to setup pins (%d)\n", ret);
++
++	imx27_add_imx_uart0(&uart0_pdata);
++	imx27_add_imx_uart2(&uart2_pdata);
++
++	/* bring lan8700 out of power down mode */
++	phy_register_fixup_for_id("1:1f", lan8700_wakeup);
++	imx27_add_fec(NULL);
++
++	imx27_add_mxc_nand(&apf27_nand_board_info);
++
++	imx27_add_imx2_wdt(NULL);
++
++	if (otg_mode_host) {
++		otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
++				ULPI_OTG_DRVVBUS_EXT);
++		if (otg_pdata.otg)
++			imx27_add_mxc_ehci_otg(&otg_pdata);
++	}
++	if (!otg_mode_host)
++		imx27_add_fsl_usb2_udc(&otg_device_pdata);
++
++	i2c_register_board_info(1, apf27_i2c_devices_bus1,
++				ARRAY_SIZE(apf27_i2c_devices_bus1));
++	imx27_add_imx_i2c(1, &apf27_i2c_1_data);
++}
++
++static void __init apf27_timer_init(void)
++{
++	mx27_clocks_init(26000000); /* init ext ref, even if not used */
++}
++
++static struct sys_timer apf27_timer = {
++	.init = apf27_timer_init,
++};
++
++MACHINE_START(APF27, "Armadeus APF27")
++	/* Maintainer: Julien Boibessot <jul...@ar...> */
++	.atag_offset = 0x100,
++	.map_io = mx27_map_io,
++	.init_early = imx27_init_early,
++	.init_irq = mx27_init_irq,
++	.handle_irq = imx27_handle_irq,
++	.timer = &apf27_timer,
++	.init_machine = apf27_init,
++	.restart = mxc_restart,
++MACHINE_END
+Index: linux-3.4.2/arch/arm/plat-mxc/include/mach/uncompress.h
+===================================================================
+--- linux-3.4.2.orig/arch/arm/plat-mxc/include/mach/uncompress.h	2012-06-22 21:18:10.000000000 +0200
++++ linux-3.4.2/arch/arm/plat-mxc/include/mach/uncompress.h	2012-06-22 21:18:15.000000000 +0200
+@@ -85,6 +85,7 @@
+ 	case MACH_TYPE_PCA100:
+ 	case MACH_TYPE_MXT_TD60:
+ 	case MACH_TYPE_IMX27IPCAM:
++	case MACH_TYPE_APF27:
+ 		uart_base = MX2X_UART1_BASE_ADDR;
+ 		break;
+ 	case MACH_TYPE_MX31LITE:
+Index: linux-3.4.2/arch/arm/tools/mach-types
+===================================================================
+--- linux-3.4.2.orig/arch/arm/tools/mach-types	2012-06-22 21:18:10.000000000 +0200
++++ linux-3.4.2/arch/arm/tools/mach-types	2012-06-22 21:18:15.000000000 +0200
+@@ -298,6 +298,7 @@
+ wbd111			MACH_WBD111		WBD111			1690
+ mv2120			MACH_MV2120		MV2120			1693
+ mx51_3ds		MACH_MX51_3DS		MX51_3DS		1696
++apf27			MACH_APF27		APF27			1698
+ imx27lite		MACH_IMX27LITE		IMX27LITE		1701
+ usb_a9260		MACH_USB_A9260		USB_A9260		1709
+ usb_a9263		MACH_USB_A9263		USB_A9263		1710
diff --git a/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch b/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
index 42e147c..a139663 100644
--- a/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
+++ b/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
@@ -2,13 +2,13 @@ Add Armadeus systems APF28 SOM support.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: linux-3.3.5/arch/arm/mach-mxs/Kconfig
+Index: linux-3.4.2/arch/arm/mach-mxs/Kconfig
 ===================================================================
---- linux-3.3.5.orig/arch/arm/mach-mxs/Kconfig	2012-05-07 17:55:30.000000000 +0200
-+++ linux-3.3.5/arch/arm/mach-mxs/Kconfig	2012-05-08 14:59:27.000000000 +0200
-@@ -91,4 +91,13 @@
- 	bool "Support DENX M28EVK Platform"
- 	select MODULE_M28
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Kconfig	2012-06-22 21:47:32.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/Kconfig	2012-06-22 21:47:40.000000000 +0200
+@@ -107,4 +107,13 @@
+ 	bool "Support Bluegiga APX4 Development Kit"
+ 	select MODULE_APX4
  
 +config MACH_APF28
 +	bool "Armadeus APF28 module"
@@ -20,21 +20,21 @@ Index: linux-3.3.5/arch/arm/mach-mxs/Kconfig
 +	  specific configurations for the module and its peripherals.
 +
  endif
-Index: linux-3.3.5/arch/arm/mach-mxs/Makefile
+Index: linux-3.4.2/arch/arm/mach-mxs/Makefile
 ===================================================================
---- linux-3.3.5.orig/arch/arm/mach-mxs/Makefile	2012-05-07 17:55:30.000000000 +0200
-+++ linux-3.3.5/arch/arm/mach-mxs/Makefile	2012-05-08 14:59:27.000000000 +0200
-@@ -13,5 +13,6 @@
- obj-$(CONFIG_MACH_M28EVK)    += mach-m28evk.o
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Makefile	2012-06-22 21:47:32.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/Makefile	2012-06-22 21:47:40.000000000 +0200
+@@ -14,5 +14,6 @@
+ obj-$(CONFIG_MACH_APX4DEVKIT) += mach-apx4devkit.o
  obj-$(CONFIG_MODULE_TX28) += module-tx28.o
  obj-$(CONFIG_MACH_TX28)    += mach-tx28.o
 +obj-$(CONFIG_MACH_APF28)	+= mach-apf28.o
  
  obj-y += devices/
-Index: linux-3.3.5/arch/arm/mach-mxs/mach-apf28.c
+Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.3.5/arch/arm/mach-mxs/mach-apf28.c	2012-05-08 14:59:27.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c	2012-06-22 21:47:40.000000000 +0200
 @@ -0,0 +1,106 @@
 +/*
 + * Copyright 2011 Armadeus systems.
diff --git a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
index cd85c31..b6c905c 100644
--- a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -2,11 +2,11 @@ Add Armadeus systems APF28Dev development board support.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
-Index: linux-3.1/arch/arm/mach-mxs/Kconfig
+Index: linux-3.4.2/arch/arm/mach-mxs/Kconfig
 ===================================================================
---- linux-3.1.orig/arch/arm/mach-mxs/Kconfig	2011-11-09 15:52:13.000000000 +0100
-+++ linux-3.1/arch/arm/mach-mxs/Kconfig	2011-11-09 15:53:11.000000000 +0100
-@@ -77,4 +77,21 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Kconfig	2012-06-22 21:47:40.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/Kconfig	2012-06-22 21:47:48.000000000 +0200
+@@ -116,4 +116,21 @@
  	  Include support for the Armadeus systems APF28 SOM. This includes
  	  specific configurations for the module and its peripherals.
  
@@ -28,21 +28,21 @@ Index: linux-3.1/arch/arm/mach-mxs/Kconfig
 +	  at runtime.
 +
  endif
-Index: linux-3.1/arch/arm/mach-mxs/Makefile
+Index: linux-3.4.2/arch/arm/mach-mxs/Makefile
 ===================================================================
---- linux-3.1.orig/arch/arm/mach-mxs/Makefile	2011-11-09 15:52:13.000000000 +0100
-+++ linux-3.1/arch/arm/mach-mxs/Makefile	2011-11-09 15:53:11.000000000 +0100
-@@ -13,5 +13,6 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Makefile	2012-06-22 21:47:40.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/Makefile	2012-06-22 21:47:48.000000000 +0200
+@@ -15,5 +15,6 @@
  obj-$(CONFIG_MODULE_TX28) += module-tx28.o
  obj-$(CONFIG_MACH_TX28)    += mach-tx28.o
  obj-$(CONFIG_MACH_APF28)	+= mach-apf28.o
 +obj-$(CONFIG_MACH_APF28_DEV)	+= apf28dev-baseboard.o
  
  obj-y += devices/
-Index: linux-3.1/arch/arm/mach-mxs/apf28dev-baseboard.c
+Index: linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/arm/mach-mxs/apf28dev-baseboard.c	2011-11-09 15:53:11.000000000 +0100
++++ linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c	2012-06-22 21:47:48.000000000 +0200
 @@ -0,0 +1,201 @@
 +/*
 + * Copyright 2011 Armadeus systems.
@@ -245,10 +245,10 @@ Index: linux-3.1/arch/arm/mach-mxs/apf28dev-baseboard.c
 +	mx28_add_mxs_mmc(0, &apf28dev_mmc0_pdata);
 +}
 +EXPORT_SYMBOL_GPL(apf28dev_init);
-Index: linux-3.1/arch/arm/mach-mxs/mach-apf28.c
+Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
 ===================================================================
---- linux-3.1.orig/arch/arm/mach-mxs/mach-apf28.c	2011-11-09 15:53:02.000000000 +0100
-+++ linux-3.1/arch/arm/mach-mxs/mach-apf28.c	2011-11-09 15:53:11.000000000 +0100
+--- linux-3.4.2.orig/arch/arm/mach-mxs/mach-apf28.c	2012-06-22 21:47:40.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c	2012-06-22 21:47:48.000000000 +0200
 @@ -78,6 +78,17 @@
  	.phy = PHY_INTERFACE_MODE_RMII,
  };


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-407-g967dd93

[jorasse <jo...@us...>]

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  967dd939ccce0d8f36d805f13f87b9da9420d908 (commit)
       via  fc46c28bfa491a3fa091cd8c672ff86990ca48c4 (commit)
      from  6bedf4f68a566b653e0db8e75490c4e7b84efd93 (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 967dd939ccce0d8f36d805f13f87b9da9420d908
Merge: fc46c28 6bedf4f
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jun 21 00:50:49 2012 +0200

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

commit fc46c28bfa491a3fa091cd8c672ff86990ca48c4
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jun 21 00:50:32 2012 +0200

    [UBOOT] pps27: update nfs boot script and support linux DTB - also update mmc script to be compatible with any base board

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

Summary of changes:
 .../device/armadeus/pps/pps-u-boot-2012.04.h       |   61 +++++++++++---------
 1 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index e3875ce..1f0b366 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"3.0"
-#define CONFIG_IDENT_STRING	" pps patch 3.4"
+#define CONFIG_ENV_VERSION 	"3.1"
+#define CONFIG_IDENT_STRING	" pps patch 3.5"
 #define CONFIG_BOARD_NAME	pps
 
 /*
@@ -83,10 +83,12 @@
 #define CONFIG_CMD_DHCP		/* DHCP Support			*/
 #define CONFIG_CMD_DNS
 /*#define CONFIG_CMD_EEPROM */	/* EEPROM read/write support	*/
+#define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT		/* FAT support			*/
 /*#define CONFIG_CMD_I2C */	/* I2C serial bus support	*/
 #define CONFIG_CMD_IMX_FUSE	/* imx iim fuse                 */
 #define CONFIG_CMD_MII		/* MII support			*/
+#define CONFIG_CMD_MMC
 #define CONFIG_CMD_MTDPARTS	/* MTD partition support 	*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
@@ -170,10 +172,10 @@
 #define CONFIG_CMDLINE_TAG		/* send commandline to Kernel	*/
 #define CONFIG_SETUP_MEMORY_TAGS 	/* send memory definition to kernel */
 #define CONFIG_INITRD_TAG		/* send initrd params	*/
-/*
-#define CONFIG_REVISION_TAG
+
+/* #define CONFIG_REVISION_TAG */
 #define CONFIG_OF_LIBFDT
-*/
+
 #define CONFIG_BOOTDELAY	1
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
@@ -205,6 +207,7 @@
 	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
 	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
 	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
+	"kernel_addr_r=A0000000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
@@ -215,32 +218,29 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off \0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} otg_mode=device; "				\
-		"run addnfsargs addipargs; setenv autostart yes;" 	\
-		"nboot kernel\0"					\
-	"nfsboot2=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} otg_mode=device; "				\
-		"run addnfsargs addipargs; setenv autostart yes;"	\
-		"setenv kernel_image ${board_name}-linux.bin;"		\
-		"nfs ${loadaddr} "					\
-			"${serverip}:${rootpath}/${kernel_image};"	\
-		"bootm\0"						\
+		"${mtdparts}; run addnfsargs addipargs;"		\
+		"nfs ${kernel_addr_r} "					\
+		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} otg_mode=device; "				\
-		"run addubifsargs addipargs; setenv autostart yes;"	\
-		"nboot kernel\0"					\
+		"${mtdparts};run addubifsargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"nboot ${kernel_addr_r} kernel;"			\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} otg_mode=device; "				\
-		"run addmmcargs addipargs; setenv autostart yes;"	\
-		"nboot kernel\0"					\
+		"${mtdparts}; run addmmcargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
+			" /boot/${board_name}-linux.bin;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"boot_nfs_fallback_flash=if ping ${serverip};"			\
 			"then echo Boot over NFS; run nfsboot;"		\
 			"else echo Boot from the board; run ubifsboot;"	\
 		"fi\0"							\
-	"boot_nfs2_fallback_flash=if ping ${serverip};"			\
-			"then echo Boot over NFS; run nfsboot2;"	\
-			"else echo Boot from the board; run ubifsboot;"	\
-		"fi\0"							\
 	"firmware_autoload=0\0"						\
 	"flash_uboot=nand unlock ${u-boot_addr} ;"			\
 		"nand erase.part u-boot;"		\
@@ -264,14 +264,21 @@
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
+	"flash_dtb=nand erase.part dtb;"				\
+		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
+			"then echo Flashing of rootfs succeed;"		\
+			"else echo Flashing of rootfs failed;"		\
+		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
 	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
+	"download_dtb=tftpboot ${loadaddr} imx27-${board_name}.dtb\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
+	"update_dtb=run download_dtb flash_dtb\0"		\
 	"update_all=run download_kernel flash_kernel download_rootfs "	\
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\
@@ -749,8 +756,8 @@
 #define CONFIG_SYS_AIPI2_PSR1_VAL	0xFFFFFFFF
 
 /* PCCR enable DMA FEC I2C1 IIM SDHC1 */
-#define CONFIG_SYS_PCCR0_VAL		0x05070400
-#define CONFIG_SYS_PCCR1_VAL		0xA14A0408
+#define CONFIG_SYS_PCCR0_VAL		0x05070410
+#define CONFIG_SYS_PCCR1_VAL		0xA14A0608
 
 /*
  * From here, there should not be any user configuration.


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-405-g6bedf4f

[jorasse <jo...@us...>]

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  6bedf4f68a566b653e0db8e75490c4e7b84efd93 (commit)
      from  cb7bad506bb64b527cab0a0737e82945d10b02a1 (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 6bedf4f68a566b653e0db8e75490c4e7b84efd93
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jun 21 00:33:30 2012 +0200

    [UBOOT] apf9328: update nfs boot script to download linux kernel from the NFS server

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

Summary of changes:
 .../armadeus/apf9328/apf9328-u-boot-2012.04.h      |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
index e85d1f0..ff052a1 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
@@ -23,8 +23,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"5.1"
-#define CONFIG_IDENT_STRING	" apf9328 patch 5.4"
+#define CONFIG_ENV_VERSION 	"5.2"
+#define CONFIG_IDENT_STRING	" apf9328 patch 5.5"
 #define CONFIG_BOARD_NAME	apf9328
 
 /*
@@ -207,7 +207,9 @@
 		"${hostname}:eth0:off \0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
 		"${mtdparts}; run addnfsargs addipargs; "		\
-		"bootm ${kernel_addr}\0"				\
+		"nfs ${loadaddr} "					\
+		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
+		"bootm ${loadaddr}\0"				\
 	"jffsboot=setenv bootargs console=${consoledev},${baudrate} "	\
 		"${mtdparts}; run addjffsargs addipargs; "		\
 		"bootm ${kernel_addr}\0"				\


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-404-gcb7bad5

[jorasse <jo...@us...>]

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  cb7bad506bb64b527cab0a0737e82945d10b02a1 (commit)
      from  99062345837c404e0cec6ad96c3f3153a3a6869a (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 cb7bad506bb64b527cab0a0737e82945d10b02a1
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 20 19:43:04 2012 +0200

    [UBOOT] apf51: update mmc and nfs boot script - support linux DTB - Note: APF51 does not read the kernel from the SD

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2012.04.h   |   43 ++++++++++++++++---
 1 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index dbb84d8..ec6515b 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"1.0"
-#define CONFIG_IDENT_STRING	" apf51 patch 1.4"
+#define CONFIG_ENV_VERSION 	"1.1"
+#define CONFIG_IDENT_STRING	" apf51 patch 1.5"
 #define CONFIG_BOARD_NAME	apf51
 
 /*
@@ -91,8 +91,10 @@
 #define CONFIG_CMD_CACHE	/* icache, dcache               */
 #define CONFIG_CMD_DHCP		/* DHCP Support                 */
 /*#define CONFIG_CMD_DNS*/
+/*#define CONFIG_CMD_EXT2*/
 /*#define CONFIG_CMD_I2C*/	/* I2C serial bus support       */
 #define CONFIG_CMD_IIM		/* imx iim fuse                 */
+/*#define CONFIG_CMD_MMC*/
 #define CONFIG_CMD_MTDPARTS	/* MTD partition support        */
 #define CONFIG_CMD_NAND		/* NAND support                 */
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
@@ -213,6 +215,7 @@
 	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
 	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
 	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
+	"kernel_addr_r=90800000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
@@ -223,14 +226,24 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
-		"nboot 90800000 0 ${kernel_addr}\0"			\
+		"${mtdparts}; run addnfsargs addipargs;"		\
+		"nfs ${kernel_addr_r} "					\
+		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts};run addubifsargs addipargs; setenv autostart yes;"\
-		"nboot 90800000 0 ${kernel_addr}\0"			\
+		"${mtdparts};run addubifsargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"nboot ${kernel_addr_r} kernel;"			\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
 		"${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
-		"nboot 90800000 0 ${kernel_addr}\0"			\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"nboot ${kernel_addr_r} kernel;"			\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"firmware_autoload=0\0"						\
 	"flash_uboot=nand unlock ${uboot_addr} ;"			\
 		"nand erase.part u-boot;"				\
@@ -255,14 +268,21 @@
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
+	"flash_dtb=nand erase.part dtb;"				\
+		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
+			"then echo Flashing of rootfs succeed;"		\
+			"else echo Flashing of rootfs failed;"		\
+		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
 	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
+	"download_dtb=tftpboot ${loadaddr} imx51-${board_name}.dtb\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
+	"update_dtb=run download_dtb flash_dtb\0"			\
 	"update_all=run download_kernel flash_kernel download_rootfs "	\
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=echo unlock_reg not needed anymore\0"
@@ -386,6 +406,15 @@
 /*
  * SD/MMC
  */
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_FSL_ESDHC
+#define CONFIG_SYS_FSL_ESDHC_ADDR	0
+#define CONFIG_SYS_FSL_ESDHC_NUM	1
+
+#define CONFIG_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#endif
 
 /*
  * RTC


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-403-g9906234

[jorasse <jo...@us...>]

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  99062345837c404e0cec6ad96c3f3153a3a6869a (commit)
      from  057d4d032272400ae74b517e33ad9fa8499d4f73 (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 99062345837c404e0cec6ad96c3f3153a3a6869a
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 20 00:53:41 2012 +0200

    [UBOOT] apf27: update mmc and nfs boot script - support linux DTB

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2012.04.h   |   45 ++++++++++++--------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index 6e9741a..ae4e989 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"3.0"
-#define CONFIG_IDENT_STRING	" apf27 patch 3.5"
+#define CONFIG_ENV_VERSION 	"3.1"
+#define CONFIG_IDENT_STRING	" apf27 patch 3.6"
 #define CONFIG_BOARD_NAME	apf27
 
 /*
@@ -207,6 +207,7 @@
 	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
 	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
 	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
+	"kernel_addr_r=A0000000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
@@ -217,28 +218,29 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off \0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
-		"nboot kernel\0"					\
-	"nfsboot2=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
-		"setenv kernel_image ${board_name}-linux.bin;"		\
-		"nfs ${loadaddr} "					\
-			"${serverip}:${rootpath}/${kernel_image};"	\
-		"bootm\0"						\
+		"${mtdparts}; run addnfsargs addipargs;"		\
+		"nfs ${kernel_addr_r} "					\
+		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts};run addubifsargs addipargs; setenv autostart yes;"\
-		"nboot kernel\0"					\
+		"${mtdparts};run addubifsargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"nboot ${kernel_addr_r} kernel;"			\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
-		"nboot kernel\0"					\
+		"${mtdparts}; run addmmcargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
+			" /boot/${board_name}-linux.bin;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"boot_nfs_fallback_flash=if ping ${serverip};"			\
 			"then echo Boot over NFS; run nfsboot;"		\
 			"else echo Boot from the board; run ubifsboot;"	\
 		"fi\0"							\
-	"boot_nfs2_fallback_flash=if ping ${serverip};"			\
-			"then echo Boot over NFS; run nfsboot2;"	\
-			"else echo Boot from the board; run ubifsboot;"	\
-		"fi\0"							\
 	"firmware_autoload=0\0"						\
 	"flash_uboot=nand unlock ${u-boot_addr} ;"			\
 		"nand erase.part u-boot;"		\
@@ -262,14 +264,21 @@
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
+	"flash_dtb=nand erase.part dtb;"				\
+		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
+			"then echo Flashing of rootfs succeed;"		\
+			"else echo Flashing of rootfs failed;"		\
+		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
 	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
+	"download_dtb=tftpboot ${loadaddr} imx27-${board_name}.dtb\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
+	"update_dtb=run download_dtb flash_dtb\0"		\
 	"update_all=run download_kernel flash_kernel download_rootfs "	\
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-402-g057d4d0

[jorasse <jo...@us...>]

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  057d4d032272400ae74b517e33ad9fa8499d4f73 (commit)
       via  c4138eba9023ad721e2f2d30bf0145ca41edbd4b (commit)
      from  045dc476880412445af1bee7a95fd17caf0249bf (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 057d4d032272400ae74b517e33ad9fa8499d4f73
Merge: c4138eb 045dc47
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 20 00:21:27 2012 +0200

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

commit c4138eba9023ad721e2f2d30bf0145ca41edbd4b
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 20 00:19:50 2012 +0200

    [UBOOT] apf28: update mmc and nfs boot script - support linux DTB

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2012.04.h   |   41 ++++++++++++++-----
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index c58f980..c33f3a5 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -25,8 +25,8 @@
 #include <asm/arch/regs-base.h>
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"1.0"
-#define CONFIG_IDENT_STRING	" apf28 patch 1.4"
+#define CONFIG_ENV_VERSION 	"1.1"
+#define CONFIG_IDENT_STRING	" apf28 patch 1.5"
 #define CONFIG_BOARD_NAME	apf28
 
 /*
@@ -236,6 +236,7 @@
 	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
 	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
 	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
+	"kernel_addr_r=40000000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
@@ -245,15 +246,26 @@
 	"addipargs=setenv bootargs ${bootargs} "			\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
-	"nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
-		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
-		"nboot kernel\0"		\
-	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
-		"${mtdparts};run addubifsargs addipargs; setenv autostart yes;"\
-		"nboot kernel\0"		\
-	"mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
-		"${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
-		"nboot kernel\0"		\
+	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addnfsargs addipargs;"		\
+		"nfs ${kernel_addr_r} "					\
+		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
+	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts};run addubifsargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"nboot ${kernel_addr_r} kernel;"			\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
+	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addmmcargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
+			" /boot/${board_name}-linux.bin;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"flash_uboot=if bcb nand.write ; then "				\
 		"nand erase ${u-boot_addr} ${u-boot_len} ; "		\
 		"nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};" \
@@ -273,14 +285,21 @@
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
+	"flash_dtb=nand erase.part dtb;"				\
+		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
+			"then echo Flashing of rootfs succeed;"		\
+			"else echo Flashing of rootfs failed;"		\
+		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0"	\
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
 	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
+	"download_dtb=tftpboot ${loadaddr} imx28-${board_name}.dtb\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
+	"update_dtb=run download_dtb flash_dtb\0"		\
 	"update_all=run download_kernel flash_kernel download_rootfs "	\
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=echo unlock_reg not needed anymore\0"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-400-g045dc47

[Julien B a. A. <ar...@us...>]

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  045dc476880412445af1bee7a95fd17caf0249bf (commit)
       via  7522f1e3fc9ebea9fc24fc51b8fa1b70a458e30b (commit)
       via  a75b28ea5e0532543d91c17c9b467aabb3a94778 (commit)
      from  9b6064af33fd823b95c3bb1555b8f6444cda1534 (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 045dc476880412445af1bee7a95fd17caf0249bf
Merge: 7522f1e 9b6064a
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jun 19 22:48:26 2012 +0200

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

commit 7522f1e3fc9ebea9fc24fc51b8fa1b70a458e30b
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jun 19 22:47:15 2012 +0200

    [BUILDROOT] linux-firmware: fixes libertas forced installation when not selected

commit a75b28ea5e0532543d91c17c9b467aabb3a94778
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jun 19 22:46:03 2012 +0200

    [BUILDROOT] linux-firmware: add new wl12xx firmware (mainline backport)

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

Summary of changes:
 ...85-linux-firmware-add_new_wl12xx_firmware.patch |   45 ++++++++++++++++++++
 ...-linux-firmware-add_marvell_libertas_8686.patch |   33 ++++++++++----
 2 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 patches/buildroot/2012.02/185-linux-firmware-add_new_wl12xx_firmware.patch

diff --git a/patches/buildroot/2012.02/185-linux-firmware-add_new_wl12xx_firmware.patch b/patches/buildroot/2012.02/185-linux-firmware-add_new_wl12xx_firmware.patch
new file mode 100644
index 0000000..ed8e0b5
--- /dev/null
+++ b/patches/buildroot/2012.02/185-linux-firmware-add_new_wl12xx_firmware.patch
@@ -0,0 +1,45 @@
+From f5b6e19eff604bf92ab84c30eebd600f88d39db3 Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yeg...@go...>
+Date: Wed, 04 Apr 2012 12:37:01 +0000
+Subject: linux-firmware: add new wl12xx firmware
+
+Signed-off-by: Yegor Yefremov <yeg...@go...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+(limited to 'package/linux-firmware/linux-firmware.mk')
+
+diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
+index e09f67d..ba33d37 100644
+--- a/package/linux-firmware/linux-firmware.mk
++++ b/package/linux-firmware/linux-firmware.mk
+@@ -3,7 +3,7 @@
+ # linux-firmware
+ #
+ #############################################################
+-LINUX_FIRMWARE_VERSION = a2995d38c234e3d767df7223d84a0f33a1a24997
++LINUX_FIRMWARE_VERSION = 8ccddee5ee23a0e192da38d98bcbbbb41bf385dd
+ LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+ LINUX_FIRMWARE_SITE_METHOD = git
+ 
+@@ -38,6 +38,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X) += \
+ 	ti-connectivity/wl127x-fw-3.bin				\
+ 	ti-connectivity/wl127x-fw-plt-3.bin			\
+ 	ti-connectivity/wl127x-nvs.bin				\
++	ti-connectivity/wl127x-fw-4-mr.bin			\
++	ti-connectivity/wl127x-fw-4-plt.bin			\
++	ti-connectivity/wl127x-fw-4-sr.bin			\
+ 	ti-connectivity/TIInit_7.2.31.bts 			\
+ 	LICENCE.ti-connectivity
+ 
+@@ -50,6 +53,9 @@ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X) += \
+ 	ti-connectivity/wl1271-nvs.bin				\
+ 	ti-connectivity/wl128x-nvs.bin				\
+ 	ti-connectivity/wl12xx-nvs.bin				\
++	ti-connectivity/wl128x-fw-4-mr.bin			\
++	ti-connectivity/wl128x-fw-4-plt.bin			\
++	ti-connectivity/wl128x-fw-4-sr.bin			\
+ 	ti-connectivity/TIInit_7.2.31.bts 			\
+ 	LICENCE.ti-connectivity
+ 
+--
+cgit v0.9.0.1-2-gef13
diff --git a/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch b/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
index 9d7509c..20a19c1 100644
--- a/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
+++ b/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 Index: buildroot/package/linux-firmware/Config.in
 ===================================================================
 --- buildroot.orig/package/linux-firmware/Config.in	2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/package/linux-firmware/Config.in	2012-06-17 21:01:54.000000000 +0200
++++ buildroot/package/linux-firmware/Config.in	2012-06-19 19:05:58.000000000 +0200
 @@ -8,6 +8,37 @@
  
  if BR2_PACKAGE_LINUX_FIRMWARE
@@ -47,14 +47,16 @@ Index: buildroot/package/linux-firmware/Config.in
 Index: buildroot/package/linux-firmware/linux-firmware.mk
 ===================================================================
 --- buildroot.orig/package/linux-firmware/linux-firmware.mk	2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/package/linux-firmware/linux-firmware.mk	2012-06-17 21:07:42.000000000 +0200
-@@ -3,10 +3,25 @@
++++ buildroot/package/linux-firmware/linux-firmware.mk	2012-06-19 19:14:45.000000000 +0200
+@@ -3,10 +3,28 @@
  # linux-firmware
  #
  #############################################################
--LINUX_FIRMWARE_VERSION = a2995d38c234e3d767df7223d84a0f33a1a24997
-+#LINUX_FIRMWARE_VERSION = a2995d38c234e3d767df7223d84a0f33a1a24997
++ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_88W8686_SDIO),y)
 +LINUX_FIRMWARE_VERSION = af5222c5ded5d944267acfbd001571409bea7eeb
++else
+ LINUX_FIRMWARE_VERSION = 8ccddee5ee23a0e192da38d98bcbbbb41bf385dd
++endif
  LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
  LINUX_FIRMWARE_SITE_METHOD = git
  
@@ -75,14 +77,25 @@ Index: buildroot/package/linux-firmware/linux-firmware.mk
  # rt2501/rt61
  LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61) += \
  	rt2561.bin rt2561s.bin rt2661.bin LICENCE.ralink-firmware.txt
-@@ -52,6 +67,10 @@
- 	mkdir -p $(TARGET_DIR)/lib/firmware
- 	$(TAR) c -C $(@D) $(LINUX_FIRMWARE_FILES_y) | \
- 		$(TAR) x -C $(TARGET_DIR)/lib/firmware
-+	# To be compatible with old Armadeus kernels:
+@@ -45,6 +63,13 @@
+ 	ti-connectivity/TIInit_7.2.31.bts 			\
+ 	LICENCE.ti-connectivity
+ 
++ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_88W8686_SDIO),y)
++define ARMADEUS_LIBERTAS_OLD_KERNELS_COMPATIBILITY
 +	cd $(TARGET_DIR)/lib/firmware; \
 +		ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_VERSION)_helper.bin ./sd8686_helper.bin ; \
 +		ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_VERSION).bin ./sd8686.bin
++endef
++endif
+ 
+ ifneq ($(LINUX_FIRMWARE_FILES_y),)
+ 
+@@ -52,6 +77,7 @@
+ 	mkdir -p $(TARGET_DIR)/lib/firmware
+ 	$(TAR) c -C $(@D) $(LINUX_FIRMWARE_FILES_y) | \
+ 		$(TAR) x -C $(TARGET_DIR)/lib/firmware
++	$(ARMADEUS_LIBERTAS_OLD_KERNELS_COMPATIBILITY)
  endef
  
  endif


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-397-g9b6064a

[jorasse <jo...@us...>]

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  9b6064af33fd823b95c3bb1555b8f6444cda1534 (commit)
      from  f9e43b7ff5a0bc44c2573d7c15f8b8ea0ab13c01 (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 9b6064af33fd823b95c3bb1555b8f6444cda1534
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Jun 19 13:02:18 2012 +0200

    [ROOTFS] add /boot folder to store binary images to boot or update the board

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

Summary of changes:
 .../target/device/armadeus/rootfs/post_build.sh    |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index 13aec6f..2939f40 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -47,5 +47,7 @@ ln -sf /tmp $1/var/pcmcia
 ln -sf /tmp $1/var/run
 ln -sf /tmp $1/var/spool
 ln -sf /tmp $1/var/tmp
+# /boot
+mkdir -p $1/boot
 
 exit 0


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-396-gf9e43b7

[Fabien M <fa...@us...>]

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  f9e43b7ff5a0bc44c2573d7c15f8b8ea0ab13c01 (commit)
       via  b136a10c4013cd08c7eee59a5ee6568421f8d512 (commit)
      from  e8688ab7d260b00137c87b478effa9b6140d2902 (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 f9e43b7ff5a0bc44c2573d7c15f8b8ea0ab13c01
Merge: b136a10 e8688ab
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jun 19 11:55:46 2012 +0200

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

commit b136a10c4013cd08c7eee59a5ee6568421f8d512
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jun 19 11:54:18 2012 +0200

    [scripts] delete duplicated code

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

Summary of changes:
 scripts/quiltify.sh |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index cebe56e..1268060 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -166,13 +166,7 @@ for patch in $PATCHES; do
 done
 
 if [ "$ARMADEUS_BOARD_NAME" == "apf28" ] && [ "$ARMADEUS_LINUX_VERSION" == "2.6.35.3" ]; then
-	tar -zxvf $ARMADEUS_DL_DIR/MX28-FEC-PROBLEM-PATCH.tar.gz
-	PATCHES=`ls -ar *.patch`
-	for patch in $PATCHES; do
-		quilt import $patch
-	done
-	rm *.patch
-	
+
 	tar -zxvf  $ARMADEUS_DL_DIR/MX28-FEC-PROBLEM-PATCH.tar.gz
 	PATCHES=`ls -ar *.patch`
 	for patch in $PATCHES; do


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-394-ge8688ab

[jscheer <js...@us...>]

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  e8688ab7d260b00137c87b478effa9b6140d2902 (commit)
       via  30775a1ba654e60eab4cd120d63f1bbf3c7995f2 (commit)
      from  b45f65273171887cf3f982269f0d48ddbad66300 (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 e8688ab7d260b00137c87b478effa9b6140d2902
Merge: 30775a1 b45f652
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Jun 19 10:50:50 2012 +0200

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

commit 30775a1ba654e60eab4cd120d63f1bbf3c7995f2
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Jun 19 10:50:14 2012 +0200

    [DEMOS] Fix mkspecs path for APF build in ApfDacClientServer demo's build.sh.

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

Summary of changes:
 software/demos/ApfDacClientServer/src/build.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/software/demos/ApfDacClientServer/src/build.sh b/software/demos/ApfDacClientServer/src/build.sh
index 642f9cf..70ca5d3 100755
--- a/software/demos/ApfDacClientServer/src/build.sh
+++ b/software/demos/ApfDacClientServer/src/build.sh
@@ -88,7 +88,7 @@ export OUTPUT_DIR=../../bin/apf
 #export QTDIR=$ARMADEUS_ROOTFS_DIR/qt/qtopia.4.2.0/
 export QTDIR=$ARMADEUS_QTE_DIR
 ## due to some installation problems.... I use a custom qmake spec
-export QMAKESPEC=$ARMADEUS_BUILDROOT_DIR/output/host/usr/mkspecs/qws/linux-arm-g++
+export QMAKESPEC=$ARMADEUS_QTE_DIR/mkspecs/qws/linux-arm-g++
 export PATH=$ARMADEUS_TOOLCHAIN_PATH:$QTDIR/bin:$INITIALPATH
 
 buildForEnvironment "APF board" $1


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-392-gb45f652

[jorasse <jo...@us...>]

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  b45f65273171887cf3f982269f0d48ddbad66300 (commit)
      from  7ac15e407209f749bd250b973c8f8a711b9133ee (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 b45f65273171887cf3f982269f0d48ddbad66300
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jun 18 14:27:33 2012 +0200

    [UBOOT] apf27: support SD card reader

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2012.04.h   |    8 +++++---
 ...-Add-support-for-the-armadeus-apf27-board.patch |    8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index 58cf1cd..6e9741a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -25,7 +25,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION 	"3.0"
-#define CONFIG_IDENT_STRING	" apf27 patch 3.4"
+#define CONFIG_IDENT_STRING	" apf27 patch 3.5"
 #define CONFIG_BOARD_NAME	apf27
 
 /*
@@ -83,10 +83,12 @@
 #define CONFIG_CMD_DHCP		/* DHCP Support			*/
 #define CONFIG_CMD_DNS
 /*#define CONFIG_CMD_EEPROM */	/* EEPROM read/write support	*/
+#define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT		/* FAT support			*/
 /*#define CONFIG_CMD_I2C */	/* I2C serial bus support	*/
 #define CONFIG_CMD_IMX_FUSE	/* imx iim fuse                 */
 #define CONFIG_CMD_MII		/* MII support			*/
+#define CONFIG_CMD_MMC
 #define CONFIG_CMD_MTDPARTS	/* MTD partition support 	*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
@@ -745,8 +747,8 @@
 #define CONFIG_SYS_AIPI2_PSR1_VAL	0xFFFFFFFF
 
 /* PCCR enable DMA FEC I2C1 IIM SDHC1 */
-#define CONFIG_SYS_PCCR0_VAL		0x05070400
-#define CONFIG_SYS_PCCR1_VAL		0xA14A0408
+#define CONFIG_SYS_PCCR0_VAL		0x05070410
+#define CONFIG_SYS_PCCR1_VAL		0xA14A0608
 
 /*
  * From here, there should not be any user configuration.
diff --git a/patches/u-boot/2012.04/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2012.04/302-Add-support-for-the-armadeus-apf27-board.patch
index 9fb4010..2904403 100644
--- a/patches/u-boot/2012.04/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2012.04/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -234,6 +234,7 @@ index 0000000..c55da1a
 +
 +static int apf27_devices_init(void)
 +{
++	struct gpio_regs *regs = (struct gpio_regs *)IMX_GPIO_BASE;
 +	int i;
 +	unsigned int mode[] = {
 +		PD0_AIN_FEC_TXD0,
@@ -263,14 +264,13 @@ index 0000000..c55da1a
 +
 +#ifdef CONFIG_MXC_MMC
 +	mx27_sd2_init_pins();
++	imx_gpio_mode((GPIO_PORTF | GPIO_OUT | GPIO_PUEN | GPIO_GPIO | 16));
++	writel(readl(&regs->port[PORTF].dr) | (1 << 16),
++				&regs->port[PORTF].dr);
 +#endif
 +	return 0;
 +}
 +
-+int board_mmc_init(bd_t *bis)
-+{
-+	return -1;
-+}
 +int
 +board_init(void)
 +{


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-391-g7ac15e4

[jorasse <jo...@us...>]

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  7ac15e407209f749bd250b973c8f8a711b9133ee (commit)
      from  81ed4007823980b4812426c1393dcc5b51f8a964 (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 7ac15e407209f749bd250b973c8f8a711b9133ee
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jun 17 23:09:40 2012 +0200

    [UBOOT] apf51: enable option to support flattened device trees

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2012.04.h   |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index 3580798..dbb84d8 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -178,10 +178,9 @@
 #define CONFIG_CMDLINE_TAG		/* send commandline to Kernel	*/
 #define CONFIG_SETUP_MEMORY_TAGS 	/* send memory definition to kernel */
 #define CONFIG_INITRD_TAG		/* send initrd params	*/
-/*
-#define CONFIG_REVISION_TAG
+
+/* #define CONFIG_REVISION_TAG */
 #define CONFIG_OF_LIBFDT
-*/
 
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-390-g81ed400

[jorasse <jo...@us...>]

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  81ed4007823980b4812426c1393dcc5b51f8a964 (commit)
       via  650d4b828cc2261bd7ac17f8381b1ed38aefafcc (commit)
      from  0d770c3b715907db123f4566fff7ac15438c058e (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 81ed4007823980b4812426c1393dcc5b51f8a964
Merge: 650d4b8 0d770c3
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jun 17 23:07:54 2012 +0200

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

commit 650d4b828cc2261bd7ac17f8381b1ed38aefafcc
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jun 17 23:07:29 2012 +0200

    [UBOOT] apf28: enable option to support flattened device trees

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2012.04.h   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index 461caf9..c58f980 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -202,10 +202,10 @@
 #define CONFIG_CMDLINE_TAG		/* send commandline to Kernel	*/
 #define CONFIG_SETUP_MEMORY_TAGS 	/* send memory definition to kernel */
 #define CONFIG_INITRD_TAG		/* send initrd params	*/
-/*
-#define CONFIG_REVISION_TAG
+
+/* #define CONFIG_REVISION_TAG */
 #define CONFIG_OF_LIBFDT
-*/
+
 #define	CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-388-g0d770c3

[jorasse <jo...@us...>]

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  0d770c3b715907db123f4566fff7ac15438c058e (commit)
      from  57da43d9eb00238382d418e6145c034337ed3cfc (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 0d770c3b715907db123f4566fff7ac15438c058e
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jun 17 23:00:30 2012 +0200

    [UBOOT] apf27: enable option to support flattened device trees

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2012.04.h   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index 4ee2da3..58cf1cd 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -170,10 +170,10 @@
 #define CONFIG_CMDLINE_TAG		/* send commandline to Kernel	*/
 #define CONFIG_SETUP_MEMORY_TAGS 	/* send memory definition to kernel */
 #define CONFIG_INITRD_TAG		/* send initrd params	*/
-/*
-#define CONFIG_REVISION_TAG
+
+/* #define CONFIG_REVISION_TAG */
 #define CONFIG_OF_LIBFDT
-*/
+
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-387-g57da43d

[jorasse <jo...@us...>]

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  57da43d9eb00238382d418e6145c034337ed3cfc (commit)
       via  2b0a4a35da3d1d75477137508b2b254bc7b69824 (commit)
      from  80d2c9d3e2975120f20db063d0688aedd027d3ff (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 57da43d9eb00238382d418e6145c034337ed3cfc
Merge: 2b0a4a3 80d2c9d
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jun 17 22:55:56 2012 +0200

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

commit 2b0a4a35da3d1d75477137508b2b254bc7b69824
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jun 17 22:54:40 2012 +0200

    [UBOOT] apf28: add MMC bounce buffer option

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2012.04.h   |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index f517ac7..461caf9 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -384,6 +384,7 @@
  */
 #ifdef	CONFIG_CMD_MMC
 #define	CONFIG_MMC
+#define	CONFIG_MMC_BOUNCE_BUFFER
 #define	CONFIG_GENERIC_MMC
 #define	CONFIG_MXS_MMC
 #endif


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-385-g80d2c9d

[Julien B a. A. <ar...@us...>]

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  80d2c9d3e2975120f20db063d0688aedd027d3ff (commit)
      from  daa18e5df129783c67cef271ea0d80093101ef64 (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 80d2c9d3e2975120f20db063d0688aedd027d3ff
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Jun 17 21:14:05 2012 +0200

    [BUILDROOT] Fixes linux-firmware usage on APF51

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

Summary of changes:
 buildroot/configs/apf51_defconfig                  |    4 ++--
 ...-linux-firmware-add_marvell_libertas_8686.patch |   15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index e4d5fac..0516c2f 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -47,9 +47,9 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_FBV=y
 BR2_PACKAGE_DBUS=y
-BR2_PACKAGE_FIRMWARE=y
-BR2_PACKAGE_FIRMWARE_88W8686=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_88W8686=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_JFFS2DUMP=y
 BR2_PACKAGE_MTD_MKFSJFFS2=y
diff --git a/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch b/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
index b60882d..9d7509c 100644
--- a/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
+++ b/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: buildroot/package/linux-firmware/Config.in
 ===================================================================
---- buildroot.orig/package/linux-firmware/Config.in	2012-05-03 21:00:53.000000000 +0200
-+++ buildroot/package/linux-firmware/Config.in	2012-05-03 21:37:17.000000000 +0200
+--- buildroot.orig/package/linux-firmware/Config.in	2012-02-29 23:19:47.000000000 +0100
++++ buildroot/package/linux-firmware/Config.in	2012-06-17 21:01:54.000000000 +0200
 @@ -8,6 +8,37 @@
  
  if BR2_PACKAGE_LINUX_FIRMWARE
@@ -46,8 +46,8 @@ Index: buildroot/package/linux-firmware/Config.in
  config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
 Index: buildroot/package/linux-firmware/linux-firmware.mk
 ===================================================================
---- buildroot.orig/package/linux-firmware/linux-firmware.mk	2012-05-03 21:01:00.000000000 +0200
-+++ buildroot/package/linux-firmware/linux-firmware.mk	2012-05-03 21:34:45.000000000 +0200
+--- buildroot.orig/package/linux-firmware/linux-firmware.mk	2012-02-29 23:19:47.000000000 +0100
++++ buildroot/package/linux-firmware/linux-firmware.mk	2012-06-17 21:07:42.000000000 +0200
 @@ -3,10 +3,25 @@
  # linux-firmware
  #
@@ -75,13 +75,14 @@ Index: buildroot/package/linux-firmware/linux-firmware.mk
  # rt2501/rt61
  LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61) += \
  	rt2561.bin rt2561s.bin rt2661.bin LICENCE.ralink-firmware.txt
-@@ -52,6 +67,9 @@
+@@ -52,6 +67,10 @@
  	mkdir -p $(TARGET_DIR)/lib/firmware
  	$(TAR) c -C $(@D) $(LINUX_FIRMWARE_FILES_y) | \
  		$(TAR) x -C $(TARGET_DIR)/lib/firmware
 +	# To be compatible with old Armadeus kernels:
-+	ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_SDIO_VERSION)_helper.bin $(FIRMWARE_TARGET_DIR)/sd8686_helper.bin
-+	ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_SDIO_VERSION).bin $(FIRMWARE_TARGET_DIR)/sd8686.bin
++	cd $(TARGET_DIR)/lib/firmware; \
++		ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_VERSION)_helper.bin ./sd8686_helper.bin ; \
++		ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_VERSION).bin ./sd8686.bin
  endef
  
  endif


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-384-gdaa18e5

[Fabien M <fa...@us...>]

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  daa18e5df129783c67cef271ea0d80093101ef64 (commit)
       via  bd646b6bee57cb3dc4e13da8281c169238503df4 (commit)
      from  5d4ac172d0c0bf27a555b0b43fbd8e89fe551628 (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 daa18e5df129783c67cef271ea0d80093101ef64
Merge: bd646b6 5d4ac17
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jun 15 17:50:13 2012 +0200

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

commit bd646b6bee57cb3dc4e13da8281c169238503df4
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jun 15 17:49:41 2012 +0200

    [scripts] Upgrade quiltify to include freescales.tar.gz patches

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

Summary of changes:
 scripts/quiltify.sh |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index da1264c..cebe56e 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -51,12 +51,6 @@ fi
 make shell_env
 . armadeus_env.sh
 
-if [ "$ARMADEUS_BOARD_NAME" == "apf28" ] && [ "$ARMADEUS_LINUX_VERSION" == "2.6.35.3" ]; then
-	FREESCALE_PATCH=linux-2.6.35.3-imx_10.12.01.patch.tar.gz
-else
-	FREESCALE_PATCH=""
-fi
-
 if [ "$1" != "export" ]; then
 	ask_user_choice "What do you want to quiltify today ? ;-)" "Linux Buildroot U-Boot"
 fi
@@ -171,8 +165,36 @@ for patch in $PATCHES; do
 	quilt import $patch
 done
 
-if [ "$FREESCALE_PATCH" != "" ]; then
-	quilt import $ARMADEUS_DL_DIR/$FREESCALE_PATCH
+if [ "$ARMADEUS_BOARD_NAME" == "apf28" ] && [ "$ARMADEUS_LINUX_VERSION" == "2.6.35.3" ]; then
+	tar -zxvf $ARMADEUS_DL_DIR/MX28-FEC-PROBLEM-PATCH.tar.gz
+	PATCHES=`ls -ar *.patch`
+	for patch in $PATCHES; do
+		quilt import $patch
+	done
+	rm *.patch
+	
+	tar -zxvf  $ARMADEUS_DL_DIR/MX28-FEC-PROBLEM-PATCH.tar.gz
+	PATCHES=`ls -ar *.patch`
+	for patch in $PATCHES; do
+		quilt import $patch
+	done
+	rm *.patch
+	
+	tar -zxvf  $ARMADEUS_DL_DIR/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz
+	PATCHES=`ls -ar patches_for_L2.6.35_MX28_SDK_10.12_SOURCE/kernel/*.patch`
+	for patch in $PATCHES; do
+		quilt import $patch
+	done
+	rm -rf patches_for_L2.6.35_MX28_SDK_10.12_SOURCE/kernel/
+	
+	tar -zxvf  $ARMADEUS_DL_DIR/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz
+	PATCHES=`ls -ar *.patch`
+	for patch in $PATCHES; do
+		quilt import $patch
+	done
+	rm *.patch
+	
+	quilt import $ARMADEUS_DL_DIR/linux-2.6.35.3-imx_10.12.01.patch.tar.gz
 fi
 
 quilt push -a


hooks/post-receive
-- 
armadeus