rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 641548d..59a0f3f 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -77,14 +77,14 @@
  */
 
 #define CFG_FLASH_CFI          /* The flash is CFI compatible */
-#define CFG_FLASH_CFI_DRIVER   /* Use common CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* Use common CFI driver */
 #define CFG_FLASH_CFI_AMD_RESET
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #define CFG_FLASH_BASE         0x20000000
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
 #define CFG_MAX_FLASH_SECT     135     /* max number of sectors on one chip */
-#define CFG_ENV_ADDR           0x20020000
-#define        CFG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_ADDR                0x20020000
+#define        CONFIG_ENV_SECT_SIZE    0x10000 /* Total Size of Environment Sector */
 /* JFFS Partition offset set  */
 #define CFG_JFFS2_FIRST_BANK   0
 #define CFG_JFFS2_NUM_BANKS    1
@@ -148,28 +148,27 @@
 
 #if (CONFIG_DRIVER_SMC91111)
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "ramargs=setenv bootargs root=/dev/mtdblock0 rw console=ttyBF0,57600\0"                 \
+       "ramargs=setenv bootargs root=/dev/mtdblock0 rw console=ttyBF0,57600\0"  \
        "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):" \
-               "$(rootpath) console=ttyBF0,57600\0"                                            \
+               "$(rootpath) console=ttyBF0,57600\0"                    \
        "addip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip):"   \
                "$(gatewayip):$(netmask):$(hostname):eth0:off\0"        \
-       "ramboot=tftpboot $(loadaddr) linux; "          \
+       "ramboot=tftpboot $(loadaddr) linux; "                          \
                "run ramargs; run addip; bootelf\0"                     \
-       "nfsboot=tftpboot $(loadaddr) linux; "          \
+       "nfsboot=tftpboot $(loadaddr) linux; "                          \
                "run nfsargs; run addip; bootelf\0"                     \
-       "update=tftpboot $(loadaddr) u-boot.bin; "      \
+       "update=tftpboot $(loadaddr) u-boot.bin; "                      \
                "protect off 0x20000000 0x2003FFFF; "                   \
                "erase 0x20000000 0x2003FFFF; "                         \
-               "cp.b $(loadaddr) 0x20000000 $(filesize)\0" \
+               "cp.b $(loadaddr) 0x20000000 $(filesize)\0"             \
        ""
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "ramargs=setenv bootargs root=/dev/mtdblock0 rw console=ttyBF0,57600\0"         \
+       "ramargs=setenv bootargs root=/dev/mtdblock0 rw console=ttyBF0,57600\0"  \
        "flashboot=bootm 0x20100000\0"                                  \
        ""
 #endif
 
-
 /*
  * BOOTP options
  */
@@ -178,7 +177,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
@@ -193,7 +191,6 @@
 #define CONFIG_CMD_DHCP
 #endif
 
-
 /*
  * Console settings
  */