diff options
| author | Ye Li <ye.li@nxp.com> | 2016-05-05 17:02:23 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2016-05-06 11:06:22 +0800 |
| commit | 22f6c4b151fbdea1985403086715de841152c880 (patch) | |
| tree | ef14af73ee1287d658e6968022fbc5e75f23aeb9 /include | |
| parent | 8a7d61d0731725c6f79488e0089b0b5bd35d028a (diff) | |
| download | u-boot-imx-22f6c4b151fbdea1985403086715de841152c880.zip u-boot-imx-22f6c4b151fbdea1985403086715de841152c880.tar.gz u-boot-imx-22f6c4b151fbdea1985403086715de841152c880.tar.bz2 | |
MLK-12723 imx: Change the env offset on NAND to 60M
Current environment offset on NAND is 37MB, this will cause a alignment
issue when erasing if nand erase block is 2MB. The saveenv is failed.
=> saveenv
Saving Environment to NAND...
Erasing NAND...
Attempt to erase non block-aligned data
Since the max erase block we supported is 4MB, adjust the env offset to 60MB,
where is the last 4MB in 64MB reserved area for boot.
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sx_arm2.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6ul_arm2.h | 2 | ||||
| -rw-r--r-- | include/configs/mx7d_arm2.h | 2 | ||||
| -rw-r--r-- | include/configs/mx7dsabresd.h | 2 | ||||
| -rw-r--r-- | include/configs/picosom-imx6ul.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 143d1ff..d7590d9 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -359,7 +359,7 @@ #define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE) #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (37 << 20) +#define CONFIG_ENV_OFFSET (60 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #elif defined(CONFIG_ENV_IS_IN_SATA) diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h index d5f4438..30034f0 100644 --- a/include/configs/mx6sx_arm2.h +++ b/include/configs/mx6sx_arm2.h @@ -325,7 +325,7 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (37 << 20) +#define CONFIG_ENV_OFFSET (60 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #elif defined(CONFIG_ENV_IS_IN_FLASH) diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index ad6b393..b0053cb 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -309,7 +309,7 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (37 << 20) +#define CONFIG_ENV_OFFSET (60 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 151745a..85b8b70 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -305,7 +305,7 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (37 << 20) +#define CONFIG_ENV_OFFSET (60 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif diff --git a/include/configs/mx6ul_arm2.h b/include/configs/mx6ul_arm2.h index f039f60..528b7f7 100644 --- a/include/configs/mx6ul_arm2.h +++ b/include/configs/mx6ul_arm2.h @@ -255,7 +255,7 @@ #define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE) #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (37 << 20) +#define CONFIG_ENV_OFFSET (60 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif diff --git a/include/configs/mx7d_arm2.h b/include/configs/mx7d_arm2.h index 97cc9e3..3e1eb8f 100644 --- a/include/configs/mx7d_arm2.h +++ b/include/configs/mx7d_arm2.h @@ -292,7 +292,7 @@ #define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE) #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (37 << 20) +#define CONFIG_ENV_OFFSET (60 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index f55e51e..03a3dc8 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -306,7 +306,7 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (37 << 20) +#define CONFIG_ENV_OFFSET (60 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif diff --git a/include/configs/picosom-imx6ul.h b/include/configs/picosom-imx6ul.h index a262aa9..2603511 100644 --- a/include/configs/picosom-imx6ul.h +++ b/include/configs/picosom-imx6ul.h @@ -255,7 +255,7 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (37 << 20) +#define CONFIG_ENV_OFFSET (60 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif |