rename CFG_ENV_IS_IN_DATAFLASH in CONFIG_ENV_IS_IN_DATAFLASH

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/README b/README
index 48232553f1d0637899d9bc853d345de9856d9799..baa06e0f272c05a7ab881da3b4b3184229aae2e1 100644 (file)
--- a/README
+++ b/README
@@ -2242,7 +2242,7 @@ to save the current settings.
          The size in bytes of the EEPROM device.
 
 
-- CFG_ENV_IS_IN_DATAFLASH:
+- CONFIG_ENV_IS_IN_DATAFLASH:
 
        Define this if you have a DataFlash memory device which you
        want to use for the environment.

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 8b6b46b62c142de68418f09168554c8dbd870d53..f3d84086c57af0980f5422551a5cd76c663da765 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -55,7 +55,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #if !defined(CFG_ENV_IS_IN_NVRAM)      && \
     !defined(CONFIG_ENV_IS_IN_EEPROM)  && \
     !defined(CFG_ENV_IS_IN_FLASH)      && \
-    !defined(CFG_ENV_IS_IN_DATAFLASH)  && \
+    !defined(CONFIG_ENV_IS_IN_DATAFLASH)       && \
     !defined(CFG_ENV_IS_IN_NAND)       && \
     !defined(CFG_ENV_IS_IN_ONENAND)    && \
     !defined(CFG_ENV_IS_IN_SPI_FLASH)  && \

diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index 294536461d2320b0885478594156b98337438d76..1d55a279c926f99a8597c65624b72b93a77c6c64 100644 (file)
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -19,7 +19,7 @@
  */
 #include <common.h>
 
-#if defined(CFG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */
+#if defined(CONFIG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */
 
 #include <command.h>
 #include <environment.h>
@@ -101,4 +101,4 @@ int env_init(void)
        return (0);
 }
 
-#endif /* CFG_ENV_IS_IN_DATAFLASH */
+#endif /* CONFIG_ENV_IS_IN_DATAFLASH */

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 520c67685dba52560ff75dc13b3cfda7da3e368d..acf452bbe3667745c0cd3c2708cdf16cb8c14b92 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -148,7 +148,7 @@
 #ifdef CFG_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash */
-#define CFG_ENV_IS_IN_DATAFLASH        1
+#define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET         0x4200
 #define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)

diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index fca431e3baf1c7449c62b75e72c9f64a21a824a8..92724abbe898ec2c7c1b21ccecd5d83fe636abec 100644 (file)
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -179,9 +179,9 @@
 #define CFG_FLASH_ERASE_TOUT           (2*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT           (2*CFG_HZ) /* Timeout for Flash Write */
 
-#undef CFG_ENV_IS_IN_DATAFLASH
+#undef CONFIG_ENV_IS_IN_DATAFLASH
 
-#ifdef CFG_ENV_IS_IN_DATAFLASH
+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #define CFG_ENV_OFFSET                 0x20000
 #define CFG_ENV_ADDR                   (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE                   0x2000  /* 0x8000 */
@@ -194,7 +194,7 @@
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
 #define CFG_ENV_SIZE                   0x10000 /* sectors are 64K here */
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
-#endif /* CFG_ENV_IS_IN_DATAFLASH */
+#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
 
 
 #define CFG_LOAD_ADDR          0x21000000  /* default load address */

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 675224e0ba6bc7c55e71602e4e6bbd4556a266a5..f41936319902bf750bb929a228ffdf67a8b26954 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -134,7 +134,7 @@
 #ifdef CFG_USE_DATAFLASH_CS0
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH        1
+#define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET         0x4200
 #define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
@@ -148,7 +148,7 @@
 #elif CFG_USE_DATAFLASH_CS1
 
 /* bootstrap + u-boot + env + linux in dataflash on CS1 */
-#define CFG_ENV_IS_IN_DATAFLASH        1
+#define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
 #define CFG_ENV_OFFSET         0x4200
 #define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index e53a23f33fff5a1bdb1938a86a15ab2ef16e2dea..29291499814f36e65476ec1b7c6124e881e48956 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -148,7 +148,7 @@
 #ifdef CFG_USE_DATAFLASH_CS0
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH        1
+#define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET         0x4200
 #define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 5f90d39d5caf83c79dd941430099afb695333a0d..c91e07629a39d47c9ce5718b634223f5c05e51ed 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -154,7 +154,7 @@
 #ifdef CFG_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH        1
+#define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET         0x4200
 #define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 2ad8d05eb0ddb121fe8ff7a7b3ccfc775d6e6934..0bf0ace1160e292c49bcd407603664fb7ed4a3b9 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -123,7 +123,7 @@
 #ifdef CFG_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH        1
+#define CONFIG_ENV_IS_IN_DATAFLASH     1
 #define CFG_MONITOR_BASE       (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET         0x4200
 #define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)

diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index 88c8fdbf7fdf98cd1692a2d58e8c5480a3181e76..66265242e693d85fbe981587059360fbb23f65ac 100644 (file)
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -191,9 +191,9 @@
 #define CFG_JFFS2_FIRST_SECTOR 3
 #define CFG_JFFS2_NUM_BANKS    1
 
-#undef CFG_ENV_IS_IN_DATAFLASH
+#undef CONFIG_ENV_IS_IN_DATAFLASH
 
-#ifdef CFG_ENV_IS_IN_DATAFLASH
+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #define CFG_ENV_OFFSET                 0x20000
 #define CFG_ENV_ADDR                   (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE                   0x2000  /* 0x8000 */
@@ -201,7 +201,7 @@
 #define CFG_ENV_IS_IN_FLASH            1
 #define CFG_ENV_ADDR                   (PHYS_FLASH_1 + 0x20000)  /* after u-boot.bin */
 #define CFG_ENV_SIZE                   0x20000 /* sectors are 128K here */
-#endif /* CFG_ENV_IS_IN_DATAFLASH */
+#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
 
 
 #define CFG_LOAD_ADDR          0x21000000  /* default load address */

diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index 7fc460a705df2f6cee64c6cb4f002a7c2ca5ebb8..7024a833b24d69bdb64e194d45691114b67f5542 100644 (file)
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -154,7 +154,7 @@
 #define CFG_FLASH_ERASE_TOUT   (2*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
-#ifdef CFG_ENV_IS_IN_DATAFLASH
+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #define CFG_ENV_OFFSET         0x20000
 #define CFG_ENV_ADDR           (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE           0x2000