Message ID | 20190307125529.32593-1-peng.fan@nxp.com |
---|---|
State | Accepted |
Commit | e5b8f7e665aa175f0c48e045a0e143f3e22c148d |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot] imx8qxp: mek: enable dm-spl for pm | expand |
Hi Stefano, Are you fine with this patch? Thanks, Peng. > -----Original Message----- > From: Peng Fan > Sent: 2019年3月7日 20:44 > To: sbabic@denx.de; festevam@gmail.com > Cc: dl-uboot-imx <uboot-imx@nxp.com>; u-boot@lists.denx.de; Peng Fan > <peng.fan@nxp.com> > Subject: [PATCH] imx8qxp: mek: enable dm-spl for pm > > with u-boot,dm-spl added for imx8qx-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> > --- > arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 5 +++++ > board/freescale/imx8qxp_mek/spl.c | 15 --------------- > configs/imx8qxp_mek_defconfig | 2 +- > 3 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi > b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi > index 5d50eb028e..201559008c 100644 > --- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi > +++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi > @@ -3,6 +3,11 @@ > * Copyright 2018 NXP > */ > > +&{/imx8qx-pm} { > + > + u-boot,dm-spl; > +}; > + > &mu { > u-boot,dm-spl; > }; > diff --git a/board/freescale/imx8qxp_mek/spl.c > b/board/freescale/imx8qxp_mek/spl.c > index 95ce9f37e8..51f323811a 100644 > --- a/board/freescale/imx8qxp_mek/spl.c > +++ b/board/freescale/imx8qxp_mek/spl.c > @@ -27,21 +27,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/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig > index a94998b8b5..915d8812ad 100644 > --- a/configs/imx8qxp_mek_defconfig > +++ b/configs/imx8qxp_mek_defconfig > @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80020000 > CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > +CONFIG_SYS_MALLOC_F_LEN=0x4000 > CONFIG_TARGET_IMX8QXP_MEK=y > CONFIG_SPL_MMC_SUPPORT=y > CONFIG_SPL_SERIAL_SUPPORT=y > -- > 2.16.4
Ping.. Thanks, Peng > Hi Stefano, > > Are you fine with this patch? > > Thanks, > Peng. > > > -----Original Message----- > > From: Peng Fan > > Sent: 2019年3月7日 20:44 > > To: sbabic@denx.de; festevam@gmail.com > > Cc: dl-uboot-imx <uboot-imx@nxp.com>; u-boot@lists.denx.de; Peng Fan > > <peng.fan@nxp.com> > > Subject: [PATCH] imx8qxp: mek: enable dm-spl for pm > > > > with u-boot,dm-spl added for imx8qx-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> > > --- > > arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 5 +++++ > > board/freescale/imx8qxp_mek/spl.c | 15 --------------- > > configs/imx8qxp_mek_defconfig | 2 +- > > 3 files changed, 6 insertions(+), 16 deletions(-) > > > > diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi > > b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi > > index 5d50eb028e..201559008c 100644 > > --- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi > > +++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi > > @@ -3,6 +3,11 @@ > > * Copyright 2018 NXP > > */ > > > > +&{/imx8qx-pm} { > > + > > + u-boot,dm-spl; > > +}; > > + > > &mu { > > u-boot,dm-spl; > > }; > > diff --git a/board/freescale/imx8qxp_mek/spl.c > > b/board/freescale/imx8qxp_mek/spl.c > > index 95ce9f37e8..51f323811a 100644 > > --- a/board/freescale/imx8qxp_mek/spl.c > > +++ b/board/freescale/imx8qxp_mek/spl.c > > @@ -27,21 +27,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/imx8qxp_mek_defconfig > > b/configs/imx8qxp_mek_defconfig index a94998b8b5..915d8812ad 100644 > > --- a/configs/imx8qxp_mek_defconfig > > +++ b/configs/imx8qxp_mek_defconfig > > @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80020000 > > CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y > > CONFIG_SPL_LIBGENERIC_SUPPORT=y > > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > > +CONFIG_SYS_MALLOC_F_LEN=0x4000 > > CONFIG_TARGET_IMX8QXP_MEK=y > > CONFIG_SPL_MMC_SUPPORT=y > > CONFIG_SPL_SERIAL_SUPPORT=y > > -- > > 2.16.4
diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi index 5d50eb028e..201559008c 100644 --- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi @@ -3,6 +3,11 @@ * Copyright 2018 NXP */ +&{/imx8qx-pm} { + + u-boot,dm-spl; +}; + &mu { u-boot,dm-spl; }; diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c index 95ce9f37e8..51f323811a 100644 --- a/board/freescale/imx8qxp_mek/spl.c +++ b/board/freescale/imx8qxp_mek/spl.c @@ -27,21 +27,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/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index a94998b8b5..915d8812ad 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_TARGET_IMX8QXP_MEK=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
with u-boot,dm-spl added for imx8qx-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> --- arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 5 +++++ board/freescale/imx8qxp_mek/spl.c | 15 --------------- configs/imx8qxp_mek_defconfig | 2 +- 3 files changed, 6 insertions(+), 16 deletions(-)