[DistroKit] [PATCH 07/11] v7a: mx6: switch to upstream barebox recipe

[Roland Hieber <rhi@pengutronix.de>]

Remove the separate barebox-mx6 recipe in favour of the barebox recipe,
from upstream PTXdist, which already supports multi-arch build. Merge
the kconfig options from the config diff. Port the env variables to
start a kernel and initrd from RAM via fastboot, which also gives our
other platforms support for that mechanism. defaultenv/init/detect-mmcs
is no longer needed since the upstream barebox has CONFIG_MCI_STARTUP
enabled, which probes all MMC cards on boot. The rest of the defaultenv
is already the same in the upstream barebox recipe, so we can just
remove it.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 .../boot/ram-fastboot                         |    0
 .../nv/fastboot.acm                           |    0
 .../nv/fastboot.bbu                           |    0
 .../nv/fastboot.partitions                    |    0
 .../nv/usbgadget.autostart                    |    0
 .../barebox-mx6-defaultenv/init/detect-mmcs   |    3 -
 .../barebox-mx6-defaultenv/nv/boot.default    |    1 -
 .../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-mx6.config       | 1340 -----------------
 configs/platform-v7a/barebox-mx6.config.diff  |  255 ----
 configs/platform-v7a/barebox.config           |  257 +++-
 configs/platform-v7a/platformconfig           |    1 -
 configs/platform-v7a/platforms/barebox-mx6.in |    8 -
 .../platform-v7a/platforms/image-riotboard.in |    2 +-
 .../platform-v7a/platforms/image-sabrelite.in |    2 +-
 .../platform-v7a/platforms/image-udoo-neo.in  |    2 +-
 configs/platform-v7a/rules/barebox-mx6.make   |  114 --
 22 files changed, 245 insertions(+), 1746 deletions(-)
 rename configs/platform-v7a/{barebox-mx6-defaultenv => barebox-defaultenv}/boot/ram-fastboot (100%)
 rename configs/platform-v7a/{barebox-mx6-defaultenv => barebox-defaultenv}/nv/fastboot.acm (100%)
 rename configs/platform-v7a/{barebox-mx6-defaultenv => barebox-defaultenv}/nv/fastboot.bbu (100%)
 rename configs/platform-v7a/{barebox-mx6-defaultenv => barebox-defaultenv}/nv/fastboot.partitions (100%)
 rename configs/platform-v7a/{barebox-mx6-defaultenv => barebox-defaultenv}/nv/usbgadget.autostart (100%)
 delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/init/detect-mmcs
 delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/boot.default
 delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.state_prefix
 delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system0.boot
 delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system1.boot
 delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.targets
 delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/dev.mmc0.broken_cd
 delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/linux.bootargs.loglevel
 delete mode 100644 configs/platform-v7a/barebox-mx6.config
 delete mode 100644 configs/platform-v7a/barebox-mx6.config.diff
 delete mode 100644 configs/platform-v7a/platforms/barebox-mx6.in
 delete mode 100644 configs/platform-v7a/rules/barebox-mx6.make

diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/boot/ram-fastboot b/configs/platform-v7a/barebox-defaultenv/boot/ram-fastboot
similarity index 100%
rename from configs/platform-v7a/barebox-mx6-defaultenv/boot/ram-fastboot
rename to configs/platform-v7a/barebox-defaultenv/boot/ram-fastboot
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.acm b/configs/platform-v7a/barebox-defaultenv/nv/fastboot.acm
similarity index 100%
rename from configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.acm
rename to configs/platform-v7a/barebox-defaultenv/nv/fastboot.acm
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.bbu b/configs/platform-v7a/barebox-defaultenv/nv/fastboot.bbu
similarity index 100%
rename from configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.bbu
rename to configs/platform-v7a/barebox-defaultenv/nv/fastboot.bbu
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.partitions b/configs/platform-v7a/barebox-defaultenv/nv/fastboot.partitions
similarity index 100%
rename from configs/platform-v7a/barebox-mx6-defaultenv/nv/fastboot.partitions
rename to configs/platform-v7a/barebox-defaultenv/nv/fastboot.partitions
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/usbgadget.autostart b/configs/platform-v7a/barebox-defaultenv/nv/usbgadget.autostart
similarity index 100%
rename from configs/platform-v7a/barebox-mx6-defaultenv/nv/usbgadget.autostart
rename to configs/platform-v7a/barebox-defaultenv/nv/usbgadget.autostart
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/init/detect-mmcs b/configs/platform-v7a/barebox-mx6-defaultenv/init/detect-mmcs
deleted file mode 100644
index 0db902d2124a..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/init/detect-mmcs
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-detect mmc1 mmc2 mmc3
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/boot.default b/configs/platform-v7a/barebox-mx6-defaultenv/nv/boot.default
deleted file mode 100644
index d7d9a373c50b..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/boot.default
+++ /dev/null
@@ -1 +0,0 @@
-bootchooser net
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.state_prefix
deleted file mode 100644
index 6246412a5c27..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.state_prefix
+++ /dev/null
@@ -1 +0,0 @@
-state.bootstate
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system0.boot
deleted file mode 100644
index d2ab6841f086..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system0.boot
+++ /dev/null
@@ -1 +0,0 @@
-mmc2.root-A
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system1.boot
deleted file mode 100644
index 2c9bc29fb9a1..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.system1.boot
+++ /dev/null
@@ -1 +0,0 @@
-mmc2.root-B
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.targets
deleted file mode 100644
index f0fb14eeaad2..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootchooser.targets
+++ /dev/null
@@ -1 +0,0 @@
-system0 system1
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/dev.mmc0.broken_cd b/configs/platform-v7a/barebox-mx6-defaultenv/nv/dev.mmc0.broken_cd
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/dev.mmc0.broken_cd
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v7a/barebox-mx6-defaultenv/nv/linux.bootargs.loglevel
deleted file mode 100644
index d45c34464422..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/linux.bootargs.loglevel
+++ /dev/null
@@ -1 +0,0 @@
-loglevel=5 systemd.show_status=auto
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
deleted file mode 100644
index 98b21a9d3f51..000000000000
--- a/configs/platform-v7a/barebox-mx6.config
+++ /dev/null
@@ -1,1340 +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=y
-# 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 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_HAS_L2X0=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_ARCH_IMX_IMXIMAGE=y
-CONFIG_RESET_IMX_SRC=y
-
-#
-# i.MX boards
-#
-CONFIG_ARCH_IMX6=y
-CONFIG_ARCH_IMX6SX=y
-
-#
-# i.MX1 boards
-#
-# CONFIG_MACH_SCB9328 is not set
-
-#
-# i.MX25 boards
-#
-# CONFIG_MACH_TX25 is not set
-
-#
-# i.MX27 boards
-#
-# CONFIG_MACH_PCA100 is not set
-# CONFIG_MACH_PCM038 is not set
-
-#
-# i.MX50 boards
-#
-# CONFIG_MACH_KINDLE_MX50 is not set
-
-#
-# i.MX51 boards
-#
-# CONFIG_MACH_CCMX51 is not set
-# CONFIG_MACH_EFIKA_MX_SMARTBOOK is not set
-# CONFIG_MACH_FREESCALE_MX51_PDK is not set
-
-#
-# i.MX53 boards
-#
-# CONFIG_MACH_CCMX53 is not set
-# CONFIG_MACH_FREESCALE_MX53_LOCO is not set
-# CONFIG_MACH_GUF_VINCELL is not set
-# CONFIG_MACH_TX53 is not set
-# CONFIG_MACH_TQMA53 is not set
-# CONFIG_MACH_FREESCALE_MX53_VMX53 is not set
-# CONFIG_MACH_ZII_RDU1 is not set
-
-#
-# i.MX6 boards
-#
-# CONFIG_MACH_ADVANTECH_ROM_742X is not set
-CONFIG_MACH_NITROGEN6=y
-# CONFIG_MACH_CM_FX6 is not set
-# CONFIG_MACH_REALQ7 is not set
-# CONFIG_MACH_DFI_FS700_M60 is not set
-# CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set
-# CONFIG_MACH_ELTEC_HIPERCAM is not set
-# CONFIG_MACH_EMBEDSKY_E9 is not set
-# CONFIG_MACH_EMBEST_MARSBOARD is not set
-CONFIG_MACH_EMBEST_RIOTBOARD=y
-# CONFIG_MACH_TORADEX_COLIBRI_IMX6 is not set
-CONFIG_MACH_SABRELITE=y
-# CONFIG_MACH_SABRESD is not set
-# CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB is not set
-# CONFIG_MACH_UDOO is not set
-CONFIG_MACH_UDOO_NEO=y
-# CONFIG_MACH_GUF_SANTARO is not set
-# CONFIG_MACH_GW_VENTANA is not set
-# CONFIG_MACH_GRINN_LITEBOARD is not set
-# CONFIG_MACH_TX6X is not set
-# CONFIG_MACH_KONTRON_SAMX6I is not set
-# CONFIG_MACH_NOVENA is not set
-# CONFIG_MACH_NXP_IMX6ULL_EVK is not set
-# CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
-# CONFIG_MACH_PROTONIC_IMX6 is not set
-# CONFIG_MACH_SKOV_IMX6 is not set
-# CONFIG_MACH_SOLIDRUN_MICROSOM is not set
-# CONFIG_MACH_TECHNEXION_PICO_HOBBIT is not set
-# CONFIG_MACH_TECHNEXION_WANDBOARD is not set
-# CONFIG_MACH_TQMA6X is not set
-# CONFIG_MACH_TQMA6UL is not set
-# CONFIG_MACH_VARISCITE_MX6 is not set
-# CONFIG_MACH_WEBASTO_CCBV2 is not set
-# CONFIG_MACH_GK802 is not set
-# CONFIG_MACH_ZII_RDU2 is not set
-
-#
-# i.MX7 boards
-#
-# CONFIG_MACH_MEERKAT96 is not set
-# CONFIG_MACH_AC_SXB is not set
-# CONFIG_MACH_WARP7 is not set
-# CONFIG_MACH_FREESCALE_MX7_SABRESD is not set
-# CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set
-# CONFIG_MACH_VARISCITE_SOM_MX7 is not set
-# CONFIG_MACH_ZII_IMX7D_DEV is not set
-# CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set
-
-#
-# VF610 boards
-#
-# CONFIG_MACH_VF610_TWR is not set
-# CONFIG_MACH_ZII_VF610_DEV is not set
-# end of i.MX boards
-
-#
-# i.MX specific settings
-#
-CONFIG_IMX_IIM=y
-CONFIG_IMX_IIM_FUSE_BLOW=y
-# CONFIG_HABV4 is not set
-# end of i.MX specific settings
-
-CONFIG_BOARD_ARM_GENERIC_DT=y
-CONFIG_AEABI=y
-CONFIG_THUMB2_BAREBOX=y
-# 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_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_BAREBOX_UPDATE_IMX_NAND_FCB=y
-CONFIG_UBIFORMAT=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 is not set
-# 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_DFU=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_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=7
-CONFIG_DEFAULT_LOGLEVEL=6
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_IMX_UART_PORT=1
-# CONFIG_DEBUG_INITCALLS 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
-CONFIG_CMD_FCB=y
-# 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_UBI=y
-CONFIG_CMD_UBIFORMAT=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_SPLASH=y
-# CONFIG_CMD_FBTEST is not set
-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=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_SPI=y
-CONFIG_CMD_LED_TRIGGER=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_USBGADGET=y
-# CONFIG_CMD_DFU is not set
-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_KEYSTORE 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_ETHADDR_FROM_MACHINE_ID=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_GPIO=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_IMX=y
-# CONFIG_DRIVER_SERIAL_NS16550 is not set
-# CONFIG_DRIVER_SERIAL_CADENCE is not set
-# CONFIG_DRIVER_SERIAL_LPUART32 is not set
-# CONFIG_SERIAL_SIFIVE is not set
-# end of serial drivers
-
-CONFIG_ARCH_HAS_FEC_IMX=y
-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_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_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=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=y
-# CONFIG_DRIVER_SPI_FSL_QUADSPI is not set
-CONFIG_DRIVER_SPI_GPIO=y
-CONFIG_DRIVER_SPI_IMX=y
-CONFIG_DRIVER_SPI_IMX_2_3=y
-# CONFIG_DRIVER_SPI_LITEX_SPIFLASH is not set
-# end of SPI drivers
-
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_GPIO=y
-CONFIG_I2C_IMX=y
-# CONFIG_I2C_IMX_LPI2C is not set
-# 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=y
-# CONFIG_MTD_CONCAT is not set
-
-#
-# MTD debug options
-#
-# CONFIG_MTD_PEB_DEBUG is not set
-
-#
-# Self contained MTD devices
-#
-CONFIG_MTD_DATAFLASH=y
-# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
-CONFIG_MTD_M25P80=y
-# CONFIG_MTD_DOCG3 is not set
-# CONFIG_MTD_MTDRAM is not set
-# end of Self contained MTD devices
-
-# CONFIG_DRIVER_CFI is not set
-
-#
-# NAND
-#
-CONFIG_MTD_NAND_CORE=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_NAND=y
-# CONFIG_MTD_NAND_ECC_SOFT is not set
-CONFIG_NAND_ECC_HW_SYNDROME=y
-CONFIG_NAND_ALLOW_ERASE_BAD=y
-CONFIG_NAND_NEED_EXEC_OP=y
-
-#
-# Raw/parallel NAND flash controllers
-#
-CONFIG_NAND_IMX=y
-CONFIG_NAND_MXS=y
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_DENALI is not set
-
-#
-# ECC engine support
-#
-CONFIG_MTD_NAND_ECC=y
-# 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=y
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-# CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_BEB_LIMIT=20
-CONFIG_MTD_UBI_FASTMAP=y
-
-#
-# UBI debugging options
-#
-# CONFIG_MTD_UBI_CHECK_IO is not set
-# CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set
-CONFIG_DISK=y
-CONFIG_DISK_IDE_SFF=y
-CONFIG_DISK_WRITE=y
-
-#
-# drive types
-#
-CONFIG_DISK_ATA=y
-CONFIG_DISK_AHCI=y
-CONFIG_DISK_AHCI_IMX=y
-
-#
-# interface types
-#
-CONFIG_DISK_INTF_PLATFORM_IDE=y
-CONFIG_DISK_PATA_IMX=y
-CONFIG_USB=y
-CONFIG_USB_HOST=y
-CONFIG_USB_IMX_CHIPIDEA=y
-CONFIG_USB_IMX_CHIPIDEA_USBMISC=y
-CONFIG_USB_IMX_PHY=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=y
-CONFIG_USB_OTGDEV=y
-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_DUALSPEED=y
-CONFIG_USB_GADGET_DRIVER_ARC=y
-CONFIG_USB_GADGET_AUTOSTART=y
-
-#
-# USB Gadget drivers
-#
-CONFIG_USB_GADGET_DFU=y
-CONFIG_USB_GADGET_SERIAL=y
-CONFIG_USB_GADGET_FASTBOOT=y
-CONFIG_USB_GADGET_MASS_STORAGE=y
-# CONFIG_USB_MUSB is not set
-CONFIG_VIDEO=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_DRIVER_VIDEO_FB_SSD1307 is not set
-CONFIG_VIDEO_VPL=y
-# CONFIG_DRIVER_VIDEO_ROCKCHIP is not set
-CONFIG_DRIVER_VIDEO_IMX_IPUV3=y
-CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y
-# CONFIG_DRIVER_VIDEO_IMX_IPUV3_HDMI is not set
-# CONFIG_DRIVER_VIDEO_IMX_IPUV3_PARALLEL is not set
-# CONFIG_DRIVER_VIDEO_BOCHS_ISA is not set
-# CONFIG_DRIVER_VIDEO_SIMPLEFB_CLIENT is not set
-CONFIG_DRIVER_VIDEO_SIMPLEFB=y
-# CONFIG_DRIVER_VIDEO_RAMFB is not set
-# CONFIG_DRIVER_VIDEO_EDID is not set
-# CONFIG_DRIVER_VIDEO_BACKLIGHT is not set
-
-#
-# Video encoder chips
-#
-# CONFIG_DRIVER_VIDEO_MTL017 is not set
-# CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set
-# CONFIG_DRIVER_VIDEO_PANEL_ILITEK_ILI9341 is not set
-# CONFIG_DRIVER_VIDEO_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRIVER_VIDEO_PANEL_MIPI_DBI is not set
-# CONFIG_DRIVER_VIDEO_DW_HDMI is not set
-# CONFIG_SOUND is not set
-CONFIG_MCI_SDHCI=y
-CONFIG_MCI=y
-
-#
-# --- Feature list ---
-#
-# CONFIG_MCI_TUNING is not set
-# CONFIG_MCI_STARTUP is not set
-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_IMX_ESDHC=y
-# CONFIG_MCI_IMX_ESDHC_PIO is not set
-# CONFIG_MCI_MMCI is not set
-# 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_ARCH_HAS_IMX_GPT=y
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
-CONFIG_CLOCKSOURCE_IMX_GPT=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=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_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_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 is not set
-CONFIG_LED_GPIO_OF=y
-# CONFIG_LED_GPIO_RGB is not set
-# CONFIG_LED_GPIO_BICOLOR is not set
-CONFIG_LED_TRIGGERS=y
-# CONFIG_LED_PCA955X is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT25=y
-# CONFIG_EEPROM_AT24 is not set
-# end of EEPROM support
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_KEYBOARD_IMX_KEYPAD 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_IMX_RESET_SOURCE=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_POLLER is not set
-# CONFIG_WATCHDOG_DW is not set
-CONFIG_WATCHDOG_IMX=y
-# CONFIG_WATCHDOG_IMXULP is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
-# CONFIG_PWM_TPM is not set
-# CONFIG_HWRNG is not set
-
-#
-# DMA support
-#
-# CONFIG_DMADEVICES is not set
-CONFIG_MXS_APBH_DMA=y
-# end of DMA support
-
-CONFIG_GPIOLIB=y
-
-#
-# GPIO
-#
-# CONFIG_GPIO_74164 is not set
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-CONFIG_GPIO_IMX=y
-# 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_IMX_IOMUX_V3=y
-# CONFIG_PINCTRL_SINGLE is not set
-# end of Pin controllers
-
-CONFIG_NVMEM=y
-# CONFIG_NVMEM_RMEM is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-CONFIG_IMX_OCOTP=y
-# CONFIG_IMX_OCOTP_WRITE is not set
-# CONFIG_EEPROM_93XX46 is not set
-
-#
-# Bus devices
-#
-# CONFIG_IMX_WEIM is not set
-# end of Bus devices
-
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED=y
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_PFUZE is not set
-# CONFIG_REGULATOR_ANATOP is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-# CONFIG_RESET_CONTROLLER is not set
-CONFIG_HW_HAS_PCI=y
-
-#
-# PCI bus options
-#
-# CONFIG_PCI is not set
-# CONFIG_PCI_IMX6 is not set
-# CONFIG_PCI_ECAM_GENERIC is not set
-# end of PCI bus options
-
-# CONFIG_RTC_CLASS is not set
-
-#
-# Firmware Drivers
-#
-# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
-# 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=y
-CONFIG_USB_NOP_XCEIV=y
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-
-#
-# Hardware crypto devices
-#
-# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
-# 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_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_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_UBIFS=y
-CONFIG_FS_UBIFS_COMPRESSION_LZO=y
-# CONFIG_FS_UBIFS_COMPRESSION_ZLIB is not set
-CONFIG_FS_UBIFS_COMPRESSION_ZSTD=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_XXHASH=y
-CONFIG_ZLIB=y
-CONFIG_BZLIB=y
-# CONFIG_LZ4_DECOMPRESS is not set
-CONFIG_ZSTD_DECOMPRESS=y
-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_BCH=y
-CONFIG_BITREV=y
-CONFIG_FNMATCH=y
-CONFIG_QSORT=y
-CONFIG_LIBSCAN=y
-CONFIG_LIBUBIGEN=y
-CONFIG_IMAGE_SPARSE=y
-CONFIG_STMP_DEVICE=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
-#
-CONFIG_IMAGE_RENDERER=y
-# CONFIG_BMP is not set
-CONFIG_PNG=y
-# CONFIG_QOI is not set
-CONFIG_LODEPNG=y
-# CONFIG_PICOPNG is not set
-# end of Library gui routines
-
-# CONFIG_BAREBOX_LOGO is not set
-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_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=y
-# 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
-# CONFIG_ARCH_IMX_USBLOADER 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-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
deleted file mode 100644
index 7ba6b4e66c44..000000000000
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ /dev/null
@@ -1,255 +0,0 @@
-3118a4e72c6ae44b00e041e7fbe80ad3
-# CONFIG_ARCH_BCM283X is not set
-CONFIG_ARCH_HAS_FEC_IMX=y
-CONFIG_ARCH_HAS_IMX_GPT=y
-CONFIG_ARCH_HAS_L2X0=y
-CONFIG_ARCH_IMX6=y
-CONFIG_ARCH_IMX6SX=y
-CONFIG_ARCH_IMX=y
-CONFIG_ARCH_IMX_IMXIMAGE=y
-# CONFIG_ARCH_IMX_USBLOADER is not set
-# CONFIG_ARM_SECURE_MONITOR is undefined
-# CONFIG_ARM_SMCCC is undefined
-CONFIG_AT803X_PHY=y
-# CONFIG_BAREBOX_LOGO is not set
-CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y
-CONFIG_BCH=y
-CONFIG_BITREV=y
-# CONFIG_BMP is not set
-CONFIG_BOOTM_OFTREE_UIMAGE=y
-# CONFIG_CACHE_L2X0 is not set
-# CONFIG_CLOCKSOURCE_BCM283X is undefined
-CONFIG_CLOCKSOURCE_IMX_GPT=y
-# CONFIG_CMD_DFU is not set
-# CONFIG_CMD_FBTEST is not set
-CONFIG_CMD_FCB=y
-# CONFIG_CMD_KEYSTORE is not set
-CONFIG_CMD_MMC_EXTCSD=y
-CONFIG_CMD_NAND=y
-# CONFIG_CMD_NANDTEST is not set
-# CONFIG_CMD_NAND_BITFLIP is not set
-# CONFIG_CMD_NVMEM is not set
-# CONFIG_CMD_PWM is not set
-# CONFIG_CMD_SMC is undefined
-CONFIG_CMD_SPLASH=y
-CONFIG_CMD_UBI=y
-CONFIG_CMD_UBIFORMAT=y
-# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
-CONFIG_CRYPTO_KEYSTORE=y
-CONFIG_DEBUG_IMX_UART_PORT=1
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y
-CONFIG_DIGEST_HMAC_GENERIC=y
-CONFIG_DISK_AHCI=y
-CONFIG_DISK_AHCI_IMX=y
-CONFIG_DISK_ATA=y
-CONFIG_DISK_IDE_SFF=y
-CONFIG_DISK_INTF_PLATFORM_IDE=y
-CONFIG_DISK_PATA_IMX=y
-CONFIG_DRIVER_NET_FEC_IMX=y
-CONFIG_DRIVER_SERIAL_IMX=y
-# CONFIG_DRIVER_SERIAL_LPUART32 is not set
-# CONFIG_DRIVER_SPI_FSL_QUADSPI is not set
-CONFIG_DRIVER_SPI_IMX=y
-CONFIG_DRIVER_SPI_IMX_2_3=y
-# CONFIG_DRIVER_VIDEO_BACKLIGHT is not set
-# CONFIG_DRIVER_VIDEO_BOCHS_ISA is not set
-# CONFIG_DRIVER_VIDEO_DW_HDMI is not set
-# CONFIG_DRIVER_VIDEO_EDID is not set
-# CONFIG_DRIVER_VIDEO_FB_SSD1307 is not set
-CONFIG_DRIVER_VIDEO_IMX_IPUV3=y
-# CONFIG_DRIVER_VIDEO_IMX_IPUV3_HDMI is not set
-CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y
-# CONFIG_DRIVER_VIDEO_IMX_IPUV3_PARALLEL is not set
-# CONFIG_DRIVER_VIDEO_MTL017 is not set
-# CONFIG_DRIVER_VIDEO_PANEL_ILITEK_ILI9341 is not set
-# CONFIG_DRIVER_VIDEO_PANEL_MIPI_DBI is not set
-# CONFIG_DRIVER_VIDEO_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRIVER_VIDEO_RAMFB is not set
-# CONFIG_DRIVER_VIDEO_ROCKCHIP is not set
-CONFIG_DRIVER_VIDEO_SIMPLEFB=y
-# CONFIG_DRIVER_VIDEO_SIMPLEFB_CLIENT is not set
-# CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set
-# CONFIG_EEPROM_93XX46 is not set
-CONFIG_EEPROM_AT25=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-CONFIG_FS_UBIFS=y
-CONFIG_FS_UBIFS_COMPRESSION_LZO=y
-# CONFIG_FS_UBIFS_COMPRESSION_ZLIB is not set
-CONFIG_FS_UBIFS_COMPRESSION_ZSTD=y
-CONFIG_GENERIC_PHY=y
-CONFIG_GPIO_IMX=y
-# CONFIG_GPIO_RASPBERRYPI_EXP is undefined
-# CONFIG_HABV4 is not set
-CONFIG_HAVE_DIGEST_HMAC=y
-# CONFIG_HWRNG is not set
-CONFIG_HW_HAS_PCI=y
-# CONFIG_HW_RANDOM_BCM2835 is undefined
-# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined
-# CONFIG_HW_RANDOM_TIMERIOMEM is undefined
-# CONFIG_I2C_BCM283X is undefined
-CONFIG_I2C_IMX=y
-# CONFIG_I2C_IMX_LPI2C is not set
-CONFIG_IMAGE_RENDERER=y
-CONFIG_IMX_IIM=y
-CONFIG_IMX_IIM_FUSE_BLOW=y
-CONFIG_IMX_OCOTP=y
-# CONFIG_IMX_OCOTP_WRITE is not set
-# CONFIG_IMX_WEIM is not set
-CONFIG_INPUT=y
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_KEYBOARD_IMX_KEYPAD is not set
-# CONFIG_LED_PWM is not set
-CONFIG_LIBSCAN=y
-CONFIG_LIBUBIGEN=y
-CONFIG_LODEPNG=y
-CONFIG_MACHINE_ID=y
-# CONFIG_MACH_AC_SXB is not set
-# CONFIG_MACH_ADVANTECH_ROM_742X is not set
-# CONFIG_MACH_CCMX51 is not set
-# CONFIG_MACH_CCMX53 is not set
-# CONFIG_MACH_CM_FX6 is not set
-# CONFIG_MACH_DFI_FS700_M60 is not set
-# CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set
-# CONFIG_MACH_EFIKA_MX_SMARTBOOK is not set
-# CONFIG_MACH_ELTEC_HIPERCAM is not set
-# CONFIG_MACH_EMBEDSKY_E9 is not set
-# CONFIG_MACH_EMBEST_MARSBOARD is not set
-CONFIG_MACH_EMBEST_RIOTBOARD=y
-# CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB is not set
-# CONFIG_MACH_FREESCALE_MX51_PDK is not set
-# CONFIG_MACH_FREESCALE_MX53_LOCO is not set
-# CONFIG_MACH_FREESCALE_MX53_VMX53 is not set
-# CONFIG_MACH_FREESCALE_MX7_SABRESD is not set
-# CONFIG_MACH_GK802 is not set
-# CONFIG_MACH_GRINN_LITEBOARD is not set
-# CONFIG_MACH_GUF_SANTARO is not set
-# CONFIG_MACH_GUF_VINCELL is not set
-# CONFIG_MACH_GW_VENTANA is not set
-# CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set
-# CONFIG_MACH_KINDLE_MX50 is not set
-# CONFIG_MACH_KONTRON_SAMX6I is not set
-# CONFIG_MACH_MEERKAT96 is not set
-CONFIG_MACH_NITROGEN6=y
-# CONFIG_MACH_NOVENA is not set
-# CONFIG_MACH_NXP_IMX6ULL_EVK is not set
-# CONFIG_MACH_PCA100 is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set
-# CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
-# CONFIG_MACH_PROTONIC_IMX6 is not set
-# CONFIG_MACH_REALQ7 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_SABRELITE=y
-# CONFIG_MACH_SABRESD is not set
-# CONFIG_MACH_SCB9328 is not set
-# CONFIG_MACH_SKOV_IMX6 is not set
-# CONFIG_MACH_SOLIDRUN_MICROSOM is not set
-# CONFIG_MACH_TECHNEXION_PICO_HOBBIT is not set
-# CONFIG_MACH_TECHNEXION_WANDBOARD is not set
-# CONFIG_MACH_TORADEX_COLIBRI_IMX6 is not set
-# CONFIG_MACH_TQMA53 is not set
-# CONFIG_MACH_TQMA6UL is not set
-# CONFIG_MACH_TQMA6X is not set
-# CONFIG_MACH_TX25 is not set
-# CONFIG_MACH_TX53 is not set
-# CONFIG_MACH_TX6X is not set
-# CONFIG_MACH_UDOO is not set
-CONFIG_MACH_UDOO_NEO=y
-# CONFIG_MACH_VARISCITE_MX6 is not set
-# CONFIG_MACH_VARISCITE_SOM_MX7 is not set
-# CONFIG_MACH_VF610_TWR is not set
-# CONFIG_MACH_WARP7 is not set
-# CONFIG_MACH_WEBASTO_CCBV2 is not set
-# CONFIG_MACH_ZII_IMX7D_DEV is not set
-# CONFIG_MACH_ZII_RDU1 is not set
-# CONFIG_MACH_ZII_RDU2 is not set
-# CONFIG_MACH_ZII_VF610_DEV is not set
-# CONFIG_MCI_BCM283X is undefined
-# CONFIG_MCI_BCM283X_SDHOST is undefined
-CONFIG_MCI_IMX_ESDHC=y
-# CONFIG_MCI_IMX_ESDHC_PIO is not set
-# CONFIG_MCI_MMCI is not set
-CONFIG_MCI_MMC_BOOT_PARTITIONS=y
-CONFIG_MCI_SDHCI=y
-# CONFIG_MCI_STARTUP is not set
-CONFIG_MFD_SYSCON=y
-CONFIG_MICREL_PHY=y
-CONFIG_MTD_DATAFLASH=y
-# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND_CORE=y
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_ECC=y
-# CONFIG_MTD_NAND_ECC_SOFT is not set
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-CONFIG_MTD_RAW_DEVICE=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_MTD_SPI_NOR=y
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_CHECK_IO is not set
-CONFIG_MTD_UBI_FASTMAP=y
-# CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set
-CONFIG_MXS_APBH_DMA=y
-CONFIG_NAND=y
-CONFIG_NAND_ALLOW_ERASE_BAD=y
-CONFIG_NAND_ECC_HW_SYNDROME=y
-CONFIG_NAND_IMX=y
-CONFIG_NAND_MXS=y
-CONFIG_NAND_NEED_EXEC_OP=y
-CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
-CONFIG_NVMEM=y
-# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_RMEM is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-# CONFIG_PBL_OPTEE is undefined
-# CONFIG_PCI is not set
-# CONFIG_PCI_ECAM_GENERIC is not set
-# CONFIG_PCI_IMX6 is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PICOPNG is not set
-# CONFIG_PINCTRL_BCM283X is undefined
-CONFIG_PINCTRL_IMX_IOMUX_V3=y
-CONFIG_PNG=y
-CONFIG_PROMPT="barebox:"
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
-# CONFIG_PWM_TPM is not set
-# CONFIG_QOI is not set
-# CONFIG_REGULATOR_ANATOP is not set
-# CONFIG_REGULATOR_BCM283X is undefined
-CONFIG_REGULATOR_FIXED=y
-# CONFIG_REGULATOR_PFUZE is not set
-CONFIG_RESET_IMX_SRC=y
-# CONFIG_SPI_BCM2835 is undefined
-# CONFIG_SPI_CADENCE_QUADSPI is not set
-CONFIG_SPI_MEM=y
-# CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set
-CONFIG_STMP_DEVICE=y
-# CONFIG_SYSCON_REBOOT_MODE is not set
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_UBIFORMAT=y
-CONFIG_USB_GADGET_DFU=y
-CONFIG_USB_GADGET_DRIVER_ARC=y
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_IMX_CHIPIDEA=y
-CONFIG_USB_IMX_CHIPIDEA_USBMISC=y
-CONFIG_USB_IMX_PHY=y
-CONFIG_USB_NOP_XCEIV=y
-CONFIG_USB_OTGDEV=y
-CONFIG_USB_ULPI=y
-CONFIG_VIDEO=y
-CONFIG_VIDEO_VPL=y
-# CONFIG_WATCHDOG_BCM2835 is undefined
-CONFIG_WATCHDOG_IMX=y
-# CONFIG_WATCHDOG_IMXULP is not set
-CONFIG_WATCHDOG_IMX_RESET_SOURCE=y
-CONFIG_XXHASH=y
-CONFIG_ZSTD_DECOMPRESS=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 8d8eaa35b0ad..18869ee9fea9 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -24,7 +24,7 @@ CONFIG_ARCH_MULTIARCH=y
 # 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_IMX=y
 # CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_LAYERSCAPE is not set
@@ -45,6 +45,121 @@ CONFIG_CPU_32v7=y
 # processor features
 #
 # CONFIG_BOOT_ENDIANNESS_SWITCH is not set
+CONFIG_ARCH_HAS_L2X0=y
+# CONFIG_CACHE_L2X0 is not set
+CONFIG_ARCH_IMX_IMXIMAGE=y
+CONFIG_RESET_IMX_SRC=y
+
+#
+# i.MX boards
+#
+CONFIG_ARCH_IMX6=y
+CONFIG_ARCH_IMX6SX=y
+
+#
+# i.MX1 boards
+#
+# CONFIG_MACH_SCB9328 is not set
+
+#
+# i.MX25 boards
+#
+# CONFIG_MACH_TX25 is not set
+
+#
+# i.MX27 boards
+#
+# CONFIG_MACH_PCA100 is not set
+# CONFIG_MACH_PCM038 is not set
+
+#
+# i.MX50 boards
+#
+# CONFIG_MACH_KINDLE_MX50 is not set
+
+#
+# i.MX51 boards
+#
+# CONFIG_MACH_CCMX51 is not set
+# CONFIG_MACH_EFIKA_MX_SMARTBOOK is not set
+# CONFIG_MACH_FREESCALE_MX51_PDK is not set
+
+#
+# i.MX53 boards
+#
+# CONFIG_MACH_CCMX53 is not set
+# CONFIG_MACH_FREESCALE_MX53_LOCO is not set
+# CONFIG_MACH_GUF_VINCELL is not set
+# CONFIG_MACH_TX53 is not set
+# CONFIG_MACH_TQMA53 is not set
+# CONFIG_MACH_FREESCALE_MX53_VMX53 is not set
+# CONFIG_MACH_ZII_RDU1 is not set
+
+#
+# i.MX6 boards
+#
+# CONFIG_MACH_ADVANTECH_ROM_742X is not set
+CONFIG_MACH_NITROGEN6=y
+# CONFIG_MACH_CM_FX6 is not set
+# CONFIG_MACH_REALQ7 is not set
+# CONFIG_MACH_DFI_FS700_M60 is not set
+# CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set
+# CONFIG_MACH_ELTEC_HIPERCAM is not set
+# CONFIG_MACH_EMBEDSKY_E9 is not set
+# CONFIG_MACH_EMBEST_MARSBOARD is not set
+CONFIG_MACH_EMBEST_RIOTBOARD=y
+# CONFIG_MACH_TORADEX_COLIBRI_IMX6 is not set
+CONFIG_MACH_SABRELITE=y
+# CONFIG_MACH_SABRESD is not set
+# CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB is not set
+# CONFIG_MACH_UDOO is not set
+CONFIG_MACH_UDOO_NEO=y
+# CONFIG_MACH_GUF_SANTARO is not set
+# CONFIG_MACH_GW_VENTANA is not set
+# CONFIG_MACH_GRINN_LITEBOARD is not set
+# CONFIG_MACH_TX6X is not set
+# CONFIG_MACH_KONTRON_SAMX6I is not set
+# CONFIG_MACH_NOVENA is not set
+# CONFIG_MACH_NXP_IMX6ULL_EVK is not set
+# CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
+# CONFIG_MACH_PROTONIC_IMX6 is not set
+# CONFIG_MACH_SKOV_IMX6 is not set
+# CONFIG_MACH_SOLIDRUN_MICROSOM is not set
+# CONFIG_MACH_TECHNEXION_PICO_HOBBIT is not set
+# CONFIG_MACH_TECHNEXION_WANDBOARD is not set
+# CONFIG_MACH_TQMA6X is not set
+# CONFIG_MACH_TQMA6UL is not set
+# CONFIG_MACH_VARISCITE_MX6 is not set
+# CONFIG_MACH_WEBASTO_CCBV2 is not set
+# CONFIG_MACH_GK802 is not set
+# CONFIG_MACH_ZII_RDU2 is not set
+
+#
+# i.MX7 boards
+#
+# CONFIG_MACH_MEERKAT96 is not set
+# CONFIG_MACH_AC_SXB is not set
+# CONFIG_MACH_WARP7 is not set
+# CONFIG_MACH_FREESCALE_MX7_SABRESD is not set
+# CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set
+# CONFIG_MACH_VARISCITE_SOM_MX7 is not set
+# CONFIG_MACH_ZII_IMX7D_DEV is not set
+# CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set
+
+#
+# VF610 boards
+#
+# CONFIG_MACH_VF610_TWR is not set
+# CONFIG_MACH_ZII_VF610_DEV is not set
+# end of i.MX boards
+
+#
+# i.MX specific settings
+#
+CONFIG_IMX_IIM=y
+CONFIG_IMX_IIM_FUSE_BLOW=y
+# CONFIG_HABV4 is not set
+# end of i.MX specific settings
 
 #
 # OMAP Features
@@ -136,6 +251,8 @@ CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
 CONFIG_CDEV_ALIAS=y
 CONFIG_MENUTREE=y
+CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y
+CONFIG_UBIFORMAT=y
 CONFIG_BOOT=y
 CONFIG_FASTBOOT_BASE=y
 
@@ -247,6 +364,7 @@ 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_DFU=y
 # CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set
 CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
 CONFIG_HAS_SCHED=y
@@ -287,6 +405,7 @@ CONFIG_FASTBOOT_CMD_OEM=y
 CONFIG_COMPILE_LOGLEVEL=7
 CONFIG_DEFAULT_LOGLEVEL=6
 # CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_IMX_UART_PORT=1
 CONFIG_DEBUG_OMAP_UART_PORT=1
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_DEBUG_PBL is not set
@@ -347,6 +466,7 @@ CONFIG_CMD_MMC_EXTCSD=y
 # CONFIG_CMD_POLLER is not set
 CONFIG_CMD_BTHREAD=y
 # CONFIG_CMD_SLICE is not set
+CONFIG_CMD_FCB=y
 # end of Information
 
 #
@@ -373,6 +493,8 @@ CONFIG_CMD_AUTOMOUNT=y
 CONFIG_CMD_MOUNT=y
 # CONFIG_CMD_FINDMNT is not set
 CONFIG_CMD_PARTED=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFORMAT=y
 CONFIG_CMD_UMOUNT=y
 # end of Partition
 
@@ -460,6 +582,8 @@ CONFIG_CMD_EDIT=y
 CONFIG_CMD_MENU=y
 CONFIG_CMD_MENU_MANAGEMENT=y
 CONFIG_CMD_MENUTREE=y
+CONFIG_CMD_SPLASH=y
+# CONFIG_CMD_FBTEST is not set
 CONFIG_CMD_READLINE=y
 CONFIG_CMD_TIMEOUT=y
 # end of Console and Framebuffer interaction
@@ -500,6 +624,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_LED_TRIGGER=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USBGADGET=y
+# CONFIG_CMD_DFU is not set
 CONFIG_CMD_WD=y
 CONFIG_CMD_WD_DEFAULT_TIMOUT=0
 # end of Hardware manipulation
@@ -568,13 +693,16 @@ 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_IMX=y
 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
+# CONFIG_DRIVER_SERIAL_LPUART32 is not set
 # CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
+CONFIG_ARCH_HAS_FEC_IMX=y
 CONFIG_PHYLIB=y
 
 #
@@ -588,6 +716,7 @@ CONFIG_DRIVER_NET_TI_DAVINCI_MDIO=y
 CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
 CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
 # CONFIG_DRIVER_NET_ENC28J60 is not set
+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
@@ -639,6 +768,8 @@ CONFIG_SPI=y
 CONFIG_SPI_MEM=y
 # CONFIG_DRIVER_SPI_FSL_QUADSPI is not set
 CONFIG_DRIVER_SPI_GPIO=y
+CONFIG_DRIVER_SPI_IMX=y
+CONFIG_DRIVER_SPI_IMX_2_3=y
 # CONFIG_DRIVER_SPI_LITEX_SPIFLASH is not set
 CONFIG_DRIVER_SPI_OMAP3=y
 # CONFIG_STM32_QSPI is not set
@@ -652,6 +783,8 @@ CONFIG_I2C_ALGOBIT=y
 # I2C Hardware Bus support
 #
 CONFIG_I2C_GPIO=y
+CONFIG_I2C_IMX=y
+# CONFIG_I2C_IMX_LPI2C is not set
 # CONFIG_I2C_DESIGNWARE is not set
 # CONFIG_I2C_MV64XXX is not set
 CONFIG_I2C_OMAP=y
@@ -662,7 +795,7 @@ CONFIG_I2C_STM32=y
 CONFIG_MTD=y
 CONFIG_MTD_WRITE=y
 CONFIG_MTD_OOB_DEVICE=y
-# CONFIG_MTD_RAW_DEVICE is not set
+CONFIG_MTD_RAW_DEVICE=y
 # CONFIG_MTD_CONCAT is not set
 
 #
@@ -673,7 +806,8 @@ CONFIG_MTD_OOB_DEVICE=y
 #
 # Self contained MTD devices
 #
-# CONFIG_MTD_DATAFLASH is not set
+CONFIG_MTD_DATAFLASH=y
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
 CONFIG_MTD_M25P80=y
 # CONFIG_MTD_DOCG3 is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -689,11 +823,14 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND=y
 # CONFIG_MTD_NAND_ECC_SOFT is not set
 CONFIG_NAND_ECC_HW_SYNDROME=y
-# CONFIG_NAND_ALLOW_ERASE_BAD is not set
+CONFIG_NAND_ALLOW_ERASE_BAD=y
+CONFIG_NAND_NEED_EXEC_OP=y
 
 #
 # Raw/parallel NAND flash controllers
 #
+CONFIG_NAND_IMX=y
+CONFIG_NAND_MXS=y
 CONFIG_NAND_OMAP_GPMC=y
 # CONFIG_MTD_NAND_OMAP_ELM is not set
 # CONFIG_NAND_STM32 is not set
@@ -713,29 +850,43 @@ CONFIG_MTD_SPI_NOR=y
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set
-# CONFIG_MTD_UBI is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_CHECK_IO is not set
+# CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set
 CONFIG_DISK=y
+CONFIG_DISK_IDE_SFF=y
 CONFIG_DISK_WRITE=y
 
 #
 # drive types
 #
-# CONFIG_DISK_ATA is not set
-# CONFIG_DISK_AHCI is not set
+CONFIG_DISK_ATA=y
+CONFIG_DISK_AHCI=y
+CONFIG_DISK_AHCI_IMX=y
 
 #
 # interface types
 #
-# CONFIG_DISK_INTF_PLATFORM_IDE is not set
+CONFIG_DISK_INTF_PLATFORM_IDE=y
+CONFIG_DISK_PATA_IMX=y
 CONFIG_USB=y
 CONFIG_USB_HOST=y
+CONFIG_USB_IMX_CHIPIDEA=y
+CONFIG_USB_IMX_CHIPIDEA_USBMISC=y
+CONFIG_USB_IMX_PHY=y
 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
-# CONFIG_USB_ULPI is not set
+CONFIG_USB_ULPI=y
 CONFIG_USB_OTGDEV=y
 CONFIG_USB_STORAGE=y
 
@@ -746,12 +897,14 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_ONBOARD_HUB is not set
 # CONFIG_TYPEC_TUSB320 is not set
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_GADGET_DRIVER_ARC=y
 CONFIG_USB_GADGET_AUTOSTART=y
 
 #
 # USB Gadget drivers
 #
-# CONFIG_USB_GADGET_DFU is not set
+CONFIG_USB_GADGET_DFU=y
 CONFIG_USB_GADGET_SERIAL=y
 CONFIG_USB_GADGET_FASTBOOT=y
 CONFIG_USB_GADGET_MASS_STORAGE=y
@@ -760,8 +913,34 @@ CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_MUSB_AM335X=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
-# CONFIG_VIDEO is not set
+CONFIG_VIDEO=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+# CONFIG_DRIVER_VIDEO_FB_SSD1307 is not set
+CONFIG_VIDEO_VPL=y
+# CONFIG_DRIVER_VIDEO_STM32_LTDC is not set
+# CONFIG_DRIVER_VIDEO_ROCKCHIP is not set
+CONFIG_DRIVER_VIDEO_IMX_IPUV3=y
+CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y
+# CONFIG_DRIVER_VIDEO_IMX_IPUV3_HDMI is not set
+# CONFIG_DRIVER_VIDEO_IMX_IPUV3_PARALLEL is not set
+# CONFIG_DRIVER_VIDEO_BOCHS_ISA is not set
+# CONFIG_DRIVER_VIDEO_SIMPLEFB_CLIENT is not set
+CONFIG_DRIVER_VIDEO_SIMPLEFB=y
+# CONFIG_DRIVER_VIDEO_RAMFB is not set
+# CONFIG_DRIVER_VIDEO_EDID is not set
+# CONFIG_DRIVER_VIDEO_BACKLIGHT is not set
+
+#
+# Video encoder chips
+#
+# CONFIG_DRIVER_VIDEO_MTL017 is not set
+# CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set
+# CONFIG_DRIVER_VIDEO_PANEL_ILITEK_ILI9341 is not set
+# CONFIG_DRIVER_VIDEO_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRIVER_VIDEO_PANEL_MIPI_DBI is not set
+# CONFIG_DRIVER_VIDEO_DW_HDMI is not set
 # CONFIG_SOUND is not set
+CONFIG_MCI_SDHCI=y
 CONFIG_MCI=y
 
 #
@@ -783,6 +962,8 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 # CONFIG_MCI_DW is not set
 # CONFIG_MCI_SUNXI_SMHC is not set
 # CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
+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_ARASAN is not set
@@ -802,8 +983,10 @@ CONFIG_COMMON_CLK_GPIO=y
 #
 # Clocksource
 #
+CONFIG_ARCH_HAS_IMX_GPT=y
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
 CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
+CONFIG_CLOCKSOURCE_IMX_GPT=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 CONFIG_CLOCKSOURCE_TI_DM=y
 # CONFIG_CLKSRC_STM32 is not set
@@ -857,29 +1040,36 @@ CONFIG_LED_TRIGGERS=y
 #
 # EEPROM support
 #
-# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_AT25=y
 CONFIG_EEPROM_AT24=y
 # end of EEPROM support
 
 #
 # Input device support
 #
+CONFIG_INPUT=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_IMX_KEYPAD 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_IMX_RESET_SOURCE=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_POLLER=y
 # CONFIG_WATCHDOG_DW is not set
+CONFIG_WATCHDOG_IMX=y
+# CONFIG_WATCHDOG_IMXULP 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=y
+CONFIG_PWM_IMX=y
+# CONFIG_PWM_TPM is not set
 CONFIG_PWM_STM32=y
 CONFIG_HWRNG=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -891,6 +1081,7 @@ CONFIG_HW_RANDOM_OPTEE=y
 # DMA support
 #
 # CONFIG_DMADEVICES is not set
+CONFIG_MXS_APBH_DMA=y
 # end of DMA support
 
 CONFIG_GPIOLIB=y
@@ -904,6 +1095,7 @@ CONFIG_GPIO_PINCONF=y
 # CONFIG_GPIO_74164 is not set
 # CONFIG_GPIO_74XX_MMIO is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
+CONFIG_GPIO_IMX=y
 CONFIG_GPIO_OMAP=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
@@ -920,6 +1112,7 @@ CONFIG_GPIO_OMAP=y
 # Pin controllers
 #
 CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX_IOMUX_V3=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_STM32=y
 # end of Pin controllers
@@ -927,6 +1120,8 @@ CONFIG_PINCTRL_STM32=y
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_RMEM is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
+CONFIG_IMX_OCOTP=y
+# CONFIG_IMX_OCOTP_WRITE is not set
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_STM32_BSEC=y
 CONFIG_STM32_BSEC_WRITE=y
@@ -937,11 +1132,13 @@ CONFIG_STM32_BSEC_OPTEE_TA=y
 #
 CONFIG_BUS_OMAP_GPMC=y
 CONFIG_TI_SYSC=y
+# CONFIG_IMX_WEIM is not set
 # end of Bus devices
 
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED=y
 # CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_PFUZE is not set
 CONFIG_REGULATOR_STM32_PWR=y
 CONFIG_REGULATOR_STM32_VREFBUF=y
 CONFIG_REGULATOR_STPMIC1=y
@@ -952,6 +1149,7 @@ CONFIG_REGULATOR_ARM_SCMI=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
+# CONFIG_IMX_REMOTEPROC is not set
 CONFIG_STM32_REMOTEPROC=y
 # end of Remoteproc drivers
 
@@ -960,6 +1158,16 @@ CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_IMX7 is not set
 CONFIG_RESET_SCMI=y
+CONFIG_HW_HAS_PCI=y
+
+#
+# PCI bus options
+#
+# CONFIG_PCI is not set
+# CONFIG_PCI_IMX6 is not set
+# CONFIG_PCI_ECAM_GENERIC is not set
+# end of PCI bus options
+
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -988,13 +1196,14 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # end of FPGA Configuration Support
 
 CONFIG_GENERIC_PHY=y
-# CONFIG_USB_NOP_XCEIV is not set
+CONFIG_USB_NOP_XCEIV=y
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
 CONFIG_PHY_STM32_USBPHYC=y
 
 #
 # Hardware crypto devices
 #
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # end of Hardware crypto devices
 
 #
@@ -1074,6 +1283,10 @@ CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
 # CONFIG_FS_JFFS2 is not set
+CONFIG_FS_UBIFS=y
+CONFIG_FS_UBIFS_COMPRESSION_LZO=y
+# CONFIG_FS_UBIFS_COMPRESSION_ZLIB is not set
+CONFIG_FS_UBIFS_COMPRESSION_ZSTD=y
 # CONFIG_FS_BPKFS is not set
 # CONFIG_FS_UIMAGEFS is not set
 # CONFIG_FS_PSTORE is not set
@@ -1105,10 +1318,11 @@ CONFIG_FS_FAT_LFN=y
 #
 CONFIG_PARAMETER=y
 CONFIG_UNCOMPRESS=y
+CONFIG_XXHASH=y
 CONFIG_ZLIB=y
 CONFIG_BZLIB=y
 # CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_ZSTD_DECOMPRESS is not set
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DECOMPRESS=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -1120,9 +1334,14 @@ CONFIG_XZ_DEC_ARM64=y
 # CONFIG_BASE64 is not set
 CONFIG_PROCESS_ESCAPE_SEQUENCE=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_BCH=y
+CONFIG_BITREV=y
 CONFIG_FNMATCH=y
 CONFIG_QSORT=y
+CONFIG_LIBSCAN=y
+CONFIG_LIBUBIGEN=y
 CONFIG_IMAGE_SPARSE=y
+CONFIG_STMP_DEVICE=y
 CONFIG_LIBFDT=y
 # CONFIG_RATP is not set
 # CONFIG_ALLOW_PRNG_FALLBACK is not set
@@ -1132,8 +1351,15 @@ CONFIG_CRC8=y
 #
 # Library gui routines
 #
+CONFIG_IMAGE_RENDERER=y
+# CONFIG_BMP is not set
+CONFIG_PNG=y
+# CONFIG_QOI is not set
+CONFIG_LODEPNG=y
+# CONFIG_PICOPNG is not set
 # end of Library gui routines
 
+# CONFIG_BAREBOX_LOGO is not set
 CONFIG_PRINTF_UUID=y
 CONFIG_NLS=y
 # CONFIG_BLOBGEN is not set
@@ -1217,6 +1443,7 @@ CONFIG_MISSING_FIRMWARE_ERROR=y
 # Host Tools
 #
 # CONFIG_COMPILE_HOST_TOOLS is not set
+# CONFIG_ARCH_IMX_USBLOADER is not set
 CONFIG_OMAP_IMAGE=y
 # end of Host Tools
 
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index ad5efc011d80..b7b3672d82f6 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -190,7 +190,6 @@ PTXCONF_BAREBOX_COMMON_MD5="22046ac9b06e570a51e945c633a2b24c"
 PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
 PTXCONF_BAREBOX_AM335X_MLO=y
 PTXCONF_BAREBOX_AT91=y
-PTXCONF_BAREBOX_MX6=y
 PTXCONF_BAREBOX_RPI2=y
 PTXCONF_BAREBOX_VEXPRESS=y
 PTXCONF_BAREBOX_ARCH_STRING="arm"
diff --git a/configs/platform-v7a/platforms/barebox-mx6.in b/configs/platform-v7a/platforms/barebox-mx6.in
deleted file mode 100644
index 6003b400cef3..000000000000
--- a/configs/platform-v7a/platforms/barebox-mx6.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=bootloader
-
-config BAREBOX_MX6
-	tristate
-	prompt "Barebox (mx6)"
-	select BAREBOX_COMMON
-	help
-	  Barebox image for i.MX6
diff --git a/configs/platform-v7a/platforms/image-riotboard.in b/configs/platform-v7a/platforms/image-riotboard.in
index 952853a1b24b..41c98076fb3b 100644
--- a/configs/platform-v7a/platforms/image-riotboard.in
+++ b/configs/platform-v7a/platforms/image-riotboard.in
@@ -4,7 +4,7 @@ config IMAGE_RIOTBOARD
 	tristate
 	select HOST_GENIMAGE
 	select IMAGE_ROOT_EXT
-	select BAREBOX_MX6
+	select BAREBOX
 	prompt "Generate images/riotboard.hdimg"
 	help
 	  SD card image for the RIoTboard
diff --git a/configs/platform-v7a/platforms/image-sabrelite.in b/configs/platform-v7a/platforms/image-sabrelite.in
index c60f9c7132e2..9c2ff8ab5020 100644
--- a/configs/platform-v7a/platforms/image-sabrelite.in
+++ b/configs/platform-v7a/platforms/image-sabrelite.in
@@ -4,7 +4,7 @@ config IMAGE_SABRELITE
 	tristate
 	select HOST_GENIMAGE
 	select IMAGE_ROOT_EXT
-	select BAREBOX_MX6
+	select BAREBOX
 	prompt "Generate images/sabrelite.hdimg"
 	help
 	  SD card image for the Boundary Devices SABRE Lite board
diff --git a/configs/platform-v7a/platforms/image-udoo-neo.in b/configs/platform-v7a/platforms/image-udoo-neo.in
index 310c4df3dbec..f8f47b8815c3 100644
--- a/configs/platform-v7a/platforms/image-udoo-neo.in
+++ b/configs/platform-v7a/platforms/image-udoo-neo.in
@@ -3,7 +3,7 @@
 config IMAGE_UDOO_NEO
 	tristate
 	select HOST_GENIMAGE
-	select BAREBOX_MX6
+	select BAREBOX
 	select IMAGE_ROOT_EXT
 	prompt "Generate images/udoo-neo.hdimg"
 	help
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
deleted file mode 100644
index a168117f8f3b..000000000000
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ /dev/null
@@ -1,114 +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_MX6) += barebox-mx6
-
-#
-# Paths and names
-#
-BAREBOX_MX6_VERSION	:= $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_MX6_MD5		:= $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_MX6		:= barebox-mx6-$(BAREBOX_MX6_VERSION)
-BAREBOX_MX6_SUFFIX	:= tar.bz2
-BAREBOX_MX6_URL		:= $(call barebox-url, BAREBOX_MX6)
-BAREBOX_MX6_PATCHES	:= barebox-$(BAREBOX_MX6_VERSION)
-BAREBOX_MX6_SOURCE	:= $(SRCDIR)/$(BAREBOX_MX6_PATCHES).$(BAREBOX_MX6_SUFFIX)
-BAREBOX_MX6_DIR		:= $(BUILDDIR)/$(BAREBOX_MX6)
-BAREBOX_MX6_BUILD_DIR	:= $(BAREBOX_MX6_DIR)-build
-BAREBOX_MX6_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-mx6.config)
-BAREBOX_MX6_REF_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-common.config)
-BAREBOX_MX6_LICENSE	:= GPL-2.0-only
-BAREBOX_MX6_BUILD_OOT	:= KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-# use host pkg-config for host tools
-BAREBOX_MX6_PATH := PATH=$(HOST_PATH)
-
-BAREBOX_MX6_WRAPPER_BLACKLIST := \
-	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-
-BAREBOX_MX6_CONF_OPT := \
-	-C $(BAREBOX_MX6_DIR) \
-	O=$(BAREBOX_MX6_BUILD_DIR) \
-	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
-	$(call barebox-opts, BAREBOX_MX6)
-
-BAREBOX_MX6_MAKE_OPT := $(BAREBOX_MX6_CONF_OPT)
-
-BAREBOX_MX6_IMAGES := images/barebox-embest-imx6s-riotboard.img \
-	images/barebox-freescale-imx6dl-sabrelite.img \
-	images/barebox-freescale-imx6q-sabrelite.img \
-	images/barebox-boundarydevices-imx6q-nitrogen6x-1g.img \
-	images/barebox-boundarydevices-imx6q-nitrogen6x-2g.img \
-	images/barebox-boundarydevices-imx6qp-nitrogen6_max.img \
-	images/barebox-udoo-neo.img
-
-BAREBOX_MX6_IMAGES := $(addprefix $(BAREBOX_MX6_BUILD_DIR)/,$(BAREBOX_MX6_IMAGES))
-
-ifdef PTXCONF_BAREBOX_MX6
-$(BAREBOX_MX6_CONFIG):
-	@echo
-	@echo "****************************************************************************"
-	@echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-mx6'"
-	@echo "****************************************************************************"
-	@echo
-	@echo
-	@exit 1
-endif
-
-$(STATEDIR)/barebox-mx6.prepare: $(BAREBOX_MX6_CONFIG)
-	@$(call targetinfo)
-	@$(call world/prepare, BAREBOX_MX6)
-	@rm -f "$(BAREBOX_MX6_BUILD_DIR)/.ptxdist-defaultenv"
-	@ln -s "$(call ptx/in-platformconfigdir, barebox-mx6-defaultenv)" \
-		"$(BAREBOX_MX6_BUILD_DIR)/.ptxdist-defaultenv"
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-mx6.install:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-mx6.targetinstall:
-	@$(call targetinfo)
-	@$(foreach image, $(BAREBOX_MX6_IMAGES), \
-		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-mx6.clean:
-	@$(call targetinfo)
-	@$(call clean_pkg, BAREBOX_MX6)
-	@$(foreach image, $(BAREBOX_MX6_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-barebox-mx6_oldconfig barebox-mx6_menuconfig barebox-mx6_nconfig: $(STATEDIR)/barebox-mx6.extract
-	@$(call world/kconfig, BAREBOX_MX6, $(subst barebox-mx6_,,$@))
-
-# vim: syntax=make
-- 
2.39.5