Merge branch 'mimc200' into next

[platform/kernel/u-boot.git] / include / configs / EB+MCF-EV123.h

diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 876ec20..a13db7c 100644 (file)
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -178,7 +178,7 @@
 #define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_SDRAM_BASE1
 #define        CONFIG_SYS_SDRAM_SIZE           CONFIG_SYS_SDRAM_SIZE1
 
-#define CONFIG_SYS_FLASH_BASE          0xFFE00000
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_CS0_BASE
 #define        CONFIG_SYS_INT_FLASH_BASE       0xF0000000
 #define CONFIG_SYS_INT_FLASH_ENABLE    0x21
 
@@ -218,17 +218,13 @@
  * Memory bank definitions
  */
 
-#define CONFIG_SYS_CS0_BASE            CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_CS0_SIZE            2*1024*1024
-#define CONFIG_SYS_CS0_WIDTH           16
-#define CONFIG_SYS_CS0_RO              0
-#define CONFIG_SYS_CS0_WS              6
+#define CONFIG_SYS_CS0_BASE            0xFFE00000
+#define CONFIG_SYS_CS0_CTRL            0x00001980
+#define CONFIG_SYS_CS0_MASK            0x001F0001
 
 #define CONFIG_SYS_CS3_BASE            0xE0000000
-#define CONFIG_SYS_CS3_SIZE            1*1024*1024
-#define CONFIG_SYS_CS3_WIDTH           16
-#define CONFIG_SYS_CS3_RO              0
-#define CONFIG_SYS_CS3_WS              6
+#define CONFIG_SYS_CS0_CTRL            0x00001980
+#define CONFIG_SYS_CS3_MASK            0x000F0001
 
 /*-----------------------------------------------------------------------
  * Port configuration