rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

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

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index d490b33..f0e0282 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   */
 
@@ -42,11 +40,11 @@
 #define CFG_ENV_IS_IN_FLASH    1
 #define CFG_FLASH_USE_BUFFER_WRITE
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #else
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
 
@@ -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  */