summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2015-10-27 15:53:43 +0800
committerYe.Li <B37916@freescale.com>2015-10-27 16:04:17 +0800
commit7a12e5c20a0cdf156862e1a5002659495556e36f (patch)
tree102f58f01b1c12c68bbd9fc9cb9bf7a782844249 /include
parent1e771cb709b71b9a471de94a1b8f22c345ca2bb3 (diff)
downloadu-boot-imx-7a12e5c20a0cdf156862e1a5002659495556e36f.zip
u-boot-imx-7a12e5c20a0cdf156862e1a5002659495556e36f.tar.gz
u-boot-imx-7a12e5c20a0cdf156862e1a5002659495556e36f.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6sabre_common.h2
-rw-r--r--include/configs/mx6sx_arm2.h2
-rw-r--r--include/configs/mx6sxsabreauto.h2
-rw-r--r--include/configs/mx6ul_14x14_evk.h2
-rw-r--r--include/configs/mx6ul_arm2.h2
-rw-r--r--include/configs/mx7d_arm2.h2
-rw-r--r--include/configs/mx7dsabresd.h2
7 files changed, 7 insertions, 7 deletions
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