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

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

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index b06c0a2..0644982 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -229,9 +229,9 @@
  * Environment configuration
  *
  */
-#define CFG_ENV_IS_IN_FLASH    1       /* environment is in FLASH      */
-#undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_IS_IN_FLASH 1       /* environment is in FLASH      */
+#undef CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
  * General Memory organization
@@ -251,11 +251,11 @@
 #define CFG_RAMSTART
 #endif
 
-#if defined(CFG_ENV_IS_IN_FLASH)
-#define CFG_ENV_IN_OWN_SECTOR  1          /* Give Environment own sector */
-#define CFG_ENV_ADDR           0xFFF00000 /* Address of Environment Sector */
-#define        CFG_ENV_SIZE            0x00001000 /* Size of Environment */
-#define CFG_ENV_SECT_SIZE      0x00040000 /* Size of Environment Sector */
+#if defined(CONFIG_ENV_IS_IN_FLASH)
+#define CONFIG_ENV_IN_OWN_SECTOR       1          /* Give Environment own sector */
+#define CONFIG_ENV_ADDR                0xFFF00000 /* Address of Environment Sector */
+#define        CONFIG_ENV_SIZE         0x00001000 /* Size of Environment */
+#define CONFIG_ENV_SECT_SIZE   0x00040000 /* Size of Environment Sector */
 #endif
 
 /*
@@ -263,7 +263,7 @@
  *
  */
 #define CFG_FLASH_CFI          1       /* flash is CFI conformant      */
-#define CFG_FLASH_CFI_DRIVER   1       /* use common cfi driver        */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* use common cfi driver        */
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_BANKS    1       /* max # of memory banks        */
 #define CFG_FLASH_INCREMENT    0       /* there is only one bank       */