rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 60ad396..a5ef6e1 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -46,7 +46,7 @@
 #define CONFIG_TSIM            1       /* ... running on TSIM */
 
 /* CPU / AMBA BUS configuration */
-#define CONFIG_SYS_CLK_FREQ    40000000        /* 40MHz */
+#define CONFIG_SYS_CLK_FREQ    40000000        /* 40MHz */
 
 /* Number of SPARC register windows */
 #define CFG_SPARC_NWINDOWS 8
@@ -181,9 +181,9 @@
 #define CFG_NO_FLASH           1
 #define CFG_FLASH_BASE         0x00000000
 #define CFG_FLASH_SIZE         0x00800000
-#define CFG_ENV_SIZE           0x8000
+#define CONFIG_ENV_SIZE                0x8000
 
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SIZE)
 
 #define PHYS_FLASH_SECT_SIZE   0x00020000      /* 128 KB sectors */
 #define CFG_MAX_FLASH_SECT     64      /* max num of sects on one chip */
@@ -202,17 +202,17 @@
 
 /*** CFI CONFIG ***/
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_8BIT
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #endif
 
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_NOWHERE 1
-/*#define CFG_ENV_IS_IN_FLASH  0*/
-/*#define CFG_ENV_SIZE         0x8000*/
-#define CFG_ENV_SECT_SIZE      0x40000
+#define CONFIG_ENV_IS_NOWHERE 1
+/*#define CONFIG_ENV_IS_IN_FLASH*/
+/*#define CONFIG_ENV_SIZE              0x8000*/
+#define CONFIG_ENV_SECT_SIZE   0x40000
 #define CONFIG_ENV_OVERWRITE   1
 
 /*