summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-12-20 22:45:10 +0000
committerwdenk <wdenk>2003-12-20 22:45:10 +0000
commitb2001f273fcb34d0f2ca43a9b01a24e5c50da6cd (patch)
treedd6dc8e652da48b306248ca77c71312968c52b28 /include
parent5c745d2613cddf5d029a163a95584e770496c7e4 (diff)
* Fix IceCube CLKIN configuration (it's 33.000000MHz)
* Add new configuration for IceCube board with DDR memory * Update TRAB memory configurations
Diffstat (limited to 'include')
-rw-r--r--include/configs/IceCube.h19
-rw-r--r--include/configs/trab.h11
2 files changed, 26 insertions, 4 deletions
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index f371ba668d..2f0a875838 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -32,7 +32,7 @@
#define CONFIG_MPC5XXX 1 /* This is an MPC5xxx CPU */
#define CONFIG_ICECUBE 1 /* ... on IceCube board */
-#define CFG_MPC5XXX_CLKIN 33333333 /* ... running at 33MHz */
+#define CFG_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
#define BOOTFLAG_WARM 0x02 /* Software reboot */
@@ -219,7 +219,11 @@
/*
* GPIO configuration
*/
+#ifdef CONFIG_MPC5200_DDR
+#define CFG_GPS_PORT_CONFIG 0x90000004
+#else
#define CFG_GPS_PORT_CONFIG 0x10000004
+#endif
/*
* Miscellaneous configurable options
@@ -253,12 +257,25 @@
#define CFG_HID0_FINAL 0
#endif
+#ifdef CONFIG_MPC5200_DDR
+
+#define CFG_BOOTCS_START 0xff800000
+#define CFG_BOOTCS_SIZE 0x00800000
+#define CFG_BOOTCS_CFG 0x00047801
+#define CFG_CS1_START 0xff000000
+#define CFG_CS1_SIZE 0x00800000
+#define CFG_CS1_CFG 0x00047800
+
+#else /* !CONFIG_MPC5200_DDR */
+
#define CFG_BOOTCS_START CFG_FLASH_BASE
#define CFG_BOOTCS_SIZE CFG_FLASH_SIZE
#define CFG_BOOTCS_CFG 0x00047801
#define CFG_CS0_START CFG_FLASH_BASE
#define CFG_CS0_SIZE CFG_FLASH_SIZE
+#endif /* CONFIG_MPC5200_DDR */
+
#define CFG_CS_BURST 0x00000000
#define CFG_CS_DEADCYCLE 0x33333333
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 95ee37e2a7..e9ba90f2aa 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -26,10 +26,15 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#ifdef CONFIG_OLD_VERSION /* Old configuration: */
-#define CONFIG_RAM_16MB /* 16 MB SDRAM */
+/*
+ * Default configuration is with 8 MB Flash, 32 MB RAM
+ */
+#if (!defined(CONFIG_FLASH_8MB)) && (!defined(CONFIG_FLASH_16MB))
+# define CONFIG_FLASH_8MB /* 8 MB Flash */
+#endif
+#if (!defined(CONFIG_RAM_16MB)) && (!defined(CONFIG_RAM_32MB))
+# define CONFIG_RAM_32MB /* 32 MB SDRAM */
#endif
-#define CONFIG_FLASH_8MB /* 8 MB Flash */
/*
* If we are developing, we might want to start armboot from ram