summaryrefslogtreecommitdiff
path: root/include/configs/imx8mq_arm2.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs/imx8mq_arm2.h')
-rw-r--r--include/configs/imx8mq_arm2.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/include/configs/imx8mq_arm2.h b/include/configs/imx8mq_arm2.h
index 75dec8b71e..b9613080d9 100644
--- a/include/configs/imx8mq_arm2.h
+++ b/include/configs/imx8mq_arm2.h
@@ -67,7 +67,7 @@
#define CONFIG_SPL_NAND_SUPPORT
#define CONFIG_SPL_DMA_SUPPORT
#define CONFIG_SPL_NAND_MXS
-#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x8000000 /* Put the FIT out of first 128MB boot area */
+#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x4000000 /* Put the FIT out of first 64MB boot area */
#endif
#define CONFIG_SPL_DMA_SUPPORT
@@ -144,7 +144,7 @@
"fdt_addr=0x43000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200\0" \
- "bootargs=console=${console} ubi.mtd=5 " \
+ "bootargs=console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 ubi.mtd=5 " \
"root=ubi0:rootfs rootfstype=ubifs " \
MFG_NAND_PARTITION \
"\0" \
@@ -232,10 +232,17 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
+#define CONFIG_ENV_SIZE 0x1000
+#ifdef CONFIG_NAND_BOOT
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OFFSET (60 << 20)
+#else
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_OFFSET (64 * SZ_64K)
-#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_ENV_IS_IN_MMC
+#endif
+
#define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */
#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */