diff mbox series

[2/2] arm: stm32: Limit u-boot.itb size to 0x160000 bytes on DH STM32MP15 DHSOM

Message ID 20231104163203.117382-2-marex@denx.de
State Accepted
Commit 6d84f6bc75a30214534966efae022cfbb9e8097b
Delegated to: Patrice Chotard
Headers show
Series [1/2] arm: stm32: Enable TCP, IPv6, wget on DH STM32MP15 DHSOM | expand

Commit Message

Marek Vasut Nov. 4, 2023, 4:31 p.m. UTC
The maximum size of u-boot.itb in SPI NOR on DH STM32MP15 DHSOM is
0x160000 . Define this size in U-Boot config to prevent misconfigured
builds from emitting larger u-boot.itb than the one which fits the
SPI NOR area reserved for the blob.

The SPI NOR layout is as follows:
0x00_0000..0x03_ffff ... SPL 1
0x04_0000..0x07_ffff ... SPL 2
0x08_0000..0x1d_ffff ... U-Boot
0x1e_0000..0x1e_ffff ... Environment 1
0x1f_0000..0x1f_ffff ... Environment 2

Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Andreas Geisreiter <ageisreiter@dh-electronics.de>
Cc: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Cc: Patrice Chotard <patrice.chotard@foss.st.com>
Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
Cc: u-boot@dh-electronics.com
Cc: uboot-stm32@st-md-mailman.stormreply.com
---
 configs/stm32mp15_dhcom_basic_defconfig | 2 ++
 configs/stm32mp15_dhcor_basic_defconfig | 2 ++
 2 files changed, 4 insertions(+)

Comments

Patrice CHOTARD Nov. 9, 2023, 7:19 a.m. UTC | #1
On 11/4/23 17:31, Marek Vasut wrote:
> The maximum size of u-boot.itb in SPI NOR on DH STM32MP15 DHSOM is
> 0x160000 . Define this size in U-Boot config to prevent misconfigured
> builds from emitting larger u-boot.itb than the one which fits the
> SPI NOR area reserved for the blob.
> 
> The SPI NOR layout is as follows:
> 0x00_0000..0x03_ffff ... SPL 1
> 0x04_0000..0x07_ffff ... SPL 2
> 0x08_0000..0x1d_ffff ... U-Boot
> 0x1e_0000..0x1e_ffff ... Environment 1
> 0x1f_0000..0x1f_ffff ... Environment 2
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> ---
> Cc: Andreas Geisreiter <ageisreiter@dh-electronics.de>
> Cc: Christoph Niedermaier <cniedermaier@dh-electronics.com>
> Cc: Patrice Chotard <patrice.chotard@foss.st.com>
> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Cc: u-boot@dh-electronics.com
> Cc: uboot-stm32@st-md-mailman.stormreply.com
> ---
>  configs/stm32mp15_dhcom_basic_defconfig | 2 ++
>  configs/stm32mp15_dhcor_basic_defconfig | 2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
> index 08aac878f8e..1d241529be7 100644
> --- a/configs/stm32mp15_dhcom_basic_defconfig
> +++ b/configs/stm32mp15_dhcom_basic_defconfig
> @@ -25,6 +25,8 @@ CONFIG_SPL_SPI=y
>  CONFIG_SYS_LOAD_ADDR=0xc2000000
>  CONFIG_SYS_MEMTEST_START=0xc0000000
>  CONFIG_SYS_MEMTEST_END=0xc4000000
> +CONFIG_HAS_BOARD_SIZE_LIMIT=y
> +CONFIG_BOARD_SIZE_LIMIT=1441792
>  CONFIG_FIT=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000
> diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
> index 8cd6924b580..6e0c4a8cf9f 100644
> --- a/configs/stm32mp15_dhcor_basic_defconfig
> +++ b/configs/stm32mp15_dhcor_basic_defconfig
> @@ -23,6 +23,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
>  CONFIG_SPL_SPI=y
>  # CONFIG_ARMV7_VIRT is not set
>  CONFIG_SYS_LOAD_ADDR=0xc2000000
> +CONFIG_HAS_BOARD_SIZE_LIMIT=y
> +CONFIG_BOARD_SIZE_LIMIT=1441792
>  CONFIG_FIT=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

Thanks
Patrice
Patrice CHOTARD Nov. 10, 2023, 12:24 p.m. UTC | #2
On 11/9/23 08:19, Patrice CHOTARD wrote:
> 
> 
> On 11/4/23 17:31, Marek Vasut wrote:
>> The maximum size of u-boot.itb in SPI NOR on DH STM32MP15 DHSOM is
>> 0x160000 . Define this size in U-Boot config to prevent misconfigured
>> builds from emitting larger u-boot.itb than the one which fits the
>> SPI NOR area reserved for the blob.
>>
>> The SPI NOR layout is as follows:
>> 0x00_0000..0x03_ffff ... SPL 1
>> 0x04_0000..0x07_ffff ... SPL 2
>> 0x08_0000..0x1d_ffff ... U-Boot
>> 0x1e_0000..0x1e_ffff ... Environment 1
>> 0x1f_0000..0x1f_ffff ... Environment 2
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> ---
>> Cc: Andreas Geisreiter <ageisreiter@dh-electronics.de>
>> Cc: Christoph Niedermaier <cniedermaier@dh-electronics.com>
>> Cc: Patrice Chotard <patrice.chotard@foss.st.com>
>> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
>> Cc: u-boot@dh-electronics.com
>> Cc: uboot-stm32@st-md-mailman.stormreply.com
>> ---
>>  configs/stm32mp15_dhcom_basic_defconfig | 2 ++
>>  configs/stm32mp15_dhcor_basic_defconfig | 2 ++
>>  2 files changed, 4 insertions(+)
>>
>> diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
>> index 08aac878f8e..1d241529be7 100644
>> --- a/configs/stm32mp15_dhcom_basic_defconfig
>> +++ b/configs/stm32mp15_dhcom_basic_defconfig
>> @@ -25,6 +25,8 @@ CONFIG_SPL_SPI=y
>>  CONFIG_SYS_LOAD_ADDR=0xc2000000
>>  CONFIG_SYS_MEMTEST_START=0xc0000000
>>  CONFIG_SYS_MEMTEST_END=0xc4000000
>> +CONFIG_HAS_BOARD_SIZE_LIMIT=y
>> +CONFIG_BOARD_SIZE_LIMIT=1441792
>>  CONFIG_FIT=y
>>  CONFIG_SPL_LOAD_FIT=y
>>  CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000
>> diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
>> index 8cd6924b580..6e0c4a8cf9f 100644
>> --- a/configs/stm32mp15_dhcor_basic_defconfig
>> +++ b/configs/stm32mp15_dhcor_basic_defconfig
>> @@ -23,6 +23,8 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
>>  CONFIG_SPL_SPI=y
>>  # CONFIG_ARMV7_VIRT is not set
>>  CONFIG_SYS_LOAD_ADDR=0xc2000000
>> +CONFIG_HAS_BOARD_SIZE_LIMIT=y
>> +CONFIG_BOARD_SIZE_LIMIT=1441792
>>  CONFIG_FIT=y
>>  CONFIG_SPL_LOAD_FIT=y
>>  CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000
> Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
> 
> Thanks
> Patrice
Applied to u-boot-stm32/master

Thanks
Patrice
diff mbox series

Patch

diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
index 08aac878f8e..1d241529be7 100644
--- a/configs/stm32mp15_dhcom_basic_defconfig
+++ b/configs/stm32mp15_dhcom_basic_defconfig
@@ -25,6 +25,8 @@  CONFIG_SPL_SPI=y
 CONFIG_SYS_LOAD_ADDR=0xc2000000
 CONFIG_SYS_MEMTEST_START=0xc0000000
 CONFIG_SYS_MEMTEST_END=0xc4000000
+CONFIG_HAS_BOARD_SIZE_LIMIT=y
+CONFIG_BOARD_SIZE_LIMIT=1441792
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000
diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
index 8cd6924b580..6e0c4a8cf9f 100644
--- a/configs/stm32mp15_dhcor_basic_defconfig
+++ b/configs/stm32mp15_dhcor_basic_defconfig
@@ -23,6 +23,8 @@  CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 # CONFIG_ARMV7_VIRT is not set
 CONFIG_SYS_LOAD_ADDR=0xc2000000
+CONFIG_HAS_BOARD_SIZE_LIMIT=y
+CONFIG_BOARD_SIZE_LIMIT=1441792
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000