aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Huang <Chang-Ming.Huang@freescale.com>2011-01-24 17:09:53 +0000
committerKumar Gala <galak@kernel.crashing.org>2011-04-04 09:24:40 -0500
commit9c4d8767ed672f995bf2d6b7cb2e83823bae9d76 (patch)
tree76d155b4efab968065bf36fb8fcdc858e652ac9f
parentfbee0f7f09e94c0967ac118d41388c3edb0c226d (diff)
downloadu-boot-midas-9c4d8767ed672f995bf2d6b7cb2e83823bae9d76.tar.gz
u-boot-midas-9c4d8767ed672f995bf2d6b7cb2e83823bae9d76.tar.bz2
u-boot-midas-9c4d8767ed672f995bf2d6b7cb2e83823bae9d76.zip
powerpc/85xx: Add eSDHC support on P2020DS
We enable SDHC_CD and SDHC_WP signals (pin muxed with GPIO8 & GPIO9 respectively). We enable EXT2, FAT, and parition support for both MMC & USB configs. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> Signed-off-by: Jin Qing <b24347@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--board/freescale/p2020ds/p2020ds.c13
-rw-r--r--include/configs/P2020DS.h25
2 files changed, 37 insertions, 1 deletions
diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c
index 8546aa903f..16e9206cb6 100644
--- a/board/freescale/p2020ds/p2020ds.c
+++ b/board/freescale/p2020ds/p2020ds.c
@@ -44,6 +44,19 @@
DECLARE_GLOBAL_DATA_PTR;
+int board_early_init_f(void)
+{
+#ifdef CONFIG_MMC
+ ccsr_gur_t *gur = (ccsr_gur_t *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+
+ setbits_be32(&gur->pmuxcr,
+ (MPC85xx_PMUXCR_SDHC_CD |
+ MPC85xx_PMUXCR_SDHC_WP));
+#endif
+
+ return 0;
+}
+
int checkboard(void)
{
u8 sw;
diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index b32a9976f6..d4770f2774 100644
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -78,6 +78,8 @@
#define CONFIG_L2_CACHE /* toggle L2 cache */
#define CONFIG_BTB /* toggle branch predition */
+#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
+
#define CONFIG_ENABLE_36BIT_PHYS 1
#ifdef CONFIG_PHYS_64BIT
@@ -605,15 +607,36 @@
/*
* USB
*/
+#define CONFIG_USB_EHCI
+
+#ifdef CONFIG_USB_EHCI
#define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE
-#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#endif
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
+ * SDHC/MMC
+ */
+#define CONFIG_MMC
+
+#ifdef CONFIG_MMC
+#define CONFIG_FSL_ESDHC
+#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#endif
+
+#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_DOS_PARTITION
+#endif
+
+/*
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */