summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-05-29 21:45:38 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2020-03-05 19:22:20 +0100
commiteeb1d9b89d30d6014e2295aa92f1beb1708df73e (patch)
tree79eeded672f2531bc367a7e19e7320a326869172
parent32948b338e1aaa2405dfe4d72412c81940d8d0b4 (diff)
colibri-imx8qxp: move environment into first boot area
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--include/configs/colibri-imx8qxp.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h
index 130138ae78..34e32603e9 100644
--- a/include/configs/colibri-imx8qxp.h
+++ b/include/configs/colibri-imx8qxp.h
@@ -169,21 +169,21 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_SYS_INIT_SP_ADDR 0x80200000
+#define CONFIG_SYS_INIT_SP_ADDR 0x80200000
#define CONFIG_SYS_MEMTEST_START 0x88000000
#define CONFIG_SYS_MEMTEST_END 0x89000000
-/* Default environment is in SD */
+/* Environment in eMMC, before config block at the end of 1st "boot sector" */
#define CONFIG_ENV_SIZE 0x2000
-
-#define CONFIG_ENV_OFFSET (64 * SZ_64K)
-#define CONFIG_SYS_MMC_ENV_PART 0 /* user area */
+#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
+ CONFIG_TDX_CFG_BLOCK_OFFSET)
+#define CONFIG_SYS_MMC_ENV_DEV 0
+#define CONFIG_SYS_MMC_ENV_PART 1
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-/* On Colibri iMX8 USDHC1 is eMMC, USDHC2 is 4-bit SD */
-#define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 eMMC */
+/* On Colibri iMX8X USDHC1 is eMMC and USDHC2 is 4-bit SD */
#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 eMMC */
#define CONFIG_SYS_FSL_USDHC_NUM 2