[PATCH v1 2/4] ARM: dts: imx8qxp-colibri: replace dm-spl with dm-pre-proper
Igor Opaniuk
igor.opaniuk at gmail.com
Wed Feb 19 14:04:50 CET 2020
From: Igor Opaniuk <igor.opaniuk at toradex.com>
For non-SPL/TPL setups dm-spl, dm-tpl, dm-pre-proper, dm-pre-reloc are
handled equally, forcing the nodes with these properties
to be accessible and device being probed
before pre-relocation of U-Boot proper (drivers/core/util.c):
bool ofnode_pre_reloc(ofnode node)
{
/* for SPL and TPL the remaining nodes after the fdtgrep 1st pass
* had property dm-pre-reloc or u-boot,dm-spl/tpl.
* They are removed in final dtb (fdtgrep 2nd pass)
*/
return true;
if (ofnode_read_bool(node, "u-boot,dm-pre-reloc"))
return true;
if (ofnode_read_bool(node, "u-boot,dm-pre-proper"))
return true;
/*
* In regular builds individual spl and tpl handling both
* count as handled pre-relocation for later second init.
*/
if (ofnode_read_bool(node, "u-boot,dm-spl") ||
ofnode_read_bool(node, "u-boot,dm-tpl"))
return true;
return false;
}
Howewer, to avoid confusion in future, replace dm-spl
`%s/dm-spl/dm-pre-proper/g` properties to dm-pre-proper
to explicitly state that they are handled during pre-relocation
stage of U-Boot proper.
Signed-off-by: Igor Opaniuk <igor.opaniuk at toradex.com>
---
arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 56 ++++++++++----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
index 5b061f94ba..87de9b5653 100644
--- a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
@@ -5,113 +5,113 @@
&{/imx8qx-pm} {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&mu {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&clk {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&iomuxc {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio_gpio0 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio_gpio1 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio_gpio2 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio_gpio3 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio_gpio4 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio_gpio5 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio_gpio6 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_lsio_gpio7 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_conn {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_conn_sdch0 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_conn_sdch1 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&pd_conn_sdch2 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&gpio0 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&gpio1 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&gpio2 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&gpio3 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&gpio4 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&gpio5 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&gpio6 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&gpio7 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&lpuart3 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&usdhc1 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&usdhc2 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
--
2.17.1
More information about the U-Boot
mailing list