rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROM

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

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index 095fdaf..7fc460a 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -40,7 +40,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_INITRD_TAG              1
 
-#undef CONFIG_AUTOBOOT_PROMPT
 #define CONFIG_MENUPROMPT              "."
 
 /*
@@ -58,7 +57,7 @@
  * Hardware drivers
  */
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_ENV_SECT_SIZE      0x20000
 #define CFG_FLASH_USE_BUFFER_WRITE
 #define CFG_FLASH_PROTECTION   /*for Intel P30 Flash*/
@@ -66,7 +65,7 @@
 #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
@@ -105,7 +104,7 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS \
                "unlock=yes\0"
 
-#define CFG_CMD_JFFS2
+#define CONFIG_CMD_JFFS2
 #undef CONFIG_CMD_EEPROM
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_RUN
@@ -165,7 +164,7 @@
 #define CFG_ENV_SIZE           2048
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET         1024
 #define CFG_ENV_SIZE           1024
 #endif