rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index 060330e..32403f7 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -40,13 +40,12 @@
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_INITRD_TAG              1
 
-#undef CONFIG_AUTOBOOT_PROMPT
 #define CONFIG_MENUPROMPT              "."
 
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE      128     /* Bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE                        115200
@@ -58,15 +57,15 @@
  * Hardware drivers
  */
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_FLASH_CFI_DRIVER        1
+#define CONFIG_ENV_SECT_SIZE   0x20000
 #define CFG_FLASH_USE_BUFFER_WRITE
 #define CFG_FLASH_PROTECTION   /*for Intel P30 Flash*/
 #define CONFIG_HARD_I2C
 #define CFG_I2C_SPEED          100
 #define CFG_I2C_SLAVE          0
 #define CFG_CONSOLE_INFO_QUIET
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR    0x50
 #define CFG_I2C_EEPROM_ADDR_LEN        1
 #define CFG_EEPROM_AT24C16
@@ -155,19 +154,19 @@
 #define CFG_FLASH_ERASE_TOUT   (2*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
-#ifdef CFG_ENV_IS_IN_DATAFLASH
-#define CFG_ENV_OFFSET         0x20000
-#define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x2000
+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
+#define CONFIG_ENV_OFFSET              0x20000
+#define CONFIG_ENV_ADDR                (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x2000
 #else
-#define CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x00020000)
-#define CFG_ENV_SIZE           2048
+#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x00020000)
+#define CONFIG_ENV_SIZE                2048
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
-#define CFG_ENV_OFFSET         1024
-#define CFG_ENV_SIZE           1024
+#ifdef CONFIG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_OFFSET              1024
+#define CONFIG_ENV_SIZE                1024
 #endif
 
 #define CFG_LOAD_ADDR          0x21000000 /* default load address */