ColdFire: Modules header files cleanup

[people/ms/u-boot.git] / include / configs / M5253DEMO.h

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 3a5c12faa46f9988aeb24f47af989d502186191d..378e45a4469b3ddbeafb7253047b3e096960eb89 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -90,7 +90,7 @@
 
 #define CONFIG_DRIVER_DM9000
 #ifdef CONFIG_DRIVER_DM9000
-#      define CONFIG_DM9000_BASE       ((CONFIG_SYS_CSAR1 << 16) | 0x300)
+#      define CONFIG_DM9000_BASE       (CONFIG_SYS_CS1_BASE | 0x300)
 #      define DM9000_IO                CONFIG_DM9000_BASE
 #      define DM9000_DATA              (CONFIG_DM9000_BASE + 4)
 #      undef CONFIG_DM9000_DEBUG
@@ -202,7 +202,7 @@
 #define CONFIG_SYS_BOOTMAPSZ           (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
 
 /* FLASH organization */
-#define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CSAR0 << 16)
+#define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE)
 #define CONFIG_SYS_MAX_FLASH_BANKS     1       /* max number of memory banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      2048    /* max number of sectors on one chip */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    1000
@@ -233,21 +233,13 @@
 /* Port configuration */
 #define CONFIG_SYS_FECI2C              0xF0
 
-#define CONFIG_SYS_CSAR0               0xFF80
-#define CONFIG_SYS_CSMR0               0x007F0021
-#define CONFIG_SYS_CSCR0               0x1D80
+#define CONFIG_SYS_CS0_BASE            0xFF800000
+#define CONFIG_SYS_CS0_MASK            0x007F0021
+#define CONFIG_SYS_CS0_CTRL            0x00001D80
 
-#define CONFIG_SYS_CSAR1               0xE000
-#define CONFIG_SYS_CSMR1               0x00000001
-#define CONFIG_SYS_CSCR1               0x3DD8
-
-#define CONFIG_SYS_CSAR2               0
-#define CONFIG_SYS_CSMR2               0
-#define CONFIG_SYS_CSCR2               0
-
-#define CONFIG_SYS_CSAR3               0
-#define CONFIG_SYS_CSMR3               0
-#define CONFIG_SYS_CSCR3               0
+#define CONFIG_SYS_CS1_BASE            0xE0000000
+#define CONFIG_SYS_CS1_MASK            0x00000001
+#define CONFIG_SYS_CS1_CTRL            0x00003DD8
 
 /*-----------------------------------------------------------------------
  * Port configuration