wandboard: Add FIT image support

After the transition to DM, only the mx6dl/solo wandboard
is supported.

Add FIT image support so that all the wandboard variants
can be supported, like it was prior to the DM conversion.

Successfully booted Linux on mx6q/solo/qp wandboards.

Signed-off-by: Fabio Estevam <festevam@gmail.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 320f0ebe3877b53652fad62c5a1cba44cf505561..68f17c1e2232e4492926ed24647198c2bc1384c6 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -561,8 +561,10 @@ dtb-$(CONFIG_MX6QDL) += \
        imx6q-icore-rqs.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabresd.dtb \
+       imx6q-wandboard-revb1.dtb \
        imx6qp-sabreauto.dtb \
-       imx6qp-sabresd.dtb
+       imx6qp-sabresd.dtb \
+       imx6qp-wandboard-revd1.dtb
 
 dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb
 

diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 9d7a94ff9d9874577c377526900a7ab387cce8b1..74d7a17028b3b77848cdd32f0a112b2e27dc4303 100644 (file)
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -500,3 +500,21 @@ int checkboard(void)
 
        return 0;
 }
+
+#ifdef CONFIG_SPL_LOAD_FIT
+int board_fit_config_name_match(const char *name)
+{
+       if (is_mx6dq()) {
+               if (!strcmp(name, "imx6q-wandboard-revb1"))
+                       return 0;
+       } else if (is_mx6dqp()) {
+               if (!strcmp(name, "imx6qp-wandboard-revd1"))
+                       return 0;
+       } else if (is_mx6dl() || is_mx6solo()) {
+               if (!strcmp(name, "imx6dl-wandboard-revb1"))
+                       return 0;
+       }
+
+       return -EINVAL;
+}
+#endif

diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index ee81e1aa1c8e1276c1bdf6372b57be6eb614da27..f1d6cc56b07fbcb061d5311a4d86b84f8e6a7054 100644 (file)
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -13,6 +13,9 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_FIT=y
+CONFIG_SPL_FIT_PRINT=y
+CONFIG_SPL_LOAD_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
@@ -23,6 +26,8 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_TEXT_BASE=0x00908000
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SPL_FIT_IMAGE_TINY=y
 CONFIG_SPL_FS_EXT4=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
@@ -36,6 +41,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1"
+CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1"
+CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y