Moved conditional compile into Makefile

[u-boot] / include / configs / M5475EVB.h

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index a19c3422708f46eea9015d73bd334f42158f480d..af6723c63753717faad66bdaf4d1ad7e305abd39 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -226,7 +226,7 @@
  */
 #define CFG_SDRAM_BASE         0x00000000
 #define CFG_SDRAM_CFG1         0x73711630
-#define CFG_SDRAM_CFG2         0x46370000
+#define CFG_SDRAM_CFG2         0x46770000
 #define CFG_SDRAM_CTRL         0xE10B0000
 #define CFG_SDRAM_EMOD         0x40010000
 #define CFG_SDRAM_MODE         0x018D0000
@@ -259,7 +259,7 @@
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 #      define CFG_FLASH_BASE           (CFG_CS0_BASE)
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_SECT       137     /* max number of sectors on one chip */
 #      define CFG_FLASH_PROTECTION     /* "Real" (hardware) sectors protection */
@@ -303,9 +303,9 @@
 #define CFG_CS0_CTRL           0x00101980
 
 #ifdef CFG_NOR1SZ
-#define CFG_CS1_BASE           0xF8000000
+#define CFG_CS1_BASE           0xE0000000
 #define CFG_CS1_MASK           (((CFG_NOR1SZ << 20) - 1) & 0xFFFF0001)
-#define CFG_CS1_CTRL           0x00000D80
+#define CFG_CS1_CTRL           0x00101D80
 #endif
 
 #endif                         /* _M5475EVB_H */