stm32mp1: split board and SOC support for STM32MP15x family
Subsystems (3)
cover stm32mp1: split board and SOC support for STM32MP15x family
This serie prepare the introduction of boards with STM32MP15x SOC not provided by STMicroelectronics.
I introduce two new CONFIG: one for SOC and one ST boards (EV1, DK1, DK2). And also create a new directory board/st/common to manage part common with all the board (today only command stboard).
Patrick Delaunay (3):
stm32mp1: move stboard command in board/st/common directory
board: stm32mp1: move CONFIG_ENV_XXX in defconfig
stm32mp1: split board and SOC support for STM32MP15x family
arch/arm/dts/Makefile | 2 +-
arch/arm/mach-stm32mp/Kconfig | 32 +++++++++++++++------
board/st/common/Kconfig | 7 +++++
board/st/common/MAINTAINERS | 6 ++++
board/st/common/Makefile | 6 ++++
board/st/{stm32mp1 => common}/cmd_stboard.c | 3 ++
board/st/stm32mp1/Kconfig | 20 ++-----------
board/st/stm32mp1/Makefile | 1 -
board/st/stm32mp1/stm32mp1.c | 2 +-
configs/stm32mp15_basic_defconfig | 4 ++-
configs/stm32mp15_optee_defconfig | 4 ++-
configs/stm32mp15_trusted_defconfig | 4 ++-
12 files changed, 59 insertions(+), 32 deletions(-)
create mode 100644 board/st/common/Kconfig
create mode 100644 board/st/common/MAINTAINERS
create mode 100644 board/st/common/Makefile
rename board/st/{stm32mp1 => common}/cmd_stboard.c (98%)Signature · 1 line
2.17.1
PATCH 1/3 stm32mp1: move stboard command in board/st/common directory
Move the ST command in board/st/common, as this command is only used by ST board. Prepare the support in U-Boot of boards with STM32MP15x SOC but not STMicroelectronics.
---
board/st/common/Kconfig | 6 ++++++
board/st/common/MAINTAINERS | 6 ++++++
board/st/common/Makefile | 6 ++++++
board/st/{stm32mp1 => common}/cmd_stboard.c | 3 +++
board/st/stm32mp1/Kconfig | 9 ++-------
board/st/stm32mp1/Makefile | 1 -
6 files changed, 23 insertions(+), 8 deletions(-)
create mode 100644 board/st/common/Kconfig
create mode 100644 board/st/common/MAINTAINERS
create mode 100644 board/st/common/Makefile
rename board/st/{stm32mp1 => common}/cmd_stboard.c (98%)board/st/common/Kconfig new file +6 -0
@@ -0,0 +1,6 @@ +config CMD_STBOARD + bool "stboard - command for OTP board information" + default y + help + This compile the stboard command to + read and write the board in the OTP.
board/st/common/MAINTAINERS new file +6 -0
@@ -0,0 +1,6 @@ +ST BOARDS +M: Patrick Delaunay <[email protected]> +L: uboot-stm32 at st-md-mailman.stormreply.com (moderated for non-subscribers) +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-stm.git +S: Maintained +F: board/st/common/
board/st/common/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# +# Copyright (C) 2020, STMicroelectronics - All Rights Reserved +# + +obj-$(CONFIG_CMD_STBOARD) += cmd_stboard.o
board/st/common/cmd_stboard.c renamed from board/st/stm32mp1/cmd_stboard.c +3 -0
@@ -3,6 +3,7 @@* Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ +#ifndef CONFIG_SPL_BUILD #include <common.h> #include <console.h> #include <misc.h>
@@ -143,3 +144,5 @@ U_BOOT_CMD(stboard, 6, 0, do_stboard," - Variant: 1 ... 15\n" " - Revision: A...O\n" " - BOM: 1...15\n"); + +#endif
board/st/stm32mp1/Kconfig +2 -7
@@ -15,15 +15,10 @@ config ENV_SECT_SIZE config ENV_OFFSET default 0x280000 if ENV_IS_IN_SPI_FLASH -config CMD_STBOARD - bool "stboard - command for OTP board information" - default y - help - This compile the stboard command to - read and write the board in the OTP. - config TARGET_STM32MP157C_DK2 bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board" default y +source "board/st/common/Kconfig" + endif
board/st/stm32mp1/Makefile +0 -1
@@ -7,7 +7,6 @@ ifdef CONFIG_SPL_BUILD obj-y += spl.o else obj-y += stm32mp1.o -obj-$(CONFIG_CMD_STBOARD) += cmd_stboard.o endif obj-y += board.o
Signature · 1 line
2.17.1
PATCH 1/3 stm32mp1: move stboard command in board/st/common directory
Hi Patrick
Quoted 103 lines · Patrick Delaunay
Move the ST command in board/st/common, as this command is only used by ST board. Prepare the support in U-Boot of boards with STM32MP15x SOC but not STMicroelectronics.
Signed-off-by Patrick Delaunay <[email protected]>---
board/st/common/Kconfig | 6 ++++++ board/st/common/MAINTAINERS | 6 ++++++ board/st/common/Makefile | 6 ++++++ board/st/{stm32mp1 => common}/cmd_stboard.c | 3 +++ board/st/stm32mp1/Kconfig | 9 ++------- board/st/stm32mp1/Makefile | 1 - 6 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 board/st/common/Kconfig create mode 100644 board/st/common/MAINTAINERS create mode 100644 board/st/common/Makefile rename board/st/{stm32mp1 => common}/cmd_stboard.c (98%)board/st/common/Kconfig new file +6
-0@@ -0,0 +1,6 @@ +config CMD_STBOARD + bool "stboard - command for OTP board information" + default y + help + This compile the stboard command to + read and write the board in the OTP.board/st/common/MAINTAINERS new file +6
-0@@ -0,0 +1,6 @@ +ST BOARDS +M: Patrick Delaunay <[email protected]> +L: uboot-stm32 at st-md-mailman.stormreply.com (moderated for non-subscribers) +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-stm.git +S: Maintained +F: board/st/common/board/st/common/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# +# Copyright (C) 2020, STMicroelectronics - All Rights Reserved +# + +obj-$(CONFIG_CMD_STBOARD) += cmd_stboard.oboard/st/common/cmd_stboard.c renamed from board/st/stm32mp1/cmd_stboard.c +3
-0@@ -3,6 +3,7 @@* Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ +#ifndef CONFIG_SPL_BUILD #include <common.h> #include <console.h> #include <misc.h> @@ -143,3 +144,5 @@ U_BOOT_CMD(stboard, 6, 0, do_stboard," - Variant: 1 ... 15\n" " - Revision: A...O\n" " - BOM: 1...15\n"); + +#endif board/st/stm32mp1/Kconfig +2
-7@@ -15,15 +15,10 @@ config ENV_SECT_SIZE config ENV_OFFSET default 0x280000 if ENV_IS_IN_SPI_FLASH -config CMD_STBOARD - bool "stboard - command for OTP board information" - default y - help - This compile the stboard command to - read and write the board in the OTP. - config TARGET_STM32MP157C_DK2 bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board" default y +source "board/st/common/Kconfig" + endifboard/st/stm32mp1/Makefile +0
-0
board/st/stm32mp1/Makefile ifdef CONFIG_SPL_BUILD · line 12
Quoted 7 lines
board/st/stm32mp1/Makefile +0
-1@@ -7,7 +7,6 @@ ifdef CONFIG_SPL_BUILD obj-y += spl.o else obj-y += stm32mp1.o -obj-$(CONFIG_CMD_STBOARD) += cmd_stboard.o endif obj-y += board.o
Thanks
PATCH 1/3 stm32mp1: move stboard command in board/st/common directory
In reply to Patrick DelaunayHi,
Quoted 9 lines
From: Patrick DELAUNAY <[email protected]>
Sent: lundi 13 janvier 2020 15:18Move the ST command in board/st/common, as this command is only used by ST board. Prepare the support in U-Boot of boards with STM32MP15x SOC but not STMicroelectronics.
Signed-off-by Patrick Delaunay <[email protected]>---
Applied to u-boot-stm32/master, thanks!
Regards
Patrick
PATCH 2/3 board: stm32mp1: move CONFIG_ENV_XXX in defconfig
In reply to Patrick DelaunayMove CONFIG_ENV_SECT_SIZE and CONFIG_ENV_OFFSET in stm32mp15_*_defconfig for ST board with NOR support (STM32MP15xx-EV1 boards)
- CONFIG_SECT_SIZE values = the max supported NOR erase size (256KB)
- CONFIG_ENV_OFFSET = offset for NOR (ENV_IS_IN_SPI_FLASH)
This Patch prepares the U-Boot support of boards with STM32MP15x SOC not provided by STMicroelectronics.
---
board/st/stm32mp1/Kconfig | 6 ------ configs/stm32mp15_basic_defconfig | 2 ++ configs/stm32mp15_optee_defconfig | 2 ++ configs/stm32mp15_trusted_defconfig | 2 ++ 4 files changed, 6 insertions(+), 6 deletions(-)
board/st/stm32mp1/Kconfig +0 -6
@@ -9,12 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stm32mp1" -config ENV_SECT_SIZE - default 0x40000 if ENV_IS_IN_SPI_FLASH - -config ENV_OFFSET - default 0x280000 if ENV_IS_IN_SPI_FLASH - config TARGET_STM32MP157C_DK2 bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board" default y
configs/stm32mp15_basic_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 +CONFIG_ENV_SECT_SIZE=0x40000 +CONFIG_ENV_OFFSET=0x280000 CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y CONFIG_TARGET_STM32MP1=y
configs/stm32mp15_optee_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 +CONFIG_ENV_SECT_SIZE=0x40000 +CONFIG_ENV_OFFSET=0x280000 CONFIG_TARGET_STM32MP1=y CONFIG_STM32MP1_OPTEE=y CONFIG_DISTRO_DEFAULTS=y
configs/stm32mp15_trusted_defconfig +2 -0
@@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 +CONFIG_ENV_SECT_SIZE=0x40000 +CONFIG_ENV_OFFSET=0x280000 CONFIG_TARGET_STM32MP1=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y
Signature · 1 line
2.17.1
PATCH 2/3 board: stm32mp1: move CONFIG_ENV_XXX in defconfig
Hi
Quoted 65 lines · Patrick Delaunay
Move
CONFIG_ENV_SECT_SIZEandCONFIG_ENV_OFFSETin stm32mp15_*_defconfig for ST board with NOR support (STM32MP15xx-EV1 boards)
-CONFIG_SECT_SIZEvalues = the max supported NOR erase size (256KB)
-CONFIG_ENV_OFFSET= offset for NOR (ENV_IS_IN_SPI_FLASH)This Patch prepares the U-Boot support of boards with STM32MP15x SOC not provided by STMicroelectronics.
Signed-off-by Patrick Delaunay <[email protected]>---
board/st/stm32mp1/Kconfig | 6 ------ configs/stm32mp15_basic_defconfig | 2 ++ configs/stm32mp15_optee_defconfig | 2 ++ configs/stm32mp15_trusted_defconfig | 2 ++ 4 files changed, 6 insertions(+), 6 deletions(-)board/st/stm32mp1/Kconfig +0
-6@@ -9,12 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stm32mp1" -config ENV_SECT_SIZE - default 0x40000 if ENV_IS_IN_SPI_FLASH - -config ENV_OFFSET - default 0x280000 if ENV_IS_IN_SPI_FLASH - config TARGET_STM32MP157C_DK2 bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board" default yconfigs/stm32mp15_basic_defconfig +2
-0@@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 +CONFIG_ENV_SECT_SIZE=0x40000 +CONFIG_ENV_OFFSET=0x280000 CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y CONFIG_TARGET_STM32MP1=yconfigs/stm32mp15_optee_defconfig +2
-0@@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 +CONFIG_ENV_SECT_SIZE=0x40000 +CONFIG_ENV_OFFSET=0x280000 CONFIG_TARGET_STM32MP1=y CONFIG_STM32MP1_OPTEE=y CONFIG_DISTRO_DEFAULTS=yconfigs/stm32mp15_trusted_defconfig +0
-0
configs/stm32mp15_trusted_defconfig line 8
Quoted 8 lines
configs/stm32mp15_trusted_defconfig +2
-0@@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 +CONFIG_ENV_SECT_SIZE=0x40000 +CONFIG_ENV_OFFSET=0x280000 CONFIG_TARGET_STM32MP1=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y
Thanks
PATCH 2/3 board: stm32mp1: move CONFIG_ENV_XXX in defconfig
In reply to Patrick DelaunayHi,
Quoted 9 lines
From: Patrick DELAUNAY <[email protected]>
Sent: lundi 13 janvier 2020 15:18Move
CONFIG_ENV_SECT_SIZEandCONFIG_ENV_OFFSETin stm32mp15_*_defconfig for ST board with NOR support (STM32MP15xx-EV1 boards)
-CONFIG_SECT_SIZEvalues = the max supported NOR erase size (256KB)
-CONFIG_ENV_OFFSET= offset for NOR (ENV_IS_IN_SPI_FLASH)
Quoted 5 lines
This Patch prepares the U-Boot support of boards with STM32MP15x SOC not provided by STMicroelectronics.
Signed-off-by Patrick Delaunay <[email protected]>---
Applied to u-boot-stm32/master, thanks!
Regards
Patrick
PATCH 3/3 stm32mp1: split board and SOC support for STM32MP15x family
In reply to Patrick DelaunaySplit 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)
---
arch/arm/dts/Makefile | 2 +- arch/arm/mach-stm32mp/Kconfig | 32 +++++++++++++++++++++-------- board/st/common/Kconfig | 3 ++- board/st/stm32mp1/Kconfig | 7 +------ board/st/stm32mp1/stm32mp1.c | 2 +- configs/stm32mp15_basic_defconfig | 2 +- configs/stm32mp15_optee_defconfig | 2 +- configs/stm32mp15_trusted_defconfig | 2 +- 8 files changed, 32 insertions(+), 20 deletions(-)
arch/arm/dts/Makefile +1 -1
@@ -856,7 +856,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += ast2500-evb.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb -dtb-$(CONFIG_TARGET_STM32MP1) += \ +dtb-$(CONFIG_STM32MP15x) += \ stm32mp157a-dk1.dtb \ stm32mp157a-avenger96.dtb \ stm32mp157c-dk2.dtb \
arch/arm/mach-stm32mp/Kconfig +24 -8
@@ -33,8 +33,8 @@ config SYS_MALLOC_LEN config ENV_SIZE default 0x2000 -config TARGET_STM32MP1 - bool "Support stm32mp1xx" +config STM32MP15x + bool "Support STMicroelectronics STM32MP15x Soc" select ARCH_SUPPORT_PSCI if !STM32MP1_TRUSTED select CPU_V7A select CPU_V7_HAS_NONSEC if !STM32MP1_TRUSTED
@@ -45,19 +45,35 @@ config TARGET_STM32MP1 select STM32_RESET select STM32_SERIAL 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 CMD_BOOTCOUNT imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE imply PRE_CONSOLE_BUFFER imply SILENT_CONSOLE - imply SYSRESET_PSCI if STM32MP1_TRUSTED - imply SYSRESET_SYSCON if !STM32MP1_TRUSTED help - target STMicroelectronics SOC STM32MP1 family - STM32MP157, STM32MP153 or STM32MP151 - STMicroelectronics MPU with core ARMv7 - dual core A7 for STM32MP157/3, monocore for STM32MP151 + target the STMicroelectronics board with SOC STM32MP15x + managed by board/st/stm32mp1: + Evalulation board (EV1) or Discovery board (DK1 and DK2). + The difference between board are managed with devicetree + +endchoice config STM32MP1_TRUSTED bool "Support trusted boot with TF-A"
board/st/common/Kconfig +2 -1
@@ -1,6 +1,7 @@ config CMD_STBOARD bool "stboard - command for OTP board information" - default y + depends on ARCH_STM32MP + default y if TARGET_ST_STM32MP15x help This compile the stboard command to read and write the board in the OTP.
board/st/stm32mp1/Kconfig +1 -6
@@ -1,4 +1,4 @@ -if TARGET_STM32MP1 +if TARGET_ST_STM32MP15x config SYS_BOARD default "stm32mp1"
@@ -9,10 +9,5 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stm32mp1" -config TARGET_STM32MP157C_DK2 - bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board" - default y - source "board/st/common/Kconfig" - endif
board/st/stm32mp1/stm32mp1.c +1 -1
@@ -607,7 +607,7 @@ error: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" ))return true;
configs/stm32mp15_basic_defconfig +1 -1
@@ -5,7 +5,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_OFFSET=0x280000 CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y -CONFIG_TARGET_STM32MP1=y +CONFIG_TARGET_ST_STM32MP15x=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y # CONFIG_ARMV7_VIRT is not set
configs/stm32mp15_optee_defconfig +1 -1
@@ -3,7 +3,7 @@ CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_OFFSET=0x280000 -CONFIG_TARGET_STM32MP1=y +CONFIG_TARGET_ST_STM32MP15x=y CONFIG_STM32MP1_OPTEE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y
configs/stm32mp15_trusted_defconfig +1 -1
@@ -3,7 +3,7 @@ CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_OFFSET=0x280000 -CONFIG_TARGET_STM32MP1=y +CONFIG_TARGET_ST_STM32MP15x=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
Signature · 1 line
2.17.1
PATCH 3/3 stm32mp1: split board and SOC support for STM32MP15x family
Hi
Quoted 168 lines · Patrick Delaunay
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 <[email protected]>---
arch/arm/dts/Makefile | 2 +- arch/arm/mach-stm32mp/Kconfig | 32 +++++++++++++++++++++-------- board/st/common/Kconfig | 3 ++- board/st/stm32mp1/Kconfig | 7 +------ board/st/stm32mp1/stm32mp1.c | 2 +- configs/stm32mp15_basic_defconfig | 2 +- configs/stm32mp15_optee_defconfig | 2 +- configs/stm32mp15_trusted_defconfig | 2 +- 8 files changed, 32 insertions(+), 20 deletions(-)arch/arm/dts/Makefile +1
-1@@ -856,7 +856,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += ast2500-evb.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb -dtb-$(CONFIG_TARGET_STM32MP1) += \ +dtb-$(CONFIG_STM32MP15x) += \ stm32mp157a-dk1.dtb \ stm32mp157a-avenger96.dtb \ stm32mp157c-dk2.dtb \arch/arm/mach-stm32mp/Kconfig +24
-8@@ -33,8 +33,8 @@ config SYS_MALLOC_LEN config ENV_SIZE default 0x2000 -config TARGET_STM32MP1 - bool "Support stm32mp1xx" +config STM32MP15x + bool "Support STMicroelectronics STM32MP15x Soc" select ARCH_SUPPORT_PSCI if !STM32MP1_TRUSTED select CPU_V7A select CPU_V7_HAS_NONSEC if !STM32MP1_TRUSTED@@ -45,19 +45,35 @@ config TARGET_STM32MP1 select STM32_RESET select STM32_SERIAL 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 CMD_BOOTCOUNT imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE imply PRE_CONSOLE_BUFFER imply SILENT_CONSOLE - imply SYSRESET_PSCI if STM32MP1_TRUSTED - imply SYSRESET_SYSCON if !STM32MP1_TRUSTED help - target STMicroelectronics SOC STM32MP1 family - STM32MP157, STM32MP153 or STM32MP151 - STMicroelectronics MPU with core ARMv7 - dual core A7 for STM32MP157/3, monocore for STM32MP151 + target the STMicroelectronics board with SOC STM32MP15x + managed by board/st/stm32mp1: + Evalulation board (EV1) or Discovery board (DK1 and DK2). + The difference between board are managed with devicetree + +endchoice config STM32MP1_TRUSTED bool "Support trusted boot with TF-A"board/st/common/Kconfig +2
-1@@ -1,6 +1,7 @@ config CMD_STBOARD bool "stboard - command for OTP board information" - default y + depends on ARCH_STM32MP + default y if TARGET_ST_STM32MP15x help This compile the stboard command to read and write the board in the OTP.board/st/stm32mp1/Kconfig +1
-6@@ -1,4 +1,4 @@ -if TARGET_STM32MP1 +if TARGET_ST_STM32MP15x config SYS_BOARD default "stm32mp1"@@ -9,10 +9,5 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stm32mp1" -config TARGET_STM32MP157C_DK2 - bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board" - default y - source "board/st/common/Kconfig" - endifboard/st/stm32mp1/stm32mp1.c +1
-1@@ -607,7 +607,7 @@ error: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" ))return true;configs/stm32mp15_basic_defconfig +1
-1@@ -5,7 +5,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_OFFSET=0x280000 CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y -CONFIG_TARGET_STM32MP1=y +CONFIG_TARGET_ST_STM32MP15x=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y # CONFIG_ARMV7_VIRT is not setconfigs/stm32mp15_optee_defconfig +1
-1@@ -3,7 +3,7 @@ CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_OFFSET=0x280000 -CONFIG_TARGET_STM32MP1=y +CONFIG_TARGET_ST_STM32MP15x=y CONFIG_STM32MP1_OPTEE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=yconfigs/stm32mp15_trusted_defconfig +0
-0
configs/stm32mp15_trusted_defconfig CONFIG_ARCH_STM32MP=y · line 9
Quoted 8 lines
configs/stm32mp15_trusted_defconfig +1
-1@@ -3,7 +3,7 @@ CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_OFFSET=0x280000 -CONFIG_TARGET_STM32MP1=y +CONFIG_TARGET_ST_STM32MP15x=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
Thanks
PATCH 3/3 stm32mp1: split board and SOC support for STM32MP15x family
In reply to Patrick DelaunayHi,
Quoted 6 lines
From: Patrick DELAUNAY <[email protected]>
Sent: lundi 13 janvier 2020 15:18Split the board and SOC support for STM32MP15x family and prepare the introduction of new boards with STM32MP15x.
Quoted 6 lines
This path define the 2 configurations:
- STM32MP15x: STM32MP15x soc support (new)
-TARGET_ST_STM32MP15x: STMicroelectronics board support (choice)Signed-off-by Patrick Delaunay <[email protected]>---
Applied to u-boot-stm32/master, thanks!
Regards
Patrick