rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

[karo-tx-uboot.git] / include / configs / grsim_leon2.h

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 2ad5b95a170ad4885077ee6f6cfecedaec909883..3cfeb204050097dca0e1c00c6a5285ff2f6e9ae3 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -45,7 +45,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
@@ -199,15 +199,15 @@
 
 /*** 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 CONFIG_ENV_IS_NOWHERE 1
+/*#define CONFIG_ENV_IS_IN_FLASH*/
 /*#define CFG_ENV_SIZE         0x8000*/
 #define CFG_ENV_SECT_SIZE      0x40000
 #define CONFIG_ENV_OVERWRITE   1