[U-Boot] [PATCH 1/2] Revert "imx8qxp_mek: Disable CONFIG_DISPLAY_CPUINFO"
This reverts commit c5bbfaf05dc8592b479a44df6abaadbab54fec2b.
Disabling CONFIG_DISPLAY_CPUINFO was a temporary solution to get the v2018.11 release out. Now the merge window opens, revert it.
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
configs/imx8qxp_mek_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index a45f3ba..1588416 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_IMX8QXP_MEK=y CONFIG_NR_DRAM_BANKS=3 CONFIG_BOOTDELAY=3 -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_CMD_CPU=y # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_CLK=y
This commit should be squashed into
commit 2bba642dbaa4 ("dm: core: Respect drivers with the DM_FLAG_PRE_RELOC flag in lists_bind_fdt()")
on u-boot-dm/master branch.
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
drivers/misc/imx8/scu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/imx8/scu.c b/drivers/misc/imx8/scu.c index 0647ddf..b824ac7 100644 --- a/drivers/misc/imx8/scu.c +++ b/drivers/misc/imx8/scu.c @@ -223,7 +223,7 @@ static int imx8_scu_bind(struct udevice *dev) if (node < 0) panic("No clk node found\n");
- ret = lists_bind_fdt(dev, offset_to_ofnode(node), &child); + ret = lists_bind_fdt(dev, offset_to_ofnode(node), &child, true); if (ret) return ret;
@@ -234,7 +234,7 @@ static int imx8_scu_bind(struct udevice *dev) if (node < 0) panic("No iomuxc node found\n");
- ret = lists_bind_fdt(dev, offset_to_ofnode(node), &child); + ret = lists_bind_fdt(dev, offset_to_ofnode(node), &child, true); if (ret) return ret;
On 12 November 2018 at 08:02, Bin Meng bmeng.cn@gmail.com wrote:
This commit should be squashed into
commit 2bba642dbaa4 ("dm: core: Respect drivers with the DM_FLAG_PRE_RELOC flag in lists_bind_fdt()")
on u-boot-dm/master branch.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
drivers/misc/imx8/scu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On 12 November 2018 at 19:32, Simon Glass sjg@chromium.org wrote:
On 12 November 2018 at 08:02, Bin Meng bmeng.cn@gmail.com wrote:
This commit should be squashed into
commit 2bba642dbaa4 ("dm: core: Respect drivers with the DM_FLAG_PRE_RELOC flag in lists_bind_fdt()")
on u-boot-dm/master branch.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
drivers/misc/imx8/scu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org'
Applied (merged in) to u-boot-dm, thanks!
On 12 November 2018 at 08:02, Bin Meng bmeng.cn@gmail.com wrote:
This reverts commit c5bbfaf05dc8592b479a44df6abaadbab54fec2b.
Disabling CONFIG_DISPLAY_CPUINFO was a temporary solution to get the v2018.11 release out. Now the merge window opens, revert it.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
configs/imx8qxp_mek_defconfig | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On 12 November 2018 at 19:32, Simon Glass sjg@chromium.org wrote:
On 12 November 2018 at 08:02, Bin Meng bmeng.cn@gmail.com wrote:
This reverts commit c5bbfaf05dc8592b479a44df6abaadbab54fec2b.
Disabling CONFIG_DISPLAY_CPUINFO was a temporary solution to get the v2018.11 release out. Now the merge window opens, revert it.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
configs/imx8qxp_mek_defconfig | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm, thanks!
participants (2)
-
Bin Meng -
Simon Glass