summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@toradex.com>2020-03-27 12:28:13 +0200
committerStefano Babic <sbabic@denx.de>2020-04-07 10:40:56 +0200
commit99897dd80d9db93c1c587a92d41240694f43bffb (patch)
treeac45aa0f017e49bcfbe6670506b9c2f252a50c4c
parent1efb80c4fcb6ad421f1b494409ecd53c60ac4755 (diff)
downloadu-boot-99897dd80d9db93c1c587a92d41240694f43bffb.tar.gz
ARM: dts: imx8qm-apalis: replace dm-spl with dm-pre-proper
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@toradex.com> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
-rw-r--r--arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi62
1 files changed, 31 insertions, 31 deletions
diff --git a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
index 7b1a9550e4..6cdf58c8ad 100644
--- a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
@@ -4,125 +4,125 @@
*/
&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;
};
&lpuart0 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&lpuart1 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};
&lpuart2 {
- 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;
};
&usdhc3 {
- u-boot,dm-spl;
+ u-boot,dm-pre-proper;
};