[PATCH] configs: stm32mp15: move bootdelay configuration in defconfig

[Patrice CHOTARD]

Hi

On 3/9/21 3:21 PM, Patrice CHOTARD wrote:
> Hi Patrick
> 
> On 3/1/21 7:40 PM, Patrick Delaunay wrote:
>> The STM32MP15 boards have no reason to configure bootdelay in stm32mp1.h
>> as it is already done with CONFIG_BOOTDELAY (default = 2) and in
>> include/env_default.h.
>>
>> This patch allows configuration for customers which reuse stm32mp1.h
>> and reduce the size of the default environment.
>>
>> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
>> ---
>>
>>  configs/stm32mp15_basic_defconfig       | 1 +
>>  configs/stm32mp15_dhcom_basic_defconfig | 1 +
>>  configs/stm32mp15_dhcor_basic_defconfig | 1 +
>>  configs/stm32mp15_trusted_defconfig     | 1 +
>>  include/configs/stm32mp1.h              | 1 -
>>  5 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
>> index 1c680984b8..0864d4f252 100644
>> --- a/configs/stm32mp15_basic_defconfig
>> +++ b/configs/stm32mp15_basic_defconfig
>> @@ -20,6 +20,7 @@ CONFIG_SPL_SPI_SUPPORT=y
>>  CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
>>  CONFIG_DISTRO_DEFAULTS=y
>>  CONFIG_FIT=y
>> +CONFIG_BOOTDELAY=1
>>  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
>>  CONFIG_SPL_LOG=y
>>  CONFIG_BOARD_EARLY_INIT_F=y
>> diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
>> index ed285e9161..e36d34d001 100644
>> --- a/configs/stm32mp15_dhcom_basic_defconfig
>> +++ b/configs/stm32mp15_dhcom_basic_defconfig
>> @@ -19,6 +19,7 @@ CONFIG_FIT=y
>>  CONFIG_SPL_LOAD_FIT=y
>>  CONFIG_SPL_FIT_SOURCE="board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its"
>>  # CONFIG_USE_SPL_FIT_GENERATOR is not set
>> +CONFIG_BOOTDELAY=1
>>  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
>>  CONFIG_BOARD_EARLY_INIT_F=y
>>  CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y
>> diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
>> index a6620561ac..4794b1a14d 100644
>> --- a/configs/stm32mp15_dhcor_basic_defconfig
>> +++ b/configs/stm32mp15_dhcor_basic_defconfig
>> @@ -17,6 +17,7 @@ CONFIG_FIT=y
>>  CONFIG_SPL_LOAD_FIT=y
>>  CONFIG_SPL_FIT_SOURCE="board/dhelectronics/dh_stm32mp1/u-boot-dhcor.its"
>>  # CONFIG_USE_SPL_FIT_GENERATOR is not set
>> +CONFIG_BOOTDELAY=1
>>  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
>>  CONFIG_BOARD_EARLY_INIT_F=y
>>  CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y
>> diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
>> index 107041119f..4becdbb238 100644
>> --- a/configs/stm32mp15_trusted_defconfig
>> +++ b/configs/stm32mp15_trusted_defconfig
>> @@ -13,6 +13,7 @@ CONFIG_ENV_OFFSET_REDUND=0x2C0000
>>  CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
>>  CONFIG_DISTRO_DEFAULTS=y
>>  CONFIG_FIT=y
>> +CONFIG_BOOTDELAY=1
>>  CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
>>  CONFIG_SYS_PROMPT="STM32MP> "
>>  CONFIG_CMD_ADTIMG=y
>> diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
>> index 36e400453e..db2117a3d7 100644
>> --- a/include/configs/stm32mp1.h
>> +++ b/include/configs/stm32mp1.h
>> @@ -160,7 +160,6 @@
>>   * and the ramdisk at the end.
>>   */
>>  #define CONFIG_EXTRA_ENV_SETTINGS \
>> -	"bootdelay=1\0" \
>>  	"kernel_addr_r=0xc2000000\0" \
>>  	"fdt_addr_r=0xc4000000\0" \
>>  	"scriptaddr=0xc4100000\0" \
>>
> 
> Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>
> Thanks
> Patrice
> 
Applied to u-boot-stm/next

Thanks

Patrice