diff options
author | Ye.Li <B37916@freescale.com> | 2015-10-27 15:53:43 +0800 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-02-17 10:54:04 +0100 |
commit | a61eb57ca91d2a7fb1e6836974c438e07e38e65e (patch) | |
tree | c25407462de1b39f4bb6bd283b53dbbbce034ef0 | |
parent | 2e07d70d623e3d55a12aa79f63fd9c999d10649f (diff) |
MLK-11767:imx: Modify the u-boot ENV offset for NAND storage
The current 36M offset will conflict with NAND FCB firmware2 when the
nand chip block is 1MB size. This patch change it to 36M + 1M offset,
so the redundant u-boot at firmware2 will not be broken.
Signed-off-by: Ye.Li <B37916@freescale.com>
-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 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index f6fe595259..424189a4d7 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 (36 << 20) +#define CONFIG_ENV_OFFSET (37 << 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 21560ccfb4..c4f4ef1acc 100644 --- a/include/configs/mx6sx_arm2.h +++ b/include/configs/mx6sx_arm2.h @@ -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 (36 << 20) +#define CONFIG_ENV_OFFSET (37 << 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 2dc1d7290f..26bba25f3b 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 (36 << 20) +#define CONFIG_ENV_OFFSET (37 << 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 aace9b3fc3..aabe2f75a4 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 (36 << 20) +#define CONFIG_ENV_OFFSET (37 << 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 c30da2c828..5cebf30ea9 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 (36 << 20) +#define CONFIG_ENV_OFFSET (37 << 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 d062a61d8f..fe1f22f08c 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 (36 << 20) +#define CONFIG_ENV_OFFSET (37 << 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 363ff68dde..2324a31a36 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 (36 << 20) +#define CONFIG_ENV_OFFSET (37 << 20) #define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #endif |