imx8qm: mek: enable dm-spl for pm

with u-boot,dm-spl added for imx8qm-pm node, and SPL_SIMPLE_BUS enabled,
the bind and probe code in board file could be removed.

Also we need to enlarge SYS_MALLOC_F_LEN to avoid calloc fail.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
index 5d50eb028e4a9493bc2a26338dab407c7048e5a7..9a4a83b70ef4a3f9058a453dc349263524d408d3 100644 (file)
--- a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
@@ -3,6 +3,11 @@
  * Copyright 2018 NXP
  */
 
+&{/imx8qm-pm} {
+
+       u-boot,dm-spl;
+};
+
 &mu {
        u-boot,dm-spl;
 };

diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index 95ce9f37e8b718a2a2b8338eb313c06e1e830cc9..cb4006eb2a40dc3cef6fdfd4130f2c8477a5d120 100644 (file)
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -18,7 +18,6 @@ DECLARE_GLOBAL_DATA_PTR;
 void spl_board_init(void)
 {
        struct udevice *dev;
-       int offset;
 
        uclass_find_first_device(UCLASS_MISC, &dev);
 
@@ -27,21 +26,6 @@ void spl_board_init(void)
                        continue;
        }
 
-       offset = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "nxp,imx8-pd");
-       while (offset != -FDT_ERR_NOTFOUND) {
-               lists_bind_fdt(gd->dm_root, offset_to_ofnode(offset),
-                              NULL, true);
-               offset = fdt_node_offset_by_compatible(gd->fdt_blob, offset,
-                                                      "nxp,imx8-pd");
-       }
-
-       uclass_find_first_device(UCLASS_POWER_DOMAIN, &dev);
-
-       for (; dev; uclass_find_next_device(&dev)) {
-               if (device_probe(dev))
-                       continue;
-       }
-
        arch_cpu_init();
 
        board_early_init_f();

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index 747f3ea9f306cc8d7fcfe47d469c455c95ba55d5..9ec76764841ae975e73b928d2663ba1db202ce35 100644 (file)
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -7,7 +7,7 @@ CONFIG_SPL_TEXT_BASE=0x100000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_SPL_LOAD_IMX_CONTAINER=y
 CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qm_mek/uboot-container.cfg"
 CONFIG_TARGET_IMX8QM_MEK=y