[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