[DistroKit] [PATCH 05/11] v7a: stm32mp: switch to upstream barebox recipe

[Roland Hieber <rhi@pengutronix.de>]

Remove the separate barebox-stm32 recipe in favour of the barebox recipe
from upstream PTXdist, which already supports multi-arch build. Merge
the kconfig options from the config diff. Let the barebox recipe install
its DTBs into the image folder (via BAREBOX_INSTALL_DTBS), which are
later picked up by genimage (however, the upstream recipe uses a
different naming scheme). The old defaultenv is already the same as in
the upstream recipe, so we don't need to port anything.

Since the barebox image is now too large to fit into the FIP partition,
enlarge the partition. (Incidentally, genimage v18 has a bug that does
not check whether the FIP image will fit into the partition, but this
will be fixed in a future release.)

Link: https://github.com/pengutronix/genimage/pull/293
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 .../init/bootsource                           |    9 -
 .../nv/bootchooser.state_prefix               |    1 -
 .../nv/bootchooser.system0.boot               |    1 -
 .../nv/bootchooser.system1.boot               |    1 -
 .../nv/bootchooser.targets                    |    1 -
 .../nv/dev.mmc0.broken_cd                     |    1 -
 .../nv/linux.bootargs.loglevel                |    1 -
 configs/platform-v7a/barebox-stm32mp.config   | 1105 -----------------
 .../platform-v7a/barebox-stm32mp.config.diff  |  195 ---
 configs/platform-v7a/barebox.config           |  138 +-
 .../config/images/stm32mp-optee.config        |    2 +-
 .../platform-v7a/config/images/stm32mp.config |    5 +-
 configs/platform-v7a/platformconfig           |    3 +-
 .../platform-v7a/platforms/barebox-stm32mp.in |    8 -
 .../platforms/image-lxa-mc1-scmi.in           |    2 +-
 .../platform-v7a/platforms/image-lxa-mc1.in   |    2 +-
 .../platforms/image-stm32mp135f-dk.in         |    2 +-
 .../platforms/image-stm32mp157c-dk2.in        |    2 +-
 .../platforms/image-stm32mp157c-ev1.in        |    2 +-
 .../platform-v7a/rules/barebox-stm32mp.make   |  121 --
 20 files changed, 121 insertions(+), 1481 deletions(-)
 delete mode 100755 configs/platform-v7a/barebox-stm32mp-defaultenv/init/bootsource
 delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.state_prefix
 delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot
 delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot
 delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets
 delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/dev.mmc0.broken_cd
 delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel
 delete mode 100644 configs/platform-v7a/barebox-stm32mp.config
 delete mode 100644 configs/platform-v7a/barebox-stm32mp.config.diff
 delete mode 100644 configs/platform-v7a/platforms/barebox-stm32mp.in
 delete mode 100644 configs/platform-v7a/rules/barebox-stm32mp.make

diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/init/bootsource b/configs/platform-v7a/barebox-stm32mp-defaultenv/init/bootsource
deleted file mode 100755
index edce471abe78..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/init/bootsource
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -n "$nv.boot.default" ]; then
-	exit
-fi
-
-if [ $bootsource = mmc ]; then
-	global.boot.default="bootchooser net"
-fi
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.state_prefix
deleted file mode 100644
index 6246412a5c27..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.state_prefix
+++ /dev/null
@@ -1 +0,0 @@
-state.bootstate
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot
deleted file mode 100644
index c0c541c8b2a3..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot
+++ /dev/null
@@ -1 +0,0 @@
-mmc0.root-A
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot
deleted file mode 100644
index 1d40e339c2fe..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot
+++ /dev/null
@@ -1 +0,0 @@
-mmc0.root-B
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets
deleted file mode 100644
index f0fb14eeaad2..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets
+++ /dev/null
@@ -1 +0,0 @@
-system0 system1
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/dev.mmc0.broken_cd b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/dev.mmc0.broken_cd
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/dev.mmc0.broken_cd
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel
deleted file mode 100644
index d45c34464422..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel
+++ /dev/null
@@ -1 +0,0 @@
-loglevel=5 systemd.show_status=auto
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
deleted file mode 100644
index 69d21b9f5f23..000000000000
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ /dev/null
@@ -1,1105 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.05.0 Configuration
-#
-CONFIG_ARM=y
-CONFIG_ARCH_LINUX_NAME="arm"
-CONFIG_ARCH_MKIMAGE_NAME="arm"
-CONFIG_ARM32=y
-CONFIG_ARCH_TEXT_BASE=0x00000000
-CONFIG_ARM_LINUX=y
-
-#
-# System Type
-#
-CONFIG_ARCH_STM32=y
-CONFIG_ARCH_MULTIARCH=y
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_ZYNQ is not set
-# CONFIG_ARCH_BCM283X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_K3 is not set
-# CONFIG_ARCH_SUNXI is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
-# CONFIG_ARCH_OMAP_MULTI is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-CONFIG_ARCH_STM32MP=y
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-
-#
-# processor features
-#
-# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_ARCH_NR_GPIO=416
-CONFIG_ARCH_STM32MP13=y
-CONFIG_ARCH_STM32MP157=y
-CONFIG_MACH_STM32MP13XX_DK=y
-CONFIG_MACH_STM32MP15XX_DKX=y
-CONFIG_MACH_LXA_MC1=y
-# CONFIG_MACH_LXA_TAC is not set
-# CONFIG_MACH_LXA_FAIRYTUX2 is not set
-# CONFIG_MACH_SEEED_ODYSSEY is not set
-CONFIG_MACH_STM32MP15X_EV1=y
-# CONFIG_MACH_PROTONIC_STM32MP1 is not set
-# CONFIG_MACH_PROTONIC_STM32MP13 is not set
-# CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1 is not set
-CONFIG_BOARD_ARM_GENERIC_DT=y
-CONFIG_AEABI=y
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_ARM_BOARD_APPEND_ATAG=y
-# CONFIG_ARM_BOARD_PREPEND_ATAG is not set
-# end of System Type
-
-# CONFIG_64BIT is not set
-CONFIG_32BIT=y
-
-#
-# ARM specific settings
-#
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_ARM_EXCEPTIONS=y
-CONFIG_ARM_UNWIND=y
-# CONFIG_ARM_SEMIHOSTING is not set
-CONFIG_ARM_SMCCC=y
-CONFIG_ARM_PSCI_OF=y
-CONFIG_ARM_PSCI_CLIENT=y
-# CONFIG_ARM_BOOTM_ELF is not set
-# CONFIG_ARM_BOOTM_FIP is not set
-# end of ARM specific settings
-
-#
-# General architecture-dependent options
-#
-CONFIG_BOARD_GENERIC_DT=y
-# CONFIG_BOARD_GENERIC_FIT is not set
-# end of General architecture-dependent options
-
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_ARCH_HAS_SJLJ=y
-CONFIG_HAS_DEBUG_LL=y
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140201
-CONFIG_CLANG_VERSION=0
-CONFIG_GREGORIAN_CALENDER=y
-CONFIG_HAS_KALLSYMS=y
-CONFIG_HAS_MODULES=y
-CONFIG_HAS_DMA=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_BLOCK=y
-CONFIG_BLOCK_WRITE=y
-CONFIG_BLOCK_STATS=y
-CONFIG_FILETYPE=y
-CONFIG_BINFMT=y
-CONFIG_UIMAGE=y
-CONFIG_FITIMAGE=y
-CONFIG_LOGBUF=y
-CONFIG_STDDEV=y
-CONFIG_CDEV_ALIAS=y
-CONFIG_MENUTREE=y
-CONFIG_BOOT=y
-CONFIG_FASTBOOT_BASE=y
-
-#
-# General Settings
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAS_INSECURE_DEFAULTS=y
-CONFIG_INSECURE=y
-CONFIG_BANNER=y
-CONFIG_MEMINFO=y
-CONFIG_MEMTEST=y
-CONFIG_ENVIRONMENT_VARIABLES=y
-CONFIG_GLOBALVAR=y
-CONFIG_NVVAR=y
-
-#
-# memory layout
-#
-CONFIG_HAVE_PBL_IMAGE=y
-CONFIG_HAVE_PBL_MULTI_IMAGES=y
-CONFIG_HAVE_IMAGE_COMPRESSION=y
-CONFIG_PBL_IMAGE=y
-CONFIG_PBL_MULTI_IMAGES=y
-CONFIG_USE_COMPRESSED_DTB=y
-CONFIG_PBL_RELOCATABLE=y
-CONFIG_IMAGE_COMPRESSION=y
-# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
-CONFIG_IMAGE_COMPRESSION_LZO=y
-# CONFIG_IMAGE_COMPRESSION_GZIP is not set
-# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
-# CONFIG_IMAGE_COMPRESSION_NONE is not set
-CONFIG_MMU=y
-CONFIG_MMUINFO=y
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
-CONFIG_STACK_SIZE=0x8000
-CONFIG_MALLOC_SIZE=0x0
-CONFIG_MALLOC_ALIGNMENT=8
-# end of memory layout
-
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_MALLOC_DLMALLOC is not set
-CONFIG_MALLOC_TLSF=y
-CONFIG_KALLSYMS=y
-CONFIG_RELOCATABLE=y
-# CONFIG_PANIC_POWEROFF is not set
-# CONFIG_PANIC_HANG is not set
-CONFIG_PANIC_RESET=y
-CONFIG_PROMPT="barebox:"
-CONFIG_BAUDRATE=115200
-CONFIG_CBSIZE=1024
-CONFIG_FIRMWARE=y
-CONFIG_SHELL_HUSH=y
-# CONFIG_SHELL_SIMPLE is not set
-# CONFIG_SHELL_NONE is not set
-CONFIG_GLOB=y
-CONFIG_GLOB_SORT=y
-CONFIG_PROMPT_HUSH_PS2="> "
-CONFIG_HUSH_FANCY_PROMPT=y
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_MENU=y
-# CONFIG_PASSWORD is not set
-CONFIG_ERRNO_MESSAGES=y
-CONFIG_TIMESTAMP=y
-CONFIG_BOOTM=y
-CONFIG_BOOT_OVERRIDE=y
-CONFIG_BOOTM_SHOW_TYPE=y
-CONFIG_BOOTM_VERBOSE=y
-CONFIG_BOOTM_INITRD=y
-CONFIG_BOOTM_OFTREE=y
-CONFIG_BOOTM_UIMAGE=y
-CONFIG_BOOTM_OFTREE_UIMAGE=y
-# CONFIG_BOOTM_AIMAGE is not set
-CONFIG_BOOTM_FITIMAGE=y
-# CONFIG_BOOTM_FITIMAGE_SIGNATURE is not set
-CONFIG_BOOTM_OPTIONAL_SIGNED_IMAGES=y
-CONFIG_BLSPEC=y
-CONFIG_FLEXIBLE_BOOTARGS=y
-CONFIG_ROOTWAIT_BOOTARG=y
-CONFIG_MMCBLKDEV_ROOTARG=y
-CONFIG_BAREBOX_UPDATE=y
-CONFIG_SYSTEM_PARTITIONS=y
-CONFIG_IMD=y
-CONFIG_CONSOLE_FULL=y
-# CONFIG_CONSOLE_SIMPLE is not set
-# CONFIG_CONSOLE_NONE is not set
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-# CONFIG_CONSOLE_ACTIVATE_ALL is not set
-# CONFIG_CONSOLE_ACTIVATE_ALL_FALLBACK is not set
-CONFIG_CONSOLE_ACTIVATE_NONE=y
-CONFIG_CONSOLE_ALLOW_COLOR=y
-# CONFIG_CONSOLE_DISABLE_INPUT is not set
-CONFIG_PBL_CONSOLE=y
-# CONFIG_CONSOLE_RATP is not set
-CONFIG_PARTITION=y
-CONFIG_PARTITION_MANIPULATION=y
-CONFIG_PARTITION_DISK=y
-CONFIG_PARTITION_DISK_DOS=y
-CONFIG_PARTITION_DISK_EFI=y
-# CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set
-# CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
-CONFIG_ENV_HANDLING=y
-CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_COMPRESSION_NONE=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
-# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set
-CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
-CONFIG_HAS_SCHED=y
-CONFIG_POLLER=y
-CONFIG_BTHREAD=y
-CONFIG_STATE=y
-# CONFIG_STATE_CRYPTO is not set
-# CONFIG_STATE_BACKWARD_COMPATIBLE is not set
-CONFIG_BOOTCHOOSER=y
-CONFIG_BOOT_DEFAULTS=y
-CONFIG_BAREBOX_DT_2ND=y
-CONFIG_RESET_SOURCE=y
-CONFIG_MACHINE_ID=y
-# CONFIG_SYSTEMD_OF_WATCHDOG is not set
-CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
-
-#
-# OP-TEE loading
-#
-CONFIG_HAVE_OPTEE=y
-CONFIG_OPTEE_SIZE=0x03000000
-CONFIG_OPTEE_SHM_SIZE=0x400000
-# CONFIG_BOOTM_OPTEE is not set
-CONFIG_FILETYPE_STRINGS=y
-# end of OP-TEE loading
-
-#
-# Android Fastboot
-#
-CONFIG_FASTBOOT_SPARSE=y
-CONFIG_FASTBOOT_CMD_OEM=y
-# end of Android Fastboot
-# end of General Settings
-
-#
-# Debugging
-#
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_INITCALLS is not set
-# CONFIG_DEBUG_PBL is not set
-# CONFIG_DEBUG_PROBES is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_RESOURCES is not set
-# CONFIG_PBL_BREAK is not set
-# CONFIG_PRINTF_FULL is not set
-# CONFIG_UBSAN is not set
-CONFIG_CC_HAS_KASAN_GENERIC=y
-# CONFIG_KASAN is not set
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_WERROR is not set
-
-#
-# arm Debugging
-#
-# end of Debugging
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_HAVE_EFI_STUB=y
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_COMMAND_SUPPORT=y
-CONFIG_COMPILE_HASH=y
-
-#
-# Commands
-#
-
-#
-# Information
-#
-# CONFIG_CMD_TUTORIAL is not set
-CONFIG_CMD_ARM_CPUINFO=y
-CONFIG_CMD_CLASS=y
-CONFIG_CMD_DEVINFO=y
-# CONFIG_CMD_DEVLOOKUP is not set
-# CONFIG_CMD_DEVUNBIND is not set
-CONFIG_CMD_DMESG=y
-CONFIG_CMD_DRVINFO=y
-CONFIG_CMD_HELP=y
-CONFIG_LONGHELP=y
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_IMD=y
-CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_ARM_MMUINFO=y
-CONFIG_CMD_BLKSTATS=y
-CONFIG_CMD_REGULATOR=y
-# CONFIG_CMD_NVMEM is not set
-# CONFIG_CMD_VARINFO is not set
-CONFIG_CMD_VERSION=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MMC_EXTCSD=y
-# CONFIG_CMD_POLLER is not set
-CONFIG_CMD_BTHREAD=y
-# CONFIG_CMD_SLICE is not set
-# end of Information
-
-#
-# Boot
-#
-CONFIG_CMD_BOOT=y
-CONFIG_CMD_BOOTM=y
-# CONFIG_CMD_BOOTU is not set
-# CONFIG_CMD_BOOTZ is not set
-CONFIG_CMD_GO=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_LOADY is not set
-CONFIG_CMD_RESET=y
-CONFIG_CMD_UIMAGE=y
-CONFIG_CMD_BOOTCHOOSER=y
-# end of Boot
-
-#
-# Partition
-#
-CONFIG_CMD_PARTITION=y
-CONFIG_CMD_AUTOMOUNT=y
-CONFIG_CMD_MOUNT=y
-# CONFIG_CMD_FINDMNT is not set
-CONFIG_CMD_PARTED=y
-CONFIG_CMD_UMOUNT=y
-# end of Partition
-
-#
-# Environment
-#
-CONFIG_CMD_NV=y
-CONFIG_CMD_EXPORT=y
-# CONFIG_CMD_DEFAULTENV is not set
-CONFIG_CMD_GLOBAL=y
-CONFIG_CMD_LOADENV=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_MAGICVAR=y
-CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_SETENV=y
-# end of Environment
-
-#
-# File
-#
-CONFIG_CMD_BASENAME=y
-CONFIG_CMD_CAT=y
-CONFIG_CMD_CD=y
-CONFIG_CMD_CP=y
-# CONFIG_CMD_CMP is not set
-CONFIG_CMD_DIGEST=y
-CONFIG_CMD_DIRNAME=y
-CONFIG_CMD_FILETYPE=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_LS=y
-CONFIG_CMD_TREE=y
-# CONFIG_CMD_STAT is not set
-CONFIG_CMD_MD5SUM=y
-CONFIG_CMD_MKDIR=y
-CONFIG_CMD_PWD=y
-CONFIG_CMD_READLINK=y
-CONFIG_CMD_RM=y
-CONFIG_CMD_RMDIR=y
-CONFIG_CMD_SHA1SUM=y
-# CONFIG_CMD_SHA224SUM is not set
-# CONFIG_CMD_SHA256SUM is not set
-# CONFIG_CMD_BASE64 is not set
-# CONFIG_CMD_SHA384SUM is not set
-# CONFIG_CMD_SHA512SUM is not set
-# CONFIG_CMD_FIPTOOL is not set
-CONFIG_CMD_UNCOMPRESS=y
-# end of File
-
-#
-# Shell scripting
-#
-CONFIG_CMD_FALSE=y
-CONFIG_CMD_GETOPT=y
-CONFIG_CMD_LET=y
-CONFIG_CMD_MSLEEP=y
-CONFIG_CMD_READF=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_TEST=y
-CONFIG_CMD_TRUE=y
-# end of Shell scripting
-
-#
-# Network
-#
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_HOST=y
-CONFIG_NET_CMD_IFUP=y
-CONFIG_CMD_MIITOOL=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TFTP=y
-# CONFIG_CMD_IP is not set
-CONFIG_CMD_IP_ROUTE_GET=y
-# CONFIG_CMD_ETHLOG is not set
-# end of Network
-
-#
-# Console and Framebuffer interaction
-#
-CONFIG_CMD_CLEAR=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_EDIT=y
-# CONFIG_CMD_LOGIN is not set
-CONFIG_CMD_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_MENUTREE=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TIMEOUT=y
-# end of Console and Framebuffer interaction
-
-#
-# Memory
-#
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_MD=y
-CONFIG_CMD_MEMCMP=y
-CONFIG_CMD_MEMCPY=y
-CONFIG_CMD_MEMSET=y
-CONFIG_CMD_MEMTEST=y
-# CONFIG_CMD_MEMTESTER is not set
-CONFIG_CMD_MM=y
-CONFIG_CMD_MW=y
-# end of Memory
-
-#
-# Hardware manipulation
-#
-CONFIG_CMD_CLK=y
-CONFIG_CMD_DETECT=y
-# CONFIG_CMD_TRUNCATE is not set
-CONFIG_CMD_SYNC=y
-CONFIG_CMD_FLASH=y
-CONFIG_CMD_GPIO=y
-# CONFIG_CMD_I2C is not set
-# CONFIG_CMD_PWM is not set
-CONFIG_CMD_LED=y
-CONFIG_CMD_POWEROFF=y
-# CONFIG_CMD_SMC is not set
-CONFIG_CMD_USB=y
-CONFIG_CMD_USBGADGET=y
-CONFIG_CMD_WD=y
-CONFIG_CMD_WD_DEFAULT_TIMOUT=0
-# end of Hardware manipulation
-
-#
-# Miscellaneous
-#
-# CONFIG_CMD_2048 is not set
-CONFIG_CMD_BAREBOX_UPDATE=y
-# CONFIG_CMD_BLOBGEN is not set
-# CONFIG_CMD_FIRMWARELOAD is not set
-# CONFIG_CMD_KALLSYMS is not set
-CONFIG_CMD_OF_COMPATIBLE=y
-CONFIG_CMD_OF_DIFF=y
-CONFIG_CMD_OF_DUMP=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_OF_PROPERTY=y
-# CONFIG_CMD_OF_DISPLAY_TIMINGS is not set
-CONFIG_CMD_OF_FIXUP=y
-CONFIG_CMD_OF_FIXUP_STATUS=y
-CONFIG_CMD_OF_OVERLAY=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_WATCH=y
-# CONFIG_CMD_UPTIME is not set
-CONFIG_CMD_STATE=y
-# CONFIG_CMD_DHRYSTONE is not set
-# CONFIG_CMD_SPD_DECODE is not set
-# CONFIG_CMD_SEED is not set
-# CONFIG_CMD_STACKSMASH is not set
-# end of Miscellaneous
-# end of Commands
-
-CONFIG_NET=y
-CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
-CONFIG_NET_NETCONSOLE=y
-CONFIG_NET_RESOLV=y
-CONFIG_NET_IFUP=y
-CONFIG_NET_DHCP=y
-# CONFIG_NET_SNTP is not set
-CONFIG_NET_FASTBOOT=y
-
-#
-# Drivers
-#
-CONFIG_REGMAP_FORMATTED=y
-CONFIG_REGMAP_I2C=y
-CONFIG_OFTREE=y
-CONFIG_OFTREE_MEM_GENERIC=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_OFDEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_GPIO_PINCONF=y
-CONFIG_OF_BAREBOX_DRIVERS=y
-# CONFIG_OF_BAREBOX_ENV_IN_FS is not set
-CONFIG_OF_OVERLAY=y
-# CONFIG_OF_OVERLAY_LIVE is not set
-# CONFIG_AIODEV is not set
-CONFIG_ARM_AMBA=y
-
-#
-# serial drivers
-#
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
-# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_DRIVER_SERIAL_STM32=y
-# CONFIG_DRIVER_SERIAL_NS16550 is not set
-# CONFIG_DRIVER_SERIAL_CADENCE is not set
-# CONFIG_SERIAL_SIFIVE is not set
-# end of serial drivers
-
-CONFIG_PHYLIB=y
-
-#
-# Network drivers
-#
-# CONFIG_DRIVER_NET_ARC_EMAC is not set
-# CONFIG_DRIVER_NET_BCMGENET is not set
-# CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set
-CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
-CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
-# CONFIG_DRIVER_NET_FSL_FMAN is not set
-# CONFIG_DRIVER_NET_KS8851_MLL is not set
-# CONFIG_DRIVER_NET_SMC911X is not set
-# CONFIG_DRIVER_NET_SMC91111 is not set
-# CONFIG_DRIVER_NET_LITEETH is not set
-
-#
-# phylib
-#
-
-#
-# MII PHY device drivers
-#
-# CONFIG_AR8327N_PHY is not set
-CONFIG_AT803X_PHY=y
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_DP83TD510_PHY is not set
-# CONFIG_DP83TG720_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-CONFIG_MICREL_PHY=y
-# CONFIG_MOTORCOMM_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-
-#
-# MII bus device drivers
-#
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# end of phylib
-
-# CONFIG_NET_USB is not set
-# CONFIG_DSA is not set
-# end of Network drivers
-
-#
-# SPI drivers
-#
-# CONFIG_SPI is not set
-# end of SPI drivers
-
-CONFIG_I2C=y
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_MV64XXX is not set
-CONFIG_I2C_STM32=y
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_MUX is not set
-# CONFIG_MTD is not set
-CONFIG_DISK=y
-CONFIG_DISK_WRITE=y
-
-#
-# drive types
-#
-# CONFIG_DISK_ATA is not set
-# CONFIG_DISK_AHCI is not set
-
-#
-# interface types
-#
-# CONFIG_DISK_INTF_PLATFORM_IDE is not set
-CONFIG_USB=y
-CONFIG_USB_HOST=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_HOST=y
-CONFIG_USB_DWC2_GADGET=y
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_EHCI is not set
-# CONFIG_USB_XHCI is not set
-# CONFIG_USB_ULPI is not set
-CONFIG_USB_OTGDEV=y
-# CONFIG_USB_STORAGE is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_ONBOARD_HUB is not set
-# CONFIG_TYPEC_TUSB320 is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_AUTOSTART is not set
-
-#
-# USB Gadget drivers
-#
-# CONFIG_USB_GADGET_DFU is not set
-CONFIG_USB_GADGET_SERIAL=y
-CONFIG_USB_GADGET_FASTBOOT=y
-CONFIG_USB_GADGET_MASS_STORAGE=y
-# CONFIG_USB_MUSB is not set
-# CONFIG_VIDEO is not set
-# CONFIG_SOUND is not set
-CONFIG_MCI=y
-
-#
-# --- Feature list ---
-#
-# CONFIG_MCI_TUNING is not set
-CONFIG_MCI_STARTUP=y
-CONFIG_MCI_INFO=y
-CONFIG_MCI_WRITE=y
-CONFIG_MCI_ERASE=y
-CONFIG_MCI_MMC_BOOT_PARTITIONS=y
-# CONFIG_MCI_MMC_GPP_PARTITIONS is not set
-# CONFIG_MCI_MMC_RPMB is not set
-
-#
-# --- MCI host drivers ---
-#
-# CONFIG_MCI_DWC_MSHC is not set
-# CONFIG_MCI_DW is not set
-# CONFIG_MCI_SUNXI_SMHC is not set
-# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
-# CONFIG_MCI_MMCI is not set
-# CONFIG_MCI_ARASAN is not set
-# CONFIG_MCI_AM654 is not set
-CONFIG_MCI_STM32_SDMMC2=y
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_OF_PROVIDER=y
-CONFIG_COMMON_CLK_STM32MP135=y
-CONFIG_COMMON_CLK_STM32MP157=y
-CONFIG_COMMON_CLK_SCMI=y
-CONFIG_COMMON_CLK_GPIO=y
-
-#
-# Clocksource
-#
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
-# CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
-# CONFIG_CLKSRC_STM32 is not set
-# end of Clocksource
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_ACT8846 is not set
-# CONFIG_MFD_DA9053 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_LP3972 is not set
-# CONFIG_MFD_MC13XXX is not set
-# CONFIG_MFD_MC34704 is not set
-# CONFIG_MFD_MC9SDZ60 is not set
-# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TPS65219 is not set
-# CONFIG_MFD_TWL4030 is not set
-# CONFIG_MFD_TWL6030 is not set
-CONFIG_MFD_STPMIC1=y
-# CONFIG_MFD_PCA9450 is not set
-# CONFIG_MFD_RN568PMIC is not set
-CONFIG_MFD_STM32_TIMERS=y
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# end of Multifunction device drivers
-
-#
-# Misc devices
-#
-# CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
-CONFIG_STATE_DRV=y
-CONFIG_DEV_MEM=y
-# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_ALIAS is not set
-# end of Misc devices
-
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_LED_PWM=y
-CONFIG_LED_GPIO_OF=y
-# CONFIG_LED_GPIO_RGB is not set
-# CONFIG_LED_GPIO_BICOLOR is not set
-# CONFIG_LED_TRIGGERS is not set
-# CONFIG_LED_PCA955X is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=y
-# end of EEPROM support
-
-#
-# Input device support
-#
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_USB is not set
-# CONFIG_INPUT_SPECIALKEYS is not set
-# end of Input device support
-
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_POLLER=y
-# CONFIG_WATCHDOG_DW is not set
-CONFIG_STM32_IWDG_WATCHDOG=y
-# CONFIG_STPMIC1_WATCHDOG is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-CONFIG_PWM=y
-CONFIG_PWM_STM32=y
-CONFIG_HWRNG=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HWRNG_STM32=y
-CONFIG_HW_RANDOM_OPTEE=y
-
-#
-# DMA support
-#
-# CONFIG_DMADEVICES is not set
-# end of DMA support
-
-CONFIG_GPIOLIB=y
-
-#
-# GPIO
-#
-CONFIG_HAVE_GPIO_PINCONF=y
-CONFIG_GPIO_PINCONF=y
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_DESIGNWARE is not set
-# CONFIG_GPIO_SX150X is not set
-# CONFIG_GPIO_SIFIVE is not set
-# CONFIG_GPIO_LATCH is not set
-# end of GPIO
-
-# CONFIG_W1 is not set
-
-#
-# Pin controllers
-#
-CONFIG_PINCTRL=y
-# CONFIG_PINCTRL_SINGLE is not set
-CONFIG_PINCTRL_STM32=y
-# end of Pin controllers
-
-CONFIG_NVMEM=y
-# CONFIG_NVMEM_RMEM is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-CONFIG_STM32_BSEC=y
-CONFIG_STM32_BSEC_WRITE=y
-CONFIG_STM32_BSEC_OPTEE_TA=y
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED=y
-# CONFIG_REGULATOR_FAN53555 is not set
-CONFIG_REGULATOR_STM32_PWR=y
-CONFIG_REGULATOR_STM32_VREFBUF=y
-CONFIG_REGULATOR_STPMIC1=y
-# CONFIG_REGULATOR_ANATOP is not set
-CONFIG_REGULATOR_ARM_SCMI=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=y
-CONFIG_STM32_REMOTEPROC=y
-# end of Remoteproc drivers
-
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_SIMPLE=y
-# CONFIG_RESET_IMX7 is not set
-CONFIG_RESET_SCMI=y
-# CONFIG_RTC_CLASS is not set
-
-#
-# Firmware Drivers
-#
-# CONFIG_QEMU_FW_CFG is not set
-
-#
-# ARM System Control and Management Interface Protocol
-#
-CONFIG_ARM_SCMI_PROTOCOL=y
-CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
-CONFIG_ARM_SCMI_HAVE_SHMEM=y
-CONFIG_ARM_SCMI_HAVE_MSG=y
-CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
-CONFIG_ARM_SCMI_TRANSPORT_SMC=y
-# CONFIG_ARM_SCMI_POWER_DOMAIN is not set
-# end of ARM System Control and Management Interface Protocol
-# end of Firmware Drivers
-
-#
-# FPGA Configuration Support
-#
-# CONFIG_FPGA is not set
-# end of FPGA Configuration Support
-
-CONFIG_GENERIC_PHY=y
-# CONFIG_USB_NOP_XCEIV is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-CONFIG_PHY_STM32_USBPHYC=y
-
-#
-# Hardware crypto devices
-#
-# end of Hardware crypto devices
-
-#
-# Memory controller drivers
-#
-CONFIG_STM32_FMC2_EBI=y
-# end of Memory controller drivers
-
-#
-# SoC drivers
-#
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# KVX SoC drivers
-#
-# end of KVX SoC drivers
-# end of SoC drivers
-
-#
-# PM Domains
-#
-
-#
-# i.MX PM Domains
-#
-# end of i.MX PM Domains
-# end of PM Domains
-
-#
-# NVME Support
-#
-# end of NVME Support
-
-# CONFIG_SYSCON_REBOOT_MODE is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_RESET_SYSCON is not set
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-CONFIG_RESET_STM32=y
-# CONFIG_VIRTIO_MENU is not set
-# CONFIG_MAILBOX is not set
-CONFIG_TEE=y
-CONFIG_OPTEE=y
-# CONFIG_OPTEE_AVB_PERSISTENT_VALUES is not set
-CONFIG_OF_FIXUP_OPTEE=y
-# end of Drivers
-
-#
-# Filesystem support
-#
-CONFIG_FS=y
-CONFIG_FS_LEGACY=y
-CONFIG_FS_WRITABLE=y
-
-#
-# Some selected filesystems still use the legacy FS API.
-#
-
-#
-# Consider updating them.
-#
-CONFIG_FS_AUTOMOUNT=y
-# CONFIG_FS_CRAMFS is not set
-CONFIG_FS_EXT4=y
-CONFIG_FS_RAMFS=y
-CONFIG_FS_DEVFS=y
-CONFIG_FS_TFTP=y
-CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128
-CONFIG_FS_NFS=y
-CONFIG_FS_FAT=y
-CONFIG_FS_FAT_WRITE=y
-CONFIG_FS_FAT_LFN=y
-# CONFIG_FS_BPKFS is not set
-# CONFIG_FS_UIMAGEFS is not set
-# CONFIG_FS_PSTORE is not set
-# CONFIG_FS_SQUASHFS is not set
-
-#
-# ZLIB support disabled
-#
-
-#
-# LZ4 support disabled
-#
-
-#
-# LZO support disabled
-#
-
-#
-# XZ support disabled
-#
-
-#
-# ZSTD support disabled
-#
-# end of Filesystem support
-
-#
-# Library routines
-#
-CONFIG_PARAMETER=y
-CONFIG_UNCOMPRESS=y
-CONFIG_ZLIB=y
-# CONFIG_BZLIB is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_ZSTD_DECOMPRESS is not set
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_BASE64 is not set
-CONFIG_PROCESS_ESCAPE_SEQUENCE=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_FNMATCH=y
-CONFIG_QSORT=y
-CONFIG_IMAGE_SPARSE=y
-CONFIG_LIBFDT=y
-# CONFIG_RATP is not set
-# CONFIG_ALLOW_PRNG_FALLBACK is not set
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC8=y
-
-#
-# Library gui routines
-#
-# end of Library gui routines
-
-CONFIG_PRINTF_UUID=y
-CONFIG_NLS=y
-# CONFIG_BLOBGEN is not set
-CONFIG_IDR=y
-# end of Library routines
-
-#
-# Hardening options
-#
-
-#
-# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating
-#
-
-#
-# that some of the configured options have potentially insecure defaults.
-#
-
-#
-# Extra care needs to be taken in secure booted systems.
-#
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-
-#
-# Memory initialization
-#
-CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
-# CONFIG_INIT_STACK_NONE is not set
-# CONFIG_INIT_STACK_ALL_PATTERN is not set
-CONFIG_INIT_STACK_ALL_ZERO=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
-# CONFIG_ZERO_CALL_USED_REGS is not set
-# end of Memory initialization
-
-CONFIG_STACK_GUARD_PAGE=y
-CONFIG_STACKPROTECTOR=y
-# CONFIG_STACKPROTECTOR_NONE is not set
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_PBL_STACKPROTECTOR_NONE=y
-# CONFIG_PBL_STACKPROTECTOR_STRONG is not set
-# end of Hardening options
-
-#
-# Crypto support
-#
-CONFIG_CRC32=y
-CONFIG_DIGEST=y
-CONFIG_HAVE_DIGEST_MD5=y
-CONFIG_HAVE_DIGEST_SHA1=y
-CONFIG_HAVE_DIGEST_SHA224=y
-CONFIG_HAVE_DIGEST_SHA256=y
-CONFIG_HAVE_DIGEST_HMAC=y
-# CONFIG_DIGEST_CRC32_GENERIC is not set
-CONFIG_DIGEST_MD5_GENERIC=y
-CONFIG_DIGEST_SHA1_GENERIC=y
-# CONFIG_DIGEST_SHA224_GENERIC is not set
-# CONFIG_DIGEST_SHA256_GENERIC is not set
-# CONFIG_DIGEST_SHA384_GENERIC is not set
-# CONFIG_DIGEST_SHA512_GENERIC is not set
-CONFIG_DIGEST_HMAC_GENERIC=y
-CONFIG_DIGEST_SHA1_ARM=y
-CONFIG_DIGEST_SHA256_ARM=y
-# CONFIG_CRYPTO_RSA is not set
-# CONFIG_CRYPTO_ECDSA is not set
-# CONFIG_CRYPTO_BUILTIN_KEYS is not set
-# CONFIG_CRYPTO_KEYSTORE is not set
-# end of Crypto support
-
-#
-# Firmware files
-#
-CONFIG_EXTRA_FIRMWARE_DIR="firmware"
-CONFIG_MISSING_FIRMWARE_ERROR=y
-# end of Firmware files
-
-#
-# Host Tools
-#
-# CONFIG_COMPILE_HOST_TOOLS is not set
-# end of Host Tools
-
-#
-# Target Tools
-#
-# CONFIG_IMD_TARGET is not set
-# CONFIG_KERNEL_INSTALL_TARGET is not set
-# CONFIG_BAREBOXENV_TARGET is not set
-# CONFIG_BAREBOXCRC32_TARGET is not set
-# CONFIG_MVEBU_KWBOOT_TARGET is not set
-# end of Target Tools
-
-# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
deleted file mode 100644
index d3a707369541..000000000000
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ /dev/null
@@ -1,195 +0,0 @@
-3118a4e72c6ae44b00e041e7fbe80ad3
-# CONFIG_ARCH_BCM283X is not set
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
-CONFIG_ARCH_NR_GPIO=416
-CONFIG_ARCH_STM32=y
-CONFIG_ARCH_STM32MP13=y
-CONFIG_ARCH_STM32MP157=y
-CONFIG_ARCH_STM32MP=y
-CONFIG_ARM_BOARD_APPEND_ATAG=y
-# CONFIG_ARM_BOARD_PREPEND_ATAG is not set
-CONFIG_ARM_PSCI_CLIENT=y
-CONFIG_ARM_PSCI_OF=y
-CONFIG_ARM_SCMI_HAVE_MSG=y
-CONFIG_ARM_SCMI_HAVE_SHMEM=y
-CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
-# CONFIG_ARM_SCMI_POWER_DOMAIN is not set
-CONFIG_ARM_SCMI_PROTOCOL=y
-CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
-CONFIG_ARM_SCMI_TRANSPORT_SMC=y
-# CONFIG_ARM_SECURE_MONITOR is undefined
-CONFIG_AT803X_PHY=y
-CONFIG_BOOTM_OFTREE_UIMAGE=y
-# CONFIG_BZLIB is not set
-# CONFIG_CLKSRC_STM32 is not set
-# CONFIG_CLOCKSOURCE_BCM283X is undefined
-# CONFIG_CMD_BOOTZ is not set
-# CONFIG_CMD_DEFAULTENV is not set
-# CONFIG_CMD_I2C is not set
-# CONFIG_CMD_LED_TRIGGER is undefined
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_MMC_EXTCSD=y
-# CONFIG_CMD_NVMEM is not set
-CONFIG_CMD_POWEROFF=y
-# CONFIG_CMD_PWM is not set
-# CONFIG_CMD_SPI is undefined
-# CONFIG_CMD_STACKSMASH is not set
-CONFIG_COMMON_CLK_SCMI=y
-CONFIG_COMMON_CLK_STM32MP135=y
-CONFIG_COMMON_CLK_STM32MP157=y
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_CRC8=y
-# CONFIG_DEBUG_PBL is not set
-CONFIG_DEFAULT_LOGLEVEL=7
-CONFIG_DIGEST_HMAC_GENERIC=y
-# CONFIG_DRIVER_CFI is undefined
-CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
-CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
-# CONFIG_DRIVER_NET_ENC28J60 is undefined
-# CONFIG_DRIVER_NET_MICREL is undefined
-CONFIG_DRIVER_SERIAL_STM32=y
-# CONFIG_DRIVER_SPI_GPIO is undefined
-# CONFIG_DRIVER_SPI_LITEX_SPIFLASH is undefined
-CONFIG_EEPROM_AT24=y
-# CONFIG_EEPROM_AT25 is undefined
-# CONFIG_FIRMWARE_ALTERA_SERIAL is undefined
-# CONFIG_FS_JFFS2 is undefined
-CONFIG_GENERIC_PHY=y
-# CONFIG_GPIO_74164 is undefined
-CONFIG_GPIO_PINCONF=y
-# CONFIG_GPIO_RASPBERRYPI_EXP is undefined
-CONFIG_HAVE_DIGEST_HMAC=y
-CONFIG_HAVE_GPIO_PINCONF=y
-CONFIG_HAVE_OPTEE=y
-CONFIG_HWRNG_STM32=y
-# CONFIG_HW_RANDOM_BCM2835 is undefined
-# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined
-CONFIG_HW_RANDOM_OPTEE=y
-# CONFIG_I2C_ALGOBIT is undefined
-# CONFIG_I2C_BCM283X is undefined
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_STM32=y
-CONFIG_IDR=y
-CONFIG_LED_PWM=y
-# CONFIG_LED_TRIGGERS is not set
-CONFIG_MACHINE_ID=y
-# CONFIG_MACH_LXA_FAIRYTUX2 is not set
-CONFIG_MACH_LXA_MC1=y
-# CONFIG_MACH_LXA_TAC is not set
-# CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1 is not set
-# CONFIG_MACH_PROTONIC_STM32MP13 is not set
-# CONFIG_MACH_PROTONIC_STM32MP1 is not set
-# CONFIG_MACH_RPI2 is undefined
-# CONFIG_MACH_RPI3 is undefined
-# CONFIG_MACH_RPI4 is undefined
-# CONFIG_MACH_RPI is undefined
-# CONFIG_MACH_RPI_AARCH_32_64 is undefined
-# CONFIG_MACH_RPI_CM3 is undefined
-# CONFIG_MACH_RPI_COMMON is undefined
-# CONFIG_MACH_SEEED_ODYSSEY is not set
-CONFIG_MACH_STM32MP13XX_DK=y
-CONFIG_MACH_STM32MP15XX_DKX=y
-CONFIG_MACH_STM32MP15X_EV1=y
-# CONFIG_MCI_BCM283X is undefined
-# CONFIG_MCI_BCM283X_SDHOST is undefined
-# CONFIG_MCI_MMCI is not set
-CONFIG_MCI_MMC_BOOT_PARTITIONS=y
-# CONFIG_MCI_SPI is undefined
-CONFIG_MCI_STM32_SDMMC2=y
-CONFIG_MFD_STM32_TIMERS=y
-CONFIG_MFD_STPMIC1=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MICREL_PHY=y
-# CONFIG_MTD is not set
-# CONFIG_MTD_CONCAT is undefined
-# CONFIG_MTD_DATAFLASH is undefined
-# CONFIG_MTD_DOCG3 is undefined
-# CONFIG_MTD_M25P80 is undefined
-# CONFIG_MTD_MTDRAM is undefined
-# CONFIG_MTD_NAND_ECC_SW_BCH is undefined
-# CONFIG_MTD_NAND_ECC_SW_HAMMING is undefined
-# CONFIG_MTD_OOB_DEVICE is undefined
-# CONFIG_MTD_PEB_DEBUG is undefined
-# CONFIG_MTD_RAW_DEVICE is undefined
-# CONFIG_MTD_SPI_NOR is undefined
-# CONFIG_MTD_UBI is undefined
-# CONFIG_MTD_WRITE is undefined
-# CONFIG_NAND is undefined
-CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
-CONFIG_NET_NETCONSOLE=y
-# CONFIG_NET_USB is not set
-# CONFIG_NET_USB_ASIX is undefined
-# CONFIG_NET_USB_RTL8152 is undefined
-# CONFIG_NET_USB_SMSC95XX is undefined
-CONFIG_NVMEM=y
-# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_RMEM is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-CONFIG_OF_FIXUP_OPTEE=y
-CONFIG_OF_GPIO_PINCONF=y
-CONFIG_OPTEE=y
-# CONFIG_OPTEE_AVB_PERSISTENT_VALUES is not set
-CONFIG_OPTEE_SHM_SIZE=0x400000
-CONFIG_OPTEE_SIZE=0x03000000
-# CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
-# CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set
-CONFIG_PBL_CONSOLE=y
-# CONFIG_PBL_OPTEE is undefined
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-CONFIG_PHY_STM32_USBPHYC=y
-# CONFIG_PINCTRL_BCM283X is undefined
-CONFIG_PINCTRL_STM32=y
-CONFIG_PROMPT="barebox:"
-CONFIG_PWM=y
-CONFIG_PWM_STM32=y
-CONFIG_REGMAP_FORMATTED=y
-CONFIG_REGMAP_I2C=y
-# CONFIG_REGULATOR_ANATOP is not set
-CONFIG_REGULATOR_ARM_SCMI=y
-# CONFIG_REGULATOR_BCM283X is undefined
-CONFIG_REGULATOR_FIXED=y
-CONFIG_REGULATOR_STM32_PWR=y
-CONFIG_REGULATOR_STM32_VREFBUF=y
-CONFIG_REGULATOR_STPMIC1=y
-CONFIG_REMOTEPROC=y
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_IMX7 is not set
-CONFIG_RESET_SCMI=y
-CONFIG_RESET_SIMPLE=y
-CONFIG_RESET_STM32=y
-# CONFIG_SPI is not set
-# CONFIG_SPI_BCM2835 is undefined
-# CONFIG_SPI_MEM is undefined
-CONFIG_STACKPROTECTOR=y
-# CONFIG_STACKPROTECTOR_NONE is not set
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_STACK_GUARD_PAGE=y
-CONFIG_STM32_BSEC=y
-CONFIG_STM32_BSEC_OPTEE_TA=y
-CONFIG_STM32_BSEC_WRITE=y
-CONFIG_STM32_FMC2_EBI=y
-CONFIG_STM32_IWDG_WATCHDOG=y
-CONFIG_STM32_REMOTEPROC=y
-# CONFIG_STPMIC1_WATCHDOG is not set
-# CONFIG_SYSCON_REBOOT_MODE is not set
-CONFIG_TEE=y
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_GADGET=y
-CONFIG_USB_DWC2_HOST=y
-# CONFIG_USB_EHCI is not set
-# CONFIG_USB_GADGET_AUTOSTART is not set
-# CONFIG_USB_NET_AX88179_178A is undefined
-# CONFIG_USB_NOP_XCEIV is not set
-CONFIG_USB_OTGDEV=y
-# CONFIG_USB_STORAGE is not set
-# CONFIG_WATCHDOG_BCM2835 is undefined
-CONFIG_WATCHDOG_POLLER=y
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_XZ_DEC_ARM64 is undefined
-# CONFIG_XZ_DEC_ARM is undefined
-# CONFIG_XZ_DEC_ARMTHUMB is undefined
-# CONFIG_XZ_DEC_IA64 is undefined
-# CONFIG_XZ_DEC_POWERPC is undefined
-# CONFIG_XZ_DEC_SPARC is undefined
-# CONFIG_XZ_DEC_X86 is undefined
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index e031d8534dbc..8d8eaa35b0ad 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -12,6 +12,7 @@ CONFIG_ARM_LINUX=y
 #
 # System Type
 #
+CONFIG_ARCH_STM32=y
 CONFIG_ARCH_OMAP=y
 CONFIG_ARCH_MULTIARCH=y
 # CONFIG_ARCH_AT91 is not set
@@ -29,7 +30,7 @@ CONFIG_ARCH_MULTIARCH=y
 # CONFIG_ARCH_LAYERSCAPE is not set
 CONFIG_ARCH_OMAP_MULTI=y
 # CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_STM32MP is not set
+CONFIG_ARCH_STM32MP=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_VEXPRESS is not set
 
@@ -65,6 +66,19 @@ CONFIG_MACH_BEAGLEBONE=y
 # CONFIG_MACH_WAGO_PFC_AM35XX is not set
 # end of OMAP Features
 
+CONFIG_ARCH_NR_GPIO=416
+CONFIG_ARCH_STM32MP13=y
+CONFIG_ARCH_STM32MP157=y
+CONFIG_MACH_STM32MP13XX_DK=y
+CONFIG_MACH_STM32MP15XX_DKX=y
+CONFIG_MACH_LXA_MC1=y
+# CONFIG_MACH_LXA_TAC is not set
+# CONFIG_MACH_LXA_FAIRYTUX2 is not set
+# CONFIG_MACH_SEEED_ODYSSEY is not set
+CONFIG_MACH_STM32MP15X_EV1=y
+# CONFIG_MACH_PROTONIC_STM32MP1 is not set
+# CONFIG_MACH_PROTONIC_STM32MP13 is not set
+# CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1 is not set
 CONFIG_BOARD_ARM_GENERIC_DT=y
 CONFIG_AEABI=y
 CONFIG_THUMB2_BAREBOX=y
@@ -82,7 +96,9 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_EXCEPTIONS=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_ARM_SEMIHOSTING is not set
-# CONFIG_ARM_PSCI_CLIENT is not set
+CONFIG_ARM_SMCCC=y
+CONFIG_ARM_PSCI_OF=y
+CONFIG_ARM_PSCI_CLIENT=y
 # CONFIG_ARM_BOOTM_ELF is not set
 # CONFIG_ARM_BOOTM_FIP is not set
 # end of ARM specific settings
@@ -217,7 +233,7 @@ CONFIG_CONSOLE_FULL=y
 CONFIG_CONSOLE_ACTIVATE_NONE=y
 CONFIG_CONSOLE_ALLOW_COLOR=y
 # CONFIG_CONSOLE_DISABLE_INPUT is not set
-# CONFIG_PBL_CONSOLE is not set
+CONFIG_PBL_CONSOLE=y
 # CONFIG_CONSOLE_RATP is not set
 CONFIG_PARTITION=y
 CONFIG_PARTITION_MANIPULATION=y
@@ -243,13 +259,16 @@ CONFIG_BOOTCHOOSER=y
 CONFIG_BOOT_DEFAULTS=y
 CONFIG_BAREBOX_DT_2ND=y
 CONFIG_RESET_SOURCE=y
-# CONFIG_MACHINE_ID is not set
+CONFIG_MACHINE_ID=y
 # CONFIG_SYSTEMD_OF_WATCHDOG is not set
 CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
 
 #
 # OP-TEE loading
 #
+CONFIG_HAVE_OPTEE=y
+CONFIG_OPTEE_SIZE=0x03000000
+CONFIG_OPTEE_SHM_SIZE=0x400000
 # CONFIG_BOOTM_OPTEE is not set
 CONFIG_FILETYPE_STRINGS=y
 # end of OP-TEE loading
@@ -270,6 +289,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_OMAP_UART_PORT=1
 # CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PBL is not set
 # CONFIG_DEBUG_PROBES is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DEBUG_LIST is not set
@@ -323,7 +343,7 @@ CONFIG_CMD_REGULATOR=y
 # CONFIG_CMD_VARINFO is not set
 CONFIG_CMD_VERSION=y
 CONFIG_CMD_MMC=y
-# CONFIG_CMD_MMC_EXTCSD is not set
+CONFIG_CMD_MMC_EXTCSD=y
 # CONFIG_CMD_POLLER is not set
 CONFIG_CMD_BTHREAD=y
 # CONFIG_CMD_SLICE is not set
@@ -438,7 +458,7 @@ CONFIG_CMD_ECHO_E=y
 CONFIG_CMD_EDIT=y
 # CONFIG_CMD_LOGIN is not set
 CONFIG_CMD_MENU=y
-# CONFIG_CMD_MENU_MANAGEMENT is not set
+CONFIG_CMD_MENU_MANAGEMENT=y
 CONFIG_CMD_MENUTREE=y
 CONFIG_CMD_READLINE=y
 CONFIG_CMD_TIMEOUT=y
@@ -462,17 +482,20 @@ CONFIG_CMD_MW=y
 #
 # Hardware manipulation
 #
+CONFIG_CMD_CLK=y
 CONFIG_CMD_DETECT=y
 # CONFIG_CMD_TRUNCATE is not set
 CONFIG_CMD_SYNC=y
 CONFIG_CMD_FLASH=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
+# CONFIG_CMD_PWM is not set
 CONFIG_CMD_LED=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_NANDTEST is not set
 # CONFIG_CMD_NAND_BITFLIP is not set
-# CONFIG_CMD_POWEROFF is not set
+CONFIG_CMD_POWEROFF=y
+# CONFIG_CMD_SMC is not set
 CONFIG_CMD_SPI=y
 CONFIG_CMD_LED_TRIGGER=y
 CONFIG_CMD_USB=y
@@ -507,11 +530,13 @@ CONFIG_CMD_STATE=y
 # CONFIG_CMD_DHRYSTONE is not set
 # CONFIG_CMD_SPD_DECODE is not set
 # CONFIG_CMD_SEED is not set
+# CONFIG_CMD_STACKSMASH is not set
 # end of Miscellaneous
 # end of Commands
 
 CONFIG_NET=y
-# CONFIG_NET_NETCONSOLE is not set
+CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
+CONFIG_NET_NETCONSOLE=y
 CONFIG_NET_RESOLV=y
 CONFIG_NET_IFUP=y
 CONFIG_NET_DHCP=y
@@ -521,12 +546,15 @@ CONFIG_NET_FASTBOOT=y
 #
 # Drivers
 #
+CONFIG_REGMAP_FORMATTED=y
+CONFIG_REGMAP_I2C=y
 CONFIG_OFTREE=y
 CONFIG_OFTREE_MEM_GENERIC=y
 CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_OFDEVICE=y
 CONFIG_OF_GPIO=y
+CONFIG_OF_GPIO_PINCONF=y
 CONFIG_OF_BAREBOX_DRIVERS=y
 # CONFIG_OF_BAREBOX_ENV_IN_FS is not set
 CONFIG_OF_OVERLAY=y
@@ -540,6 +568,7 @@ CONFIG_ARM_AMBA=y
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_DRIVER_SERIAL_ARM_DCC is not set
 # CONFIG_SERIAL_AMBA_PL011 is not set
+CONFIG_DRIVER_SERIAL_STM32=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 # CONFIG_DRIVER_SERIAL_NS16550_OMAP_TTYS is not set
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
@@ -556,6 +585,8 @@ CONFIG_PHYLIB=y
 CONFIG_DRIVER_NET_CPSW=y
 CONFIG_DRIVER_NET_TI_DAVINCI_MDIO=y
 # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set
+CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
+CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
 # CONFIG_DRIVER_NET_ENC28J60 is not set
 # CONFIG_DRIVER_NET_FSL_FMAN is not set
 # CONFIG_DRIVER_NET_KS8851_MLL is not set
@@ -572,14 +603,14 @@ CONFIG_DRIVER_NET_TI_DAVINCI_MDIO=y
 # MII PHY device drivers
 #
 # CONFIG_AR8327N_PHY is not set
-# CONFIG_AT803X_PHY is not set
+CONFIG_AT803X_PHY=y
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DP83867_PHY is not set
 # CONFIG_DP83TD510_PHY is not set
 # CONFIG_DP83TG720_PHY is not set
 # CONFIG_LXT_PHY is not set
 # CONFIG_MARVELL_PHY is not set
-# CONFIG_MICREL_PHY is not set
+CONFIG_MICREL_PHY=y
 # CONFIG_MOTORCOMM_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_REALTEK_PHY is not set
@@ -610,6 +641,8 @@ CONFIG_SPI_MEM=y
 CONFIG_DRIVER_SPI_GPIO=y
 # CONFIG_DRIVER_SPI_LITEX_SPIFLASH is not set
 CONFIG_DRIVER_SPI_OMAP3=y
+# CONFIG_STM32_QSPI is not set
+# CONFIG_DRIVER_SPI_STM32 is not set
 # end of SPI drivers
 
 CONFIG_I2C=y
@@ -620,7 +653,9 @@ CONFIG_I2C_ALGOBIT=y
 #
 CONFIG_I2C_GPIO=y
 # CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_MV64XXX is not set
 CONFIG_I2C_OMAP=y
+CONFIG_I2C_STM32=y
 # end of I2C Hardware Bus support
 
 # CONFIG_I2C_MUX is not set
@@ -661,6 +696,7 @@ CONFIG_NAND_ECC_HW_SYNDROME=y
 #
 CONFIG_NAND_OMAP_GPMC=y
 # CONFIG_MTD_NAND_OMAP_ELM is not set
+# CONFIG_NAND_STM32 is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
 # CONFIG_MTD_NAND_DENALI is not set
 
@@ -693,8 +729,9 @@ CONFIG_DISK_WRITE=y
 # CONFIG_DISK_INTF_PLATFORM_IDE is not set
 CONFIG_USB=y
 CONFIG_USB_HOST=y
-# CONFIG_USB_DWC2_HOST is not set
-# CONFIG_USB_DWC2_GADGET is not set
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+CONFIG_USB_DWC2_GADGET=y
 # CONFIG_USB_DWC3 is not set
 CONFIG_USB_EHCI=y
 # CONFIG_USB_XHCI is not set
@@ -735,7 +772,7 @@ CONFIG_MCI_STARTUP=y
 CONFIG_MCI_INFO=y
 CONFIG_MCI_WRITE=y
 CONFIG_MCI_ERASE=y
-# CONFIG_MCI_MMC_BOOT_PARTITIONS is not set
+CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 # CONFIG_MCI_MMC_GPP_PARTITIONS is not set
 # CONFIG_MCI_MMC_RPMB is not set
 
@@ -751,8 +788,16 @@ CONFIG_MCI_OMAP_HSMMC=y
 # CONFIG_MCI_ARASAN is not set
 # CONFIG_MCI_AM654 is not set
 # CONFIG_MCI_SPI is not set
+CONFIG_MCI_STM32_SDMMC2=y
 CONFIG_MCI_OMAP_HSMMC_PBL=y
-# CONFIG_COMMON_CLK is not set
+CONFIG_HAVE_CLK=y
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_OF_PROVIDER=y
+CONFIG_COMMON_CLK_STM32MP135=y
+CONFIG_COMMON_CLK_STM32MP157=y
+CONFIG_COMMON_CLK_SCMI=y
+CONFIG_COMMON_CLK_GPIO=y
 
 #
 # Clocksource
@@ -761,6 +806,7 @@ CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
 CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 CONFIG_CLOCKSOURCE_TI_DM=y
+# CONFIG_CLKSRC_STM32 is not set
 # end of Clocksource
 
 #
@@ -774,13 +820,14 @@ CONFIG_CLOCKSOURCE_TI_DM=y
 # CONFIG_MFD_MC34704 is not set
 # CONFIG_MFD_MC9SDZ60 is not set
 # CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TPS65219 is not set
 # CONFIG_MFD_TWL4030 is not set
 # CONFIG_MFD_TWL6030 is not set
-# CONFIG_MFD_STPMIC1 is not set
+CONFIG_MFD_STPMIC1=y
 # CONFIG_MFD_PCA9450 is not set
 # CONFIG_MFD_RN568PMIC is not set
+CONFIG_MFD_STM32_TIMERS=y
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_AXP20X_I2C is not set
@@ -800,6 +847,7 @@ CONFIG_DEV_MEM=y
 
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
+CONFIG_LED_PWM=y
 CONFIG_LED_GPIO_OF=y
 # CONFIG_LED_GPIO_RGB is not set
 # CONFIG_LED_GPIO_BICOLOR is not set
@@ -824,14 +872,19 @@ CONFIG_EEPROM_AT24=y
 # end of Input device support
 
 CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_POLLER is not set
+CONFIG_WATCHDOG_POLLER=y
 # CONFIG_WATCHDOG_DW is not set
 CONFIG_WATCHDOG_OMAP=y
+CONFIG_STM32_IWDG_WATCHDOG=y
+# CONFIG_STPMIC1_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_PWM is not set
+CONFIG_PWM=y
+CONFIG_PWM_STM32=y
 CONFIG_HWRNG=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HWRNG_STM32=y
+CONFIG_HW_RANDOM_OPTEE=y
 # CONFIG_HW_RANDOM_OMAP is not set
 
 #
@@ -846,6 +899,8 @@ CONFIG_GPIOLIB=y
 # GPIO
 #
 CONFIG_GPIO_GENERIC=y
+CONFIG_HAVE_GPIO_PINCONF=y
+CONFIG_GPIO_PINCONF=y
 # CONFIG_GPIO_74164 is not set
 # CONFIG_GPIO_74XX_MMIO is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -866,12 +921,16 @@ CONFIG_GPIO_OMAP=y
 #
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_STM32=y
 # end of Pin controllers
 
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_RMEM is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 # CONFIG_EEPROM_93XX46 is not set
+CONFIG_STM32_BSEC=y
+CONFIG_STM32_BSEC_WRITE=y
+CONFIG_STM32_BSEC_OPTEE_TA=y
 
 #
 # Bus devices
@@ -883,14 +942,24 @@ CONFIG_TI_SYSC=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED=y
 # CONFIG_REGULATOR_FAN53555 is not set
+CONFIG_REGULATOR_STM32_PWR=y
+CONFIG_REGULATOR_STM32_VREFBUF=y
+CONFIG_REGULATOR_STPMIC1=y
+# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_ARM_SCMI=y
 
 #
 # Remoteproc drivers
 #
-# CONFIG_REMOTEPROC is not set
+CONFIG_REMOTEPROC=y
+CONFIG_STM32_REMOTEPROC=y
 # end of Remoteproc drivers
 
-# CONFIG_RESET_CONTROLLER is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_SIMPLE=y
+# CONFIG_RESET_IMX7 is not set
+CONFIG_RESET_SCMI=y
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -902,7 +971,13 @@ CONFIG_REGULATOR_FIXED=y
 #
 # ARM System Control and Management Interface Protocol
 #
-# CONFIG_ARM_SCMI_PROTOCOL is not set
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
+CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_HAVE_MSG=y
+CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+# CONFIG_ARM_SCMI_POWER_DOMAIN is not set
 # end of ARM System Control and Management Interface Protocol
 # end of Firmware Drivers
 
@@ -912,7 +987,10 @@ CONFIG_REGULATOR_FIXED=y
 # CONFIG_FPGA is not set
 # end of FPGA Configuration Support
 
-# CONFIG_GENERIC_PHY is not set
+CONFIG_GENERIC_PHY=y
+# CONFIG_USB_NOP_XCEIV is not set
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
+CONFIG_PHY_STM32_USBPHYC=y
 
 #
 # Hardware crypto devices
@@ -922,6 +1000,7 @@ CONFIG_REGULATOR_FIXED=y
 #
 # Memory controller drivers
 #
+CONFIG_STM32_FMC2_EBI=y
 # end of Memory controller drivers
 
 #
@@ -954,14 +1033,19 @@ CONFIG_REGULATOR_FIXED=y
 #
 # end of NVME Support
 
+# CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_POWER_RESET_SYSCON is not set
 # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
 # CONFIG_POWER_RESET_GPIO is not set
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
+CONFIG_RESET_STM32=y
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_MAILBOX is not set
-# CONFIG_TEE is not set
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+# CONFIG_OPTEE_AVB_PERSISTENT_VALUES is not set
+CONFIG_OF_FIXUP_OPTEE=y
 # end of Drivers
 
 #
@@ -1043,7 +1127,7 @@ CONFIG_LIBFDT=y
 # CONFIG_RATP is not set
 # CONFIG_ALLOW_PRNG_FALLBACK is not set
 # CONFIG_CRC_CCITT is not set
-# CONFIG_CRC8 is not set
+CONFIG_CRC8=y
 
 #
 # Library gui routines
@@ -1053,6 +1137,7 @@ CONFIG_LIBFDT=y
 CONFIG_PRINTF_UUID=y
 CONFIG_NLS=y
 # CONFIG_BLOBGEN is not set
+CONFIG_IDR=y
 # end of Library routines
 
 #
@@ -1088,8 +1173,9 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # end of Memory initialization
 
 # CONFIG_STACK_GUARD_PAGE is not set
-CONFIG_STACKPROTECTOR_NONE=y
-# CONFIG_STACKPROTECTOR_STRONG is not set
+CONFIG_STACKPROTECTOR=y
+# CONFIG_STACKPROTECTOR_NONE is not set
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_PBL_STACKPROTECTOR_NONE=y
 # CONFIG_PBL_STACKPROTECTOR_STRONG is not set
 # end of Hardening options
diff --git a/configs/platform-v7a/config/images/stm32mp-optee.config b/configs/platform-v7a/config/images/stm32mp-optee.config
index 4b58f3be69ab..49981b27b5bb 100644
--- a/configs/platform-v7a/config/images/stm32mp-optee.config
+++ b/configs/platform-v7a/config/images/stm32mp-optee.config
@@ -52,7 +52,7 @@ image @STM32MP_BOARD@-emmcboot.img {
 image @STM32MP_BOARD@.fip {
 	fip {
 		fw-config = "stm32mp1-@STM32MP_BOARD@-fw-config.dtb"
-		hw-config = "@STM32MP_BOARD@.dtb-bb"
+		hw-config = "barebox-@STM32MP_BOARD@.dtb"
 		nt-fw = "barebox-stm32mp-generic-bl33.img"
 		tos-fw = { "tee-header_v2.bin", "tee-pager_v2.bin", "tee-pageable_v2.bin" }
 	}
diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config
index 247fb49c0a77..854437964388 100644
--- a/configs/platform-v7a/config/images/stm32mp.config
+++ b/configs/platform-v7a/config/images/stm32mp.config
@@ -16,7 +16,6 @@ image @IMAGE@ {
 	}
 	partition fip {
 		image = "@STM32MP_BOARD@@SCMI@.fip"
-		size = 1M
 	}
 
 	partition barebox-environment {
@@ -52,11 +51,11 @@ image @STM32MP_BOARD@@SCMI@-emmcboot.img {
 image @STM32MP_BOARD@@SCMI@.fip {
 	fip {
 		fw-config = "stm32mp1-@STM32MP_BOARD@-fw-config.dtb"
-		hw-config = "@STM32MP_BOARD@@SCMI@.dtb-bb"
+		hw-config = "barebox-@STM32MP_BOARD@@SCMI@.dtb"
 		nt-fw = "barebox-stm32mp-generic-bl33.img"
 		tos-fw = { "stm32mp1-bl32.bin" }
 		tos-fw-config = "stm32mp1-@STM32MP_BOARD@-bl32.dtb"
 	}
-	size = 1M
+	size = 2M
 }
 /* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 0d6a0fdcd86a..ad5efc011d80 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -192,7 +192,6 @@ PTXCONF_BAREBOX_AM335X_MLO=y
 PTXCONF_BAREBOX_AT91=y
 PTXCONF_BAREBOX_MX6=y
 PTXCONF_BAREBOX_RPI2=y
-PTXCONF_BAREBOX_STM32MP=y
 PTXCONF_BAREBOX_VEXPRESS=y
 PTXCONF_BAREBOX_ARCH_STRING="arm"
 PTXCONF_BAREBOX_DEPENDENCIES=y
@@ -206,7 +205,7 @@ PTXCONF_BAREBOX_CONFIG="barebox.config"
 PTXCONF_BAREBOX_EXTRA_ENV=y
 PTXCONF_BAREBOX_EXTRA_ENV_PATH="barebox-defaultenv"
 # PTXCONF_BAREBOX_BAREBOXENV is not set
-# PTXCONF_BAREBOX_INSTALL_DTBS is not set
+PTXCONF_BAREBOX_INSTALL_DTBS=y
 # PTXCONF_BAREBOX_BAREBOXCRC32 is not set
 # PTXCONF_BAREBOX_KERNEL_INSTALL is not set
 # PTXCONF_BAREBOX_BAREBOXIMD is not set
diff --git a/configs/platform-v7a/platforms/barebox-stm32mp.in b/configs/platform-v7a/platforms/barebox-stm32mp.in
deleted file mode 100644
index 6fc59546d8f4..000000000000
--- a/configs/platform-v7a/platforms/barebox-stm32mp.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=bootloader
-
-config BAREBOX_STM32MP
-	tristate
-	prompt "Barebox (stm32mp)"
-	select BAREBOX_COMMON
-	help
-	  Barebox image for STM32MP
diff --git a/configs/platform-v7a/platforms/image-lxa-mc1-scmi.in b/configs/platform-v7a/platforms/image-lxa-mc1-scmi.in
index 728ce474c472..0e28544bb9b1 100644
--- a/configs/platform-v7a/platforms/image-lxa-mc1-scmi.in
+++ b/configs/platform-v7a/platforms/image-lxa-mc1-scmi.in
@@ -5,7 +5,7 @@ config IMAGE_LXA_MC1_SCMI
 	select HOST_GENIMAGE
 	select HOST_TF_A
 	select IMAGE_ROOT_EXT
-	select BAREBOX_STM32MP
+	select BAREBOX
 	select TF_A
 	prompt "Generate images/lxa-mc1-scmi.hdimg"
 	help
diff --git a/configs/platform-v7a/platforms/image-lxa-mc1.in b/configs/platform-v7a/platforms/image-lxa-mc1.in
index affb04eed9de..2fd4b689da7f 100644
--- a/configs/platform-v7a/platforms/image-lxa-mc1.in
+++ b/configs/platform-v7a/platforms/image-lxa-mc1.in
@@ -5,7 +5,7 @@ config IMAGE_LXA_MC1
 	select HOST_GENIMAGE
 	select HOST_TF_A
 	select IMAGE_ROOT_EXT
-	select BAREBOX_STM32MP
+	select BAREBOX
 	select TF_A
 	prompt "Generate images/lxa-mc1.hdimg"
 	help
diff --git a/configs/platform-v7a/platforms/image-stm32mp135f-dk.in b/configs/platform-v7a/platforms/image-stm32mp135f-dk.in
index 4b06817a7dfc..08b20a3fa305 100644
--- a/configs/platform-v7a/platforms/image-stm32mp135f-dk.in
+++ b/configs/platform-v7a/platforms/image-stm32mp135f-dk.in
@@ -7,7 +7,7 @@ config IMAGE_STM32MP135F_DK
 	select IMAGE_ROOT_EXT
 	select TF_A_STM32MP13
 	select OPTEE
-	select BAREBOX_STM32MP
+	select BAREBOX
 	prompt "Generate images/stm32mp135f-dk.hdimg"
 	help
 	  Generate GPT image for the STM32MP135F-DK
diff --git a/configs/platform-v7a/platforms/image-stm32mp157c-dk2.in b/configs/platform-v7a/platforms/image-stm32mp157c-dk2.in
index d146b96bac70..a8ad90ddb879 100644
--- a/configs/platform-v7a/platforms/image-stm32mp157c-dk2.in
+++ b/configs/platform-v7a/platforms/image-stm32mp157c-dk2.in
@@ -5,7 +5,7 @@ config IMAGE_STM32MP157C_DK2
 	select HOST_GENIMAGE
 	select HOST_TF_A
 	select IMAGE_ROOT_EXT
-	select BAREBOX_STM32MP
+	select BAREBOX
 	select TF_A
 	prompt "Generate images/stm32mp157c-dk2.hdimg"
 	help
diff --git a/configs/platform-v7a/platforms/image-stm32mp157c-ev1.in b/configs/platform-v7a/platforms/image-stm32mp157c-ev1.in
index 7bc91af9e34c..427918e13ad9 100644
--- a/configs/platform-v7a/platforms/image-stm32mp157c-ev1.in
+++ b/configs/platform-v7a/platforms/image-stm32mp157c-ev1.in
@@ -5,7 +5,7 @@ config IMAGE_STM32MP157C_EV1
 	select HOST_GENIMAGE
 	select HOST_TF_A
 	select IMAGE_ROOT_EXT
-	select BAREBOX_STM32MP
+	select BAREBOX
 	select TF_A
 	prompt "Generate images/stm32mp157c-ev1.hdimg"
 	help
diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make
deleted file mode 100644
index c2ee11957240..000000000000
--- a/configs/platform-v7a/rules/barebox-stm32mp.make
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BAREBOX_STM32MP) += barebox-stm32mp
-
-#
-# Paths and names
-#
-BAREBOX_STM32MP_VERSION		:= $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_STM32MP_MD5		:= $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_STM32MP			:= barebox-stm32mp-$(BAREBOX_STM32MP_VERSION)
-BAREBOX_STM32MP_SUFFIX		:= tar.bz2
-BAREBOX_STM32MP_URL		:= $(call barebox-url, BAREBOX_STM32MP)
-BAREBOX_STM32MP_PATCHES		:= barebox-$(BAREBOX_STM32MP_VERSION)
-BAREBOX_STM32MP_SOURCE		:= $(SRCDIR)/$(BAREBOX_STM32MP_PATCHES).$(BAREBOX_STM32MP_SUFFIX)
-BAREBOX_STM32MP_DIR		:= $(BUILDDIR)/$(BAREBOX_STM32MP)
-BAREBOX_STM32MP_BUILD_DIR	:= $(BAREBOX_STM32MP_DIR)-build
-BAREBOX_STM32MP_CONFIG		:= $(call ptx/in-platformconfigdir, barebox-stm32mp.config)
-BAREBOX_STM32MP_REF_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-common.config)
-BAREBOX_STM32MP_LICENSE		:= GPL-2.0
-BAREBOX_STM32MP_BUILD_OOT	:= KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-BAREBOX_STM32MP_WRAPPER_BLACKLIST := \
-	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-
-BAREBOX_STM32MP_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_STM32MP_CONF_OPT := \
-	-C $(BAREBOX_STM32MP_DIR) \
-	O=$(BAREBOX_STM32MP_BUILD_DIR) \
-	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
-	$(call barebox-opts, BAREBOX_STM32MP)
-
-BAREBOX_STM32MP_MAKE_OPT := $(BAREBOX_STM32MP_CONF_OPT)
-
-BAREBOX_STM32MP_IMAGES := \
-	images/barebox-stm32mp-generic-bl33.img
-
-BAREBOX_STM32MP_FIP_DTBS := \
-	stm32mp157c-dk2.dtb \
-	stm32mp157c-ev1.dtb \
-	stm32mp157c-lxa-mc1.dtb \
-	stm32mp157c-lxa-mc1-scmi.dtb \
-	stm32mp135f-dk.dtb
-
-BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/,$(BAREBOX_STM32MP_IMAGES))
-BAREBOX_STM32MP_FIP_DTBS := \
-	$(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/arch/arm/dts/,$(BAREBOX_STM32MP_FIP_DTBS))
-
-ifdef PTXCONF_BAREBOX_STM32MP
-$(BAREBOX_STM32MP_CONFIG):
-	@echo
-	@echo "****************************************************************************"
-	@echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-stm32mp'"
-	@echo "****************************************************************************"
-	@echo
-	@echo
-	@exit 1
-endif
-
-$(STATEDIR)/barebox-stm32mp.prepare: $(BAREBOX_STM32MP_CONFIG)
-	@$(call targetinfo)
-	@$(call world/prepare, BAREBOX_STM32MP)
-	@rm -f "$(BAREBOX_STM32MP_BUILD_DIR)/.ptxdist-defaultenv"
-	@ln -s "$(call ptx/in-platformconfigdir, barebox-stm32mp-defaultenv)" \
-		"$(BAREBOX_STM32MP_BUILD_DIR)/.ptxdist-defaultenv"
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-stm32mp.install:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Targetinstall
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-stm32mp.targetinstall:
-	@$(call targetinfo)
-	@$(foreach image, $(BAREBOX_STM32MP_IMAGES), \
-		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image));)
-	@$(foreach dtb, $(BAREBOX_STM32MP_FIP_DTBS), \
-			install -m 644 \
-			$(dtb) $(IMAGEDIR)/$(notdir $(dtb))-bb;)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-stm32mp.clean:
-	@$(call targetinfo)
-	@$(call clean_pkg, BAREBOX_STM32MP)
-	@$(foreach image, $(BAREBOX_STM32MP_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@$(foreach dtb, $(BAREBOX_STM32MP_FIP_DTBS), \
-		rm -fv $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl))
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-barebox-stm32mp_oldconfig barebox-stm32mp_menuconfig barebox-stm32mp_nconfig: $(STATEDIR)/barebox-stm32mp.extract
-	@$(call world/kconfig, BAREBOX_STM32MP, $(subst barebox-stm32mp_,,$@))
-
-# vim: syntax=make
-- 
2.39.5