[DistroKit] [PATCH 08/11] v7a: vexpress: switch to upstream barebox recipe

[Roland Hieber <rhi@pengutronix.de>]

Remove the separate barebox-vexpress recipe in favour of the barebox
recipe from upstream PTXdist, which already supports multi-arch build.
Merge the kconfig options from the config diff. The old defaultenv is
already the same as in the upstream recipe, so we don't need to port
anything. However, the Vexpress platform cannot detect their bootsource,
so we have to introduce an init script that hard-codes our boot disk in
a suitably named boot script as a workaround so that the default boot
target can be successfully booted.

With the upstream barebox recipe, the barebox image is currently at
about 940 kiB, so we have to increase the partition sizes in the NOR
image. (Even if the env image is named "barebox-default-environment",
it is really an empty environment image only containing a correct
superblock and checksum, but no values, like calling "bareboxenv -z").

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 .../boot/9p                                   |    5 +
 .../init/missing-bootsource                   |   18 +
 .../nv/boot.default                           |    1 -
 .../nv/bootchooser.state_prefix               |    1 -
 .../nv/bootchooser.system0.boot               |    1 -
 .../nv/bootchooser.system1.boot               |    1 -
 .../nv/bootchooser.targets                    |    1 -
 .../nv/linux.bootargs.loglevel                |    1 -
 configs/platform-v7a/barebox-vexpress.config  | 1057 -----------------
 .../platform-v7a/barebox-vexpress.config.diff |   72 --
 configs/platform-v7a/barebox.config           |   24 +-
 .../config/images/vexpress-nor.config         |    6 +-
 configs/platform-v7a/platformconfig           |    1 -
 .../platforms/barebox-vexpress.in             |    8 -
 .../platforms/image-vexpress-nor.in           |    2 +-
 .../platform-v7a/platforms/image-vexpress.in  |    2 +-
 .../platform-v7a/rules/barebox-vexpress.make  |  111 --
 configs/platform-v7a/run                      |    2 +-
 18 files changed, 46 insertions(+), 1268 deletions(-)
 rename configs/platform-v7a/{barebox-vexpress-defaultenv => barebox-defaultenv}/boot/9p (69%)
 create mode 100644 configs/platform-v7a/barebox-defaultenv/init/missing-bootsource
 delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/boot.default
 delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix
 delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot
 delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot
 delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets
 delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/linux.bootargs.loglevel
 delete mode 100644 configs/platform-v7a/barebox-vexpress.config
 delete mode 100644 configs/platform-v7a/barebox-vexpress.config.diff
 delete mode 100644 configs/platform-v7a/platforms/barebox-vexpress.in
 delete mode 100644 configs/platform-v7a/rules/barebox-vexpress.make

diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/boot/9p b/configs/platform-v7a/barebox-defaultenv/boot/9p
similarity index 69%
rename from configs/platform-v7a/barebox-vexpress-defaultenv/boot/9p
rename to configs/platform-v7a/barebox-defaultenv/boot/9p
index 264ffeca3e69..3f388a47064a 100644
--- a/configs/platform-v7a/barebox-vexpress-defaultenv/boot/9p
+++ b/configs/platform-v7a/barebox-defaultenv/boot/9p
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if ! of_compatible arm,vexpress ; then
+	echo "9p is currently only available on QEMU ARM Vexpress"
+	return 1
+fi
+
 addpart /dev/nor0 "8M@32M(kernel)"
 addpart /dev/nor0 "512k@40M(dtb)"
 global.bootm.image="/dev/nor0.kernel"
diff --git a/configs/platform-v7a/barebox-defaultenv/init/missing-bootsource b/configs/platform-v7a/barebox-defaultenv/init/missing-bootsource
new file mode 100644
index 000000000000..1bf83bb2171c
--- /dev/null
+++ b/configs/platform-v7a/barebox-defaultenv/init/missing-bootsource
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if of_compatible -k arm,vexpress,v2p-ca9; then
+	realbootsource="disk0";
+fi
+
+if [ -z "$realbootsource" ]; then
+	exit
+fi
+
+for part in root-A root-B; do
+	if [ ! -e "/env/boot/bootsource.${part}" ]; then
+		echo "Platform does not support 'bootsource' target, creating workaround boot target for ${part}"
+		echo -o /env/boot/bootsource.${part} '#!/bin/sh'
+		echo -a /env/boot/bootsource.${part} "boot ${realbootsource}.${part}"
+	fi
+done
+saveenv
diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/boot.default b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/boot.default
deleted file mode 100644
index d7d9a373c50b..000000000000
--- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/boot.default
+++ /dev/null
@@ -1 +0,0 @@
-bootchooser net
diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix
deleted file mode 100644
index 6246412a5c27..000000000000
--- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix
+++ /dev/null
@@ -1 +0,0 @@
-state.bootstate
diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot
deleted file mode 100644
index 582283c385a7..000000000000
--- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot
+++ /dev/null
@@ -1 +0,0 @@
-disk0.root-A
diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot
deleted file mode 100644
index 323bafbde518..000000000000
--- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot
+++ /dev/null
@@ -1 +0,0 @@
-disk0.root-B
diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets
deleted file mode 100644
index f0fb14eeaad2..000000000000
--- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets
+++ /dev/null
@@ -1 +0,0 @@
-system0 system1
diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/linux.bootargs.loglevel
deleted file mode 100644
index d45c34464422..000000000000
--- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/linux.bootargs.loglevel
+++ /dev/null
@@ -1 +0,0 @@
-loglevel=5 systemd.show_status=auto
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
deleted file mode 100644
index e90e27442ed1..000000000000
--- a/configs/platform-v7a/barebox-vexpress.config
+++ /dev/null
@@ -1,1057 +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_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 is not set
-# CONFIG_ARCH_VERSATILE is not set
-CONFIG_ARCH_VEXPRESS=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-
-#
-# processor features
-#
-# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_MACH_VEXPRESS=y
-# CONFIG_MACH_VIRT is not set
-CONFIG_BOARD_ARM_GENERIC_DT=y
-CONFIG_AEABI=y
-# CONFIG_THUMB2_BAREBOX is not set
-# CONFIG_ARM_BOARD_APPEND_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_PSCI_CLIENT is not set
-# 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_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="vexpress: "
-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 is not set
-# 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=y
-CONFIG_PARTITION_DISK_EFI_GPT_COMPARE=y
-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 is not set
-# CONFIG_SYSTEMD_OF_WATCHDOG is not set
-CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
-
-#
-# OP-TEE loading
-#
-# CONFIG_BOOTM_OPTEE is not set
-# CONFIG_PBL_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=7
-CONFIG_DEFAULT_LOGLEVEL=6
-# 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_VARINFO is not set
-CONFIG_CMD_VERSION=y
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_MMC_EXTCSD is not set
-# 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=y
-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=y
-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 is not set
-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_I2C=y
-CONFIG_CMD_LED=y
-# CONFIG_CMD_POWEROFF is not set
-CONFIG_CMD_SPI=y
-CONFIG_CMD_LED_TRIGGER=y
-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
-# end of Miscellaneous
-# end of Commands
-
-CONFIG_NET=y
-# CONFIG_NET_NETCONSOLE is not set
-CONFIG_NET_RESOLV=y
-CONFIG_NET_IFUP=y
-CONFIG_NET_DHCP=y
-# CONFIG_NET_SNTP is not set
-CONFIG_NET_FASTBOOT=y
-
-#
-# Drivers
-#
-CONFIG_OFTREE=y
-CONFIG_OFTREE_MEM_GENERIC=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_OFDEVICE=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=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_ENC28J60 is not set
-# CONFIG_DRIVER_NET_FSL_FMAN is not set
-# CONFIG_DRIVER_NET_KS8851_MLL is not set
-# CONFIG_DRIVER_NET_MICREL is not set
-CONFIG_DRIVER_NET_SMC911X=y
-# 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 is not set
-# 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_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
-# end of phylib
-
-CONFIG_NET_USB=y
-CONFIG_NET_USB_ASIX=y
-# CONFIG_USB_NET_AX88179_178A is not set
-CONFIG_NET_USB_SMSC95XX=y
-# CONFIG_NET_USB_RTL8152 is not set
-# CONFIG_DSA is not set
-# end of Network drivers
-
-#
-# SPI drivers
-#
-CONFIG_SPI=y
-# CONFIG_SPI_MEM is not set
-# CONFIG_DRIVER_SPI_LITEX_SPIFLASH is not set
-# end of SPI drivers
-
-CONFIG_I2C=y
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_MV64XXX is not set
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_MUX is not set
-CONFIG_MTD=y
-CONFIG_MTD_WRITE=y
-CONFIG_MTD_OOB_DEVICE=y
-# CONFIG_MTD_RAW_DEVICE is not set
-CONFIG_MTD_CONCAT=y
-
-#
-# MTD debug options
-#
-# CONFIG_MTD_PEB_DEBUG is not set
-
-#
-# Self contained MTD devices
-#
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_DOCG3 is not set
-# CONFIG_MTD_MTDRAM is not set
-# end of Self contained MTD devices
-
-CONFIG_DRIVER_CFI=y
-CONFIG_DRIVER_CFI_INTEL=y
-CONFIG_DRIVER_CFI_AMD=y
-CONFIG_DRIVER_CFI_BANK_WIDTH_1=y
-CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
-CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
-# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set
-# CONFIG_CFI_BUFFER_WRITE is not set
-
-#
-# NAND
-#
-# CONFIG_NAND is not set
-
-#
-# ECC engine support
-#
-# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
-# CONFIG_MTD_NAND_ECC_SW_BCH is not set
-# end of ECC engine support
-# end of NAND
-
-# CONFIG_MTD_SPI_NOR is not set
-# CONFIG_MTD_UBI 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_HOST is not set
-# CONFIG_USB_DWC2_GADGET is not set
-# CONFIG_USB_DWC3 is not set
-CONFIG_USB_EHCI=y
-# CONFIG_USB_XHCI is not set
-# CONFIG_USB_ULPI is not set
-CONFIG_USB_STORAGE=y
-
-#
-# 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=y
-
-#
-# 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 is not set
-# 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=y
-# CONFIG_MCI_ARASAN is not set
-# CONFIG_MCI_AM654 is not set
-# CONFIG_MCI_SPI is not set
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_OF_PROVIDER=y
-CONFIG_COMMON_CLK_GPIO=y
-
-#
-# Clocksource
-#
-CONFIG_AMBA_SP804=y
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
-# CONFIG_CLOCKSOURCE_DW_APB_TIMER 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 is not set
-# 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_PCA9450 is not set
-# CONFIG_MFD_RN568PMIC is not set
-# 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_SRAM=y
-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_TRIGGERS=y
-# CONFIG_LED_PCA955X is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_AT24 is not set
-# end of EEPROM support
-
-#
-# Input device support
-#
-# CONFIG_INPUT_EVBUG 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 is not set
-# CONFIG_WATCHDOG_DW is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_PWM is not set
-CONFIG_HWRNG=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-
-#
-# DMA support
-#
-# CONFIG_DMADEVICES is not set
-# end of DMA support
-
-# CONFIG_W1 is not set
-
-#
-# Pin controllers
-#
-CONFIG_PINCTRL=y
-# CONFIG_PINCTRL_SINGLE is not set
-# end of Pin controllers
-
-# CONFIG_NVMEM is not set
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_FAN53555 is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-# CONFIG_RESET_CONTROLLER is not set
-# 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 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 is not set
-
-#
-# Hardware crypto devices
-#
-# end of Hardware crypto devices
-
-#
-# Memory controller drivers
-#
-# 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_POWER_RESET_SYSCON is not set
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_VIRTIO_MENU is not set
-# CONFIG_MAILBOX is not set
-# CONFIG_TEE is not set
-# 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_JFFS2 is not set
-# 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=y
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_ZSTD_DECOMPRESS is not set
-CONFIG_XZ_DECOMPRESS=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_ARM64=y
-# 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 is not set
-
-#
-# Library gui routines
-#
-# end of Library gui routines
-
-CONFIG_PRINTF_UUID=y
-CONFIG_NLS=y
-# CONFIG_BLOBGEN is not set
-# 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 is not set
-CONFIG_STACKPROTECTOR_NONE=y
-# CONFIG_STACKPROTECTOR_STRONG is not set
-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_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 is not set
-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-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
deleted file mode 100644
index 9d84cd8b5914..000000000000
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-3118a4e72c6ae44b00e041e7fbe80ad3
-CONFIG_AMBA_SP804=y
-# CONFIG_ARCH_BCM283X is not set
-CONFIG_ARCH_VEXPRESS=y
-# CONFIG_ARM_SECURE_MONITOR is undefined
-# CONFIG_ARM_SMCCC is undefined
-# CONFIG_CFI_BUFFER_WRITE is not set
-# CONFIG_CLOCKSOURCE_BCM283X is undefined
-# CONFIG_CMD_GPIO is undefined
-# CONFIG_CMD_SMC is undefined
-# CONFIG_DEBUG_PBL is not set
-CONFIG_DRIVER_CFI=y
-CONFIG_DRIVER_CFI_AMD=y
-CONFIG_DRIVER_CFI_BANK_WIDTH_1=y
-CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
-CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
-# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set
-CONFIG_DRIVER_CFI_INTEL=y
-CONFIG_DRIVER_NET_SMC911X=y
-# CONFIG_DRIVER_SPI_GPIO is undefined
-# CONFIG_FIRMWARE_ALTERA_SERIAL is undefined
-# CONFIG_GENERIC_GPIO is undefined
-# CONFIG_GPIOLIB is undefined
-# CONFIG_GPIO_74164 is undefined
-# CONFIG_GPIO_74XX_MMIO is undefined
-# CONFIG_GPIO_DESIGNWARE is undefined
-# CONFIG_GPIO_GENERIC_PLATFORM is undefined
-# CONFIG_GPIO_LATCH is undefined
-# CONFIG_GPIO_PCA953X is undefined
-# CONFIG_GPIO_PCF857X is undefined
-# CONFIG_GPIO_PL061 is undefined
-# CONFIG_GPIO_RASPBERRYPI_EXP is undefined
-# CONFIG_GPIO_SIFIVE is undefined
-# CONFIG_GPIO_SX150X is undefined
-# CONFIG_GPIO_WATCHDOG is undefined
-# CONFIG_HW_RANDOM_BCM2835 is undefined
-# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined
-# CONFIG_I2C_ALGOBIT is undefined
-# CONFIG_I2C_BCM283X is undefined
-# CONFIG_I2C_GPIO is undefined
-# CONFIG_JTAG is undefined
-# CONFIG_KEYBOARD_GPIO is undefined
-# CONFIG_KEYBOARD_QT1070 is undefined
-# CONFIG_LED_GPIO is undefined
-# CONFIG_LED_GPIO_BICOLOR is undefined
-# CONFIG_LED_GPIO_OF is undefined
-# CONFIG_LED_GPIO_RGB is undefined
-# 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_VEXPRESS=y
-# CONFIG_MACH_VIRT is not set
-# CONFIG_MCI_BCM283X is undefined
-# CONFIG_MCI_BCM283X_SDHOST is undefined
-# CONFIG_MDIO_BUS_MUX_GPIO is undefined
-CONFIG_MTD_CONCAT=y
-# CONFIG_OF_GPIO is undefined
-CONFIG_PBL_CONSOLE=y
-# CONFIG_PINCTRL_BCM283X is undefined
-# CONFIG_POWER_RESET_GPIO is undefined
-# CONFIG_POWER_RESET_GPIO_RESTART is undefined
-CONFIG_PROMPT="vexpress: "
-# CONFIG_REGULATOR_BCM283X is undefined
-# CONFIG_REGULATOR_FIXED is undefined
-CONFIG_SERIAL_AMBA_PL011=y
-# CONFIG_SPI_BCM2835 is undefined
-CONFIG_SRAM=y
-# CONFIG_WATCHDOG_BCM2835 is undefined
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 18869ee9fea9..dad3c5e822a1 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -32,7 +32,7 @@ CONFIG_ARCH_OMAP_MULTI=y
 # CONFIG_ARCH_ROCKCHIP is not set
 CONFIG_ARCH_STM32MP=y
 # CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
+CONFIG_ARCH_VEXPRESS=y
 
 #
 # Processor Type
@@ -194,6 +194,8 @@ 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_MACH_VEXPRESS=y
+# CONFIG_MACH_VIRT is not set
 CONFIG_BOARD_ARM_GENERIC_DT=y
 CONFIG_AEABI=y
 CONFIG_THUMB2_BAREBOX=y
@@ -692,7 +694,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_SERIAL_AMBA_PL011=y
 CONFIG_DRIVER_SERIAL_IMX=y
 CONFIG_DRIVER_SERIAL_STM32=y
 CONFIG_DRIVER_SERIAL_NS16550=y
@@ -720,7 +722,7 @@ CONFIG_DRIVER_NET_FEC_IMX=y
 # CONFIG_DRIVER_NET_FSL_FMAN is not set
 # CONFIG_DRIVER_NET_KS8851_MLL is not set
 # CONFIG_DRIVER_NET_MICREL is not set
-# CONFIG_DRIVER_NET_SMC911X is not set
+CONFIG_DRIVER_NET_SMC911X=y
 # CONFIG_DRIVER_NET_SMC91111 is not set
 # CONFIG_DRIVER_NET_LITEETH is not set
 
@@ -796,7 +798,7 @@ CONFIG_MTD=y
 CONFIG_MTD_WRITE=y
 CONFIG_MTD_OOB_DEVICE=y
 CONFIG_MTD_RAW_DEVICE=y
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
 
 #
 # MTD debug options
@@ -813,7 +815,14 @@ CONFIG_MTD_M25P80=y
 # CONFIG_MTD_MTDRAM is not set
 # end of Self contained MTD devices
 
-# CONFIG_DRIVER_CFI is not set
+CONFIG_DRIVER_CFI=y
+CONFIG_DRIVER_CFI_INTEL=y
+CONFIG_DRIVER_CFI_AMD=y
+CONFIG_DRIVER_CFI_BANK_WIDTH_1=y
+CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
+CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
+# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set
+# CONFIG_CFI_BUFFER_WRITE is not set
 
 #
 # NAND
@@ -965,7 +974,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 CONFIG_MCI_IMX_ESDHC=y
 # CONFIG_MCI_IMX_ESDHC_PIO is not set
 CONFIG_MCI_OMAP_HSMMC=y
-# CONFIG_MCI_MMCI is not set
+CONFIG_MCI_MMCI=y
 # CONFIG_MCI_ARASAN is not set
 # CONFIG_MCI_AM654 is not set
 # CONFIG_MCI_SPI is not set
@@ -984,6 +993,7 @@ CONFIG_COMMON_CLK_GPIO=y
 # Clocksource
 #
 CONFIG_ARCH_HAS_IMX_GPT=y
+CONFIG_AMBA_SP804=y
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
 CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 CONFIG_CLOCKSOURCE_IMX_GPT=y
@@ -1021,7 +1031,7 @@ CONFIG_MFD_STM32_TIMERS=y
 # Misc devices
 #
 # CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
+CONFIG_SRAM=y
 CONFIG_STATE_DRV=y
 CONFIG_DEV_MEM=y
 # CONFIG_UBOOTVAR is not set
diff --git a/configs/platform-v7a/config/images/vexpress-nor.config b/configs/platform-v7a/config/images/vexpress-nor.config
index 58bbbfca404a..6dc983325ee5 100644
--- a/configs/platform-v7a/config/images/vexpress-nor.config
+++ b/configs/platform-v7a/config/images/vexpress-nor.config
@@ -12,13 +12,13 @@ image @IMAGE@ {
 	}
 	partition barebox-environment {
 		/* empty environment -> use barebox builtin */
-		image = barebox-zero-env-vexpress
-		offset = 512K
+		image = barebox-default-environment
+		offset = 2M
 		in-partition-table = false
 	}
 	partition barebox-state {
 		image = /dev/null
-		offset = 1M
+		offset = 3M
 		in-partition-table = false
 		size = 1M
 	}
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index b7b3672d82f6..1230a3424a63 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -191,7 +191,6 @@ PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
 PTXCONF_BAREBOX_AM335X_MLO=y
 PTXCONF_BAREBOX_AT91=y
 PTXCONF_BAREBOX_RPI2=y
-PTXCONF_BAREBOX_VEXPRESS=y
 PTXCONF_BAREBOX_ARCH_STRING="arm"
 PTXCONF_BAREBOX_DEPENDENCIES=y
 PTXCONF_BAREBOX=y
diff --git a/configs/platform-v7a/platforms/barebox-vexpress.in b/configs/platform-v7a/platforms/barebox-vexpress.in
deleted file mode 100644
index 2d3540b312f5..000000000000
--- a/configs/platform-v7a/platforms/barebox-vexpress.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=bootloader
-
-config BAREBOX_VEXPRESS
-	tristate
-	prompt "Barebox (vexpress)"
-	select BAREBOX_COMMON
-	help
-	  Vexpress support for barebox.
diff --git a/configs/platform-v7a/platforms/image-vexpress-nor.in b/configs/platform-v7a/platforms/image-vexpress-nor.in
index 20593d87e5d9..5e1891f0bea6 100644
--- a/configs/platform-v7a/platforms/image-vexpress-nor.in
+++ b/configs/platform-v7a/platforms/image-vexpress-nor.in
@@ -3,7 +3,7 @@
 config IMAGE_VEXPRESS_NOR
 	tristate
 	select HOST_GENIMAGE
-	select BAREBOX_VEXPRESS
+	select BAREBOX
 	select KERNEL
 	prompt "Generate images/vexpress.norimg"
 	help
diff --git a/configs/platform-v7a/platforms/image-vexpress.in b/configs/platform-v7a/platforms/image-vexpress.in
index 8b4b3a703b2d..89e5b3a457fc 100644
--- a/configs/platform-v7a/platforms/image-vexpress.in
+++ b/configs/platform-v7a/platforms/image-vexpress.in
@@ -3,7 +3,7 @@
 config IMAGE_VEXPRESS
 	tristate
 	select HOST_GENIMAGE
-	select BAREBOX_VEXPRESS
+	select BAREBOX
 	select IMAGE_ROOT_EXT
 	prompt "Generate images/vexpress.hdimg"
 	help
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
deleted file mode 100644
index 1e3a38250256..000000000000
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Robert Schwebel <r.schwebel@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BAREBOX_VEXPRESS) += barebox-vexpress
-
-#
-# Paths and names
-#
-BAREBOX_VEXPRESS_VERSION	:= $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_VEXPRESS_MD5		:= $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_VEXPRESS		:= barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)
-BAREBOX_VEXPRESS_SUFFIX		:= tar.bz2
-BAREBOX_VEXPRESS_URL		:= $(call barebox-url, BAREBOX_VEXPRESS)
-BAREBOX_VEXPRESS_PATCHES	:= barebox-$(BAREBOX_VEXPRESS_VERSION)
-BAREBOX_VEXPRESS_SOURCE		:= $(SRCDIR)/$(BAREBOX_VEXPRESS_PATCHES).$(BAREBOX_VEXPRESS_SUFFIX)
-BAREBOX_VEXPRESS_DIR		:= $(BUILDDIR)/$(BAREBOX_VEXPRESS)
-BAREBOX_VEXPRESS_BUILD_DIR	:= $(BAREBOX_VEXPRESS_DIR)-build
-BAREBOX_VEXPRESS_CONFIG		:= $(call ptx/in-platformconfigdir, barebox-vexpress.config)
-BAREBOX_VEXPRESS_REF_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-common.config)
-BAREBOX_VEXPRESS_LICENSE	:= GPL-2.0-only
-BAREBOX_VEXPRESS_BUILD_OOT	:= KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-# use host pkg-config for host tools
-BAREBOX_VEXPRESS_PATH := PATH=$(HOST_PATH)
-
-BAREBOX_VEXPRESS_WRAPPER_BLACKLIST := \
-	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-
-BAREBOX_VEXPRESS_CONF_OPT := \
-	-C $(BAREBOX_VEXPRESS_DIR) \
-	O=$(BAREBOX_VEXPRESS_BUILD_DIR) \
-	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
-	$(call barebox-opts, BAREBOX_VEXPRESS)
-
-BAREBOX_VEXPRESS_MAKE_OPT := $(BAREBOX_VEXPRESS_CONF_OPT)
-
-BAREBOX_VEXPRESS_IMAGES := images/barebox-vexpress-ca9.img
-BAREBOX_VEXPRESS_IMAGES := $(addprefix $(BAREBOX_VEXPRESS_BUILD_DIR)/,$(BAREBOX_VEXPRESS_IMAGES))
-
-ifdef PTXCONF_BAREBOX_VEXPRESS
-$(BAREBOX_VEXPRESS_CONFIG):
-	@echo
-	@echo "****************************************************************************"
-	@echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-vexpress'"
-	@echo "****************************************************************************"
-	@echo
-	@echo
-	@exit 1
-endif
-
-$(STATEDIR)/barebox-vexpress.prepare: $(BAREBOX_VEXPRESS_CONFIG)
-	@$(call targetinfo)
-	@$(call world/prepare, BAREBOX_VEXPRESS)
-	@rm -f "$(BAREBOX_VEXPRESS_BUILD_DIR)/.ptxdist-defaultenv"
-	@ln -s "$(call ptx/in-platformconfigdir, barebox-vexpress-defaultenv)" \
-		"$(BAREBOX_VEXPRESS_BUILD_DIR)/.ptxdist-defaultenv"
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-vexpress.install:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-vexpress.targetinstall:
-	@$(call targetinfo)
-	@$(foreach image, $(BAREBOX_VEXPRESS_IMAGES), \
-		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@install -D -m644 $(BAREBOX_VEXPRESS_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-vexpress
-	@install -D -m644 $(BAREBOX_VEXPRESS_BUILD_DIR)/arch/arm/dts/vexpress-v2p-ca9.dtb $(IMAGEDIR)/vexpress-v2p-ca9.dtb-bb
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-vexpress.clean:
-	@$(call targetinfo)
-	@$(call clean_pkg, BAREBOX_VEXPRESS)
-	@$(foreach image, $(BAREBOX_VEXPRESS_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@rm -vf $(IMAGEDIR)/barebox-zero-env-vexpress \
-		$(IMAGEDIR)/vexpress-v2p-ca9.dtb-bb
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-barebox-vexpress_oldconfig barebox-vexpress_menuconfig barebox-vexpress_nconfig: $(STATEDIR)/barebox-vexpress.extract
-	@$(call world/kconfig, BAREBOX_VEXPRESS, $(subst barebox-vexpress_,,$@))
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/run b/configs/platform-v7a/run
index 257dc1a6fd2e..9d0d7a0a9179 100755
--- a/configs/platform-v7a/run
+++ b/configs/platform-v7a/run
@@ -96,7 +96,7 @@ if [ -e "${PTXDIST_PLATFORMDIR}/images/usbstick.img" ]; then
 fi
 QEMU_LINUX_ARGS=( -kernel ${PTXDIST_PLATFORMDIR}/images/linuximage -dtb ${PTXDIST_PLATFORMDIR}/images/vexpress-v2p-ca9.dtb )
 # the barebox device tree has a state node for bootchooser
-QEMU_BAREBOX_ARGS=( -dtb ${PTXDIST_PLATFORMDIR}/images/vexpress-v2p-ca9.dtb-bb )
+QEMU_BAREBOX_ARGS=( -dtb ${PTXDIST_PLATFORMDIR}/images/barebox-vexpress-v2p-ca9.dtb )
 
 check_hd() {
 	if [ ! -e "${PTXDIST_PLATFORMDIR}/images/vexpress.hdimg" ]; then
-- 
2.39.5