summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2017-04-05 10:17:47 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 19:48:58 +0800
commit5061ff951fe41403baba7c37c02123ea78435d79 (patch)
tree6c91d661144b939687437119d1d943651e18d07c /include
parentce4339b757d66230adb345e07c08ac0a134d13cc (diff)
downloadu-boot-imx-5061ff951fe41403baba7c37c02123ea78435d79.zip
u-boot-imx-5061ff951fe41403baba7c37c02123ea78435d79.tar.gz
u-boot-imx-5061ff951fe41403baba7c37c02123ea78435d79.tar.bz2
MLK-14606 mx6/7: Modify ENV offset to 896K
Since the u-boot size increases after using OF_CONTROL to including DTB, we have to adjust ENV_OFFSET to 896K for SD/eMMC/FLASH/SATA. Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6qarm2.h2
-rw-r--r--include/configs/mx6sabre_common.h2
-rw-r--r--include/configs/mx6slevk.h4
-rw-r--r--include/configs/mx6sll_arm2.h4
-rw-r--r--include/configs/mx6sllevk.h2
-rw-r--r--include/configs/mx6sx_arm2.h6
-rw-r--r--include/configs/mx6sxsabreauto.h4
-rw-r--r--include/configs/mx6sxsabresd.h4
-rw-r--r--include/configs/mx6ul_14x14_evk.h4
-rw-r--r--include/configs/mx6ul_arm2.h6
-rw-r--r--include/configs/mx6ullevk.h4
-rw-r--r--include/configs/mx7d_arm2.h6
-rw-r--r--include/configs/mx7dsabresd.h4
-rw-r--r--include/configs/mx7ulp_arm2.h2
-rw-r--r--include/configs/mx7ulp_evk.h2
15 files changed, 28 insertions, 28 deletions
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 1edd300..ab75ba6 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -133,7 +133,7 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Environment organization */
-#define CONFIG_ENV_OFFSET (13 * 64 * 1024)
+#define CONFIG_ENV_OFFSET (14 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 1
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 0d0967f..d55371d 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -336,7 +336,7 @@
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SIZE
#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SIZE
-#define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE)
+#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_FLASH_SECT_SIZE)
#elif defined(CONFIG_ENV_IS_IN_NAND)
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET (60 << 20)
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 879454d..19f6557 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -174,14 +174,14 @@
#if defined CONFIG_SPI_BOOT
#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_OFFSET (864 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#else
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#define CONFIG_ENV_IS_IN_MMC
#endif
diff --git a/include/configs/mx6sll_arm2.h b/include/configs/mx6sll_arm2.h
index b25e7ed..3aa1f26 100644
--- a/include/configs/mx6sll_arm2.h
+++ b/include/configs/mx6sll_arm2.h
@@ -169,9 +169,9 @@
#endif
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (864 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index f68a30b..67a20f7 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -141,7 +141,7 @@
#define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */
#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#define CONFIG_ENV_IS_IN_MMC
/* MMC Configs */
diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h
index 1c420d3..2ed83a1 100644
--- a/include/configs/mx6sx_arm2.h
+++ b/include/configs/mx6sx_arm2.h
@@ -283,9 +283,9 @@
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (832 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
@@ -300,7 +300,7 @@
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SIZE
#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SIZE
-#define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE)
+#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_FLASH_SECT_SIZE)
#endif
#define CONFIG_CMD_BMODE
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index d01b513..4ed6385 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -271,9 +271,9 @@
#define CONFIG_ENV_SIZE SZ_8K
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (864 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 7be8a0a..02785b7 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -294,9 +294,9 @@
#define CONFIG_ENV_SIZE SZ_8K
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (864 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index ebc2ac3..ccd13ea 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -267,9 +267,9 @@
#define CONFIG_ENV_SIZE SZ_8K
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (864 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
diff --git a/include/configs/mx6ul_arm2.h b/include/configs/mx6ul_arm2.h
index 21dc94f..c0ccd3d 100644
--- a/include/configs/mx6ul_arm2.h
+++ b/include/configs/mx6ul_arm2.h
@@ -216,9 +216,9 @@
#endif
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (864 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
@@ -228,7 +228,7 @@
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SIZE
#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SIZE
-#define CONFIG_ENV_OFFSET (6 * CONFIG_SYS_FLASH_SECT_SIZE)
+#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_FLASH_SECT_SIZE)
#elif defined(CONFIG_ENV_IS_IN_NAND)
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET (60 << 20)
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index dd8106c..92fbac3 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -266,9 +266,9 @@
#define CONFIG_ENV_SIZE SZ_8K
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (864 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
diff --git a/include/configs/mx7d_arm2.h b/include/configs/mx7d_arm2.h
index e16558b..f2d639d 100644
--- a/include/configs/mx7d_arm2.h
+++ b/include/configs/mx7d_arm2.h
@@ -288,9 +288,9 @@
#endif
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (832 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
@@ -300,7 +300,7 @@
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_SIZE CONFIG_SYS_FLASH_SECT_SIZE
#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SIZE
-#define CONFIG_ENV_OFFSET (4 * CONFIG_SYS_FLASH_SECT_SIZE)
+#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_FLASH_SECT_SIZE)
#elif defined(CONFIG_ENV_IS_IN_NAND)
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET (60 << 20)
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 69b13f8..85786c2 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -238,9 +238,9 @@
#define CONFIG_ENV_SIZE SZ_8K
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (13 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (832 * 1024)
+#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
diff --git a/include/configs/mx7ulp_arm2.h b/include/configs/mx7ulp_arm2.h
index cfdf418..a7b5b0c 100644
--- a/include/configs/mx7ulp_arm2.h
+++ b/include/configs/mx7ulp_arm2.h
@@ -45,7 +45,7 @@
#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-#define CONFIG_ENV_OFFSET (12 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_SIZE SZ_8K
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index a4c90cc..372d829 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -46,7 +46,7 @@
#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-#define CONFIG_ENV_OFFSET (12 * SZ_64K)
+#define CONFIG_ENV_OFFSET (14 * SZ_64K)
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_SIZE SZ_8K
generated by cgit v1.1 at 2024-11-25 01:00:23 +0000