Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- README | 2 +- common/cmd_nvedit.c | 2 +- common/env_dataflash.c | 4 ++-- include/configs/at91cap9adk.h | 2 +- include/configs/at91rm9200dk.h | 6 +++--- include/configs/at91sam9260ek.h | 4 ++-- include/configs/at91sam9261ek.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- include/configs/csb637.h | 6 +++--- include/configs/m501sk.h | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/README b/README index 0c501cc..406cc62 100644 --- a/README +++ b/README @@ -2236,7 +2236,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 8b6b46b..f3d8408 100644 --- 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 2945364..1d55a27 100644 --- 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 520c676..acf452b 100644 --- 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 fca431e..92724ab 100644 --- 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 675224e..f419363 100644 --- 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 e53a23f..2929149 100644 --- 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 5f90d39..c91e076 100644 --- 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 2ad8d05..0bf0ace 100644 --- 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 88c8fdb..6626524 100644 --- 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 7fc460a..7024a83 100644 --- 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