| Message ID | 20230929134646.214781-6-rogerq@kernel.org |
|---|---|
| State | Accepted |
| Commit | 7e5b6f1cff846218b824a4d906e2831c15864a53 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | arm: dts: k3-am64 / k3-am62: Fix boot | expand |
On 16:46-20230929, Roger Quadros wrote: > Since commit [1] A53 u-boot proper is broken. > This is because nodes marked as 'bootph-pre-ram' are > not available at u-boot proper before relocation. > > To fix this we mark all nodes in sk-u-boot.dtsi as > 'bootph-all'. > > [1] > 9e644284ab812 ("dm: core: Report bootph-pre-ram/sram node as pre-reloc after relocation") > > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > arch/arm/dts/k3-am625-sk-u-boot.dtsi | 54 ++++++++++++++-------------- > 1 file changed, 27 insertions(+), 27 deletions(-) > > diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi > index c1685bc9ca..c658506256 100644 > --- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi > +++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi > @@ -17,113 +17,113 @@ > }; > > memory@80000000 { > - bootph-pre-ram; > + bootph-all; > }; > }; > > &cbass_main { > - bootph-pre-ram; > + bootph-all; > }; > > &main_timer0 { > clock-frequency = <25000000>; > - bootph-pre-ram; > + bootph-all; > }; > > &dmss { > - bootph-pre-ram; > + bootph-all; > }; > > &secure_proxy_main { > - bootph-pre-ram; > + bootph-all; > }; > > &dmsc { > - bootph-pre-ram; > + bootph-all; > }; > > &k3_pds { > - bootph-pre-ram; > + bootph-all; > }; > > &k3_clks { > - bootph-pre-ram; > + bootph-all; > }; > > &k3_reset { > - bootph-pre-ram; > + bootph-all; > }; > > &wkup_conf { > - bootph-pre-ram; > + bootph-all; > }; > > &chipid { > - bootph-pre-ram; > + bootph-all; > }; > > &main_pmx0 { > - bootph-pre-ram; > + bootph-all; > }; > > &main_uart0 { > - bootph-pre-ram; > + bootph-all; > }; > > &main_uart0_pins_default { > - bootph-pre-ram; > + bootph-all; > }; > > &cbass_mcu { > - bootph-pre-ram; > + bootph-all; > }; > > &cbass_wakeup { > - bootph-pre-ram; > + bootph-all; > }; > > &mcu_pmx0 { > - bootph-pre-ram; > + bootph-all; > }; > > &sdhci1 { > - bootph-pre-ram; > + bootph-all; > }; > > &main_mmc1_pins_default { > - bootph-pre-ram; > + bootph-all; > }; > > &fss { > - bootph-pre-ram; > + bootph-all; > }; > > &ospi0_pins_default { > - bootph-pre-ram; > + bootph-all; > }; > > &ospi0 { > - bootph-pre-ram; > + bootph-all; > > flash@0 { > - bootph-pre-ram; > + bootph-all; > > partitions { > - bootph-pre-ram; > + bootph-all; > > partition@3fc0000 { > - bootph-pre-ram; > + bootph-all; > }; > }; > }; > }; > > &cpsw3g { > - bootph-pre-ram; > + bootph-all; > }; > > &cpsw_port1 { > - bootph-pre-ram; > + bootph-all; > }; > > &cpsw_port2 { > -- > 2.34.1 > Reviewed-by: Nishanth Menon <nm@ti.com>
diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi index c1685bc9ca..c658506256 100644 --- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi @@ -17,113 +17,113 @@ }; memory@80000000 { - bootph-pre-ram; + bootph-all; }; }; &cbass_main { - bootph-pre-ram; + bootph-all; }; &main_timer0 { clock-frequency = <25000000>; - bootph-pre-ram; + bootph-all; }; &dmss { - bootph-pre-ram; + bootph-all; }; &secure_proxy_main { - bootph-pre-ram; + bootph-all; }; &dmsc { - bootph-pre-ram; + bootph-all; }; &k3_pds { - bootph-pre-ram; + bootph-all; }; &k3_clks { - bootph-pre-ram; + bootph-all; }; &k3_reset { - bootph-pre-ram; + bootph-all; }; &wkup_conf { - bootph-pre-ram; + bootph-all; }; &chipid { - bootph-pre-ram; + bootph-all; }; &main_pmx0 { - bootph-pre-ram; + bootph-all; }; &main_uart0 { - bootph-pre-ram; + bootph-all; }; &main_uart0_pins_default { - bootph-pre-ram; + bootph-all; }; &cbass_mcu { - bootph-pre-ram; + bootph-all; }; &cbass_wakeup { - bootph-pre-ram; + bootph-all; }; &mcu_pmx0 { - bootph-pre-ram; + bootph-all; }; &sdhci1 { - bootph-pre-ram; + bootph-all; }; &main_mmc1_pins_default { - bootph-pre-ram; + bootph-all; }; &fss { - bootph-pre-ram; + bootph-all; }; &ospi0_pins_default { - bootph-pre-ram; + bootph-all; }; &ospi0 { - bootph-pre-ram; + bootph-all; flash@0 { - bootph-pre-ram; + bootph-all; partitions { - bootph-pre-ram; + bootph-all; partition@3fc0000 { - bootph-pre-ram; + bootph-all; }; }; }; }; &cpsw3g { - bootph-pre-ram; + bootph-all; }; &cpsw_port1 { - bootph-pre-ram; + bootph-all; }; &cpsw_port2 {
Since commit [1] A53 u-boot proper is broken. This is because nodes marked as 'bootph-pre-ram' are not available at u-boot proper before relocation. To fix this we mark all nodes in sk-u-boot.dtsi as 'bootph-all'. [1] 9e644284ab812 ("dm: core: Report bootph-pre-ram/sram node as pre-reloc after relocation") Signed-off-by: Roger Quadros <rogerq@kernel.org> --- arch/arm/dts/k3-am625-sk-u-boot.dtsi | 54 ++++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-)