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

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

diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index e11ce4c..5863f83 100644 (file)
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -29,8 +29,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef  DEBUG
-
 /*
  * The ADS GCPlus Linux boot ROM loads U-Boot into RAM at 0xc0200000.
  * We don't actually init RAM in this case since we're using U-Boot as
@@ -59,7 +57,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 */
 
 
@@ -171,7 +169,7 @@
 #else
 /* REVISIT: This doesn't work on ADS GCPlus just yet: */
 #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       */
@@ -180,8 +178,8 @@
 #define CFG_FLASH_BANKS_LIST    { CFG_FLASH_BASE }
 #endif
 
-#define        CFG_ENV_IS_IN_FLASH     1
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)   /* Addr of Environment Sector   */
-#define CFG_ENV_SIZE           PHYS_FLASH_SECT_SIZE
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)   /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                PHYS_FLASH_SECT_SIZE
 
 #endif /* __CONFIG_H */