rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 226ad54..28864ea 100644 (file)
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -29,8 +29,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef DEBUG
-
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -47,7 +45,7 @@
 /*
  * 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    /* size rsrvd for initial data */
 
 /*
@@ -154,7 +152,7 @@
 #define CFG_FLASH_BASE         PHYS_FLASH_1
 #define CFG_FLASH_SIZE          PHYS_FLASH_SIZE
 #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       */
@@ -162,13 +160,13 @@
 #undef CFG_FLASH_PROTECTION
 #define CFG_FLASH_BANKS_LIST    { CFG_FLASH_BASE }
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 
-#if defined(CFG_ENV_IS_IN_FLASH)
-#define CFG_ENV_IN_OWN_SECTOR  1
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
-#define CFG_ENV_SIZE           PHYS_FLASH_SECT_SIZE
-#define CFG_ENV_SECT_SIZE      PHYS_FLASH_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH)
+#define CONFIG_ENV_IN_OWN_SECTOR       1
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
+#define CONFIG_ENV_SIZE                PHYS_FLASH_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   PHYS_FLASH_SECT_SIZE
 #endif
 
 #endif /* __CONFIG_H */