Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5812550406d91b4a259e8bc7d91778a5341b3616

Authored by Ye Li
1 parent f13d059fb9
Exists in smarc-rel_imx_4.1.15_2.0.0_ga

MLK-12575-2 imx: Modify environment offset to 6 sectors on EIMNOR 

On mx6qsabreauto and mx6sx ARM2 boards, the EIMNOR sector size is 128KB.
And its u-boot environment offset is 4 sectors (512KB). But u-boot size has
exceeds it, so change to 6 sectors offset (768KB).
To align the environment configurations for all i.MX, also change the configuration
for mx6ul and mx7d, which has EIMNOR with 256KB sectors.

Signed-off-by: Ye Li <ye.li@nxp.com>

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

include/configs/mx6sabre_common.h
Diff comments   View file @ 5812550
... ... @@ -356,7 +356,7 @@
356 356 #undef CONFIG_ENV_SIZE
357 357 #define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SIZE
358 358 #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SIZE
359   -#define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE)
  359 +#define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE)
360 360 #elif defined(CONFIG_ENV_IS_IN_NAND)
361 361 #undef CONFIG_ENV_SIZE
362 362 #define CONFIG_ENV_OFFSET (37 << 20)
include/configs/mx6sx_arm2.h
Diff comments   View file @ 5812550
... ... @@ -332,7 +332,7 @@
332 332 #undef CONFIG_ENV_SIZE
333 333 #define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SIZE
334 334 #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SIZE
335   -#define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE)
  335 +#define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE)
336 336 #endif
337 337  
338 338 #define CONFIG_CMD_BMODE
include/configs/mx6ul_arm2.h
Diff comments   View file @ 5812550
... ... @@ -252,7 +252,7 @@
252 252 #undef CONFIG_ENV_SIZE
253 253 #define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SIZE
254 254 #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SIZE
255   -#define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE)
  255 +#define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE)
256 256 #elif defined(CONFIG_ENV_IS_IN_NAND)
257 257 #undef CONFIG_ENV_SIZE
258 258 #define CONFIG_ENV_OFFSET (37 << 20)
include/configs/mx7d_arm2.h
Diff comments   View file @ 5812550
... ... @@ -289,7 +289,7 @@
289 289 #undef CONFIG_ENV_SIZE
290 290 #define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SIZE
291 291 #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SIZE
292   -#define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE)
  292 +#define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE)
293 293 #elif defined(CONFIG_ENV_IS_IN_NAND)
294 294 #undef CONFIG_ENV_SIZE
295 295 #define CONFIG_ENV_OFFSET (37 << 20)