rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 1276f4d..5a7a580 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -58,7 +58,7 @@
 #define CONFIG_LEON_RAM_SELECT CONFIG_LEON_RAM_SRAM
 
 /* CPU / AMBA BUS configuration */
-#define CONFIG_SYS_CLK_FREQ    20000000        /* 20MHz */
+#define CONFIG_SYS_CLK_FREQ    20000000        /* 20MHz */
 
 /* Number of SPARC register windows */
 #define CFG_SPARC_NWINDOWS 8
@@ -208,7 +208,7 @@
 
 /*** CFI CONFIG ***/
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_8BIT
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 /* Bypass cache when reading regs from flash memory */
 #define CFG_FLASH_CFI_BYPASS_READ
@@ -218,12 +218,12 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
-#define CFG_ENV_IS_IN_FLASH    1
-/* CFG_ENV_ADDR need to be at sector boundary */
-#define CFG_ENV_SIZE           0x8000
-#define CFG_ENV_SECT_SIZE      0x20000
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_FLASH_SIZE-CFG_ENV_SECT_SIZE)
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
+#define CONFIG_ENV_IS_IN_FLASH 1
+/* CONFIG_ENV_ADDR need to be at sector boundary */
+#define CONFIG_ENV_SIZE                0x8000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_OVERWRITE   1
 
 /*