[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Michal Simek]

There shouldn't be a need to use loadables propertyn because u-boot can be
pointed by firmware property. This change should also speedup boot process
because loadables property is list of strings which code is going through.
On the other hand firmware can just point to one image.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Changes in v2:
- Also add dhcor
- Fix subject typo

Only done based on grepping the code. Please retest.

---
 board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its | 8 ++++----
 board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its b/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
index 905be57dffd7..dfe89bfad67e 100644
--- a/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
+++ b/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
@@ -39,28 +39,28 @@
 		config-1 {
 			/* DT+SoM+board model */
 			description = "dh,stm32mp15xx-dhcom-pdk2_somrev0_boardrev0";
-			loadables = "uboot";
+			firmware = "uboot";
 			fdt = "fdt-1";
 		};
 
 		config-2 {
 			/* DT+SoM+board model */
 			description = "dh,stm32mp15xx-dhcom-pdk2_somrev1_boardrev0";
-			loadables = "uboot";
+			firmware = "uboot";
 			fdt = "fdt-1";
 		};
 
 		config-3 {
 			/* DT+SoM+board model */
 			description = "dh,stm32mp15xx-dhcom-drc02_somrev0_boardrev0";
-			loadables = "uboot";
+			firmware = "uboot";
 			fdt = "fdt-2";
 		};
 
 		config-4 {
 			/* DT+SoM+board model */
 			description = "dh,stm32mp15xx-dhcom-drc02_somrev1_boardrev0";
-			loadables = "uboot";
+			firmware = "uboot";
 			fdt = "fdt-2";
 		};
 
diff --git a/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its b/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
index 7419684f5599..0ea10a14972e 100644
--- a/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
+++ b/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
@@ -31,7 +31,7 @@
 		config-1 {
 			/* DT+SoM+board model */
 			description = "arrow,stm32mp15xx-avenger96_somrev0_boardrev1";
-			loadables = "uboot";
+			firmware = "uboot";
 			fdt = "fdt-1";
 		};
 
-- 
2.28.0

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Patrick DELAUNAY]

Hi Michael and Marek,

> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Michal Simek
> Sent: lundi 5 octobre 2020 11:37
> 
> There shouldn't be a need to use loadables propertyn because u-boot can be
> pointed by firmware property. This change should also speedup boot process
> because loadables property is list of strings which code is going through.
> On the other hand firmware can just point to one image.
> 
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> 
> Changes in v2:
> - Also add dhcor
> - Fix subject typo
> 
> Only done based on grepping the code. Please retest.
> 
> ---
>  board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its | 8 ++++----
> board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
> b/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
> index 905be57dffd7..dfe89bfad67e 100644
> --- a/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
> +++ b/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
> @@ -39,28 +39,28 @@
>  		config-1 {
>  			/* DT+SoM+board model */
>  			description = "dh,stm32mp15xx-dhcom-
> pdk2_somrev0_boardrev0";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-1";
>  		};
> 
>  		config-2 {
>  			/* DT+SoM+board model */
>  			description = "dh,stm32mp15xx-dhcom-
> pdk2_somrev1_boardrev0";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-1";
>  		};
> 
>  		config-3 {
>  			/* DT+SoM+board model */
>  			description = "dh,stm32mp15xx-dhcom-
> drc02_somrev0_boardrev0";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-2";
>  		};
> 
>  		config-4 {
>  			/* DT+SoM+board model */
>  			description = "dh,stm32mp15xx-dhcom-
> drc02_somrev1_boardrev0";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-2";
>  		};
> 
> diff --git a/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
> b/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
> index 7419684f5599..0ea10a14972e 100644
> --- a/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
> +++ b/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
> @@ -31,7 +31,7 @@
>  		config-1 {
>  			/* DT+SoM+board model */
>  			description = "arrow,stm32mp15xx-
> avenger96_somrev0_boardrev1";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-1";
>  		};
> 
> --
> 2.28.0

Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>

Marek, I don't see any objection, it is also ok for you ? 
And can you test dh board with this patch ?

Thanks

Patrick

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Marek Vasut]

On 10/13/20 7:01 PM, Patrick DELAUNAY wrote:
> Hi Michael and Marek,

[...]

> Marek, I don't see any objection, it is also ok for you ? 
> And can you test dh board with this patch ?

I plan to test that , yes. Note that I am still not entirely sure
whether loadables and firmware are the same thing with both SPL fit and
SPL fit-full, I recall there was some strange difference in behavior.

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Patrice CHOTARD]

Hi Patrick

On 10/5/20 11:37 AM, Michal Simek wrote:
> There shouldn't be a need to use loadables propertyn because u-boot can be
> pointed by firmware property. This change should also speedup boot process
> because loadables property is list of strings which code is going through.
> On the other hand firmware can just point to one image.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> Changes in v2:
> - Also add dhcor
> - Fix subject typo
>
> Only done based on grepping the code. Please retest.
>
> ---
>  board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its | 8 ++++----
>  board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its b/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
> index 905be57dffd7..dfe89bfad67e 100644
> --- a/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
> +++ b/board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its
> @@ -39,28 +39,28 @@
>  		config-1 {
>  			/* DT+SoM+board model */
>  			description = "dh,stm32mp15xx-dhcom-pdk2_somrev0_boardrev0";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-1";
>  		};
>  
>  		config-2 {
>  			/* DT+SoM+board model */
>  			description = "dh,stm32mp15xx-dhcom-pdk2_somrev1_boardrev0";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-1";
>  		};
>  
>  		config-3 {
>  			/* DT+SoM+board model */
>  			description = "dh,stm32mp15xx-dhcom-drc02_somrev0_boardrev0";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-2";
>  		};
>  
>  		config-4 {
>  			/* DT+SoM+board model */
>  			description = "dh,stm32mp15xx-dhcom-drc02_somrev1_boardrev0";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-2";
>  		};
>  
> diff --git a/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its b/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
> index 7419684f5599..0ea10a14972e 100644
> --- a/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
> +++ b/board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its
> @@ -31,7 +31,7 @@
>  		config-1 {
>  			/* DT+SoM+board model */
>  			description = "arrow,stm32mp15xx-avenger96_somrev0_boardrev1";
> -			loadables = "uboot";
> +			firmware = "uboot";
>  			fdt = "fdt-1";
>  		};
>  

Reviewed-by: Patrice Chotard <patrice.chotard@st.com>

Thanks

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Marek Vasut]

On 10/21/20 2:05 PM, Patrice CHOTARD wrote:
> Hi Patrick
> 
> On 10/5/20 11:37 AM, Michal Simek wrote:
>> There shouldn't be a need to use loadables propertyn because u-boot can be
>> pointed by firmware property. This change should also speedup boot process
>> because loadables property is list of strings which code is going through.
>> On the other hand firmware can just point to one image.

Note that this patch currently cannot be tested because SPL fitImage
loading is broken on arm32, see [PATCH] Revert "Fix data abort caused by
mis-aligning FIT data" .

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Michal Simek]

Hi Marek,

st 21. 10. 2020 v 14:31 odes?latel Marek Vasut <marex@denx.de> napsal:
>
> On 10/21/20 2:05 PM, Patrice CHOTARD wrote:
> > Hi Patrick
> >
> > On 10/5/20 11:37 AM, Michal Simek wrote:
> >> There shouldn't be a need to use loadables propertyn because u-boot can be
> >> pointed by firmware property. This change should also speedup boot process
> >> because loadables property is list of strings which code is going through.
> >> On the other hand firmware can just point to one image.
>
> Note that this patch currently cannot be tested because SPL fitImage
> loading is broken on arm32, see [PATCH] Revert "Fix data abort caused by
> mis-aligning FIT data" .

Is this fixed now?

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Marek Vasut]

On 11/23/20 9:18 AM, Michal Simek wrote:
> Hi Marek,

Hi,

> st 21. 10. 2020 v 14:31 odes?latel Marek Vasut <marex@denx.de> napsal:
>>
>> On 10/21/20 2:05 PM, Patrice CHOTARD wrote:
>>> Hi Patrick
>>>
>>> On 10/5/20 11:37 AM, Michal Simek wrote:
>>>> There shouldn't be a need to use loadables propertyn because u-boot can be
>>>> pointed by firmware property. This change should also speedup boot process
>>>> because loadables property is list of strings which code is going through.
>>>> On the other hand firmware can just point to one image.
>>
>> Note that this patch currently cannot be tested because SPL fitImage
>> loading is broken on arm32, see [PATCH] Revert "Fix data abort caused by
>> mis-aligning FIT data" .
> 
> Is this fixed now?

Yes.

I would prefer this patch to be applied for next though.

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Michal Simek]

On 24. 11. 20 23:34, Marek Vasut wrote:
> On 11/23/20 9:18 AM, Michal Simek wrote:
>> Hi Marek,
> 
> Hi,
> 
>> st 21. 10. 2020 v 14:31 odes?latel Marek Vasut <marex@denx.de> napsal:
>>>
>>> On 10/21/20 2:05 PM, Patrice CHOTARD wrote:
>>>> Hi Patrick
>>>>
>>>> On 10/5/20 11:37 AM, Michal Simek wrote:
>>>>> There shouldn't be a need to use loadables propertyn because u-boot
>>>>> can be
>>>>> pointed by firmware property. This change should also speedup boot
>>>>> process
>>>>> because loadables property is list of strings which code is going
>>>>> through.
>>>>> On the other hand firmware can just point to one image.
>>>
>>> Note that this patch currently cannot be tested because SPL fitImage
>>> loading is broken on arm32, see [PATCH] Revert "Fix data abort caused by
>>> mis-aligning FIT data" .
>>
>> Is this fixed now?
> 
> Yes.
> 
> I would prefer this patch to be applied for next though.

Not a problem for me.

Thanks,
Michal

[PATCH v2] ARM: stm32: Use firmware property instead of loadables

[Patrick DELAUNAY]

Hi Michael

> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Michal Simek
> Sent: lundi 5 octobre 2020 11:37
>
> There shouldn't be a need to use loadables propertyn because u-boot can be pointed by firmware property. This change should also speedup boot process because loadables property is list of strings which code is going through.
> On the other hand firmware can just point to one image.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> Changes in v2:
> - Also add dhcor
> - Fix subject typo
>
> Only done based on grepping the code. Please retest.
>
> ---
>    board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its | 8 ++++----  board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its | 2 +-
>    2 files changed, 5 insertions(+), 5 deletions(-)
>

Applied to u-boot-stm/master, thanks!

Regards

Patrick