summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx25_3stack.h5
-rw-r--r--include/configs/mx28_evk.h3
-rw-r--r--include/configs/mx35_3stack.h2
-rw-r--r--include/configs/mx35_3stack_mmc.h10
-rw-r--r--include/configs/mx51_3stack.h5
-rw-r--r--include/configs/mx51_3stack_android.h5
-rw-r--r--include/configs/mx51_bbg.h5
-rw-r--r--include/configs/mx51_bbg_android.h5
-rw-r--r--include/configs/mx53_evk.h5
-rw-r--r--include/fsl_esdhc.h9
10 files changed, 51 insertions, 3 deletions
diff --git a/include/configs/mx25_3stack.h b/include/configs/mx25_3stack.h
index c58f2eb..fde7b12 100644
--- a/include/configs/mx25_3stack.h
+++ b/include/configs/mx25_3stack.h
@@ -53,6 +53,8 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_64BIT_VSPRINTF
+
#define BOARD_LATE_INIT
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
@@ -110,6 +112,9 @@
#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC
#define CONFIG_IMX_MMC
+ #define CONFIG_SYS_FSL_ESDHC_NUM 2
+ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
+ #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_IMX_ESDHC_V1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_CMD_FAT 1
diff --git a/include/configs/mx28_evk.h b/include/configs/mx28_evk.h
index a1ca1aa..8f0b31a 100644
--- a/include/configs/mx28_evk.h
+++ b/include/configs/mx28_evk.h
@@ -56,6 +56,8 @@
#define CONFIG_AUTO_COMPLETE /* Command auto complete */
#define CONFIG_CMDLINE_EDITING /* Command history etc */
+#define CONFIG_SYS_64BIT_VSPRINTF
+
/*
* Boot Linux
*/
@@ -125,6 +127,7 @@
#define CONFIG_MMC
#define CONFIG_IMX_SSP_MMC /* MMC driver based on SSP */
#define CONFIG_GENERIC_MMC
+#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_DOS_PARTITION
#define CONFIG_CMD_FAT
diff --git a/include/configs/mx35_3stack.h b/include/configs/mx35_3stack.h
index 7af1888..89b9f39 100644
--- a/include/configs/mx35_3stack.h
+++ b/include/configs/mx35_3stack.h
@@ -35,6 +35,8 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_64BIT_VSPRINTF
+
#define BOARD_LATE_INIT
/*
* Disabled for now due to build problems under Debian and a significant increase
diff --git a/include/configs/mx35_3stack_mmc.h b/include/configs/mx35_3stack_mmc.h
index b8e567a..c0c53fd 100644
--- a/include/configs/mx35_3stack_mmc.h
+++ b/include/configs/mx35_3stack_mmc.h
@@ -32,9 +32,14 @@
#define CONFIG_MX35 1 /* in a mx31 */
#define CONFIG_MX35_HCLK_FREQ 24000000 /* RedBoot says 26MHz */
+#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_ARCH_MMU
+
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_64BIT_VSPRINTF
+
#define BOARD_LATE_INIT
/*
* Disabled for now due to build problems under Debian and a significant increase
@@ -153,8 +158,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PROMPT "MX35 U-Boot > "
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_ARCH_MMU
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
@@ -196,6 +199,9 @@
#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC
#define CONFIG_IMX_MMC
+ #define CONFIG_SYS_FSL_ESDHC_NUM 2
+ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
+ #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_DOS_PARTITION 1
#define CONFIG_CMD_FAT 1
#endif
diff --git a/include/configs/mx51_3stack.h b/include/configs/mx51_3stack.h
index d4af081..31cf943 100644
--- a/include/configs/mx51_3stack.h
+++ b/include/configs/mx51_3stack.h
@@ -46,6 +46,8 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_64BIT_VSPRINTF
+
#define BOARD_LATE_INIT
/*
* Disabled for now due to build problems under Debian and a significant
@@ -110,6 +112,9 @@
#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC
#define CONFIG_IMX_MMC
+ #define CONFIG_SYS_FSL_ESDHC_NUM 2
+ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
+ #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_DOS_PARTITION 1
#define CONFIG_CMD_FAT 1
#endif
diff --git a/include/configs/mx51_3stack_android.h b/include/configs/mx51_3stack_android.h
index 24d43f3..752fcd7 100644
--- a/include/configs/mx51_3stack_android.h
+++ b/include/configs/mx51_3stack_android.h
@@ -46,6 +46,8 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_64BIT_VSPRINTF
+
#define BOARD_LATE_INIT
/*
* Disabled for now due to build problems under Debian and a significant
@@ -204,6 +206,9 @@
#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC
#define CONFIG_IMX_MMC
+ #define CONFIG_SYS_FSL_ESDHC_NUM 2
+ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
+ #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_DOS_PARTITION 1
#define CONFIG_CMD_FAT 1
#define CONFIG_CMD_EXT2 1
diff --git a/include/configs/mx51_bbg.h b/include/configs/mx51_bbg.h
index 1887626..121c7a1 100644
--- a/include/configs/mx51_bbg.h
+++ b/include/configs/mx51_bbg.h
@@ -45,6 +45,8 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_64BIT_VSPRINTF
+
#define BOARD_LATE_INIT
/*
* Disabled for now due to build problems under Debian and a significant
@@ -121,6 +123,9 @@
#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC
#define CONFIG_IMX_MMC
+ #define CONFIG_SYS_FSL_ESDHC_NUM 2
+ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
+ #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_DOS_PARTITION 1
#define CONFIG_CMD_FAT 1
#endif
diff --git a/include/configs/mx51_bbg_android.h b/include/configs/mx51_bbg_android.h
index 97e5ff3..a0bb39e 100644
--- a/include/configs/mx51_bbg_android.h
+++ b/include/configs/mx51_bbg_android.h
@@ -46,6 +46,8 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_64BIT_VSPRINTF
+
#define BOARD_LATE_INIT
/*
* Disabled for now due to build problems under Debian and a significant
@@ -247,6 +249,9 @@
#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC
#define CONFIG_IMX_MMC
+ #define CONFIG_SYS_FSL_ESDHC_NUM 2
+ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
+ #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_DOS_PARTITION 1
#define CONFIG_CMD_FAT 1
#define CONFIG_CMD_EXT2 1
diff --git a/include/configs/mx53_evk.h b/include/configs/mx53_evk.h
index b65643d..b327a92 100644
--- a/include/configs/mx53_evk.h
+++ b/include/configs/mx53_evk.h
@@ -44,6 +44,8 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_64BIT_VSPRINTF
+
#define BOARD_LATE_INIT
/*
* Disabled for now due to build problems under Debian and a significant
@@ -184,6 +186,9 @@
#define CONFIG_MMC 1
#define CONFIG_GENERIC_MMC
#define CONFIG_IMX_MMC
+ #define CONFIG_SYS_FSL_ESDHC_NUM 2
+ #define CONFIG_SYS_FSL_ESDHC_ADDR 0
+ #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_DOS_PARTITION 1
#define CONFIG_CMD_FAT 1
#define CONFIG_CMD_EXT2 1
diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index d921b3d..63de09a 100644
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -31,10 +31,10 @@
/* FSL eSDHC-specific constants */
#define SYSCTL 0x0002e02c
-#define SYSCTL_RSTA 0x01000000
#define SYSCTL_INITA 0x08000000
#define SYSCTL_TIMEOUT_MASK 0x000f0000
#define SYSCTL_CLOCK_MASK 0x0000fff0
+#define SYSCTL_RSTA 0x01000000
#define SYSCTL_SDCLKEN 0x00000008
#define SYSCTL_PEREN 0x00000004
#define SYSCTL_HCKEN 0x00000002
@@ -147,8 +147,15 @@
#define ESDHC_HOSTCAPBLT_DMAS 0x00400000
#define ESDHC_HOSTCAPBLT_HSS 0x00200000
+struct fsl_esdhc_cfg {
+ u32 esdhc_base;
+ u32 no_snoop;
+ u32 clk_enable;
+};
+
#if defined(CONFIG_FSL_ESDHC) || defined(CONFIG_IMX_MMC)
int fsl_esdhc_mmc_init(bd_t *bis);
+int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg);
void fdt_fixup_esdhc(void *blob, bd_t *bd);
#else
static inline int fsl_esdhc_mmc_init(bd_t *bis) { return -ENOSYS; }