summaryrefslogtreecommitdiff
path: root/configs/zc5601_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-08-25 23:12:43 -0400
committerTom Rini <trini@konsulko.com>2020-08-25 23:12:43 -0400
commit7a1a01c6029039e4fa6aa185cdbbf9a357eecba7 (patch)
treef145f655379b2298dc58ef11aa03742c159e7f56 /configs/zc5601_defconfig
parent9f9ecd3e4d7839e24c182fb7b24937e19b670f1b (diff)
parentacbc1d86f16cc8372cccb7b862a0b9dc242f8fe5 (diff)
Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10 ----------- - mx6: SOCs user selectable Fix for imx6q_logic Some DM conversion - mx7: introduce secondary boot device Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/720918010 Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/zc5601_defconfig')
-rw-r--r--configs/zc5601_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig
index 0bd9cc4937..7c88e1fdb0 100644
--- a/configs/zc5601_defconfig
+++ b/configs/zc5601_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x0
CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
+CONFIG_MX6Q=y
CONFIG_TARGET_ZC5601=y
CONFIG_SPL_TEXT_BASE=0x00908000
CONFIG_SPL_MMC_SUPPORT=y
@@ -17,7 +18,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTDELAY=3
CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
CONFIG_DEFAULT_FDT_FILE="imx6q-zc5601.dtb"