Hi Heiko, On Wed, Jan 8, 2020 at 4:52 PM Fabio Estevam <[email protected]> wrote:
> The support for imx6q-wandboard-revd1 and imx6dl-wandboard-revd1 still > needs to be added (it used to work prior to the DM conversion as you > noticed), but unfortunately I don't have access to these variants. Could you please try the attached two patches? I don't have access to a imx6dl-wandboard-revd1 board, but hopefully these two patches would make it to work. It applies against the latest u-boot-imx tree. Thanks
From e70ecca3949d549e4677167228e9b083441fe51f Mon Sep 17 00:00:00 2001 From: Fabio Estevam <[email protected]> Date: Wed, 8 Jan 2020 17:13:19 -0300 Subject: [PATCH 1/2] wandboard: Import the dts files for the other revd1 variants Import the imx6dl-wandboard-revd1.dts and imx6q-wandboard-revd1.dts from kernel 5.4.8 so that these variants can also be supported. Signed-off-by: Fabio Estevam <[email protected]> --- arch/arm/dts/Makefile | 2 ++ arch/arm/dts/imx6dl-wandboard-revd1.dts | 19 +++++++++++++++++++ arch/arm/dts/imx6q-wandboard-revd1.dts | 23 +++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 arch/arm/dts/imx6dl-wandboard-revd1.dts create mode 100644 arch/arm/dts/imx6q-wandboard-revd1.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index aef564e079..94ac25ee89 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -607,6 +607,7 @@ dtb-y += \ imx6dl-sabreauto.dtb \ imx6dl-sabresd.dtb \ imx6dl-wandboard-revb1.dtb \ + imx6dl-wandboard-revd1.dtb \ endif @@ -639,6 +640,7 @@ dtb-y += \ imx6q-sabresd.dtb \ imx6q-tbs2910.dtb \ imx6q-wandboard-revb1.dtb \ + imx6q-wandboard-revd1.dtb \ imx6qp-sabreauto.dtb \ imx6qp-sabresd.dtb \ imx6qp-wandboard-revd1.dtb \ diff --git a/arch/arm/dts/imx6dl-wandboard-revd1.dts b/arch/arm/dts/imx6dl-wandboard-revd1.dts new file mode 100644 index 0000000000..6d1d863c2e --- /dev/null +++ b/arch/arm/dts/imx6dl-wandboard-revd1.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2013 Freescale Semiconductor, Inc. + * + * Author: Fabio Estevam <[email protected]> + */ +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-wandboard-revd1.dtsi" + +/ { + model = "Wandboard i.MX6 Dual Lite Board revD1"; + compatible = "wand,imx6dl-wandboard", "fsl,imx6dl"; + + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0x40000000>; + }; +}; diff --git a/arch/arm/dts/imx6q-wandboard-revd1.dts b/arch/arm/dts/imx6q-wandboard-revd1.dts new file mode 100644 index 0000000000..55331021d8 --- /dev/null +++ b/arch/arm/dts/imx6q-wandboard-revd1.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2013 Freescale Semiconductor, Inc. + * + * Author: Fabio Estevam <[email protected]> + */ +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-wandboard-revd1.dtsi" + +/ { + model = "Wandboard i.MX6 Quad Board revD1"; + compatible = "wand,imx6q-wandboard", "fsl,imx6q"; + + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0x80000000>; + }; +}; + +&sata { + status = "okay"; +}; -- 2.17.1
From 6b625d1d89cb5a3c4d81fef30aa9faea69be2372 Mon Sep 17 00:00:00 2001 From: Fabio Estevam <[email protected]> Date: Wed, 8 Jan 2020 17:18:14 -0300 Subject: [PATCH 2/2] wandboard: Handle the imx6dl and imx6q revd1 boards Currently the only supported revd1 variant is imx6qp. Add logic for supporting imx6dl and imx6q revd1 boards as well. Reported-by: Heiko Schocher <[email protected]> Signed-off-by: Fabio Estevam <[email protected]> --- board/wandboard/wandboard.c | 16 +++++++++++++--- configs/wandboard_defconfig | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index f4534dd3dc..05f36b7f5d 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -483,12 +483,22 @@ int checkboard(void) #ifdef CONFIG_SPL_LOAD_FIT int board_fit_config_name_match(const char *name) { + /* imx6qp wandboard only comes in revd1 flavor */ + if (is_mx6dqp()) { + if (!strcmp(name, "imx6qp-wandboard-revd1")) + return 0; + } + + if (is_mx6dq() && is_revd1()) { + if (!strcmp(name, "imx6q-wandboard-revd1")) + return 0; + } else if ((is_mx6dl() || is_mx6solo()) && is_revd1()) { + if (!strcmp(name, "imx6dl-wandboard-revd1")) + return 0; + } 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; diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index ca564c59b8..d6bde4bf28 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -43,7 +43,7 @@ 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_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1" CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -- 2.17.1
