Merge branch 'master' of /home/wd/git/u-boot/custodians

[platform/kernel/u-boot.git] / include / configs / rsk7203.h

diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index 9b857ec..d99e4f3 100644 (file)
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -65,7 +65,7 @@
 #define CFG_BAUDRATE_TABLE     { 115200 }
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE       1
+#define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF0      1
 
 #define CFG_MEMTEST_START      RSK7203_SDRAM_BASE
@@ -82,9 +82,9 @@
 #define CFG_BOOTMAPSZ          (8 * 1024 * 1024)
 
 /* FLASH */
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_CFI_WIDTH FLASH_CFI_16BIT
-#define CFG_FLASH_CFI_DRIVER
 #undef CFG_FLASH_QUIET_TEST
 #define CFG_FLASH_EMPTY_INFO   /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_BASE         RSK7203_FLASH_BASE_1
@@ -92,10 +92,10 @@
 #define CFG_MAX_FLASH_SECT     64
 #define CFG_MAX_FLASH_BANKS    1
 
-#define CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_SECT_SIZE      (64 * 1024)
-#define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_SECT_SIZE   (64 * 1024)
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 #define CFG_FLASH_ERASE_TOUT   12000
 #define CFG_FLASH_WRITE_TOUT   500