Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 51bfee192099206a4397f15f3b93516e01f58ab0

Authored by Jean-Christophe PLAGNIOL-VILLARD
1 parent d8cc04d0ac
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND 

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

Showing 24 changed files with 34 additions and 34 deletions Side-by-side Diff

... ... @@ -2255,7 +2255,7 @@
2255 2255 environment area within the total memory of your DataFlash placed
2256 2256 at the specified address.
2257 2257  
2258   -- CFG_ENV_IS_IN_NAND:
  2258 +- CONFIG_ENV_IS_IN_NAND:
2259 2259  
2260 2260 Define this if you have a NAND device which you want to use
2261 2261 for the environment.
... ... @@ -56,7 +56,7 @@
56 56 !defined(CONFIG_ENV_IS_IN_EEPROM) && \
57 57 !defined(CFG_ENV_IS_IN_FLASH) && \
58 58 !defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
59   - !defined(CFG_ENV_IS_IN_NAND) && \
  59 + !defined(CONFIG_ENV_IS_IN_NAND) && \
60 60 !defined(CFG_ENV_IS_IN_ONENAND) && \
61 61 !defined(CFG_ENV_IS_IN_SPI_FLASH) && \
62 62 !defined(CFG_ENV_IS_NOWHERE)
... ... @@ -133,7 +133,7 @@
133 133 "\0"
134 134 };
135 135  
136   -#if defined(CFG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \
  136 +#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \
137 137 || defined(CFG_ENV_IS_IN_SPI_FLASH)
138 138 int default_environment_size = sizeof(default_environment);
139 139 #endif
... ... @@ -34,7 +34,7 @@
34 34  
35 35 #include <common.h>
36 36  
37   -#if defined(CFG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
  37 +#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
38 38  
39 39 #include <command.h>
40 40 #include <environment.h>
... ... @@ -367,5 +367,5 @@
367 367 }
368 368 #endif
369 369  
370   -#endif /* CFG_ENV_IS_IN_NAND */
  370 +#endif /* CONFIG_ENV_IS_IN_NAND */
include/configs/MPC8313ERDB.h
Diff comments   View file @ 51bfee1
... ... @@ -385,7 +385,7 @@
385 385 * Environment
386 386 */
387 387 #if defined(CONFIG_NAND_U_BOOT)
388   - #define CFG_ENV_IS_IN_NAND 1
  388 + #define CONFIG_ENV_IS_IN_NAND 1
389 389 #define CFG_ENV_OFFSET (512 * 1024)
390 390 #define CFG_ENV_SECT_SIZE CFG_NAND_BLOCK_SIZE
391 391 #define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
include/configs/PMC440.h
Diff comments   View file @ 51bfee1
... ... @@ -107,7 +107,7 @@
107 107 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
108 108 #define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
109 109 #else
110   -#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
  110 +#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
111 111 #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
112 112 #endif
113 113  
... ... @@ -200,7 +200,7 @@
200 200 #define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
201 201 #endif
202 202  
203   -#ifdef CFG_ENV_IS_IN_NAND
  203 +#ifdef CONFIG_ENV_IS_IN_NAND
204 204 /*
205 205 * For NAND booting the environment is embedded in the U-Boot image. Please take
206 206 * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
include/configs/acadia.h
Diff comments   View file @ 51bfee1
... ... @@ -98,7 +98,7 @@
98 98 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
99 99 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
100 100 #else
101   -#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
  101 +#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
102 102 #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
103 103 #endif
104 104  
... ... @@ -180,7 +180,7 @@
180 180 #define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
181 181 #define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
182 182  
183   -#ifdef CFG_ENV_IS_IN_NAND
  183 +#ifdef CONFIG_ENV_IS_IN_NAND
184 184 /*
185 185 * For NAND booting the environment is embedded in the U-Boot image. Please take
186 186 * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
include/configs/at91sam9260ek.h
Diff comments   View file @ 51bfee1
... ... @@ -162,7 +162,7 @@
162 162 #else /* CFG_USE_NANDFLASH */
163 163  
164 164 /* bootstrap + u-boot + env + linux in nandflash */
165   -#define CFG_ENV_IS_IN_NAND 1
  165 +#define CONFIG_ENV_IS_IN_NAND 1
166 166 #define CFG_ENV_OFFSET 0x60000
167 167 #define CFG_ENV_OFFSET_REDUND 0x80000
168 168 #define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
include/configs/at91sam9261ek.h
Diff comments   View file @ 51bfee1
... ... @@ -162,7 +162,7 @@
162 162 #else /* CFG_USE_NANDFLASH */
163 163  
164 164 /* bootstrap + u-boot + env + linux in nandflash */
165   -#define CFG_ENV_IS_IN_NAND 1
  165 +#define CONFIG_ENV_IS_IN_NAND 1
166 166 #define CFG_ENV_OFFSET 0x60000
167 167 #define CFG_ENV_OFFSET_REDUND 0x80000
168 168 #define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
include/configs/at91sam9263ek.h
Diff comments   View file @ 51bfee1
... ... @@ -168,7 +168,7 @@
168 168 #else /* CFG_USE_NANDFLASH */
169 169  
170 170 /* bootstrap + u-boot + env + linux in nandflash */
171   -#define CFG_ENV_IS_IN_NAND 1
  171 +#define CONFIG_ENV_IS_IN_NAND 1
172 172 #define CFG_ENV_OFFSET 0x60000
173 173 #define CFG_ENV_OFFSET_REDUND 0x80000
174 174 #define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
include/configs/at91sam9rlek.h
Diff comments   View file @ 51bfee1
... ... @@ -137,7 +137,7 @@
137 137 #else /* CFG_USE_NANDFLASH */
138 138  
139 139 /* bootstrap + u-boot + env + linux in nandflash */
140   -#define CFG_ENV_IS_IN_NAND 1
  140 +#define CONFIG_ENV_IS_IN_NAND 1
141 141 #define CFG_ENV_OFFSET 0x60000
142 142 #define CFG_ENV_OFFSET_REDUND 0x80000
143 143 #define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
include/configs/bamboo.h
Diff comments   View file @ 51bfee1
... ... @@ -105,7 +105,7 @@
105 105 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
106 106 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
107 107 #else
108   -#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
  108 +#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
109 109 #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
110 110 #endif
111 111  
... ... @@ -183,7 +183,7 @@
183 183 #define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
184 184 #define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
185 185  
186   -#ifdef CFG_ENV_IS_IN_NAND
  186 +#ifdef CONFIG_ENV_IS_IN_NAND
187 187 /*
188 188 * For NAND booting the environment is embedded in the U-Boot image. Please take
189 189 * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
include/configs/canyonlands.h
Diff comments   View file @ 51bfee1
... ... @@ -115,7 +115,7 @@
115 115 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
116 116 #define CFG_NAND_CS 3 /* NAND chip connected to CSx */
117 117 #else
118   -#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
  118 +#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
119 119 #define CFG_NAND_CS 0 /* NAND chip connected to CSx */
120 120 #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
121 121 #endif
... ... @@ -174,7 +174,7 @@
174 174 48, 49, 50, 51, 52, 53, 54, 55, \
175 175 56, 57, 58, 59, 60, 61, 62, 63}
176 176  
177   -#ifdef CFG_ENV_IS_IN_NAND
  177 +#ifdef CONFIG_ENV_IS_IN_NAND
178 178 /*
179 179 * For NAND booting the environment is embedded in the U-Boot image. Please take
180 180 * look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
include/configs/davinci_dvevm.h
Diff comments   View file @ 51bfee1
... ... @@ -114,7 +114,7 @@
114 114 #ifdef CFG_USE_NAND
115 115 #undef CFG_ENV_IS_IN_FLASH
116 116 #define CFG_NO_FLASH
117   -#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
  117 +#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
118 118 #ifdef CFG_NAND_SMALLPAGE
119 119 #define CFG_ENV_SECT_SIZE 512 /* Env sector Size */
120 120 #define CFG_ENV_SIZE SZ_16K
include/configs/davinci_schmoogie.h
Diff comments   View file @ 51bfee1
... ... @@ -81,7 +81,7 @@
81 81 /*=====================*/
82 82 #undef CFG_ENV_IS_IN_FLASH
83 83 #define CFG_NO_FLASH
84   -#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
  84 +#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
85 85 #define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */
86 86 #define CFG_ENV_SIZE SZ_128K
87 87 #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
include/configs/davinci_sffsdr.h
Diff comments   View file @ 51bfee1
... ... @@ -77,7 +77,7 @@
77 77 /* Flash & Environment */
78 78 #undef CFG_ENV_IS_IN_FLASH
79 79 #define CFG_NO_FLASH
80   -#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
  80 +#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
81 81 #define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */
82 82 #define CFG_ENV_SIZE SZ_128K
83 83 #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
include/configs/davinci_sonata.h
Diff comments   View file @ 51bfee1
... ... @@ -114,7 +114,7 @@
114 114 #ifdef CFG_USE_NAND
115 115 #undef CFG_ENV_IS_IN_FLASH
116 116 #define CFG_NO_FLASH
117   -#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
  117 +#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
118 118 #define CFG_ENV_SECT_SIZE 512 /* Env sector Size */
119 119 #define CFG_ENV_SIZE SZ_16K
120 120 #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
include/configs/delta.h
Diff comments   View file @ 51bfee1
... ... @@ -262,7 +262,7 @@
262 262  
263 263 #define CFG_NO_FLASH 1
264 264  
265   -#define CFG_ENV_IS_IN_NAND 1
  265 +#define CONFIG_ENV_IS_IN_NAND 1
266 266 #define CFG_ENV_OFFSET 0x40000
267 267 #define CFG_ENV_OFFSET_REDUND 0x44000
268 268 #define CFG_ENV_SIZE 0x4000
include/configs/kilauea.h
Diff comments   View file @ 51bfee1
... ... @@ -123,7 +123,7 @@
123 123 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
124 124 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
125 125 #else
126   -#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
  126 +#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
127 127 #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
128 128 #endif
129 129  
... ... @@ -200,7 +200,7 @@
200 200 #define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
201 201 #define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
202 202  
203   -#ifdef CFG_ENV_IS_IN_NAND
  203 +#ifdef CONFIG_ENV_IS_IN_NAND
204 204 /*
205 205 * For NAND booting the environment is embedded in the U-Boot image. Please take
206 206 * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
include/configs/omap2420h4.h
Diff comments   View file @ 51bfee1
... ... @@ -270,7 +270,7 @@
270 270 #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE_1 }
271 271  
272 272 #ifdef CFG_NAND_BOOT
273   -#define CFG_ENV_IS_IN_NAND 1
  273 +#define CONFIG_ENV_IS_IN_NAND 1
274 274 #define CFG_ENV_OFFSET 0x80000 /* environment starts here */
275 275 #else
276 276 #define CFG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K)
include/configs/sequoia.h
Diff comments   View file @ 51bfee1
... ... @@ -115,7 +115,7 @@
115 115 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
116 116 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */
117 117 #else
118   -#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */
  118 +#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */
119 119 #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
120 120 #endif
121 121  
... ... @@ -197,7 +197,7 @@
197 197 #define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
198 198 #define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
199 199  
200   -#ifdef CFG_ENV_IS_IN_NAND
  200 +#ifdef CONFIG_ENV_IS_IN_NAND
201 201 /*
202 202 * For NAND booting the environment is embedded in the U-Boot image. Please take
203 203 * look at the file board/amcc/sequoia/u-boot-nand.lds for details.
include/configs/smdk6400.h
Diff comments   View file @ 51bfee1
... ... @@ -284,7 +284,7 @@
284 284 */
285 285  
286 286 /* Settings as above boot configuration */
287   -#define CFG_ENV_IS_IN_NAND
  287 +#define CONFIG_ENV_IS_IN_NAND
288 288 #define CONFIG_BOOTARGS "console=ttySAC,115200"
289 289  
290 290 #if !defined(CONFIG_ENABLE_MMU)
include/configs/zylonite.h
Diff comments   View file @ 51bfee1
... ... @@ -231,7 +231,7 @@
231 231  
232 232 #define CFG_NO_FLASH 1
233 233  
234   -#define CFG_ENV_IS_IN_NAND 1
  234 +#define CONFIG_ENV_IS_IN_NAND 1
235 235 #define CFG_ENV_OFFSET 0x40000
236 236 #define CFG_ENV_OFFSET_REDUND 0x44000
237 237 #define CFG_ENV_SIZE 0x4000
include/environment.h
Diff comments   View file @ 51bfee1
... ... @@ -69,12 +69,12 @@
69 69 # endif
70 70 #endif /* CFG_ENV_IS_IN_FLASH */
71 71  
72   -#if defined(CFG_ENV_IS_IN_NAND)
  72 +#if defined(CONFIG_ENV_IS_IN_NAND)
73 73 # ifndef CFG_ENV_OFFSET
74   -# error "Need to define CFG_ENV_OFFSET when using CFG_ENV_IS_IN_NAND"
  74 +# error "Need to define CFG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
75 75 # endif
76 76 # ifndef CFG_ENV_SIZE
77   -# error "Need to define CFG_ENV_SIZE when using CFG_ENV_IS_IN_NAND"
  77 +# error "Need to define CFG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"
78 78 # endif
79 79 # ifdef CFG_ENV_OFFSET_REDUND
80 80 # define CFG_REDUNDAND_ENVIRONMENT
... ... @@ -82,7 +82,7 @@
82 82 # ifdef CFG_ENV_IS_EMBEDDED
83 83 # define ENV_IS_EMBEDDED 1
84 84 # endif
85   -#endif /* CFG_ENV_IS_IN_NAND */
  85 +#endif /* CONFIG_ENV_IS_IN_NAND */
86 86  
87 87 #ifdef USE_HOSTCC
88 88 # include <stdint.h>