[PATCH 10/12] stm32mp: activate the command stboard for stm32mp25 boards

[Patrick DELAUNAY]

Hi,

On 1/15/24 14:03, Patrice CHOTARD wrote:
>
> On 1/15/24 13:46, Patrick Delaunay wrote:
>> Activate the command stboard for stm32mp25 STMicroelectronics boards,
>> add the default used OTP identifier and the associated board identifier:
>> - stm32mp25xx-ev1 = MB1936
>> - stm32mp25xx-dk = MB1605
>>
>> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
>> ---
>>
>>   arch/arm/mach-stm32mp/include/mach/stm32.h | 1 +
>>   board/st/common/Kconfig                    | 2 +-
>>   board/st/common/cmd_stboard.c              | 2 ++
>>   3 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h
>> index 45c929aa605d..726c390977e3 100644
>> --- a/arch/arm/mach-stm32mp/include/mach/stm32.h
>> +++ b/arch/arm/mach-stm32mp/include/mach/stm32.h
>> @@ -198,6 +198,7 @@ enum forced_boot_mode {
>>   #define BSEC_OTP_SERIAL	5
>>   #define BSEC_OTP_RPN	9
>>   #define BSEC_OTP_PKG	122
>> +#define BSEC_OTP_BOARD	246
>>   #define BSEC_OTP_MAC	247
>>   #endif
>>   
>> diff --git a/board/st/common/Kconfig b/board/st/common/Kconfig
>> index c1c254d07354..5efac658cf4d 100644
>> --- a/board/st/common/Kconfig
>> +++ b/board/st/common/Kconfig
>> @@ -1,7 +1,7 @@
>>   config CMD_STBOARD
>>   	bool "stboard - command for OTP board information"
>>   	depends on ARCH_STM32MP
>> -	default y if TARGET_ST_STM32MP15x || TARGET_ST_STM32MP13x
>> +	default y if TARGET_ST_STM32MP25X || TARGET_ST_STM32MP15X || TARGET_ST_STM32MP13X
> TARGET_ST_STM32MP15x or TARGET_ST_STM32MP15X ? ;-)
> Internally, we use all our flags in uppercase, whereas at upstream there are some
> camelcase as TARGET_ST_STM32MP15x or TARGET_ST_STM32MP13x
>

Thks, I don't see that the Simon patches was not merged.


I will correct this part in V2

and also include the 2 Simon patches which rename the stm32mp config to 
avoid the same issue in futur.


See series "Clean up of bad Kconfig options"

https://patchwork.ozlabs.org/project/uboot/list/?series=339004&state=*


=> [v2,67/87] arm: Rename STM32MP13x

https://patchwork.ozlabs.org/project/uboot/patch/20230129005903.74918-68-sjg@chromium.org/


=> [v2,68/87] arm: Rename STM32MP15x

https://patchwork.ozlabs.org/project/uboot/patch/20230129005903.74918-69-sjg@chromium.org/


>>   	help
>>   	  This compile the stboard command to
>>   	  read and write the board in the OTP.
>> diff --git a/board/st/common/cmd_stboard.c b/board/st/common/cmd_stboard.c
>> index 853ab78bbf16..cb103e69b369 100644
>> --- a/board/st/common/cmd_stboard.c
>> +++ b/board/st/common/cmd_stboard.c
>> @@ -49,7 +49,9 @@ static bool check_stboard(u16 board)
>>   		0x1298,
>>   		0x1341,
>>   		0x1497,
>> +		0x1605, /* stm32mp25xx-dk */
>>   		0x1635,
>> +		0x1936, /* stm32mp25xx-ev1 */
>>   	};
>>   
>>   	for (i = 0; i < ARRAY_SIZE(st_board_id); i++)