diff options
| author | Simon Glass <sjg@chromium.org> | 2017-07-23 21:19:41 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-25 21:20:02 -0400 |
| commit | 85fc970d74d09f33fcdcc649e73c5dc4f5334605 (patch) | |
| tree | 4ba2865dc229971373e8482d990af28c9eea3838 /include | |
| parent | e73496d08e2dc60f3e00554c71b92f72cdebf0fd (diff) | |
Convert CONFIG_ENV_IS_IN_FLASH to Kconfig
This converts the following to Kconfig:
CONFIG_ENV_IS_IN_FLASH
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
147 files changed, 0 insertions, 177 deletions
diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 5a1a2879925..6b6ae7cc781 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -15,7 +15,6 @@ #undef CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_IN_SPI_FLASH -#undef CONFIG_ENV_IS_IN_FLASH #endif diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index ea980e65117..d05cc613d07 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -70,7 +70,6 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 0x10000 /* 64k, 1 sector */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 65271773f4c..0d3794dd06a 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -73,7 +73,6 @@ * of flash. NOTE: the monitor length must be multiple of sector size * (which is common practice). */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 0x20000 /* 128k, 1 sector */ #define CONFIG_ENV_OVERWRITE /* Serial change Ok */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 61a1fa48aed..d580e9b36ec 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -139,7 +139,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index ca28ab01262..e8d5dc59fe1 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -505,7 +505,6 @@ combinations. this should be removed later #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index a8bc2abcab5..937e93ef0a3 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -423,7 +423,6 @@ #endif #define CONFIG_ENV_OFFSET CONFIG_SYS_NAND_BLOCK_SIZE #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 223439aaab7..0fbf457cdca 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -159,7 +159,6 @@ #define CONFIG_ENV_OFFSET 0x2000 #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index e7d99baf251..591d0d1d853 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -198,8 +198,6 @@ #ifdef CONFIG_CF_SBF # define CONFIG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_SPI_CS 2 -#else -# define CONFIG_ENV_IS_IN_FLASH 1 #endif #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 84d3f3cfa66..57328c6269d 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -176,7 +176,6 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 4ef83f7862f..f6027e231f2 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -84,8 +84,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_ENV_IS_IN_FLASH 1 - #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text); diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 3efd7e59cfa..2bdfe80ef5d 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -23,11 +23,9 @@ #ifdef CONFIG_MONITOR_IS_IN_RAM # define CONFIG_ENV_OFFSET 0x4000 # define CONFIG_ENV_SECT_SIZE 0x1000 -# define CONFIG_ENV_IS_IN_FLASH 1 #else # define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x4000) # define CONFIG_ENV_SECT_SIZE 0x1000 -# define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 4f7a19b5d32..0722ea19e3c 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -24,11 +24,9 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 0b0e4e60c74..e6bd7f36099 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -33,11 +33,9 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 5d324ba5bff..6bcd6b6f2e8 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -34,11 +34,9 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 061a632c986..cc703aac19a 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -29,7 +29,6 @@ */ #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 419a0907c4d..d50c874fe1e 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -182,7 +182,6 @@ #define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_BASE + 0x40000) #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x8000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 8261323d791..45cdf9da15e 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -187,7 +187,6 @@ */ #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 68136ad095a..26639fc41fb 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -187,7 +187,6 @@ */ #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index f20aa6fc330..05c86ae2fc4 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -219,7 +219,6 @@ # define CONFIG_ENV_SIZE 0x2000 # define CONFIG_ENV_SECT_SIZE 0x10000 #else -# define CONFIG_ENV_IS_IN_FLASH 1 # define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000) # define CONFIG_ENV_SIZE 0x2000 # define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 35604ad4897..be54e019f20 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -272,8 +272,6 @@ #ifdef CONFIG_CF_SBF # define CONFIG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_SPI_CS 1 -#else -# define CONFIG_ENV_IS_IN_FLASH 1 #endif #undef CONFIG_ENV_OVERWRITE diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 4d250bf2a1c..9dca52e78ac 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -232,7 +232,6 @@ */ #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 -#define CONFIG_ENV_IS_IN_FLASH 1 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 6ed73656d35..d95be2bd5e9 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -219,7 +219,6 @@ */ #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 -#define CONFIG_ENV_IS_IN_FLASH 1 /*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 15bb0e9d6a1..17090da796e 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -125,7 +125,6 @@ /* Environment Configuration */ /* environment is in FLASH */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 0f26467e294..25d5cab9596 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -394,7 +394,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 5c10d9ba555..cf0c7234dcc 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -439,7 +439,6 @@ #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) #elif !defined(CONFIG_SYS_RAMBOOT) - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 53cb6d6174a..be1a6afff37 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -420,7 +420,6 @@ * Environment */ #if !defined(CONFIG_SYS_RAMBOOT) - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index d34eacbad36..b8f8f493eb3 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -295,7 +295,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 28b9478d046..428f3abf903 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -379,7 +379,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 2835d42b930..18f7523692a 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -433,7 +433,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 4b9bc1fbd1e..221c35cf51b 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -452,7 +452,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_ENV_OVERWRITE #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 781a93ab14c..1a65c25c480 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -442,7 +442,6 @@ extern int board_pci_host_broken(void); * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index ada85c7964c..d93f7a0074e 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -455,7 +455,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE+CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 1456648d6a6..d96c15ec014 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -574,7 +574,6 @@ #define CONFIG_ENV_SIZE 0x2000 #endif #else - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index decb57404a8..ca4ccd8ad3c 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -291,7 +291,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 029aa572ce4..977454167d9 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -323,7 +323,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index ffa8796407c..b4f4c4e32bc 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -325,7 +325,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) */ #if CONFIG_SYS_MONITOR_BASE > 0xfff80000 #define CONFIG_ENV_ADDR 0xfff80000 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 43e05516ab6..b41543688b8 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -438,7 +438,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #if CONFIG_SYS_MONITOR_BASE > 0xfff80000 #define CONFIG_ENV_ADDR 0xfff80000 #else diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 96a125c3233..d31395cf81f 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -321,7 +321,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 47b97d1554d..2e13fb52df2 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -330,7 +330,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 3734055bd3c..c0af7451b8b 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -336,7 +336,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index eb7db20b7f4..a75ce0b93de 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -424,7 +424,6 @@ extern unsigned long get_clock_freq(void); */ #if defined(CONFIG_SYS_RAMBOOT) #else -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index d8e0dfd8070..0a2bcb23832 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -531,7 +531,6 @@ #if defined(CONFIG_SYS_RAMBOOT) #else - #define CONFIG_ENV_IS_IN_FLASH 1 #if CONFIG_SYS_MONITOR_BASE > 0xfff80000 #define CONFIG_ENV_ADDR 0xfff80000 #else diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 46b9b7a67df..5e8211609a5 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -403,7 +403,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 4a4a76d2d46..7b9b2458b37 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -563,7 +563,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 7217426d3a5..5ee83b90346 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -94,7 +94,6 @@ #undef CONFIG_SYS_DIRECT_FLASH_TFTP /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ea549e65d97..74c33fda029 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -707,7 +707,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 9bf0904c51b..3695ac3f3f2 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -576,7 +576,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 719043d5a1b..be42dadac73 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -230,7 +230,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index d3b655fda93..36d08d8e7ff 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -88,7 +88,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else - #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \ - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index c8bba52ed13..ea05b3c36f1 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -169,7 +169,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 59bbb5391b5..f9a4ba1af3e 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -192,7 +192,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 827068589b0..6dbb3dfe00b 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -90,7 +90,6 @@ #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 826313a8508..57ef0fd3b70 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -198,7 +198,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (3 * CONFIG_SYS_NAND_BLOCK_SIZE) #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 79ee50db048..d3230c0e4ab 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -165,7 +165,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 190000069b8..bcbc8aac9fe 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -151,7 +151,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 287c722e2f4..d9983653f0b 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -110,7 +110,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index d06c5b574ec..ee1110a3170 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -347,7 +347,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index c54de650763..c216ac2d474 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -251,7 +251,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) for env */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 2bf3a5686aa..31d7cdbd10c 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -362,7 +362,6 @@ */ #ifdef CONFIG_ENV_FIT_UCBOOT -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x20000) #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ @@ -397,7 +396,6 @@ #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_BASE (CONFIG_SYS_FLASH_BASE) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 6bfc08e5af7..cef1eddeb62 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* environments */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x140000) #define CONFIG_ENV_SIZE 8192 #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 4cef64e3c5e..f9662780de5 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -358,7 +358,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* environments */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x140000) #define CONFIG_ENV_SIZE 8192 #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 5343b8df854..85591de1168 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -339,7 +339,6 @@ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_SYS_MMC_MAX_DEVICE 2 #elif defined(CONFIG_NOR_BOOT) -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */ #define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index acae6914e59..0a407461129 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024) -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SIZE 0x1000 diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index b3c22cf4a40..285041dbf83 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -124,7 +124,6 @@ #undef CONFIG_SYS_DIRECT_FLASH_TFTP /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 440505dd1f8..078c77bf68c 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -107,7 +107,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 2023895c3ef..492062abb35 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_FLASH_UNLOCK_TOUT 3000 /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \ diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index e102cba2c97..723bc154b3b 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -118,7 +118,6 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x1FF8000 #define CONFIG_ENV_SECT_SIZE 0x8000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else /* * environment in RAM - This is used to use a single PC-based application @@ -128,7 +127,6 @@ */ #define CONFIG_ENV_ADDR 0x40060000 #define CONFIG_ENV_SECT_SIZE 0x8000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif /* here we put our FPGA configuration... */ diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 53e191a312a..cb6dae71e9b 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -149,7 +149,6 @@ /* * Environment Settings */ -#define CONFIG_ENV_IS_IN_FLASH /* * after u-boot.bin diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index a8337cdf435..9effe9ebd9e 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -97,7 +97,6 @@ #define CONFIG_SYS_MONITOR_SEC 1:0-3 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x007E0000) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SIZE) diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 1a67816d438..70d1a66ad70 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -552,7 +552,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Reduce SPL size by removing unlikey targets */ #ifdef CONFIG_NOR_BOOT -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */ #define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */ diff --git a/include/configs/blanche.h b/include/configs/blanche.h index cb80b903817..50692cba651 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -83,7 +83,6 @@ #else #undef CONFIG_ENV_IS_IN_SPI_FLASH #undef CONFIG_ENV_ADDR -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) diff --git a/include/configs/boston.h b/include/configs/boston.h index 50aaa7be8c9..2646cf09ed2 100644 --- a/include/configs/boston.h +++ b/include/configs/boston.h @@ -64,7 +64,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #ifdef CONFIG_64BIT diff --git a/include/configs/calimain.h b/include/configs/calimain.h index d43e3314a75..b6c8035fb5e 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -154,7 +154,6 @@ #define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index b078e10475c..a3b7b219b34 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -96,11 +96,9 @@ #ifndef CONFIG_MONITOR_IS_IN_RAM #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #else #define CONFIG_ENV_ADDR 0xffe04000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 9efe74b593e..4be06f1914d 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -138,8 +138,6 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 #define CONFIG_SYS_FLASH_PROTECTION 1 - -#define CONFIG_ENV_IS_IN_FLASH 1 #endif #define CONFIG_SYS_MONITOR_BASE 0x0 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index abd09ca1ed1..70fdb58163b 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -99,7 +99,6 @@ #elif defined(CONFIG_ENV_IS_NOWHERE) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 2bf4d662427..b79bd4e2e1f 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -162,7 +162,6 @@ * Flash & Environment */ #ifdef CONFIG_USE_NAND -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) @@ -217,7 +216,6 @@ #endif #ifdef CONFIG_USE_NOR -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION @@ -233,7 +231,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (512 << 10) diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 40beb175744..1c2cc6f4b0f 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Reduce SPL size by removing unlikey targets */ #ifdef CONFIG_NOR_BOOT -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 * 1024) /* 128 KiB */ #define MTDIDS_DEFAULT "nor0=physmap-flash.0" #define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \ diff --git a/include/configs/ea20.h b/include/configs/ea20.h index b06c9b8f229..8f42b83a455 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -87,7 +87,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (8 << 10) #define CONFIG_ENV_OFFSET 0x80000 diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 45ce944eb10..755e7887df8 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -43,7 +43,6 @@ #define CONFIG_ENV_ADDR 0xFF040000 #define CONFIG_ENV_SECT_SIZE 0x00020000 -#define CONFIG_ENV_IS_IN_FLASH 1 /* * BOOTP options diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 24044418605..cabbe160a37 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -139,7 +139,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index def28f2cf1e..92842e1e185 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -198,7 +198,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_ENV_OVERWRITE /* Vendor params unprotected */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR 0x60040000 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index cc5cc7bac68..31364c25335 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -187,7 +187,6 @@ /* * Environment variables configurations */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x2000 /* 16K */ #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET 0x4000 /* env starts here */ diff --git a/include/configs/espt.h b/include/configs/espt.h index 845bcc1c9af..1b3295346d8 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -74,7 +74,6 @@ /* Use hardware flash sectors protection instead of U-Boot software protection */ #undef CONFIG_SYS_FLASH_PROTECTION #undef CONFIG_SYS_DIRECT_FLASH_TFTP -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE)) diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 976730cdd39..a09986d14c1 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -154,8 +154,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_IS_IN_FLASH - /* * CFI FLASH driver setup */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index df8e69fe663..c5b6fddee75 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -493,7 +493,6 @@ void fpga_control_clear(unsigned int bus, int pin); * Environment */ #if 1 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index bd6da684bc1..02d5b2cf65a 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -429,7 +429,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \ + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index e964b492e3e..01c5cc496a0 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -89,7 +89,6 @@ /* * Flash & Environment */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI /* Use buffered writes (~10x faster) */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index d0b6af8cadc..8c9ad6c1835 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -42,7 +42,6 @@ */ #define PHYS_FLASH_SIZE 0x01000000 /* 16MB */ #define CONFIG_SYS_MAX_FLASH_SECT 64 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_SYS_MONITOR_LEN 0x00100000 /* diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index 0db33b701ca..0bd42799f12 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -175,7 +175,6 @@ */ #ifndef CONFIG_SYS_RAMBOOT -#define CONFIG_ENV_IS_IN_FLASH #ifndef CONFIG_ENV_ADDR #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index feb3eec4464..f4349913143 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -98,7 +98,6 @@ #undef CONFIG_SYS_FLASH_PROTECTION #undef CONFIG_SYS_DIRECT_FLASH_TFTP -#define CONFIG_ENV_IS_IN_FLASH /* GPIO / PFC */ #define CONFIG_SH_GPIO_PFC diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index b3c931e36c6..b823ff23bf9 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -561,7 +561,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 06d7d400ca6..8fe34ef658b 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -426,7 +426,6 @@ #define CONFIG_ENV_OFFSET 0x300000 #define CONFIG_ENV_SECT_SIZE 0x10000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 83c8805df6e..740facfa582 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -422,7 +422,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 7b8561e9d6f..59e7760b100 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -240,7 +240,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 860ad8f6931..782669ad2c9 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -456,7 +456,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index b5fa41e33df..929ae3286af 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -270,7 +270,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 #ifndef CONFIG_QSPI_BOOT -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index a353cf4f687..0be4c4fa0b1 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -248,7 +248,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_CS2_FTIM2 CONFIG_SYS_NAND_FTIM2 #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/malta.h b/include/configs/malta.h index 1f977cb71a6..8eb6d7a269e 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -82,7 +82,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR \ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 8a672812d05..a4c103503fc 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -313,7 +313,6 @@ #define CONFIG_ENV_SIZE (SZ_128K) /* Envs are stored in NOR flash */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (SZ_128K) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 734bd50dda2..609da9e9ba4 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -99,7 +99,6 @@ # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) # else /* FLASH && !RAMENV */ -# define CONFIG_ENV_IS_IN_FLASH 1 /* 128K(one sector) for env */ # define CONFIG_ENV_SECT_SIZE 0x20000 # define CONFIG_ENV_ADDR \ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index b865d9f9160..cd5971d30c8 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -361,7 +361,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index df8ffe29d0a..5b37277ccea 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -51,7 +51,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 2855c00723c..850a8cc2226 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index de6e58a71e4..f456bf62931 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -85,7 +85,6 @@ #undef CONFIG_SYS_DIRECT_FLASH_TFTP -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (8 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 394ce6cd38d..8ea431efdc1 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -63,7 +63,6 @@ #undef CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index d84801b7c6e..80b6e16818b 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -132,7 +132,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning of flash */ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 2b7b871a861..9ae3d181375 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -169,8 +169,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_IS_IN_FLASH - #if defined(CONFIG_FSL_ENV_IN_NAND) #define CONFIG_ENV_OFFSET (1024 * 1024) #endif diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 94a705e0fea..77ac08aaf59 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -154,7 +154,6 @@ * Flash & Environment */ #ifdef CONFIG_USE_NAND -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_NAND_DAVINCI #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) @@ -198,7 +197,6 @@ #endif #ifdef CONFIG_SYS_USE_NOR -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION @@ -214,7 +212,6 @@ #endif #ifdef CONFIG_USE_SPIFLASH -#undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (256 << 10) @@ -309,7 +306,6 @@ #undef CONFIG_ENV_OFFSET #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */ #define CONFIG_ENV_OFFSET (51 << 9) /* Sector 51 */ -#undef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_SPI_FLASH #endif diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 193e2878450..a22e9fae9a4 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -794,7 +794,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 3d4d80c5773..d5f57694632 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -368,7 +368,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_ENV_SIZE 0x2000 #endif #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index b6ec563cee2..bae5736801c 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -269,7 +269,6 @@ #elif defined (CONFIG_SYS_USE_FLASH) -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index eeb3f27cfe3..9ea444009a8 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -299,7 +299,6 @@ #elif defined(CONFIG_SYS_USE_FLASH) /* CFG_USE_FLASH */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET 0x40000 #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index abdc93c7d25..89d1ad91e0e 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -111,8 +111,6 @@ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_ENV_IS_IN_FLASH - /* Address and size of Primary Environment Sector */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE) diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index f1e096fddd0..a78112d5bc7 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -111,8 +111,6 @@ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_ENV_IS_IN_FLASH - /* Address and size of Primary Environment Sector */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE) diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 6212dbae213..5f74b2a0e08 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -112,7 +112,6 @@ #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 744d567805b..64fd4b97a06 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index bb79a9ffeaa..c5f577a3bfb 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -77,7 +77,6 @@ /* print 'E' for empty sector on flinfo */ #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 8dc839df96e..8f30aefc41f 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 64 #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index cc709097c03..14e55c579d4 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 512 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET (128 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SECT_SIZE (128 * 1024) diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index 12812f9a345..60844ab738d 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 512 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET (128 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SECT_SIZE (64 * 1024) diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 1d07593e95e..c0faac3b79a 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -370,7 +370,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index e872e7f8101..cf9809df49d 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -485,7 +485,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SIZE 0x2000 #if CONFIG_SYS_TEXT_BASE == 0xfff00000 /* Boot from 64MB SODIMM */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x80000) diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 33b6d1fb937..c5f9fcb918a 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -443,7 +443,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 2186f21f7ad..50a0e3e7d1f 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -74,7 +74,6 @@ /* Use hardware flash sectors protection instead of U-Boot software protection */ #undef CONFIG_SYS_FLASH_PROTECTION #undef CONFIG_SYS_DIRECT_FLASH_TFTP -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE)) diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index ab304280635..59fcad03098 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -132,7 +132,6 @@ #define CONFIG_PCI_SYS_SIZE CONFIG_SYS_SDRAM_SIZE /* ENV setting */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/shmin.h b/include/configs/shmin.h index 995f76a1eab..c9718f9b36e 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -72,7 +72,6 @@ #define CONFIG_SYS_ATMEL_SECT {1, 2, 1, 7} #define CONFIG_SYS_ATMEL_SECTSZ {0x4000, 0x2000, 0x8000, 0x10000} -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE diff --git a/include/configs/socrates.h b/include/configs/socrates.h index bfd4e5fe3f8..3864dfb09fb 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -256,7 +256,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE 0x4000 diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h index 98a74fa6e1e..4dbf919cfa0 100644 --- a/include/configs/spear3xx_evb.h +++ b/include/configs/spear3xx_evb.h @@ -24,11 +24,6 @@ #define CONFIG_SPEAR_USBTTY #endif -#if defined(CONFIG_NAND) -#else -#define CONFIG_ENV_IS_IN_FLASH -#endif - #include <configs/spear-common.h> /* Ethernet driver configuration */ diff --git a/include/configs/spear6xx_evb.h b/include/configs/spear6xx_evb.h index de08a727043..4bd989e2f00 100644 --- a/include/configs/spear6xx_evb.h +++ b/include/configs/spear6xx_evb.h @@ -16,11 +16,6 @@ #define CONFIG_SPEAR_USBTTY #endif -#if defined(CONFIG_NAND) -#else -#define CONFIG_ENV_IS_IN_FLASH -#endif - #include <configs/spear-common.h> /* Serial Configuration (PL011) */ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 8609f2a0a98..c47be514d8a 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -35,7 +35,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 12 #define CONFIG_SYS_MAX_FLASH_BANKS 2 -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OFFSET (256 << 10) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE (8 << 10) diff --git a/include/configs/strider.h b/include/configs/strider.h index be6bd7352aa..a702ec71dae 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -529,7 +529,6 @@ void fpga_control_clear(unsigned int bus, int pin); * Environment */ #if 1 -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ diff --git a/include/configs/vct.h b/include/configs/vct.h index 19192ddcc5e..5a62e3fb825 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -137,7 +137,6 @@ * FLASH and environment organization */ #if defined(CONFIG_VCT_NOR) -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_NOT_MEM_MAPPED /* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index f0e9a2e58d3..32ed2f95c98 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -290,7 +290,6 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR \ (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 11cb53587c3..3b1233f6152 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -284,6 +284,5 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ #define FLASH_MAX_SECTOR_SIZE 0x00040000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#define CONFIG_ENV_IS_IN_FLASH 1 #endif /* __VEXPRESS_AEMV8A_H */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 0880b627ae6..8f9ba91641d 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -262,7 +262,6 @@ #define CONFIG_ENV_OVERWRITE 1 /* Store environment at top of flash */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET (PHYS_FLASH_SIZE - \ (2 * CONFIG_ENV_SECT_SIZE)) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE1 + \ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index f2a15f37fe3..13ebafeac86 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -313,7 +313,6 @@ * Environment */ #ifndef CONFIG_SYS_RAMBOOT - #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0xc0000) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SIZE 0x2000 diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 68a9db5b202..515f360400e 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -167,8 +167,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_ENV_IS_IN_FLASH - /* * CFI FLASH driver setup */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 63889f9b279..007670740eb 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -33,8 +33,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN 0x60000 -#define CONFIG_ENV_IS_IN_FLASH - /* Serial Configuration (PL011) */ #define CONFIG_SYS_SERIAL0 0xD0000000 #define CONFIG_SYS_SERIAL1 0xD0080000 diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 07f26544fdb..9b6a5f8ce1c 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -517,7 +517,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 2645006b37f..715acc4fbc3 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -322,7 +322,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024)) diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index abbaeaad10b..7d05a5aa827 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -371,7 +371,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024)) diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 254fc12cf6a..68795d8faa7 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -370,7 +370,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Environment Configuration */ -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024)) diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 7d7d9bb9831..206ec344d94 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -250,7 +250,6 @@ * Put environment in top block (64kB) * Another option would be to put env. in 2nd param block offs 8KB, size 8KB */ -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_SIZE - CONFIG_SYS_FLASH_SECT_SZ) #define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SZ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 9b3769b5f1e..e7308241461 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -22,7 +22,6 @@ * Environment settings */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR 0x40000 #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 96cc1b72529..21a78c4bfac 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -102,7 +102,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00040000) -#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE (128 * 1024) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 807b097d343..9b527feec87 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -161,7 +161,6 @@ #ifndef CONFIG_ENV_IS_NOWHERE # ifdef CONFIG_MTD_NOR_FLASH /* Environment in NOR flash */ -# define CONFIG_ENV_IS_IN_FLASH # elif defined(CONFIG_ZYNQ_QSPI) /* Environment in Serial Flash */ # define CONFIG_ENV_IS_IN_SPI_FLASH |