diff options
| author | Han Xu <b45815@freescale.com> | 2015-10-15 10:34:25 -0500 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-03-09 14:42:51 +0100 |
| commit | d050dfbd2cbedf7b971e6fef2d7b301371de703b (patch) | |
| tree | 48c7e2712b55db4d058b7ae132b1a96e379d5265 /include | |
| parent | ca0f7f4d6ebd98e0dff81dfb377beeb322a0eea8 (diff) | |
MLK-11718-3: imx: change the NAND env setting address
The previous 8M address for NAND env might conflict with other boot
parameters as the NAND block size increasing, change it to 36M to avoid
it.
Signed-off-by: Han Xu <b45815@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sx_arm2.h | 4 | ||||
| -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 |
7 files changed, 8 insertions, 8 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index dda9228f860..f6fe5952598 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -401,7 +401,7 @@ #define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE) #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (8 << 20) +#define CONFIG_ENV_OFFSET (36 << 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 8820e357799..21560ccfb41 100644 --- a/include/configs/mx6sx_arm2.h +++ b/include/configs/mx6sx_arm2.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Freescale Semiconductor, Inc. + * Copyright (C) 2014-2015 Freescale Semiconductor, Inc. * * Configuration settings for the Freescale i.MX6SX ARM2 board. * @@ -390,7 +390,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 (8 << 20) +#define CONFIG_ENV_OFFSET (36 << 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 a41ec144c3e..2dc1d7290fa 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -377,7 +377,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 (8 << 20) +#define CONFIG_ENV_OFFSET (36 << 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 902207b4c57..aace9b3fc3c 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -375,7 +375,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 (8 << 20) +#define CONFIG_ENV_OFFSET (36 << 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 4b4d53aecc1..c30da2c8283 100644 --- a/include/configs/mx6ul_arm2.h +++ b/include/configs/mx6ul_arm2.h @@ -316,7 +316,7 @@ #define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE) #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (8 << 20) +#define CONFIG_ENV_OFFSET (36 << 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 3e94672187c..d062a61d8f7 100644 --- a/include/configs/mx7d_arm2.h +++ b/include/configs/mx7d_arm2.h @@ -352,7 +352,7 @@ #define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE) #elif defined(CONFIG_ENV_IS_IN_NAND) #undef CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET (8 << 20) +#define CONFIG_ENV_OFFSET (36 << 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 2d4bfae88a7..363ff68ddef 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -357,7 +357,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 (8 << 20) +#define CONFIG_ENV_OFFSET (36 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif |