Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: dts: imx8qm-apalis: replace dm-spl with dm-pre-proper

Browse source 
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>
This commit is contained in:
Igor Opaniuk 2020-03-27 12:28:13 +02:00 committed by Stefano Babic
parent 1efb80c4fc
commit 99897dd80d
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
View file

@ -4,125 +4,125 @@
*/ */
&mu { &mu {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&clk { &clk {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&iomuxc { &iomuxc {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio { &pd_lsio {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio0 { &pd_lsio_gpio0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio1 { &pd_lsio_gpio1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio2 { &pd_lsio_gpio2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio3 { &pd_lsio_gpio3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio4 { &pd_lsio_gpio4 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio5 { &pd_lsio_gpio5 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio6 { &pd_lsio_gpio6 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio7 { &pd_lsio_gpio7 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn { &pd_conn {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch0 { &pd_conn_sdch0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch1 { &pd_conn_sdch1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch2 { &pd_conn_sdch2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio0 { &gpio0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio1 { &gpio1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio2 { &gpio2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio3 { &gpio3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio4 { &gpio4 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio5 { &gpio5 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio6 { &gpio6 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio7 { &gpio7 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart0 { &lpuart0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart1 { &lpuart1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart2 { &lpuart2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart3 { &lpuart3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&usdhc1 { &usdhc1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&usdhc2 { &usdhc2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&usdhc3 { &usdhc3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };