GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stm32mp1: split board and SOC support for STM32MP15x family

Browse source 
Split the board and SOC support for STM32MP15x family and
prepare the introduction of new boards with STM32MP15x.

This path define the 2 configurations:
- STM32MP15x: STM32MP15x soc support (new)
- TARGET_ST_STM32MP15x: STMicroelectronics board support (choice)

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrick Delaunay 2020-01-13 15:17:42 +01:00
parent 493305716c
commit 846254888e
8 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/dts/Makefile
View file

@ -862,7 +862,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += ast2500-evb.dtb
dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
dtb-$(CONFIG_TARGET_STM32MP1) += \ dtb-$(CONFIG_STM32MP15x) += \
stm32mp157a-dk1.dtb \ stm32mp157a-dk1.dtb \
stm32mp157a-avenger96.dtb \ stm32mp157a-avenger96.dtb \
stm32mp157c-dk2.dtb \ stm32mp157c-dk2.dtb \

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

@ -33,8 +33,8 @@ config SYS_MALLOC_LEN
config ENV_SIZE config ENV_SIZE
default 0x2000 default 0x2000
config TARGET_STM32MP1 config STM32MP15x
bool "Support stm32mp1xx" bool "Support STMicroelectronics STM32MP15x Soc"
select ARCH_SUPPORT_PSCI if !STM32MP1_TRUSTED select ARCH_SUPPORT_PSCI if !STM32MP1_TRUSTED
select CPU_V7A select CPU_V7A
select CPU_V7_HAS_NONSEC if !STM32MP1_TRUSTED select CPU_V7_HAS_NONSEC if !STM32MP1_TRUSTED
@ -45,19 +45,35 @@ config TARGET_STM32MP1
select STM32_RESET select STM32_RESET
select STM32_SERIAL select STM32_SERIAL
select SYS_ARCH_TIMER select SYS_ARCH_TIMER
imply SYSRESET_PSCI if STM32MP1_TRUSTED
imply SYSRESET_SYSCON if !STM32MP1_TRUSTED
help
support of STMicroelectronics SOC STM32MP15x family
STM32MP157, STM32MP153 or STM32MP151
STMicroelectronics MPU with core ARMv7
dual core A7 for STM32MP157/3, monocore for STM32MP151
target all the STMicroelectronics board with SOC STM32MP1 family
choice
prompt "STM32MP15x board select"
optional
config TARGET_ST_STM32MP15x
bool "STMicroelectronics STM32MP15x boards"
select STM32MP15x
imply BOOTCOUNT_LIMIT imply BOOTCOUNT_LIMIT
imply CMD_BOOTCOUNT imply CMD_BOOTCOUNT
imply CMD_CLS if CMD_BMP imply CMD_CLS if CMD_BMP
imply DISABLE_CONSOLE imply DISABLE_CONSOLE
imply PRE_CONSOLE_BUFFER imply PRE_CONSOLE_BUFFER
imply SILENT_CONSOLE imply SILENT_CONSOLE
imply SYSRESET_PSCI if STM32MP1_TRUSTED
imply SYSRESET_SYSCON if !STM32MP1_TRUSTED
help help
target STMicroelectronics SOC STM32MP1 family target the STMicroelectronics board with SOC STM32MP15x
STM32MP157, STM32MP153 or STM32MP151 managed by board/st/stm32mp1:
STMicroelectronics MPU with core ARMv7 Evalulation board (EV1) or Discovery board (DK1 and DK2).
dual core A7 for STM32MP157/3, monocore for STM32MP151 The difference between board are managed with devicetree
endchoice
config STM32MP1_TRUSTED config STM32MP1_TRUSTED
bool "Support trusted boot with TF-A" bool "Support trusted boot with TF-A"

3
board/st/common/Kconfig
View file

@ -1,6 +1,7 @@
config CMD_STBOARD config CMD_STBOARD
bool "stboard - command for OTP board information" bool "stboard - command for OTP board information"
default y depends on ARCH_STM32MP
default y if TARGET_ST_STM32MP15x
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.

7
board/st/stm32mp1/Kconfig
View file

@ -1,4 +1,4 @@
if TARGET_STM32MP1 if TARGET_ST_STM32MP15x
config SYS_BOARD config SYS_BOARD
default "stm32mp1" default "stm32mp1"
@ -9,10 +9,5 @@ config SYS_VENDOR
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "stm32mp1" default "stm32mp1"
config TARGET_STM32MP157C_DK2
bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board"
default y
source "board/st/common/Kconfig" source "board/st/common/Kconfig"
endif endif

2
board/st/stm32mp1/stm32mp1.c
View file

@ -607,7 +607,7 @@ error:
static bool board_is_dk2(void) static bool board_is_dk2(void)
{ {
if (CONFIG_IS_ENABLED(TARGET_STM32MP157C_DK2) && if (CONFIG_IS_ENABLED(TARGET_ST_STM32MP15x) &&
of_machine_is_compatible("st,stm32mp157c-dk2")) of_machine_is_compatible("st,stm32mp157c-dk2"))
return true; return true;

2
configs/stm32mp15_basic_defconfig
View file

@ -5,7 +5,7 @@ CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_ENV_OFFSET=0x280000 CONFIG_ENV_OFFSET=0x280000
CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_TARGET_STM32MP1=y CONFIG_TARGET_ST_STM32MP15x=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
# CONFIG_ARMV7_VIRT is not set # CONFIG_ARMV7_VIRT is not set

2
configs/stm32mp15_optee_defconfig
View file

@ -3,7 +3,7 @@ CONFIG_ARCH_STM32MP=y
CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_SYS_MALLOC_F_LEN=0x3000
CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_ENV_OFFSET=0x280000 CONFIG_ENV_OFFSET=0x280000
CONFIG_TARGET_STM32MP1=y CONFIG_TARGET_ST_STM32MP15x=y
CONFIG_STM32MP1_OPTEE=y CONFIG_STM32MP1_OPTEE=y
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y CONFIG_FIT=y

2
configs/stm32mp15_trusted_defconfig
View file

@ -3,7 +3,7 @@ CONFIG_ARCH_STM32MP=y
CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_SYS_MALLOC_F_LEN=0x3000
CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_ENV_OFFSET=0x280000 CONFIG_ENV_OFFSET=0x280000
CONFIG_TARGET_STM32MP1=y CONFIG_TARGET_ST_STM32MP15x=y
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"