From 8039211a8a9c8c9c97ee0d5bbd782e9e53c1d465 Mon Sep 17 00:00:00 2001 From: Ludwig Zenz Date: Tue, 2 Jul 2019 14:49:49 +0200 Subject: ARM: imx6: DHCOM i.MX6 PDK: config SPL to load U-Boot fitImage with mulitple DTs Configure fitImage for U-Boot with a device tree for imx6 quad/dual and duallite/solo. This enables to support the imx6 derivates quad/dual/duallite/solo with a single binary. Signed-off-by: Ludwig Zenz Reviewed-by: Marek Vasut --- board/dhelectronics/dh_imx6/dh_imx6.c | 15 +++++++++++++++ configs/dh_imx6_defconfig | 3 +++ 2 files changed, 18 insertions(+) diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 24141088c9..7b1a27ac37 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -355,3 +355,18 @@ int checkboard(void) puts("Board: DHCOM i.MX6\n"); return 0; } + +#ifdef CONFIG_MULTI_DTB_FIT +int board_fit_config_name_match(const char *name) +{ + if (is_mx6dq()) { + if (!strcmp(name, "imx6q-dhcom-pdk2")) + return 0; + } else if (is_mx6sdl()) { + if (!strcmp(name, "imx6dl-dhcom-pdk2")) + return 0; + } + + return -1; +} +#endif diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 77b5afdbb7..387ab843b3 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -16,6 +16,7 @@ CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y +CONFIG_SPL_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set @@ -41,6 +42,8 @@ CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-dhcom-pdk2" +CONFIG_OF_LIST="imx6q-dhcom-pdk2 imx6dl-dhcom-pdk2" +CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_BOOTCOUNT_LIMIT=y -- cgit v1.2.3