From 7a12e5c20a0cdf156862e1a5002659495556e36f Mon Sep 17 00:00:00 2001 From: "Ye.Li" Date: Tue, 27 Oct 2015 15:53:43 +0800 Subject: 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 --- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6sx_arm2.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx6ul_arm2.h | 2 +- include/configs/mx7d_arm2.h | 2 +- include/configs/mx7dsabresd.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include/configs') diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index f6fe595..424189a 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 21560cc..c4f4ef1 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 2dc1d72..26bba25 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 aace9b3..aabe2f7 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 c30da2c..5cebf30 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 d062a61..fe1f22f 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 363ff68..2324a31 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 -- cgit v1.1