rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

[karo-tx-uboot.git] / include / configs / AP1000.h

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index d490b33bd4c71e5eb93da78b4ac6981c739b4f9d..a4582148a9e56e0288955d4a652e9616b84bfdcb 100644 (file)
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -22,8 +22,6 @@
  * (easy to change)
  */
 
-#undef DEBUG
-
 #define CONFIG_405     1               /* This is a PPC405 CPU     */
 #define CONFIG_4xx     1               /* ...member of PPC4xx family   */
 
@@ -39,14 +37,14 @@
 #define CONFIG_COMMAND_HISTORY 1
 #define CONFIG_COMPLETE_ADDRESSES 1
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_FLASH_USE_BUFFER_WRITE
 
-#ifdef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_FLASH
 #else
-#ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
 
@@ -176,7 +174,7 @@
 #define CFG_FLASH_PROTECTION   1       /* use hardware protection          */
 
 /* BEG ENVIRONNEMENT FLASH */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET         0x00040000 /* Offset of Environment Sector      */
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE      0x20000 /* see README - env sector total size   */
@@ -188,7 +186,7 @@
 #define CFG_NVRAM_BASE_ADDR    0xf0000000      /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         0x1ff8          /* NVRAM size   */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE           0x1000          /* Size of Environment vars */
 #define CFG_ENV_ADDR       \
     (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)  /* Env  */