[DistroKit] [PATCH] v7a: barebox: define state for all supported board variants

[DistroKit] [PATCH] v7a: barebox: define state for all supported board variants

[Ahmad Fatoum]

Boot up is broken on some of the Raspberry Pi and STM32MP1 board we
support, because boot method is changed to bootchooser, but state isn't
defined. Fix this by extending state definition to the missed boards.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/dts/bootstate.dtsi | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/configs/platform-v7a/dts/bootstate.dtsi b/configs/platform-v7a/dts/bootstate.dtsi
index c77df2e19d65..cd24d74d4aea 100644
--- a/configs/platform-v7a/dts/bootstate.dtsi
+++ b/configs/platform-v7a/dts/bootstate.dtsi
@@ -39,8 +39,11 @@
 };
 #endif
 
-/** Raspberry Pi 3 Model B ****************************************************/
-#ifdef bcm2837_rpi_3_dts
+/** Raspberry Pi **************************************************************/
+#if defined(bcm2836_rpi_2_dts)   || \
+    defined(bcm2837_rpi_3_dts)   || \
+    defined(bcm2837_rpi_cm3_dts) || \
+    defined(bcm2711_rpi_4_dts)
 / {
 	aliases {
 		state = &state;
@@ -101,8 +104,10 @@
 };
 #endif
 
-/** LXA MC1 *******************************************************************/
-#ifdef stm32mp157c_lxa_mc1_dts
+/** STM32MP1 ******************************************************************/
+#if defined(stm32mp157c_lxa_mc1_dts) || \
+    defined(stm32mp157c_dk2_dts) || \
+    defined(stm32mp157c_ev1_dts)
 / {
 	aliases {
 		state = &state_mmc0;
-- 
2.39.2

Re: [DistroKit] [PATCH] v7a: barebox: define state for all supported board variants

[Roland Hieber]

On Wed, Nov 22, 2023 at 07:55:35PM +0100, Ahmad Fatoum wrote:
> Boot up is broken on some of the Raspberry Pi and STM32MP1 board we
> support, because boot method is changed to bootchooser, but state isn't
> defined. Fix this by extending state definition to the missed boards.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  configs/platform-v7a/dts/bootstate.dtsi | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/platform-v7a/dts/bootstate.dtsi b/configs/platform-v7a/dts/bootstate.dtsi
> index c77df2e19d65..cd24d74d4aea 100644
> --- a/configs/platform-v7a/dts/bootstate.dtsi
> +++ b/configs/platform-v7a/dts/bootstate.dtsi
> @@ -39,8 +39,11 @@
>  };
>  #endif
>  
> -/** Raspberry Pi 3 Model B ****************************************************/
> -#ifdef bcm2837_rpi_3_dts
> +/** Raspberry Pi **************************************************************/
> +#if defined(bcm2836_rpi_2_dts)   || \

Interesting, the kernel DT file names are apparently named "rpi-3-b" and
"rpi-2-b" now, but the "-b" is not part of the barebox device trees.
Anyway, that's a different issue, the patch looks fine to me.

Reviewed-by: Roland Hieber <rhi@pengutronix.de>

> +    defined(bcm2837_rpi_3_dts)   || \
> +    defined(bcm2837_rpi_cm3_dts) || \
> +    defined(bcm2711_rpi_4_dts)
>  / {
>  	aliases {
>  		state = &state;
> @@ -101,8 +104,10 @@
>  };
>  #endif
>  
> -/** LXA MC1 *******************************************************************/
> -#ifdef stm32mp157c_lxa_mc1_dts
> +/** STM32MP1 ******************************************************************/
> +#if defined(stm32mp157c_lxa_mc1_dts) || \
> +    defined(stm32mp157c_dk2_dts) || \
> +    defined(stm32mp157c_ev1_dts)
>  / {
>  	aliases {
>  		state = &state_mmc0;
> -- 
> 2.39.2
> 
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

Re: [DistroKit] [PATCH] v7a: barebox: define state for all supported board variants

[Robert Schwebel]

Applied to next.

On Wed, Nov 22, 2023 at 07:55:35PM +0100, Ahmad Fatoum wrote:
> Boot up is broken on some of the Raspberry Pi and STM32MP1 board we
> support, because boot method is changed to bootchooser, but state isn't
> defined. Fix this by extending state definition to the missed boards.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  configs/platform-v7a/dts/bootstate.dtsi | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/platform-v7a/dts/bootstate.dtsi b/configs/platform-v7a/dts/bootstate.dtsi
> index c77df2e19d65..cd24d74d4aea 100644
> --- a/configs/platform-v7a/dts/bootstate.dtsi
> +++ b/configs/platform-v7a/dts/bootstate.dtsi
> @@ -39,8 +39,11 @@
>  };
>  #endif
>  
> -/** Raspberry Pi 3 Model B ****************************************************/
> -#ifdef bcm2837_rpi_3_dts
> +/** Raspberry Pi **************************************************************/
> +#if defined(bcm2836_rpi_2_dts)   || \
> +    defined(bcm2837_rpi_3_dts)   || \
> +    defined(bcm2837_rpi_cm3_dts) || \
> +    defined(bcm2711_rpi_4_dts)
>  / {
>  	aliases {
>  		state = &state;
> @@ -101,8 +104,10 @@
>  };
>  #endif
>  
> -/** LXA MC1 *******************************************************************/
> -#ifdef stm32mp157c_lxa_mc1_dts
> +/** STM32MP1 ******************************************************************/
> +#if defined(stm32mp157c_lxa_mc1_dts) || \
> +    defined(stm32mp157c_dk2_dts) || \
> +    defined(stm32mp157c_ev1_dts)
>  / {
>  	aliases {
>  		state = &state_mmc0;
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |