[PATCH v1] arm: dts: k3-am625-verdin: fix boot

Nishanth Menon nm at ti.com
Mon Oct 16 17:58:37 CEST 2023


On 13:13-20231010, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> 
> A53 U-Boot proper got broken because nodes marked as 'bootph-pre-ram'
> are no longer available in U-Boot proper before relocation.
> 
> Fix this by marking all nodes in u-boot.dtsi as 'bootph-all'.
> 
> Fixes: 9e644284ab812 ("dm: core: Report bootph-pre-ram/sram node as pre-reloc after relocation")
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> 
Reviewed-by: Nishanth Menon <nm at ti.com>

> ---
> 
>  .../dts/k3-am625-verdin-wifi-dev-u-boot.dtsi  | 72 +++++++++----------
>  1 file changed, 36 insertions(+), 36 deletions(-)
> 
> diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
> index 5d564603eb2..afa24d07a4c 100644
> --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
> +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi
> @@ -17,49 +17,49 @@
>  	};
>  
>  	memory at 80000000 {
> -		bootph-pre-ram;
> +		bootph-all;
>  	};
>  };
>  
>  &cbass_main {
> -	bootph-pre-ram;
> +	bootph-all;
>  
>  	timer at 2400000 {
>  		clock-frequency = <25000000>;
> -		bootph-pre-ram;
> +		bootph-all;
>  	};
>  };
>  
>  &cbass_mcu {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &cbass_wakeup {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &chipid {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &cpsw3g {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &cpsw3g_phy0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &cpsw3g_phy1 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &cpsw_port1 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &cpsw_port2 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  /* MDIO, shared by Verdin ETH_1 (On-module PHY) and Verdin ETH_2_RGMII */
> @@ -67,40 +67,40 @@
>  	/delete-property/ assigned-clocks;
>  	/delete-property/ assigned-clock-parents;
>  	/delete-property/ assigned-clock-rates;
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &dmsc {
> -	bootph-pre-ram;
> +	bootph-all;
>  
>  	k3_sysreset: sysreset-controller {
>  		compatible = "ti,sci-sysreset";
> -		bootph-pre-ram;
> +		bootph-all;
>  	};
>  };
>  
>  &dmss {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &fss {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &k3_clks {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &k3_pds {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &k3_reset {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &main_gpio0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  /* On-module I2C - PMIC_I2C */
> @@ -130,53 +130,53 @@
>  };
>  
>  &main_pmx0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  /* Verdin UART_3, used as the Linux console */
>  &main_uart0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  /* Verdin UART_1 */
>  &main_uart1 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &mcu_pmx0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &pinctrl_ctrl_sleep_moci {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &pinctrl_i2c0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &pinctrl_i2c1 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &pinctrl_sdhci0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &pinctrl_uart0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &pinctrl_uart1 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &pinctrl_wkup_uart0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &sdhci0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &sdhci2 {
> @@ -184,18 +184,18 @@
>  };
>  
>  &secure_proxy_main {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &verdin_ctrl_sleep_moci {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  &wkup_conf {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
>  
>  /* Verdin UART_2 */
>  &wkup_uart0 {
> -	bootph-pre-ram;
> +	bootph-all;
>  };
> -- 
> 2.36.1
> 

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D


More information about the U-Boot mailing list