diff options
| author | Ye Li <ye.li@nxp.com> | 2017-10-31 05:58:18 -0500 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-11-01 05:31:49 -0500 |
| commit | 2d1f259d57670a19d77a25f10b107357cf0bb6e7 (patch) | |
| tree | 76e75f9beda2e933d79acd1422576ab0d08bae27 | |
| parent | 81d6bd62f17522b07fb17e65d27aa7ed3f57e059 (diff) | |
MLK-16739 imx8qm/qxp/mq: Change environment offset to avoid overlay
When M4 images (m4_0 and m4_1) are included into flash.bin, the bin size exceeds
the 1.2MB, which cause overlay with u-boot environment area.
To fix the issue, we change the u-boot environment offset to 4MB for SD and FlexSPI,
and align this for all i.MX8 platforms (i.MX8QM/QXP/MQ).
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit e0ec20c2f1c309c4b3fbba960901eb31e2a11550)
| -rw-r--r-- | include/configs/imx8mq_evk.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8qm_arm2.h | 4 | ||||
| -rw-r--r-- | include/configs/imx8qm_mek.h | 4 | ||||
| -rw-r--r-- | include/configs/imx8qxp_arm2.h | 4 | ||||
| -rw-r--r-- | include/configs/imx8qxp_mek.h | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 47b6250f14..b3b90f8234 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -184,7 +184,7 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_OFFSET (22 * SZ_64K) +#define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h index 5492105693..b7e78e293e 100644 --- a/include/configs/imx8qm_arm2.h +++ b/include/configs/imx8qm_arm2.h @@ -208,14 +208,14 @@ #ifdef CONFIG_QSPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_OFFSET (1024 * 1024) +#define CONFIG_ENV_OFFSET (4 * 1024 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 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 (14 * SZ_64K) +#define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 0c041686cc..70c9de708e 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -207,14 +207,14 @@ #ifdef CONFIG_QSPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_OFFSET (1024 * 1024) +#define CONFIG_ENV_OFFSET (4 * 1024 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 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 (14 * SZ_64K) +#define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index 2ef7b75e5b..ee826d6a50 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -207,14 +207,14 @@ #define CONFIG_ENV_OFFSET (64 << 20) #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_OFFSET (1024 * 1024) +#define CONFIG_ENV_OFFSET (4 * 1024 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 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 (14 * SZ_64K) +#define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index d8a6f75d96..d19303b779 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -196,7 +196,7 @@ #define CONFIG_ENV_SIZE 0x1000 #ifdef CONFIG_QSPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_OFFSET (1024 * 1024) +#define CONFIG_ENV_OFFSET (4 * 1024 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS #define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS @@ -204,7 +204,7 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #else #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET (14 * SZ_64K) +#define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #endif |