rename CFG_ENV macros to CONFIG_ENV

[oweals/u-boot.git] / include / configs / svm_sc8xx.h

diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index 3b90f3ceb1d048a67d99a170d8d5f59544387219..95078460d892a99d334f811a0fbd944dd64b34ad 100644 (file)
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -68,7 +68,7 @@
 
 #undef CONFIG_WATCHDOG                 /* watchdog */
 
-#define CONFIG_SVM_SC8xx               1       /* ...on SVM SC8xx series       */
+#define CONFIG_SVM_SC8xx               1       /* ...on SVM SC8xx series       */
 
 #ifdef CONFIG_LCD                      /* with LCD controller ?        */
 /* #define CONFIG_NEC_NL6448BC20 1 / * use NEC NL6448BC20 display      */
@@ -109,8 +109,8 @@
        "ramdisk_addr=48100000\0"                                       \
        ""
 #define CONFIG_BOOTCOMMAND                                                     \
-       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
-       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "tftpboot 0x210000 pImage-sc855t;bootm 0x210000"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
@@ -151,7 +151,7 @@
 #define CONFIG_CMD_DATE
 
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 /*
  * Miscellaneous configurable options
@@ -227,22 +227,22 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 #ifdef CONFIG_BOOT_8B
-#define        CFG_ENV_OFFSET          0x10000 /*   Offset   of Environment Sector     */
-#define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_OFFSET               0x10000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector     */
 #elif defined (CONFIG_BOOT_16B)
-#define        CFG_ENV_OFFSET          0x10000 /*   Offset   of Environment Sector     */
-#define        CFG_ENV_SIZE            0x10000 /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_OFFSET               0x10000 /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x10000 /* Total Size of Environment Sector     */
 #elif defined (CONFIG_BOOT_32B)
-#define        CFG_ENV_OFFSET          0x8000  /*   Offset   of Environment Sector     */
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_OFFSET               0x8000  /*   Offset   of Environment Sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */
 #endif
 
 /* Address and size of Redundant Environment Sector     */
-#define CFG_ENV_OFFSET_REDUND   (CFG_ENV_OFFSET+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND   (CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND     (CONFIG_ENV_SIZE)
 
 
 /*-----------------------------------------------------------------------
@@ -363,14 +363,14 @@
  *-----------------------------------------------------------------------
  */
 
-#undef CONFIG_IDE_8xx_PCCARD           /* Use IDE with PC Card Adapter */
+#undef CONFIG_IDE_8xx_PCCARD           /* Use IDE with PC Card Adapter */
 
 #define        CONFIG_IDE_8xx_DIRECT   1       /* Direct IDE    not supported  */
 #undef CONFIG_IDE_LED                  /* LED   for ide not supported  */
 #undef CONFIG_IDE_RESET                /* reset for ide not supported  */
 
 #define CFG_IDE_MAXBUS         1       /* max. 1 IDE bus               */
-#define CFG_IDE_MAXDEVICE      1       /* max. 1 drive per IDE bus     */
+#define CFG_IDE_MAXDEVICE      1       /* max. 1 drive per IDE bus     */
 
 #define CFG_ATA_BASE_ADDR       0xFE100010
 #define CFG_ATA_IDE0_OFFSET     0x0000