rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h
index 73a8885..668c2c1 100644 (file)
--- a/include/configs/armadillo.h
+++ b/include/configs/armadillo.h
@@ -41,16 +41,16 @@
  * (easy to change)
  */
 #define CONFIG_ARM7            1       /* This is a ARM7 CPU   */
-#define CONFIG_ARMADILLO       1       /* on an Armadillo Board      */
+#define CONFIG_ARMADILLO       1       /* on an Armadillo Board      */
 #define CONFIG_ARM_THUMB       1       /* this is an ARM720TDMI */
-#undef  CONFIG_ARM7_REVD               /* disable ARM720 REV.D Workarounds */
+#undef  CONFIG_ARM7_REVD               /* disable ARM720 REV.D Workarounds */
 
 #undef CONFIG_USE_IRQ                  /* don't need them anymore */
 
 /*
  * 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 in bytes reserved for initial data */
 
 /*
@@ -88,7 +88,7 @@
 
 
 #define CONFIG_BOOTDELAY       3
-#define CONFIG_BOOTARGS        "root=/dev/ram0 rootfstype=ext2 console=ttyAM0,115200"
+#define CONFIG_BOOTARGS                "root=/dev/ram0 rootfstype=ext2 console=ttyAM0,115200"
 
 #define CONFIG_BOOTCOMMAND     "bootm 40000 180000"
 
@@ -147,9 +147,9 @@
 #define CFG_FLASH_ERASE_TOUT   (2*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x20000)        /* Addr of Environment Sector   */
-#define CFG_ENV_SIZE           0x20000 /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x20000)        /* Addr of Environment Sector   */
+#define CONFIG_ENV_SIZE                0x20000 /* Total Size of Environment Sector     */
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS