]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: dts: k3-am625-beagleplay: Fix Boot
authorNishanth Menon <nm@ti.com>
Mon, 2 Oct 2023 15:00:53 +0000 (10:00 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 4 Oct 2023 18:16:01 +0000 (14:16 -0400)
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 u-boot.dtsi as 'bootph-all'.

[1]
9e644284ab812 ("dm: core: Report bootph-pre-ram/sram node as pre-reloc after relocation")

Reported-by: Roger Quadros <rogerq@kernel.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi

index f8c04e8a300a41e9bf743601bb9afec7df2f231a..d6c6baa5518bd15ff1091e60f8e88c6f6a86cab8 100644 (file)
        };
 
        memory@80000000 {
-               bootph-pre-ram;
+               bootph-all;
        };
 
        /* Keep the LEDs on by default to indicate life */
        leds {
-               bootph-pre-ram;
+               bootph-all;
                led-0 {
                        default-state = "on";
-                       bootph-pre-ram;
+                       bootph-all;
                };
 
                led-1 {
                        default-state = "on";
-                       bootph-pre-ram;
+                       bootph-all;
                };
 
                led-2 {
                        default-state = "on";
-                       bootph-pre-ram;
+                       bootph-all;
                };
 
                led-3 {
                        default-state = "on";
-                       bootph-pre-ram;
+                       bootph-all;
                };
 
                led-4 {
                        default-state = "on";
-                       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;
 };
 
 &dmsc {
-       bootph-pre-ram;
+       bootph-all;
        k3_sysreset: sysreset-controller {
                compatible = "ti,sci-sysreset";
-               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;
 };
 
 &console_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;
 };
 
 &main_i2c0 {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &local_i2c_pins_default {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &gpio0_pins_default {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &main_gpio0 {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &main_gpio1 {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &sdhci0 {
        /* EMMC */
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &emmc_pins_default {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &sd_pins_default {
-       bootph-pre-ram;
+       bootph-all;
        /* Force to use SDCD card detect pin */
        pinctrl-single,pins = <
                AM62X_IOPAD(0x023c, PIN_INPUT, 0) /* (A21) MMC1_CMD */
 };
 
 &tps65219 {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &sdhci1 {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 #ifdef CONFIG_TARGET_AM625_A53_EVM