summaryrefslogtreecommitdiff
path: root/include/configs/zylonite.h
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2009-02-23 15:42:44 -0600
committerKim Phillips <kim.phillips@freescale.com>2009-02-23 15:42:44 -0600
commit741a1ea97335c88747a2de6677b92458d6ada00b (patch)
tree83ee5d31a46d2f1132eb0c968874b765704bd7df /include/configs/zylonite.h
parent7511835b29f2074ebfa8ea794f0303ec8e49542b (diff)
parent32688e572ff96715b41420e9a7f280db6c399b65 (diff)
downloadu-boot-imx-741a1ea97335c88747a2de6677b92458d6ada00b.zip
u-boot-imx-741a1ea97335c88747a2de6677b92458d6ada00b.tar.gz
u-boot-imx-741a1ea97335c88747a2de6677b92458d6ada00b.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/configs/zylonite.h')
-rw-r--r--include/configs/zylonite.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h
index 31ea4ca..6febeea 100644
--- a/include/configs/zylonite.h
+++ b/include/configs/zylonite.h
@@ -41,7 +41,7 @@
#ifdef CONFIG_LCD
#define CONFIG_SHARP_LM8V31
#endif
-/* #define CONFIG_MMC 1 */
+#undef CONFIG_MMC
#define BOARD_LATE_INIT 1
#undef CONFIG_SKIP_RELOCATE_UBOOT
@@ -143,7 +143,7 @@
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */
-#define CONFIG_SYS_HZ 3250000 /* incrementer freq: 3.25 MHz */
+#define CONFIG_SYS_HZ 1000
/* Monahans Core Frequency */
#define CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO 16 /* valid values: 8, 16, 24, 31 */
@@ -152,7 +152,11 @@
/* valid baudrates */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-/* #define CONFIG_SYS_MMC_BASE 0xF0000000 */
+#ifdef CONFIG_MMC
+#define CONFIG_PXA_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_SYS_MMC_BASE 0xF0000000
+#endif
/*
* Stack sizes