Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-stm32mp / Kconfig

diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index 77f66c65c03ecbbce3c55b2df38b50b5351027b6..6c995ed8d8855b990d3b9796113c9b2e3256eb67 100644 (file)
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -16,7 +16,9 @@ config SPL
        select SPL_REGMAP
        select SPL_DM_RESET
        select SPL_SERIAL_SUPPORT
+       select SPL_SPI_LOAD
        select SPL_SYSCON
+       select SPL_WATCHDOG_SUPPORT if WATCHDOG
        imply BOOTSTAGE_STASH if SPL_BOOTSTAGE
        imply SPL_BOOTSTAGE if BOOTSTAGE
        imply SPL_DISPLAY_PRINT
@@ -29,47 +31,63 @@ config SYS_MALLOC_LEN
        default 0x2000000
 
 config ENV_SIZE
-       default 0x1000
+       default 0x2000
 
-config TARGET_STM32MP1
-       bool "Support stm32mp1xx"
-       select ARCH_SUPPORT_PSCI if !STM32MP1_TRUSTED
+config STM32MP15x
+       bool "Support STMicroelectronics STM32MP15x Soc"
+       select ARCH_SUPPORT_PSCI if !TFABOOT
+       select ARM_SMCCC if TFABOOT
        select CPU_V7A
-       select CPU_V7_HAS_NONSEC if !STM32MP1_TRUSTED
+       select CPU_V7_HAS_NONSEC if !TFABOOT
        select CPU_V7_HAS_VIRT
+       select OF_BOARD_SETUP
        select PINCTRL_STM32
        select STM32_RCC
        select STM32_RESET
+       select STM32_SERIAL
        select SYS_ARCH_TIMER
-       imply BOOTCOUNT_LIMIT
-       imply BOOTSTAGE
-       imply CMD_BOOTCOUNT
-       imply CMD_BOOTSTAGE
-       imply SYSRESET_PSCI if STM32MP1_TRUSTED
-       imply SYSRESET_SYSCON if !STM32MP1_TRUSTED
+       imply SYSRESET_PSCI if TFABOOT
+       imply SYSRESET_SYSCON if !TFABOOT
        help
-               target STMicroelectronics SOC STM32MP1 family
+               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 STM32MP1_TRUSTED
-       bool "Support trusted boot with TF-A"
-       default y if !SPL
-       select ARM_SMCCC
+config TARGET_ST_STM32MP15x
+       bool "STMicroelectronics STM32MP15x boards"
+       select STM32MP15x
+       imply BOOTCOUNT_LIMIT
+       imply BOOTSTAGE
+       imply CMD_BOOTCOUNT
+       imply CMD_BOOTSTAGE
+       imply CMD_CLS if CMD_BMP
+       imply DISABLE_CONSOLE
+       imply PRE_CONSOLE_BUFFER
+       imply SILENT_CONSOLE
+       help
+               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
+
+config TARGET_DH_STM32MP1_PDK2
+       bool "DH STM32MP1 PDK2"
+       select STM32MP15x
+       imply BOOTCOUNT_LIMIT
+       imply CMD_BOOTCOUNT
        help
-               Say Y here to enable boot with TF-A
-               Trusted boot chain is :
-               BootRom => TF-A.stm32 (clock & DDR) => U-Boot.stm32
-               TF-A monitor provides proprietary smc to manage secure devices
+               Target the DH PDK2 development kit with STM32MP15x SoM.
+
+endchoice
 
 config SYS_TEXT_BASE
-       prompt "U-Boot base address"
        default 0xC0100000
-       help
-               configure the U-Boot base address
-               when DDR driver is used:
-                 DDR + 1MB (0xC0100000)
 
 config NR_DRAM_BANKS
        default 1
@@ -82,6 +100,43 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_MMC2
          Partition on the second MMC to load U-Boot from when the MMC is being
          used in raw mode
 
+config STM32_ETZPC
+       bool "STM32 Extended TrustZone Protection"
+       depends on STM32MP15x
+       default y
+       help
+         Say y to enable STM32 Extended TrustZone Protection
+
+config CMD_STM32PROG
+       bool "command stm32prog for STM32CudeProgrammer"
+       select DFU
+       select DFU_RAM
+       select DFU_VIRT
+       select PARTITION_TYPE_GUID
+       imply CMD_GPT if MMC
+       imply CMD_MTD if MTD
+       imply DFU_MMC if MMC
+       imply DFU_MTD if MTD
+       help
+               activate a specific command stm32prog for STM32MP soc family
+               witch update the device with the tools STM32CubeProgrammer,
+               using UART with STM32 protocol or USB with DFU protocol
+               NB: access to not volatile memory (NOR/NAND/SD/eMMC) is based
+                   on U-Boot DFU framework
+
+config CMD_STM32KEY
+       bool "command stm32key to fuse public key hash"
+       default y
+       help
+               fuse public key hash in corresponding fuse used to authenticate
+               binary.
+
+config PRE_CON_BUF_ADDR
+       default 0xC02FF000
+
+config PRE_CON_BUF_SZ
+       default 4096
+
 config BOOTSTAGE_STASH_ADDR
        default 0xC3000000
 
@@ -109,5 +164,6 @@ config DEBUG_UART_CLOCK
 endif
 
 source "board/st/stm32mp1/Kconfig"
+source "board/dhelectronics/dh_stm32mp1/Kconfig"
 
 endif