[PATCH 1/6] arm: dts: k3-am64-evm: Fix boot
Roger Quadros
rogerq at kernel.org
Fri Sep 29 15:46:41 CEST 2023
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'.
Move vtt_supply and cbass_mcu node to -r5-evm.dts as
it is only required for R5 SPL.
[1]
9e644284ab812 ("dm: core: Report bootph-pre-ram/sram node as pre-reloc after relocation")
Signed-off-by: Roger Quadros <rogerq at kernel.org>
---
arch/arm/dts/k3-am642-evm-u-boot.dtsi | 56 ++++++++++++---------------
arch/arm/dts/k3-am642-r5-evm.dts | 8 ++++
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi
index c85f57d40f..d06955dfbc 100644
--- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi
+++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi
@@ -11,109 +11,101 @@
};
memory at 80000000 {
- bootph-pre-ram;
+ bootph-all;
};
};
-&vtt_supply {
- bootph-pre-ram;
-};
-
&cbass_main {
- bootph-pre-ram;
-};
-
-&cbass_mcu {
- bootph-pre-ram;
+ bootph-all;
};
&main_timer0 {
- bootph-pre-ram;
+ bootph-all;
clock-frequency = <200000000>;
};
&main_conf {
- bootph-pre-ram;
+ bootph-all;
chipid at 14 {
- bootph-pre-ram;
+ bootph-all;
};
};
&main_pmx0 {
- bootph-pre-ram;
+ bootph-all;
};
&main_i2c0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_i2c0 {
- bootph-pre-ram;
+ bootph-all;
};
&main_uart0_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_uart0 {
- bootph-pre-ram;
+ bootph-all;
};
&usb0 {
dr_mode="peripheral";
- bootph-pre-ram;
+ bootph-all;
};
&usbss0 {
- bootph-pre-ram;
+ bootph-all;
};
&main_mmc1_pins_default {
- bootph-pre-ram;
+ bootph-all;
};
&main_usb0_pins_default {
- 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_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- 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;
};
&sdhci0 {
- bootph-pre-ram;
+ bootph-all;
};
&sdhci1 {
- bootph-pre-ram;
+ bootph-all;
};
&cpsw3g {
- bootph-pre-ram;
+ bootph-all;
};
&cpsw_port2 {
diff --git a/arch/arm/dts/k3-am642-r5-evm.dts b/arch/arm/dts/k3-am642-r5-evm.dts
index 73461f8f6c..696735d8e2 100644
--- a/arch/arm/dts/k3-am642-r5-evm.dts
+++ b/arch/arm/dts/k3-am642-r5-evm.dts
@@ -40,6 +40,10 @@
};
};
+&vtt_supply {
+ bootph-pre-ram;
+};
+
&cbass_main {
sysctrler: sysctrler {
compatible = "ti,am654-system-controller";
@@ -53,6 +57,10 @@
bootph-pre-ram;
};
+&cbass_mcu {
+ bootph-pre-ram;
+};
+
&mcu_esm {
bootph-pre-ram;
};
--
2.34.1
More information about the U-Boot
mailing list