[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-231-gf534f4c

[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  f534f4cd0c4be986b91db66b1e64e8f72642a617 (commit)
       via  867a6c1e6bff78171e4cb9c558a4b1fd6a9b1256 (commit)
      from  ccc879c15b7aa1d81259f2f90d3cb9f8406ddbc1 (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 f534f4cd0c4be986b91db66b1e64e8f72642a617
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Mar 29 22:42:35 2012 +0200

    [UBOOT] pps: configure pps dedicated lines and disable mmc driver

commit 867a6c1e6bff78171e4cb9c558a4b1fd6a9b1256
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Mar 29 22:40:51 2012 +0200

    [UBOOT] apf27: use CONFIG_CMD_MMC to enable sd bus init when needed

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2011.12.h   |    3 ++-
 .../device/armadeus/pps/pps-u-boot-2011.12.h       |   16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index bbe4dc3..8bafce3 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -88,7 +88,6 @@
 #define CONFIG_CMD_IMX_FUSE	/* imx iim fuse                 */
 #define CONFIG_CMD_MII		/* MII support			*/
 #define CONFIG_CMD_MTDPARTS	/* MTD partition support 	*/
-/*#define CONFIG_CMD_MMC*/	/* MMC memory mapped support	*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
 #define CONFIG_CMD_NAND_TRIMFFS
@@ -417,10 +416,12 @@
 /*
  * SD/MMC
  */
+#ifdef CONFIG_CMD_MMC
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MXC_MMC
 #define CONFIG_MXC_MCI_REGS_BASE	0x10014000
+#endif
 
 /*
  * RTC
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
index fbc4005..ab5595f 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
@@ -88,7 +88,6 @@
 #define CONFIG_CMD_IMX_FUSE	/* imx iim fuse                 */
 #define CONFIG_CMD_MII		/* MII support			*/
 #define CONFIG_CMD_MTDPARTS	/* MTD partition support 	*/
-/*#define CONFIG_CMD_MMC*/	/* MMC memory mapped support	*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
 #define CONFIG_CMD_NAND_TRIMFFS
@@ -417,17 +416,18 @@
 /*
  * SD/MMC
  */
+#ifdef CONFIG_CMD_MMC
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MXC_MMC
 #define CONFIG_MXC_MCI_REGS_BASE	0x10014000
+#endif
 
 /*
  * RTC
  */
 #define CONFIG_RTC_DS1374
 #define CONFIG_SYS_RTC_BUS_NUM		0
-//#define DEBUG_RTC
 
 /*
  * Watchdog Config
@@ -737,20 +737,20 @@
 #define CONFIG_SYS_GPR_A_VAL		0x00000000
 #define CONFIG_SYS_PUEN_A_VAL		0xFFFFFFFF
 
-#define CONFIG_SYS_DDIR_B_VAL		0x00000000
-#define CONFIG_SYS_OCR1_B_VAL		0x00000000
+#define CONFIG_SYS_DDIR_B_VAL		0x000001F0
+#define CONFIG_SYS_OCR1_B_VAL		0x0003ff00
 #define CONFIG_SYS_OCR2_B_VAL		0x00000000
-#define CONFIG_SYS_ICFA1_B_VAL		0xFFFFFFFF
+#define CONFIG_SYS_ICFA1_B_VAL		0xFFFC00FF
 #define CONFIG_SYS_ICFA2_B_VAL		0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_B_VAL 		0xFFFFFFFF
+#define CONFIG_SYS_ICFB1_B_VAL 		0xFFFC00FF
 #define CONFIG_SYS_ICFB2_B_VAL		0xFFFFFFFF
-#define CONFIG_SYS_DR_B_VAL		0x00000000
+#define CONFIG_SYS_DR_B_VAL		0x000001F0
 #define CONFIG_SYS_GIUS_B_VAL		0xFF3FFFF0
 #define CONFIG_SYS_ICR1_B_VAL		0x00000000
 #define CONFIG_SYS_ICR2_B_VAL		0x00000000
 #define CONFIG_SYS_IMR_B_VAL		0x00000000
 #define CONFIG_SYS_GPR_B_VAL		0x00000000
-#define CONFIG_SYS_PUEN_B_VAL		0xFFFFFFFF
+#define CONFIG_SYS_PUEN_B_VAL		0xFFFFFE0F
 
 #define CONFIG_SYS_DDIR_C_VAL		0x00000000
 #define CONFIG_SYS_OCR1_C_VAL		0x00000000


hooks/post-receive
-- 
armadeus