rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 8538037..5f5970b 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -39,11 +39,7 @@
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTDELAY       3
-#define CONFIG_BOOTARGS        "console=ttySC0,115200 root=1f01"
-#define CONFIG_NETMASK          255.255.255.0
-#define CONFIG_IPADDR          192.168.0.22
-#define CONFIG_SERVERIP                192.168.0.1
-#define CONFIG_GATEWAYIP       192.168.0.1
+#define CONFIG_BOOTARGS                "console=ttySC0,115200 root=1f01"
 
 #define CONFIG_VERSION_VARIABLE
 #undef  CONFIG_SHOW_BOOT_PROGRESS
@@ -66,7 +62,7 @@
 #define CFG_BAUDRATE_TABLE     { 115200 }      /* List of legal baudrate settings for this board */
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE       1
+#define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF0      1
 #undef  CFG_CONSOLE_INFO_QUIET                 /* Suppress display of console information at boot */
 #undef  CFG_CONSOLE_OVERWRITE_ROUTINE
@@ -86,7 +82,7 @@
 #define CFG_LOAD_ADDR  (CFG_SDRAM_BASE + 4 * 1024 * 1024)      /* default load address for scripts ?!? */
 
 #define CFG_MONITOR_BASE       (MS7722SE_FLASH_BASE_1) /* Address of u-boot image
-                                                       in Flash (NOT run time address in SDRAM) ?!? */
+                                                       in Flash (NOT run time address in SDRAM) ?!? */
 #define CFG_MONITOR_LEN        (128 * 1024)            /* */
 #define CFG_MALLOC_LEN (256 * 1024)            /* Size of DRAM reserved for malloc() use */
 #define CFG_GBL_DATA_SIZE      (256)           /* size in bytes reserved for initial data */
@@ -94,14 +90,14 @@
 
 /* FLASH */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef  CFG_FLASH_QUIET_TEST
 #define CFG_FLASH_EMPTY_INFO                   /* print 'E' for empty sector on flinfo */
 
 #define CFG_FLASH_BASE         (MS7722SE_FLASH_BASE_1) /* Physical start address of Flash memory */
 
 #define CFG_MAX_FLASH_SECT     150             /* Max number of sectors on each
-                                                       Flash chip */
+                                                       Flash chip */
 
 /* if you use all NOR Flash , you change dip-switch. Please see MS7722SE01 Manual. */
 #define CFG_MAX_FLASH_BANKS    2
@@ -118,14 +114,14 @@
 
 #undef  CFG_DIRECT_FLASH_TFTP
 
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
-#define CFG_ENV_SECT_SIZE      (8 * 1024)
-#define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + (1 * CFG_ENV_SECT_SIZE))
-#define CFG_ENV_OFFSET         (CFG_ENV_ADDR - CFG_FLASH_BASE)         /* Offset of env Flash sector relative to CFG_FLASH_BASE */
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SECT_SIZE)
-#define CFG_ENV_ADDR_REDUND    (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE))
+#define CONFIG_ENV_SECT_SIZE   (8 * 1024)
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE))
+#define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CFG_FLASH_BASE)      /* Offset of env Flash sector relative to CFG_FLASH_BASE */
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE))
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333