Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: Rename STM32MP13x

Browse source 
CONFIG options must not use lower-case letter. Convert this and related
ones to upper case.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@foundries.io>
This commit is contained in:
Patrick Delaunay 2024-01-15 15:05:56 +01:00 committed by Patrice Chotard
parent eff29f0a60
commit 49de864a25
13 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/dts/Makefile
View file

@ -1361,7 +1361,7 @@ dtb-$(CONFIG_ASPEED_AST2600) += ast2600-evb.dtb
dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
dtb-$(CONFIG_STM32MP13x) += \ dtb-$(CONFIG_STM32MP13X) += \
stm32mp135f-dk.dtb stm32mp135f-dk.dtb
dtb-$(CONFIG_STM32MP15x) += \ dtb-$(CONFIG_STM32MP15x) += \

4
arch/arm/mach-stm32mp/Kconfig
View file

@ -37,7 +37,7 @@ choice
prompt "Select STMicroelectronics STM32MPxxx Soc" prompt "Select STMicroelectronics STM32MPxxx Soc"
default STM32MP15x default STM32MP15x
config STM32MP13x config STM32MP13X
bool "Support STMicroelectronics STM32MP13x Soc" bool "Support STMicroelectronics STM32MP13x Soc"
select ARM_SMCCC select ARM_SMCCC
select CPU_V7A select CPU_V7A
@ -127,7 +127,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_MMC2
config STM32_ETZPC config STM32_ETZPC
bool "STM32 Extended TrustZone Protection" bool "STM32 Extended TrustZone Protection"
depends on STM32MP15x || STM32MP13x depends on STM32MP15x || STM32MP13X
default y default y
imply BOOTP_SERVERIP imply BOOTP_SERVERIP
help help

4
arch/arm/mach-stm32mp/Kconfig.13x
View file

@ -1,10 +1,10 @@
if STM32MP13x if STM32MP13X
choice choice
prompt "STM32MP13x board select" prompt "STM32MP13x board select"
optional optional
config TARGET_ST_STM32MP13x config TARGET_ST_STM32MP13X
bool "STMicroelectronics STM32MP13x boards" bool "STMicroelectronics STM32MP13x boards"
imply BOOTSTAGE imply BOOTSTAGE
imply CMD_BOOTSTAGE imply CMD_BOOTSTAGE

2
arch/arm/mach-stm32mp/Makefile
View file

@ -9,7 +9,7 @@ obj-y += bsec.o
obj-y += soc.o obj-y += soc.o
obj-$(CONFIG_STM32MP15x) += stm32mp1/ obj-$(CONFIG_STM32MP15x) += stm32mp1/
obj-$(CONFIG_STM32MP13x) += stm32mp1/ obj-$(CONFIG_STM32MP13X) += stm32mp1/
obj-$(CONFIG_STM32MP25X) += stm32mp2/ obj-$(CONFIG_STM32MP25X) += stm32mp2/
obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o

10
arch/arm/mach-stm32mp/cmd_stm32key.c
View file

@ -19,7 +19,7 @@
* STM32MP13x: 0b111111 = 0x3F for OTP_SECURED closed device * STM32MP13x: 0b111111 = 0x3F for OTP_SECURED closed device
*/ */
#define STM32_OTP_CLOSE_ID 0 #define STM32_OTP_CLOSE_ID 0
#define STM32_OTP_STM32MP13x_CLOSE_MASK 0x3F #define STM32_OTP_STM32MP13X_CLOSE_MASK 0x3F
#define STM32_OTP_STM32MP15x_CLOSE_MASK BIT(6) #define STM32_OTP_STM32MP15x_CLOSE_MASK BIT(6)
/* PKH is the first element of the key list */ /* PKH is the first element of the key list */
@ -61,7 +61,7 @@ static u8 stm32key_index;
static u8 get_key_nb(void) static u8 get_key_nb(void)
{ {
if (IS_ENABLED(CONFIG_STM32MP13x)) if (IS_ENABLED(CONFIG_STM32MP13X))
return ARRAY_SIZE(stm32mp13_list); return ARRAY_SIZE(stm32mp13_list);
if (IS_ENABLED(CONFIG_STM32MP15x)) if (IS_ENABLED(CONFIG_STM32MP15x))
@ -70,7 +70,7 @@ static u8 get_key_nb(void)
static const struct stm32key *get_key(u8 index) static const struct stm32key *get_key(u8 index)
{ {
if (IS_ENABLED(CONFIG_STM32MP13x)) if (IS_ENABLED(CONFIG_STM32MP13X))
return &stm32mp13_list[index]; return &stm32mp13_list[index];
if (IS_ENABLED(CONFIG_STM32MP15x)) if (IS_ENABLED(CONFIG_STM32MP15x))
@ -79,8 +79,8 @@ static const struct stm32key *get_key(u8 index)
static u32 get_otp_close_mask(void) static u32 get_otp_close_mask(void)
{ {
if (IS_ENABLED(CONFIG_STM32MP13x)) if (IS_ENABLED(CONFIG_STM32MP13X))
return STM32_OTP_STM32MP13x_CLOSE_MASK; return STM32_OTP_STM32MP13X_CLOSE_MASK;
if (IS_ENABLED(CONFIG_STM32MP15x)) if (IS_ENABLED(CONFIG_STM32MP15x))
return STM32_OTP_STM32MP15x_CLOSE_MASK; return STM32_OTP_STM32MP15x_CLOSE_MASK;

2
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
View file

@ -30,7 +30,7 @@
#endif #endif
/* size of the OTP struct in NVMEM PTA */ /* size of the OTP struct in NVMEM PTA */
#define _OTP_SIZE_TA(otp) (((otp) * 2 + 2) * 4) #define _OTP_SIZE_TA(otp) (((otp) * 2 + 2) * 4)
#if defined(CONFIG_STM32MP13x) || defined(CONFIG_STM32MP15x) #if defined(CONFIG_STM32MP13X) || defined(CONFIG_STM32MP15x)
/* STM32MP1 with BSEC2 */ /* STM32MP1 with BSEC2 */
#define OTP_SIZE_TA _OTP_SIZE_TA(96) #define OTP_SIZE_TA _OTP_SIZE_TA(96)
#else #else

8
arch/arm/mach-stm32mp/include/mach/stm32.h
View file

@ -71,7 +71,7 @@ enum forced_boot_mode {
* only address used before device tree parsing * only address used before device tree parsing
*/ */
#if defined(CONFIG_STM32MP15x) || defined(CONFIG_STM32MP13x) #if defined(CONFIG_STM32MP15x) || defined(CONFIG_STM32MP13X)
#define STM32_RCC_BASE 0x50000000 #define STM32_RCC_BASE 0x50000000
#define STM32_PWR_BASE 0x50001000 #define STM32_PWR_BASE 0x50001000
#define STM32_SYSCFG_BASE 0x50020000 #define STM32_SYSCFG_BASE 0x50020000
@ -92,7 +92,7 @@ enum forced_boot_mode {
#define STM32_USART1_BASE 0x5C000000 #define STM32_USART1_BASE 0x5C000000
#define STM32_USART2_BASE 0x4000E000 #define STM32_USART2_BASE 0x4000E000
#endif #endif
#ifdef CONFIG_STM32MP13x #ifdef CONFIG_STM32MP13X
#define STM32_USART1_BASE 0x4c000000 #define STM32_USART1_BASE 0x4c000000
#define STM32_USART2_BASE 0x4c001000 #define STM32_USART2_BASE 0x4c001000
#endif #endif
@ -149,7 +149,7 @@ enum forced_boot_mode {
#define TAMP_COPRO_STATE_CRASH 5 #define TAMP_COPRO_STATE_CRASH 5
#endif #endif
#ifdef CONFIG_STM32MP13x #ifdef CONFIG_STM32MP13X
#define TAMP_BOOTCOUNT TAMP_BACKUP_REGISTER(31) #define TAMP_BOOTCOUNT TAMP_BACKUP_REGISTER(31)
#define TAMP_BOOT_CONTEXT TAMP_BACKUP_REGISTER(30) #define TAMP_BOOT_CONTEXT TAMP_BACKUP_REGISTER(30)
#endif #endif
@ -188,7 +188,7 @@ enum forced_boot_mode {
#define BSEC_OTP_MAC 57 #define BSEC_OTP_MAC 57
#define BSEC_OTP_BOARD 59 #define BSEC_OTP_BOARD 59
#endif #endif
#ifdef CONFIG_STM32MP13x #ifdef CONFIG_STM32MP13X
#define BSEC_OTP_RPN 1 #define BSEC_OTP_RPN 1
#define BSEC_OTP_SERIAL 13 #define BSEC_OTP_SERIAL 13
#define BSEC_OTP_MAC 57 #define BSEC_OTP_MAC 57

2
arch/arm/mach-stm32mp/stm32mp1/Makefile
View file

@ -5,7 +5,7 @@
obj-y += cpu.o obj-y += cpu.o
obj-$(CONFIG_STM32MP13x) += stm32mp13x.o obj-$(CONFIG_STM32MP13X) += stm32mp13x.o
obj-$(CONFIG_STM32MP15x) += stm32mp15x.o obj-$(CONFIG_STM32MP15x) += stm32mp15x.o
obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o

4
arch/arm/mach-stm32mp/stm32mp1/fdt.c
View file

@ -270,7 +270,7 @@ static int stm32_fdt_fixup_etzpc(void *fdt, int soc_node)
int offset, shift; int offset, shift;
u32 addr, status, decprot[ETZPC_DECPROT_NB]; u32 addr, status, decprot[ETZPC_DECPROT_NB];
if (IS_ENABLED(CONFIG_STM32MP13x)) { if (IS_ENABLED(CONFIG_STM32MP13X)) {
array = stm32mp13_ip_addr; array = stm32mp13_ip_addr;
array_size = ARRAY_SIZE(stm32mp13_ip_addr); array_size = ARRAY_SIZE(stm32mp13_ip_addr);
} }
@ -491,7 +491,7 @@ int ft_system_setup(void *blob, struct bd_info *bd)
cpu = get_cpu_type(); cpu = get_cpu_type();
get_soc_name(name); get_soc_name(name);
if (IS_ENABLED(CONFIG_STM32MP13x)) if (IS_ENABLED(CONFIG_STM32MP13X))
stm32mp13_fdt_fixup(blob, soc, cpu, name); stm32mp13_fdt_fixup(blob, soc, cpu, name);
if (IS_ENABLED(CONFIG_STM32MP15x)) { if (IS_ENABLED(CONFIG_STM32MP15x)) {

2
board/st/common/Kconfig
View file

@ -1,7 +1,7 @@
config CMD_STBOARD config CMD_STBOARD
bool "stboard - command for OTP board information" bool "stboard - command for OTP board information"
depends on ARCH_STM32MP depends on ARCH_STM32MP
default y if TARGET_ST_STM32MP25X || TARGET_ST_STM32MP15x || TARGET_ST_STM32MP13x default y if TARGET_ST_STM32MP25X || TARGET_ST_STM32MP15x || TARGET_ST_STM32MP13X
help help
This compile the stboard command to This compile the stboard command to
read and write the board in the OTP. read and write the board in the OTP.

2
board/st/stm32mp1/Kconfig
View file

@ -12,7 +12,7 @@ config SYS_CONFIG_NAME
source "board/st/common/Kconfig" source "board/st/common/Kconfig"
endif endif
if TARGET_ST_STM32MP13x if TARGET_ST_STM32MP13X
config SYS_BOARD config SYS_BOARD
default "stm32mp1" default "stm32mp1"

4
configs/stm32mp13_defconfig
View file

@ -5,10 +5,10 @@ CONFIG_SYS_MALLOC_F_LEN=0x180000
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0400000 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0400000
CONFIG_ENV_OFFSET=0x900000 CONFIG_ENV_OFFSET=0x900000
CONFIG_DEFAULT_DEVICE_TREE="stm32mp135f-dk" CONFIG_DEFAULT_DEVICE_TREE="stm32mp135f-dk"
CONFIG_STM32MP13x=y CONFIG_STM32MP13X=y
CONFIG_DDR_CACHEABLE_SIZE=0x8000000 CONFIG_DDR_CACHEABLE_SIZE=0x8000000
CONFIG_CMD_STM32KEY=y CONFIG_CMD_STM32KEY=y
CONFIG_TARGET_ST_STM32MP13x=y CONFIG_TARGET_ST_STM32MP13X=y
CONFIG_ENV_OFFSET_REDUND=0x940000 CONFIG_ENV_OFFSET_REDUND=0x940000
CONFIG_CMD_STM32PROG=y CONFIG_CMD_STM32PROG=y
# CONFIG_ARMV7_NONSEC is not set # CONFIG_ARMV7_NONSEC is not set

2
drivers/clk/stm32/Kconfig
View file

@ -31,7 +31,7 @@ config CLK_STM32MP1
config CLK_STM32MP13 config CLK_STM32MP13
bool "Enable RCC clock driver for STM32MP13" bool "Enable RCC clock driver for STM32MP13"
depends on ARCH_STM32MP && CLK depends on ARCH_STM32MP && CLK
default y if STM32MP13x default y if STM32MP13X
select CLK_STM32_CORE select CLK_STM32_CORE
help help
Enable the STM32 clock (RCC) driver. Enable support for Enable the STM32 clock (RCC) driver. Enable support for