summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-03-22 11:34:09 +0800
committerYe Li <ye.li@nxp.com>2016-03-25 16:43:36 +0800
commit5812550406d91b4a259e8bc7d91778a5341b3616 (patch)
treeb041f3715d996a360c782ecebfe1d8dbdf962038
parentf13d059fb9b4d20e6c62c09f49e898a7b9a00daa (diff)
downloadu-boot-imx-5812550406d91b4a259e8bc7d91778a5341b3616.zip
u-boot-imx-5812550406d91b4a259e8bc7d91778a5341b3616.tar.gz
u-boot-imx-5812550406d91b4a259e8bc7d91778a5341b3616.tar.bz2
MLK-12575-2 imx: Modify environment offset to 6 sectors on EIMNOR
On mx6qsabreauto and mx6sx ARM2 boards, the EIMNOR sector size is 128KB. And its u-boot environment offset is 4 sectors (512KB). But u-boot size has exceeds it, so change to 6 sectors offset (768KB). To align the environment configurations for all i.MX, also change the configuration for mx6ul and mx7d, which has EIMNOR with 256KB sectors. Signed-off-by: Ye Li <ye.li@nxp.com>
-rw-r--r--include/configs/mx6sabre_common.h2
-rw-r--r--include/configs/mx6sx_arm2.h2
-rw-r--r--include/configs/mx6ul_arm2.h2
-rw-r--r--include/configs/mx7d_arm2.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 4f9b793..143d1ff 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -356,7 +356,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 (6 * CONFIG_SYS_FLASH_SECT_SIZE)
#elif defined(CONFIG_ENV_IS_IN_NAND)
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET (37 << 20)
diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h
index 7954d0e..d5f4438 100644
--- a/include/configs/mx6sx_arm2.h
+++ b/include/configs/mx6sx_arm2.h
@@ -332,7 +332,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 (6 * CONFIG_SYS_FLASH_SECT_SIZE)
#endif
#define CONFIG_CMD_BMODE
diff --git a/include/configs/mx6ul_arm2.h b/include/configs/mx6ul_arm2.h
index 40c0d7e..f039f60 100644
--- a/include/configs/mx6ul_arm2.h
+++ b/include/configs/mx6ul_arm2.h
@@ -252,7 +252,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 (6 * CONFIG_SYS_FLASH_SECT_SIZE)
#elif defined(CONFIG_ENV_IS_IN_NAND)
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET (37 << 20)
diff --git a/include/configs/mx7d_arm2.h b/include/configs/mx7d_arm2.h
index 1c75119..97cc9e3 100644
--- a/include/configs/mx7d_arm2.h
+++ b/include/configs/mx7d_arm2.h
@@ -289,7 +289,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 (6 * CONFIG_SYS_FLASH_SECT_SIZE)
#elif defined(CONFIG_ENV_IS_IN_NAND)
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET (37 << 20)