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 7b86ce1612fda201bbd9453a2c67214bcc1a2302..6c995ed8d8855b990d3b9796113c9b2e3256eb67 100644 (file)
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -63,7 +63,9 @@ 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
@@ -84,16 +86,6 @@ config TARGET_DH_STM32MP1_PDK2
 
 endchoice
 
-config STM32MP1_OPTEE
-       bool "Support trusted boot with TF-A and OP-TEE"
-       depends on TFABOOT
-       default n
-       help
-               Say Y here to enable boot with TF-A and OP-TEE
-               Trusted boot chain is :
-               BootRom => TF-A.stm32 (clock & DDR) => OP-TEE => U-Boot.stm32
-               OP-TEE monitor provides ST SMC to access to secure resources
-
 config SYS_TEXT_BASE
        default 0xC0100000
 
@@ -115,15 +107,30 @@ config STM32_ETZPC
        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
-       depends on CMD_FUSE
        help
                fuse public key hash in corresponding fuse used to authenticate
                binary.
 
-
 config PRE_CON_BUF_ADDR
        default 0xC02FF000