* [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids
@ 2025-05-26 10:11 Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 02/11] v7a: barebox: version bump 2025.03.0 -> 2025.05.0 Roland Hieber
` (9 more replies)
0 siblings, 10 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
We now have host-genimage v18, which knows descriptive identifiers for
all of these partition type UUIDs.
Also use the more descriptive "fat32" instead of "F".
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
PATCH v1: https://lore.distrokit.org/distrokit/20250523080651.1892602-1-rhi@pengutronix.de
(The patch in this series has not changed, but later changes depend
on it)
---
configs/platform-mips/config/images/ar9331.config | 2 +-
configs/platform-mips/config/images/malta.config | 2 +-
configs/platform-mipsel/config/images/malta.config | 2 +-
configs/platform-rpi1/config/images/hd.config | 4 ++--
configs/platform-v7a/config/images/at91-sd.config | 4 ++--
configs/platform-v7a/config/images/beaglebone.config | 4 ++--
configs/platform-v7a/config/images/gf.config | 4 ++--
configs/platform-v7a/config/images/hd.config | 2 +-
configs/platform-v7a/config/images/riotboard.config | 2 +-
configs/platform-v7a/config/images/rpi2.config | 4 ++--
configs/platform-v7a/config/images/sabrelite.config | 2 +-
configs/platform-v7a/config/images/stm32mp-optee.config | 2 +-
configs/platform-v7a/config/images/stm32mp.config | 6 +++---
configs/platform-v7a/config/images/udoo-neo.config | 2 +-
configs/platform-v7a/config/images/vexpress.config | 2 +-
configs/platform-v7a_noneon/config/images/at91-sd.config | 4 ++--
configs/platform-v7a_noneon/config/images/vexpress.config | 2 +-
configs/platform-v8a/config/images/espressobin.config | 2 +-
configs/platform-v8a/config/images/imx8m.config | 4 ++--
configs/platform-v8a/config/images/rock3a.config | 4 ++--
20 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/configs/platform-mips/config/images/ar9331.config b/configs/platform-mips/config/images/ar9331.config
index b0664f460a53..8db778c07f26 100644
--- a/configs/platform-mips/config/images/ar9331.config
+++ b/configs/platform-mips/config/images/ar9331.config
@@ -8,7 +8,7 @@ image @IMAGE@ {
}
partition root-A {
image = root.ext2
- partition-type-uuid = e9434544-6e2c-47cc-bae2-12d6deafb44c # root-mips
+ partition-type-uuid = root-mips
}
}
diff --git a/configs/platform-mips/config/images/malta.config b/configs/platform-mips/config/images/malta.config
index b0664f460a53..8db778c07f26 100644
--- a/configs/platform-mips/config/images/malta.config
+++ b/configs/platform-mips/config/images/malta.config
@@ -8,7 +8,7 @@ image @IMAGE@ {
}
partition root-A {
image = root.ext2
- partition-type-uuid = e9434544-6e2c-47cc-bae2-12d6deafb44c # root-mips
+ partition-type-uuid = root-mips
}
}
diff --git a/configs/platform-mipsel/config/images/malta.config b/configs/platform-mipsel/config/images/malta.config
index 4b6fe4af5332..7a9c506f5a31 100644
--- a/configs/platform-mipsel/config/images/malta.config
+++ b/configs/platform-mipsel/config/images/malta.config
@@ -8,7 +8,7 @@ image @IMAGE@ {
}
partition root-A {
image = root.ext2
- partition-type-uuid = 37c58c8a-d913-4156-a25f-48b1b64e07f0 # root-mips-le
+ partition-type-uuid = root-mips-le
}
}
diff --git a/configs/platform-rpi1/config/images/hd.config b/configs/platform-rpi1/config/images/hd.config
index 949bfa2f182f..6424147b573f 100644
--- a/configs/platform-rpi1/config/images/hd.config
+++ b/configs/platform-rpi1/config/images/hd.config
@@ -5,12 +5,12 @@ image @IMAGE@ {
}
partition boot-vfat {
image = boot.vfat
- partition-type-uuid = F
+ partition-type-uuid = fat32
partition-type = 0xc
bootable = true
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
diff --git a/configs/platform-v7a/config/images/at91-sd.config b/configs/platform-v7a/config/images/at91-sd.config
index 335273d7ddc9..8eee5a8c2bee 100644
--- a/configs/platform-v7a/config/images/at91-sd.config
+++ b/configs/platform-v7a/config/images/at91-sd.config
@@ -14,12 +14,12 @@ image @IMAGE@ {
partition boot {
image = @IMAGE@-boot.vfat
partition-type = 0xc
- partition-type-uuid = F
+ partition-type-uuid = fat32
bootable = true
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/beaglebone.config b/configs/platform-v7a/config/images/beaglebone.config
index 32abd0b7f4a9..b7757b4db60b 100644
--- a/configs/platform-v7a/config/images/beaglebone.config
+++ b/configs/platform-v7a/config/images/beaglebone.config
@@ -14,12 +14,12 @@ image @IMAGE@ {
partition boot {
image = beaglebone-boot.vfat
partition-type = 0xc
- partition-type-uuid = F
+ partition-type-uuid = fat32
bootable = true
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/gf.config b/configs/platform-v7a/config/images/gf.config
index 95c5a545d6e0..f0b0f1afb1f3 100644
--- a/configs/platform-v7a/config/images/gf.config
+++ b/configs/platform-v7a/config/images/gf.config
@@ -14,12 +14,12 @@ image @IMAGE@ {
partition boot {
image = gf-boot.vfat
partition-type = 0xc
- partition-type-uuid = F
+ partition-type-uuid = fat32
bootable = true
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/hd.config b/configs/platform-v7a/config/images/hd.config
index 1d041a0ed0a2..53b39c0de1d2 100644
--- a/configs/platform-v7a/config/images/hd.config
+++ b/configs/platform-v7a/config/images/hd.config
@@ -9,6 +9,6 @@ image @IMAGE@ {
@BOOTLOADER_PARTITIONS@
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
diff --git a/configs/platform-v7a/config/images/riotboard.config b/configs/platform-v7a/config/images/riotboard.config
index bff2528fac57..ff7203bbae37 100644
--- a/configs/platform-v7a/config/images/riotboard.config
+++ b/configs/platform-v7a/config/images/riotboard.config
@@ -14,7 +14,7 @@ image @IMAGE@ {
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi2.config
index 68ee0d0d8529..7ec722f397c2 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi2.config
@@ -16,12 +16,12 @@ image @IMAGE@ {
offset = 4M
image = rpi2-boot.vfat
partition-type = 0xc
- partition-type-uuid = F
+ partition-type-uuid = fat32
bootable = true
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/sabrelite.config b/configs/platform-v7a/config/images/sabrelite.config
index 6d71c4124c3d..72c047672777 100644
--- a/configs/platform-v7a/config/images/sabrelite.config
+++ b/configs/platform-v7a/config/images/sabrelite.config
@@ -14,7 +14,7 @@ image @IMAGE@ {
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/stm32mp-optee.config b/configs/platform-v7a/config/images/stm32mp-optee.config
index be3a4b6e9e4d..c068e52036b5 100644
--- a/configs/platform-v7a/config/images/stm32mp-optee.config
+++ b/configs/platform-v7a/config/images/stm32mp-optee.config
@@ -20,7 +20,7 @@ image @IMAGE@ {
}
partition barebox-environment {
- partition-type-uuid = 6c3737f2-07f8-45d1-ad45-15d260aab24d
+ partition-type-uuid = barebox-env
size = 1M
}
partition barebox-state {
diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config
index 888f83b360b1..2d5491d0d977 100644
--- a/configs/platform-v7a/config/images/stm32mp.config
+++ b/configs/platform-v7a/config/images/stm32mp.config
@@ -20,15 +20,15 @@ image @IMAGE@ {
}
partition barebox-environment {
- partition-type-uuid = "6c3737f2-07f8-45d1-ad45-15d260aab24d"
+ partition-type-uuid = barebox-env
size = 1M
}
partition barebox-state {
- partition-type-uuid = "4778ed65-bf42-45fa-9c5b-287a1dc4aab1"
+ partition-type-uuid = barebox-state
size = 1M
}
partition root-A {
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
image = root.ext2
}
}
diff --git a/configs/platform-v7a/config/images/udoo-neo.config b/configs/platform-v7a/config/images/udoo-neo.config
index 2e0f91f2bcb0..44fc7e32f45a 100644
--- a/configs/platform-v7a/config/images/udoo-neo.config
+++ b/configs/platform-v7a/config/images/udoo-neo.config
@@ -14,7 +14,7 @@ image @IMAGE@ {
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/vexpress.config b/configs/platform-v7a/config/images/vexpress.config
index b982ae2da41c..7a51d1060a22 100644
--- a/configs/platform-v7a/config/images/vexpress.config
+++ b/configs/platform-v7a/config/images/vexpress.config
@@ -8,7 +8,7 @@ image @IMAGE@ {
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
diff --git a/configs/platform-v7a_noneon/config/images/at91-sd.config b/configs/platform-v7a_noneon/config/images/at91-sd.config
index d4e22c82594f..b278d19686a0 100644
--- a/configs/platform-v7a_noneon/config/images/at91-sd.config
+++ b/configs/platform-v7a_noneon/config/images/at91-sd.config
@@ -14,12 +14,12 @@ image @IMAGE@ {
partition boot {
image = @IMAGE@-boot.vfat
partition-type = 0xc
- partition-type-uuid = F
+ partition-type-uuid = fat32
bootable = true
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a_noneon/config/images/vexpress.config b/configs/platform-v7a_noneon/config/images/vexpress.config
index b982ae2da41c..7a51d1060a22 100644
--- a/configs/platform-v7a_noneon/config/images/vexpress.config
+++ b/configs/platform-v7a_noneon/config/images/vexpress.config
@@ -8,7 +8,7 @@ image @IMAGE@ {
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
diff --git a/configs/platform-v8a/config/images/espressobin.config b/configs/platform-v8a/config/images/espressobin.config
index 54a72563526f..b84a9aa6f0d1 100644
--- a/configs/platform-v8a/config/images/espressobin.config
+++ b/configs/platform-v8a/config/images/espressobin.config
@@ -5,7 +5,7 @@ image @IMAGE@ {
}
partition root-A {
image = root.ext2
- partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
+ partition-type-uuid = root-arm
}
}
diff --git a/configs/platform-v8a/config/images/imx8m.config b/configs/platform-v8a/config/images/imx8m.config
index 92780909dcaf..43a8672390b5 100644
--- a/configs/platform-v8a/config/images/imx8m.config
+++ b/configs/platform-v8a/config/images/imx8m.config
@@ -20,12 +20,12 @@ image @IMAGE@ {
partition barebox-state {
offset = 3M
size = 1M
- partition-type-uuid = 4778ed65-bf42-45fa-9c5b-287a1dc4aab1 # barebox-state
+ partition-type-uuid = barebox-state
image = /dev/null
}
partition root-A {
offset = 4M
image = "root.ext2"
- partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
+ partition-type-uuid = root-arm64
}
}
diff --git a/configs/platform-v8a/config/images/rock3a.config b/configs/platform-v8a/config/images/rock3a.config
index 19e8a306861a..f95305069ba8 100644
--- a/configs/platform-v8a/config/images/rock3a.config
+++ b/configs/platform-v8a/config/images/rock3a.config
@@ -23,12 +23,12 @@ image @IMAGE@ {
}
partition barebox-state {
size = 1M
- partition-type-uuid = 4778ed65-bf42-45fa-9c5b-287a1dc4aab1 # barebox-state
+ partition-type-uuid = barebox-state
image = /dev/null
}
partition root-A {
image = "root.ext2"
- partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae # root-arm64
+ partition-type-uuid = root-arm64
}
}
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 02/11] v7a: barebox: version bump 2025.03.0 -> 2025.05.0
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 03/11] v7a: barebox: boot from bootsource Roland Hieber
` (8 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Update the version number and the MD5 hash, and run oldconfig on all
barebox recipes. Our remaining patch was merged upstream in commit
1c9a72656f88, so the patch queue can be removed. The at91 images were
renamed in commit v2025.03.0-131-gdca0152f2943 (2025-03-20, Alexander
Shiyan: "ARM: at91: xload: Rename the sama5d2 output image names"),
adapt the genimage config accordingly.
Link: https://git.pengutronix.de/cgit/barebox/commit/?id=1c9a72656f8828a
Link: https://git.pengutronix.de/cgit/barebox/commit/?id=dca0152f2943460
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../platform-v7a/barebox-am335x-mlo.config | 28 ++++++------
configs/platform-v7a/barebox-at91.config | 41 +++++++++++-------
configs/platform-v7a/barebox-at91.config.diff | 4 +-
configs/platform-v7a/barebox-common.config | 39 ++++++++++-------
configs/platform-v7a/barebox-mx6.config | 39 ++++++++++-------
configs/platform-v7a/barebox-mx6.config.diff | 2 +-
configs/platform-v7a/barebox-rpi2.config | 39 ++++++++++-------
configs/platform-v7a/barebox-rpi2.config.diff | 3 +-
configs/platform-v7a/barebox-stm32mp.config | 43 ++++++++++++-------
.../platform-v7a/barebox-stm32mp.config.diff | 7 +--
configs/platform-v7a/barebox-vexpress.config | 39 ++++++++++-------
.../platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 41 +++++++++++-------
...m,arm-firmware-suite-unless-donttouch.diff | 42 ------------------
.../patches/barebox-2025.03.0/series | 1 -
configs/platform-v7a/platformconfig | 8 ++--
configs/platform-v7a/rules/barebox-at91.make | 4 +-
.../rules/image-sama5d27-giantboard.make | 2 +-
.../rules/image-sama5d27-som1-ek.make | 2 +-
19 files changed, 207 insertions(+), 179 deletions(-)
delete mode 100644 configs/platform-v7a/patches/barebox-2025.03.0/0001-of-partition-overwrite-arm,arm-firmware-suite-unless-donttouch.diff
delete mode 100644 configs/platform-v7a/patches/barebox-2025.03.0/series
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index ad87ca07cf23..44dbadc08599 100644
--- a/configs/platform-v7a/barebox-am335x-mlo.config
+++ b/configs/platform-v7a/barebox-am335x-mlo.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.03.0 Configuration
+# Barebox/arm 2025.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -79,22 +79,25 @@ CONFIG_ARM_EXCEPTIONS=y
# CONFIG_ARM_PSCI_CLIENT is not set
# end of ARM specific settings
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-
#
# General architecture-dependent options
#
# CONFIG_BOARD_GENERIC_DT is not set
# end of General architecture-dependent options
+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_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
-CONFIG_HAS_CACHE=y
CONFIG_HAS_DMA=y
-CONFIG_ARCH_HAS_SJLJ=y
CONFIG_GENERIC_GPIO=y
CONFIG_BLOCK=y
CONFIG_FILETYPE=y
@@ -121,6 +124,7 @@ CONFIG_PBL_IMAGE=y
CONFIG_PBL_MULTI_IMAGES=y
CONFIG_USE_COMPRESSED_DTB=y
CONFIG_PBL_RELOCATABLE=y
+CONFIG_PBL_CLOCKSOURCE=y
CONFIG_IMAGE_COMPRESSION=y
# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
# CONFIG_IMAGE_COMPRESSION_LZO is not set
@@ -140,7 +144,6 @@ CONFIG_MALLOC_ALIGNMENT=8
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
# CONFIG_MALLOC_DUMMY is not set
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
# CONFIG_KALLSYMS is not set
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_POWEROFF is not set
@@ -180,11 +183,14 @@ CONFIG_DEFAULT_COMPRESSION_NONE=y
# CONFIG_BTHREAD is not set
# CONFIG_STATE is not set
# CONFIG_BOOTCHOOSER is not set
+# CONFIG_BOOT_DEFAULTS is not set
+# CONFIG_BAREBOX_DT_2ND is not set
CONFIG_EXTERNAL_DTS_FRAGMENTS=""
#
# OP-TEE loading
#
+CONFIG_FILETYPE_STRINGS=y
# end of OP-TEE loading
# end of General Settings
@@ -193,7 +199,6 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS=""
#
CONFIG_COMPILE_LOGLEVEL=6
CONFIG_DEFAULT_LOGLEVEL=7
-CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
@@ -204,7 +209,6 @@ CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
-CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y
# CONFIG_KASAN is not set
# CONFIG_COMPILE_TEST is not set
@@ -287,6 +291,7 @@ CONFIG_MCI=y
# CONFIG_MCI_WRITE is not set
# 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 ---
@@ -299,6 +304,7 @@ CONFIG_MCI_OMAP_HSMMC=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
+CONFIG_MCI_OMAP_HSMMC_PBL=y
# CONFIG_COMMON_CLK is not set
#
@@ -326,7 +332,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y
# CONFIG_SRAM is not set
# CONFIG_DEV_MEM is not set
# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_UUID is not set
+# CONFIG_STORAGE_BY_ALIAS is not set
# end of Misc devices
# CONFIG_LED is not set
@@ -546,8 +552,6 @@ CONFIG_XYMODEM=y
# CONFIG_BOOTSTRAP is not set
# CONFIG_NLS is not set
# CONFIG_BLOBGEN is not set
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
# end of Library routines
#
@@ -563,7 +567,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
#
-# Extra care needs to be in secure booted systems.
+# Extra care needs to be taken in secure booted systems.
#
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index 9d1c6f9c9334..551357b674fd 100644
--- a/configs/platform-v7a/barebox-at91.config
+++ b/configs/platform-v7a/barebox-at91.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.03.0 Configuration
+# Barebox/arm 2025.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -47,7 +47,7 @@ CONFIG_HAVE_AT91_GENERATED_CLK=y
CONFIG_HAVE_AT91_AUDIO_PLL=y
CONFIG_HAVE_AT91_I2S_MUX_CLK=y
CONFIG_HAVE_AT91_DDRAMC=y
-CONFIG_AT91_MCI_PBL=y
+CONFIG_AT91_PBL=y
CONFIG_AT91SAM9_SMC=y
CONFIG_HAVE_AT91SAM9_RST=y
CONFIG_SOC_SAM_V7=y
@@ -90,10 +90,10 @@ 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
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-
#
# General architecture-dependent options
#
@@ -101,15 +101,21 @@ 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_CACHE=y
CONFIG_HAS_DMA=y
-CONFIG_ARCH_HAS_SJLJ=y
CONFIG_GENERIC_GPIO=y
CONFIG_BLOCK=y
CONFIG_BLOCK_WRITE=y
@@ -120,6 +126,7 @@ CONFIG_UIMAGE=y
CONFIG_FITIMAGE=y
CONFIG_LOGBUF=y
CONFIG_STDDEV=y
+CONFIG_CDEV_ALIAS=y
CONFIG_MENUTREE=y
CONFIG_UBIFORMAT=y
CONFIG_BOOT=y
@@ -168,7 +175,6 @@ CONFIG_MALLOC_ALIGNMENT=8
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_POWEROFF is not set
@@ -200,12 +206,12 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_UIMAGE=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
# CONFIG_BOOTM_AIMAGE is not set
-# CONFIG_BOOTM_ELF 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
@@ -242,6 +248,8 @@ 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
@@ -252,6 +260,7 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
#
# CONFIG_BOOTM_OPTEE is not set
# CONFIG_PBL_OPTEE is not set
+CONFIG_FILETYPE_STRINGS=y
# end of OP-TEE loading
#
@@ -267,7 +276,6 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=6
CONFIG_DEFAULT_LOGLEVEL=7
-CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_AT91_UART_BASE=0xfc069000
# CONFIG_DEBUG_INITCALLS is not set
@@ -279,7 +287,6 @@ CONFIG_DEBUG_AT91_UART_BASE=0xfc069000
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
-CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y
# CONFIG_KASAN is not set
# CONFIG_COMPILE_TEST is not set
@@ -324,6 +331,7 @@ 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 is not set
# CONFIG_CMD_MMC_EXTCSD is not set
@@ -390,6 +398,7 @@ 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
@@ -400,6 +409,7 @@ 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
@@ -428,6 +438,7 @@ 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
@@ -467,6 +478,7 @@ CONFIG_CMD_MW=y
#
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
@@ -512,7 +524,6 @@ CONFIG_CMD_STATE=y
# end of Commands
CONFIG_NET=y
-CONFIG_NET_NFS=y
# CONFIG_NET_NETCONSOLE is not set
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
@@ -728,6 +739,7 @@ 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 ---
@@ -791,7 +803,7 @@ CONFIG_SRAM=y
CONFIG_STATE_DRV=y
CONFIG_DEV_MEM=y
# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_UUID is not set
+# CONFIG_STORAGE_BY_ALIAS is not set
# end of Misc devices
CONFIG_LED=y
@@ -1048,9 +1060,6 @@ CONFIG_LIBFDT=y
CONFIG_PRINTF_UUID=y
CONFIG_NLS=y
# CONFIG_BLOBGEN is not set
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
CONFIG_GENERIC_ALLOCATOR=y
# end of Library routines
@@ -1067,7 +1076,7 @@ CONFIG_GENERIC_ALLOCATOR=y
#
#
-# Extra care needs to be in secure booted systems.
+# Extra care needs to be taken in secure booted systems.
#
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index cf092c542a02..31d2f1c3c7c0 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-b84e018f387ca177ad90f1972d178d88
+3118a4e72c6ae44b00e041e7fbe80ad3
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
@@ -10,8 +10,8 @@ CONFIG_ARCH_AT91=y
# CONFIG_ARM_SECURE_MONITOR is undefined
# CONFIG_ARM_SMCCC is undefined
CONFIG_AT91SAM9_SMC=y
-CONFIG_AT91_MCI_PBL=y
CONFIG_AT91_MULTI_BOARDS=y
+CONFIG_AT91_PBL=y
CONFIG_ATMEL_EBI=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
CONFIG_CLOCKSOURCE_ATMEL_PIT=y
diff --git a/configs/platform-v7a/barebox-common.config b/configs/platform-v7a/barebox-common.config
index 6fab1828a60f..51a2c8c8d37c 100644
--- a/configs/platform-v7a/barebox-common.config
+++ b/configs/platform-v7a/barebox-common.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.03.0 Configuration
+# Barebox/arm 2025.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -75,10 +75,10 @@ CONFIG_ARM_UNWIND=y
CONFIG_ARM_SMCCC=y
CONFIG_ARM_SECURE_MONITOR=y
# 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
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-
#
# General architecture-dependent options
#
@@ -86,15 +86,21 @@ 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_CACHE=y
CONFIG_HAS_DMA=y
-CONFIG_ARCH_HAS_SJLJ=y
CONFIG_GENERIC_GPIO=y
CONFIG_BLOCK=y
CONFIG_BLOCK_WRITE=y
@@ -105,6 +111,7 @@ 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
@@ -152,7 +159,6 @@ CONFIG_MALLOC_ALIGNMENT=8
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_POWEROFF is not set
@@ -184,12 +190,12 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_UIMAGE=y
# CONFIG_BOOTM_OFTREE_UIMAGE is not set
# CONFIG_BOOTM_AIMAGE is not set
-# CONFIG_BOOTM_ELF 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
@@ -226,6 +232,8 @@ 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
@@ -236,6 +244,7 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
#
# CONFIG_BOOTM_OPTEE is not set
# CONFIG_PBL_OPTEE is not set
+CONFIG_FILETYPE_STRINGS=y
# end of OP-TEE loading
#
@@ -251,7 +260,6 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
-CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
@@ -261,7 +269,6 @@ CONFIG_HAS_DEBUG_LL=y
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
-CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y
# CONFIG_KASAN is not set
# CONFIG_COMPILE_TEST is not set
@@ -304,6 +311,7 @@ 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
@@ -367,6 +375,7 @@ 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
@@ -377,6 +386,7 @@ 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
@@ -405,6 +415,7 @@ 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
@@ -444,6 +455,7 @@ CONFIG_CMD_MW=y
#
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
@@ -488,7 +500,6 @@ CONFIG_CMD_STATE=y
# end of Commands
CONFIG_NET=y
-CONFIG_NET_NFS=y
# CONFIG_NET_NETCONSOLE is not set
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
@@ -690,6 +701,7 @@ 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 ---
@@ -751,7 +763,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
CONFIG_STATE_DRV=y
CONFIG_DEV_MEM=y
# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_UUID is not set
+# CONFIG_STORAGE_BY_ALIAS is not set
# end of Misc devices
CONFIG_LED=y
@@ -1005,9 +1017,6 @@ CONFIG_LIBFDT=y
CONFIG_PRINTF_UUID=y
CONFIG_NLS=y
# CONFIG_BLOBGEN is not set
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
# end of Library routines
#
@@ -1023,7 +1032,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
#
-# Extra care needs to be in secure booted systems.
+# Extra care needs to be taken in secure booted systems.
#
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 4d35168fdac8..98b21a9d3f51 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.03.0 Configuration
+# Barebox/arm 2025.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -176,10 +176,10 @@ 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
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-
#
# General architecture-dependent options
#
@@ -187,15 +187,21 @@ 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_CACHE=y
CONFIG_HAS_DMA=y
-CONFIG_ARCH_HAS_SJLJ=y
CONFIG_GENERIC_GPIO=y
CONFIG_BLOCK=y
CONFIG_BLOCK_WRITE=y
@@ -206,6 +212,7 @@ 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
@@ -255,7 +262,6 @@ CONFIG_MALLOC_ALIGNMENT=8
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_POWEROFF is not set
@@ -287,12 +293,12 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_UIMAGE=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
# CONFIG_BOOTM_AIMAGE is not set
-# CONFIG_BOOTM_ELF 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
@@ -330,6 +336,8 @@ 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
@@ -339,6 +347,7 @@ 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
#
@@ -354,7 +363,6 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
-CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_IMX_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
@@ -365,7 +373,6 @@ CONFIG_DEBUG_IMX_UART_PORT=1
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
-CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y
# CONFIG_KASAN is not set
# CONFIG_COMPILE_TEST is not set
@@ -409,6 +416,7 @@ 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
@@ -475,6 +483,7 @@ 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
@@ -485,6 +494,7 @@ 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
@@ -513,6 +523,7 @@ 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
@@ -554,6 +565,7 @@ CONFIG_CMD_MW=y
#
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
@@ -604,7 +616,6 @@ CONFIG_CMD_STATE=y
CONFIG_NET=y
CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
-CONFIG_NET_NFS=y
# CONFIG_NET_NETCONSOLE is not set
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
@@ -874,6 +885,7 @@ 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 ---
@@ -936,7 +948,7 @@ CONFIG_MFD_SYSCON=y
CONFIG_STATE_DRV=y
CONFIG_DEV_MEM=y
# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_UUID is not set
+# CONFIG_STORAGE_BY_ALIAS is not set
# end of Misc devices
CONFIG_LED=y
@@ -1234,9 +1246,6 @@ CONFIG_LODEPNG=y
CONFIG_PRINTF_UUID=y
CONFIG_NLS=y
# CONFIG_BLOBGEN is not set
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
# end of Library routines
#
@@ -1252,7 +1261,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
#
-# Extra care needs to be in secure booted systems.
+# Extra care needs to be taken in secure booted systems.
#
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 9b2cf6d485b1..7ba6b4e66c44 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-b84e018f387ca177ad90f1972d178d88
+3118a4e72c6ae44b00e041e7fbe80ad3
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 9233a01e0081..75ad612ee031 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.03.0 Configuration
+# Barebox/arm 2025.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -75,10 +75,10 @@ CONFIG_ARM_UNWIND=y
CONFIG_ARM_SMCCC=y
CONFIG_ARM_SECURE_MONITOR=y
# 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
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-
#
# General architecture-dependent options
#
@@ -86,15 +86,21 @@ 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_CACHE=y
CONFIG_HAS_DMA=y
-CONFIG_ARCH_HAS_SJLJ=y
CONFIG_GENERIC_GPIO=y
CONFIG_BLOCK=y
CONFIG_BLOCK_WRITE=y
@@ -105,6 +111,7 @@ 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
@@ -152,7 +159,6 @@ CONFIG_MALLOC_ALIGNMENT=8
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_POWEROFF is not set
@@ -184,12 +190,12 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_UIMAGE=y
# CONFIG_BOOTM_OFTREE_UIMAGE is not set
# CONFIG_BOOTM_AIMAGE is not set
-# CONFIG_BOOTM_ELF 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
@@ -226,6 +232,8 @@ 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
@@ -235,6 +243,7 @@ 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
#
@@ -250,7 +259,6 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
-CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
@@ -260,7 +268,6 @@ CONFIG_HAS_DEBUG_LL=y
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
-CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y
# CONFIG_KASAN is not set
# CONFIG_COMPILE_TEST is not set
@@ -304,6 +311,7 @@ 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 is not set
@@ -367,6 +375,7 @@ 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
@@ -377,6 +386,7 @@ 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
@@ -405,6 +415,7 @@ 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
@@ -444,6 +455,7 @@ CONFIG_CMD_MW=y
#
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
@@ -488,7 +500,6 @@ CONFIG_CMD_STATE=y
# end of Commands
CONFIG_NET=y
-# CONFIG_NET_NFS is not set
CONFIG_NET_NETCONSOLE=y
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
@@ -692,6 +703,7 @@ 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 ---
@@ -753,7 +765,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
CONFIG_STATE_DRV=y
CONFIG_DEV_MEM=y
# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_UUID is not set
+# CONFIG_STORAGE_BY_ALIAS is not set
# end of Misc devices
CONFIG_LED=y
@@ -1010,9 +1022,6 @@ CONFIG_LIBFDT=y
CONFIG_PRINTF_UUID=y
CONFIG_NLS=y
# CONFIG_BLOBGEN is not set
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
# end of Library routines
#
@@ -1028,7 +1037,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
#
-# Extra care needs to be in secure booted systems.
+# Extra care needs to be taken in secure booted systems.
#
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 627dc4cfc297..ea62e7d9eef4 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-b84e018f387ca177ad90f1972d178d88
+3118a4e72c6ae44b00e041e7fbe80ad3
# CONFIG_CMD_NVMEM is not set
CONFIG_DRIVER_NET_BCMGENET=y
CONFIG_DRIVER_SERIAL_NS16550=y
@@ -21,7 +21,6 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
CONFIG_MCI_SDHCI=y
# CONFIG_MCI_STARTUP is not set
CONFIG_NET_NETCONSOLE=y
-# CONFIG_NET_NFS is not set
CONFIG_NVMEM=y
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_NVMEM_RMEM is not set
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index a3feb8eca43c..69d21b9f5f23 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.03.0 Configuration
+# Barebox/arm 2025.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -50,6 +50,8 @@ CONFIG_ARCH_STM32MP157=y
CONFIG_MACH_STM32MP13XX_DK=y
CONFIG_MACH_STM32MP15XX_DKX=y
CONFIG_MACH_LXA_MC1=y
+# CONFIG_MACH_LXA_TAC is not set
+# CONFIG_MACH_LXA_FAIRYTUX2 is not set
# CONFIG_MACH_SEEED_ODYSSEY is not set
CONFIG_MACH_STM32MP15X_EV1=y
# CONFIG_MACH_PROTONIC_STM32MP1 is not set
@@ -75,10 +77,10 @@ CONFIG_ARM_UNWIND=y
CONFIG_ARM_SMCCC=y
CONFIG_ARM_PSCI_OF=y
CONFIG_ARM_PSCI_CLIENT=y
+# CONFIG_ARM_BOOTM_ELF is not set
+# CONFIG_ARM_BOOTM_FIP is not set
# end of ARM specific settings
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-
#
# General architecture-dependent options
#
@@ -86,15 +88,21 @@ 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_CACHE=y
CONFIG_HAS_DMA=y
-CONFIG_ARCH_HAS_SJLJ=y
CONFIG_GENERIC_GPIO=y
CONFIG_BLOCK=y
CONFIG_BLOCK_WRITE=y
@@ -105,6 +113,7 @@ 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
@@ -152,7 +161,6 @@ CONFIG_MALLOC_ALIGNMENT=8
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_POWEROFF is not set
@@ -184,12 +192,12 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_UIMAGE=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
# CONFIG_BOOTM_AIMAGE is not set
-# CONFIG_BOOTM_ELF 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
@@ -226,6 +234,8 @@ 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
@@ -238,6 +248,7 @@ CONFIG_HAVE_OPTEE=y
CONFIG_OPTEE_SIZE=0x03000000
CONFIG_OPTEE_SHM_SIZE=0x400000
# CONFIG_BOOTM_OPTEE is not set
+CONFIG_FILETYPE_STRINGS=y
# end of OP-TEE loading
#
@@ -253,7 +264,6 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=6
CONFIG_DEFAULT_LOGLEVEL=7
-CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PBL is not set
@@ -264,7 +274,6 @@ CONFIG_HAS_DEBUG_LL=y
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
-CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y
# CONFIG_KASAN is not set
# CONFIG_COMPILE_TEST is not set
@@ -308,6 +317,7 @@ 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
@@ -371,6 +381,7 @@ 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
@@ -381,6 +392,7 @@ 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
@@ -409,6 +421,7 @@ 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
@@ -448,6 +461,7 @@ CONFIG_CMD_MW=y
#
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
@@ -493,7 +507,6 @@ CONFIG_CMD_STATE=y
CONFIG_NET=y
CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
-# CONFIG_NET_NFS is not set
CONFIG_NET_NETCONSOLE=y
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
@@ -656,6 +669,7 @@ 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 ---
@@ -719,7 +733,7 @@ CONFIG_MFD_STM32_TIMERS=y
CONFIG_STATE_DRV=y
CONFIG_DEV_MEM=y
# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_UUID is not set
+# CONFIG_STORAGE_BY_ALIAS is not set
# end of Misc devices
CONFIG_LED=y
@@ -911,6 +925,7 @@ CONFIG_RESET_STM32=y
# CONFIG_MAILBOX is not set
CONFIG_TEE=y
CONFIG_OPTEE=y
+# CONFIG_OPTEE_AVB_PERSISTENT_VALUES is not set
CONFIG_OF_FIXUP_OPTEE=y
# end of Drivers
@@ -995,9 +1010,6 @@ CONFIG_CRC8=y
CONFIG_PRINTF_UUID=y
CONFIG_NLS=y
# CONFIG_BLOBGEN is not set
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
CONFIG_IDR=y
# end of Library routines
@@ -1014,7 +1026,7 @@ CONFIG_IDR=y
#
#
-# Extra care needs to be in secure booted systems.
+# Extra care needs to be taken in secure booted systems.
#
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
@@ -1078,7 +1090,6 @@ CONFIG_MISSING_FIRMWARE_ERROR=y
# Host Tools
#
# CONFIG_COMPILE_HOST_TOOLS is not set
-CONFIG_STM32_IMAGE=y
# end of Host Tools
#
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 6ea1f0c21ec5..d3a707369541 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-b84e018f387ca177ad90f1972d178d88
+3118a4e72c6ae44b00e041e7fbe80ad3
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_NR_GPIO=416
@@ -73,7 +73,9 @@ CONFIG_IDR=y
CONFIG_LED_PWM=y
# CONFIG_LED_TRIGGERS is not set
CONFIG_MACHINE_ID=y
+# CONFIG_MACH_LXA_FAIRYTUX2 is not set
CONFIG_MACH_LXA_MC1=y
+# CONFIG_MACH_LXA_TAC is not set
# CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1 is not set
# CONFIG_MACH_PROTONIC_STM32MP13 is not set
# CONFIG_MACH_PROTONIC_STM32MP1 is not set
@@ -115,7 +117,6 @@ CONFIG_MICREL_PHY=y
# CONFIG_NAND is undefined
CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
CONFIG_NET_NETCONSOLE=y
-# CONFIG_NET_NFS is not set
# CONFIG_NET_USB is not set
# CONFIG_NET_USB_ASIX is undefined
# CONFIG_NET_USB_RTL8152 is undefined
@@ -127,6 +128,7 @@ CONFIG_NVMEM=y
CONFIG_OF_FIXUP_OPTEE=y
CONFIG_OF_GPIO_PINCONF=y
CONFIG_OPTEE=y
+# CONFIG_OPTEE_AVB_PERSISTENT_VALUES is not set
CONFIG_OPTEE_SHM_SIZE=0x400000
CONFIG_OPTEE_SIZE=0x03000000
# CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
@@ -166,7 +168,6 @@ CONFIG_STM32_BSEC=y
CONFIG_STM32_BSEC_OPTEE_TA=y
CONFIG_STM32_BSEC_WRITE=y
CONFIG_STM32_FMC2_EBI=y
-CONFIG_STM32_IMAGE=y
CONFIG_STM32_IWDG_WATCHDOG=y
CONFIG_STM32_REMOTEPROC=y
# CONFIG_STPMIC1_WATCHDOG is not set
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 2d5b5a381940..e90e27442ed1 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.03.0 Configuration
+# Barebox/arm 2025.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -62,10 +62,10 @@ 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
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-
#
# General architecture-dependent options
#
@@ -73,15 +73,21 @@ 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_CACHE=y
CONFIG_HAS_DMA=y
-CONFIG_ARCH_HAS_SJLJ=y
CONFIG_BLOCK=y
CONFIG_BLOCK_WRITE=y
CONFIG_BLOCK_STATS=y
@@ -91,6 +97,7 @@ 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
@@ -138,7 +145,6 @@ CONFIG_MALLOC_ALIGNMENT=8
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_POWEROFF is not set
@@ -170,12 +176,12 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_UIMAGE=y
# CONFIG_BOOTM_OFTREE_UIMAGE is not set
# CONFIG_BOOTM_AIMAGE is not set
-# CONFIG_BOOTM_ELF 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
@@ -212,6 +218,8 @@ 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
@@ -222,6 +230,7 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
#
# CONFIG_BOOTM_OPTEE is not set
# CONFIG_PBL_OPTEE is not set
+CONFIG_FILETYPE_STRINGS=y
# end of OP-TEE loading
#
@@ -237,7 +246,6 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
-CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PBL is not set
@@ -248,7 +256,6 @@ CONFIG_HAS_DEBUG_LL=y
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
-CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y
# CONFIG_KASAN is not set
# CONFIG_COMPILE_TEST is not set
@@ -291,6 +298,7 @@ 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
@@ -354,6 +362,7 @@ 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
@@ -364,6 +373,7 @@ 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
@@ -392,6 +402,7 @@ 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
@@ -431,6 +442,7 @@ CONFIG_CMD_MW=y
#
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
@@ -473,7 +485,6 @@ CONFIG_CMD_STATE=y
# end of Commands
CONFIG_NET=y
-CONFIG_NET_NFS=y
# CONFIG_NET_NETCONSOLE is not set
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
@@ -675,6 +686,7 @@ 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 ---
@@ -733,7 +745,7 @@ CONFIG_SRAM=y
CONFIG_STATE_DRV=y
CONFIG_DEV_MEM=y
# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_UUID is not set
+# CONFIG_STORAGE_BY_ALIAS is not set
# end of Misc devices
CONFIG_LED=y
@@ -953,9 +965,6 @@ CONFIG_LIBFDT=y
CONFIG_PRINTF_UUID=y
CONFIG_NLS=y
# CONFIG_BLOBGEN is not set
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
# end of Library routines
#
@@ -971,7 +980,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
#
-# Extra care needs to be in secure booted systems.
+# Extra care needs to be taken in secure booted systems.
#
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index bef80379b0ef..9d84cd8b5914 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-b84e018f387ca177ad90f1972d178d88
+3118a4e72c6ae44b00e041e7fbe80ad3
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 937ec40a047d..e031d8534dbc 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.03.0 Configuration
+# Barebox/arm 2025.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -83,10 +83,10 @@ 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
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-
#
# General architecture-dependent options
#
@@ -94,14 +94,20 @@ 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_HAS_KALLSYMS=y
CONFIG_HAS_MODULES=y
-CONFIG_HAS_CACHE=y
CONFIG_HAS_DMA=y
-CONFIG_ARCH_HAS_SJLJ=y
CONFIG_GENERIC_GPIO=y
CONFIG_BLOCK=y
CONFIG_BLOCK_WRITE=y
@@ -112,6 +118,7 @@ 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
@@ -140,6 +147,7 @@ CONFIG_PBL_IMAGE=y
CONFIG_PBL_MULTI_IMAGES=y
CONFIG_USE_COMPRESSED_DTB=y
CONFIG_PBL_RELOCATABLE=y
+CONFIG_PBL_CLOCKSOURCE=y
CONFIG_IMAGE_COMPRESSION=y
# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
CONFIG_IMAGE_COMPRESSION_LZO=y
@@ -159,7 +167,6 @@ CONFIG_MALLOC_ALIGNMENT=8
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_POWEROFF is not set
@@ -191,12 +198,12 @@ CONFIG_BOOTM_OFTREE=y
CONFIG_BOOTM_UIMAGE=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
# CONFIG_BOOTM_AIMAGE is not set
-# CONFIG_BOOTM_ELF 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
@@ -233,6 +240,8 @@ 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
@@ -242,6 +251,7 @@ 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
#
@@ -257,7 +267,6 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
-CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
@@ -268,7 +277,6 @@ CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
-CONFIG_HAVE_ARCH_KASAN=y
CONFIG_CC_HAS_KASAN_GENERIC=y
# CONFIG_KASAN is not set
# CONFIG_COMPILE_TEST is not set
@@ -312,6 +320,7 @@ 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 is not set
@@ -375,6 +384,7 @@ 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
@@ -385,6 +395,7 @@ 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
@@ -413,6 +424,7 @@ 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
@@ -451,6 +463,7 @@ CONFIG_CMD_MW=y
# Hardware manipulation
#
CONFIG_CMD_DETECT=y
+# CONFIG_CMD_TRUNCATE is not set
CONFIG_CMD_SYNC=y
CONFIG_CMD_FLASH=y
CONFIG_CMD_GPIO=y
@@ -498,7 +511,6 @@ CONFIG_CMD_STATE=y
# end of Commands
CONFIG_NET=y
-CONFIG_NET_NFS=y
# CONFIG_NET_NETCONSOLE is not set
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
@@ -725,6 +737,7 @@ 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 ---
@@ -738,6 +751,7 @@ CONFIG_MCI_OMAP_HSMMC=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
+CONFIG_MCI_OMAP_HSMMC_PBL=y
# CONFIG_COMMON_CLK is not set
#
@@ -781,7 +795,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y
CONFIG_STATE_DRV=y
CONFIG_DEV_MEM=y
# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_UUID is not set
+# CONFIG_STORAGE_BY_ALIAS is not set
# end of Misc devices
CONFIG_LED=y
@@ -1039,9 +1053,6 @@ CONFIG_LIBFDT=y
CONFIG_PRINTF_UUID=y
CONFIG_NLS=y
# CONFIG_BLOBGEN is not set
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
# end of Library routines
#
@@ -1057,7 +1068,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
#
-# Extra care needs to be in secure booted systems.
+# Extra care needs to be taken in secure booted systems.
#
# CONFIG_BUG_ON_DATA_CORRUPTION is not set
diff --git a/configs/platform-v7a/patches/barebox-2025.03.0/0001-of-partition-overwrite-arm,arm-firmware-suite-unless-donttouch.diff b/configs/platform-v7a/patches/barebox-2025.03.0/0001-of-partition-overwrite-arm,arm-firmware-suite-unless-donttouch.diff
deleted file mode 100644
index 4417eaecd0bd..000000000000
--- a/configs/platform-v7a/patches/barebox-2025.03.0/0001-of-partition-overwrite-arm,arm-firmware-suite-unless-donttouch.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-of: partition: overwrite arm,arm-firmware-suite unless donttouch
-
-barebox doesn't support arm,arm-firmware-suite partitioning and if the
-barebox device tree uses a fixed-partitions binding for a flash, it will
-overwrite a kernel partitions node that uses arm,arm-firmware-suite with
-the fixed partition binding.
-
-This broke in the default case with the addition of
-global.of_partition_binding=adaptive, because the check for a compatible
-was successful, but the compatible was neither fixed-partitions or
-barebox,fixed-partitions.
-
-Fix this by explicitly checking the compatibles we expect.
-This fixes a failed of_get_reproducible_name in of_state_fixup, which
-broke barebox-state usage on Vexpress in DistroKit.
-
-Fixes: f0d91d7ba6cb ("of: partition: add Linux CONFIG_OF_PARTITION-compatible adaptive fixup mode")
-Reported-by: Robert Schwebel <rsc@pengutronix.de>
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- drivers/of/partition.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/of/partition.c b/drivers/of/partition.c
-index a0890bfcdef0..7f5a526ac88f 100644
---- a/drivers/of/partition.c
-+++ b/drivers/of/partition.c
-@@ -206,8 +206,8 @@ int of_fixup_partitions(struct device_node *np, struct cdev *cdev)
- partnode = np;
- break;
- case MTD_OF_BINDING_ADAPTIVE:
-- /* If there's already a compatible property, leave it as-is */
-- if (of_property_present(partnode, "compatible"))
-+ /* If there's already a fixed-partitions node, leave compatible as-is */
-+ if (of_node_is_fixed_partitions(partnode))
- break;
- if (!cdev->mtd)
- compat = "barebox,fixed-partitions";
---
-2.39.5
-
-
diff --git a/configs/platform-v7a/patches/barebox-2025.03.0/series b/configs/platform-v7a/patches/barebox-2025.03.0/series
deleted file mode 100644
index 66000e4e8348..000000000000
--- a/configs/platform-v7a/patches/barebox-2025.03.0/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-of-partition-overwrite-arm,arm-firmware-suite-unless-donttouch.diff
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index a65e92b3927a..0d6a0fdcd86a 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -185,8 +185,8 @@ PTXCONF_AT91BOOTSTRAP2_MD5="ef321a80bf428bfd6cb642c96126ef6c"
PTXCONF_AT91BOOTSTRAP2_CONFIG="at91bootstrap-wifx-l1.config"
PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm"
PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2025.03.0"
-PTXCONF_BAREBOX_COMMON_MD5="2b84bcf8644373db021c86864f2e5761"
+PTXCONF_BAREBOX_COMMON_VERSION="2025.05.0"
+PTXCONF_BAREBOX_COMMON_MD5="22046ac9b06e570a51e945c633a2b24c"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AT91=y
@@ -197,10 +197,10 @@ PTXCONF_BAREBOX_VEXPRESS=y
PTXCONF_BAREBOX_ARCH_STRING="arm"
PTXCONF_BAREBOX_DEPENDENCIES=y
PTXCONF_BAREBOX=y
-PTXCONF_BAREBOX_VERSION="2025.03.0"
+PTXCONF_BAREBOX_VERSION="2025.05.0"
PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
-PTXCONF_BAREBOX_MD5="2b84bcf8644373db021c86864f2e5761"
+PTXCONF_BAREBOX_MD5="22046ac9b06e570a51e945c633a2b24c"
PTXCONF_BAREBOX_CONFIG="barebox.config"
# PTXCONF_BAREBOX_FIRMWARE is not set
PTXCONF_BAREBOX_EXTRA_ENV=y
diff --git a/configs/platform-v7a/rules/barebox-at91.make b/configs/platform-v7a/rules/barebox-at91.make
index 2e03e4ae05ee..e5799afc4027 100644
--- a/configs/platform-v7a/rules/barebox-at91.make
+++ b/configs/platform-v7a/rules/barebox-at91.make
@@ -49,9 +49,9 @@ BAREBOX_AT91_MAKE_OPT := $(BAREBOX_AT91_CONF_OPT)
BAREBOX_AT91_IMAGES := \
images/barebox-wifx-l1.img \
images/barebox-sama5d27-som1-ek.img \
- images/barebox-sama5d27-som1-ek-xload-mmc.img \
+ images/barebox-sama5d27-som1-ek-xload.img \
images/barebox-groboards-sama5d27-giantboard.img \
- images/barebox-groboards-sama5d27-giantboard-xload-mmc.img
+ images/barebox-groboards-sama5d27-giantboard-xload.img
BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_BUILD_DIR)/,$(BAREBOX_AT91_IMAGES))
diff --git a/configs/platform-v7a/rules/image-sama5d27-giantboard.make b/configs/platform-v7a/rules/image-sama5d27-giantboard.make
index cd7f619d02e6..b3e2877723cf 100644
--- a/configs/platform-v7a/rules/image-sama5d27-giantboard.make
+++ b/configs/platform-v7a/rules/image-sama5d27-giantboard.make
@@ -25,7 +25,7 @@ IMAGE_SAMA5D27_GIANTBOARD_CONFIG := at91-sd.config
# ----------------------------------------------------------------------------
IMAGE_SAMA5D27_GIANTBOARD_ENV := \
- FSBL=barebox-groboards-sama5d27-giantboard-xload-mmc.img \
+ FSBL=barebox-groboards-sama5d27-giantboard-xload.img \
SSBL=barebox-groboards-sama5d27-giantboard.img
$(IMAGE_SAMA5D27_GIANTBOARD_IMAGE):
diff --git a/configs/platform-v7a/rules/image-sama5d27-som1-ek.make b/configs/platform-v7a/rules/image-sama5d27-som1-ek.make
index 66ac025606db..1e4fae29628d 100644
--- a/configs/platform-v7a/rules/image-sama5d27-som1-ek.make
+++ b/configs/platform-v7a/rules/image-sama5d27-som1-ek.make
@@ -25,7 +25,7 @@ IMAGE_SAMA5D27_SOM1_EK_CONFIG := at91-sd.config
# ----------------------------------------------------------------------------
IMAGE_SAMA5D27_SOM1_EK_ENV := \
- FSBL=barebox-sama5d27-som1-ek-xload-mmc.img \
+ FSBL=barebox-sama5d27-som1-ek-xload.img \
SSBL=barebox-sama5d27-som1-ek.img
$(IMAGE_SAMA5D27_SOM1_EK_IMAGE):
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 03/11] v7a: barebox: boot from bootsource
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 02/11] v7a: barebox: version bump 2025.03.0 -> 2025.05.0 Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:18 ` Ahmad Fatoum
2025-05-26 10:11 ` [DistroKit] [PATCH 04/11] v7a: image-stm32mp*: use new partition-table-type option Roland Hieber
` (7 subsequent siblings)
9 siblings, 1 reply; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Barebox 2025.05.0 with CONFIG_BOOT_DEFAULTS (which we implicitly
enabled in the last commit) can resolve the boot target "bootsource" to
the device from which the board was initially booted, if this is
supported by the platform code (see barebox commit 6d91022db295 "common:
bootdef: add new boot entry provider" for more info). This way we won't
have to hard-code "mmc0", "mmc2", or "disk0" as the boot target for
different platforms.
Link: https://git.pengutronix.de/cgit/barebox/commit/?id=6d91022db29555c175e9
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot | 2 +-
.../platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot
index c0c541c8b2a3..5ec387df9ea0 100644
--- a/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot
+++ b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot
@@ -1 +1 @@
-mmc0.root-A
+ bootsource.root-A
diff --git a/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot
index 1d40e339c2fe..cea618acf89a 100644
--- a/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot
+++ b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot
@@ -1 +1 @@
-mmc0.root-B
+ bootsource.root-B
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 04/11] v7a: image-stm32mp*: use new partition-table-type option
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 02/11] v7a: barebox: version bump 2025.03.0 -> 2025.05.0 Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 03/11] v7a: barebox: boot from bootsource Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 05/11] v7a: stm32mp: switch to upstream barebox recipe Roland Hieber
` (6 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
'partition-table' is deprecated since genimage v15, and produces a
warning.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-v7a/config/images/stm32mp-optee.config | 2 +-
configs/platform-v7a/config/images/stm32mp.config | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/platform-v7a/config/images/stm32mp-optee.config b/configs/platform-v7a/config/images/stm32mp-optee.config
index c068e52036b5..4b58f3be69ab 100644
--- a/configs/platform-v7a/config/images/stm32mp-optee.config
+++ b/configs/platform-v7a/config/images/stm32mp-optee.config
@@ -35,7 +35,7 @@ image @IMAGE@ {
image @STM32MP_BOARD@-emmcboot.img {
hdimage {
- partition-table = false
+ partition-table-type = none
}
partition fsbl {
diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config
index 2d5491d0d977..247fb49c0a77 100644
--- a/configs/platform-v7a/config/images/stm32mp.config
+++ b/configs/platform-v7a/config/images/stm32mp.config
@@ -35,7 +35,7 @@ image @IMAGE@ {
image @STM32MP_BOARD@@SCMI@-emmcboot.img {
hdimage {
- partition-table = false
+ partition-table-type = none
}
partition fsbl {
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 05/11] v7a: stm32mp: switch to upstream barebox recipe
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
` (2 preceding siblings ...)
2025-05-26 10:11 ` [DistroKit] [PATCH 04/11] v7a: image-stm32mp*: use new partition-table-type option Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 06/11] v7a: stm32mp: populate default environment in barebox partition Roland Hieber
` (5 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Remove the separate barebox-stm32 recipe in favour of the barebox recipe
from upstream PTXdist, which already supports multi-arch build. Merge
the kconfig options from the config diff. Let the barebox recipe install
its DTBs into the image folder (via BAREBOX_INSTALL_DTBS), which are
later picked up by genimage (however, the upstream recipe uses a
different naming scheme). The old defaultenv is already the same as in
the upstream recipe, so we don't need to port anything.
Since the barebox image is now too large to fit into the FIP partition,
enlarge the partition. (Incidentally, genimage v18 has a bug that does
not check whether the FIP image will fit into the partition, but this
will be fixed in a future release.)
Link: https://github.com/pengutronix/genimage/pull/293
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../init/bootsource | 9 -
.../nv/bootchooser.state_prefix | 1 -
.../nv/bootchooser.system0.boot | 1 -
.../nv/bootchooser.system1.boot | 1 -
.../nv/bootchooser.targets | 1 -
.../nv/dev.mmc0.broken_cd | 1 -
.../nv/linux.bootargs.loglevel | 1 -
configs/platform-v7a/barebox-stm32mp.config | 1105 -----------------
.../platform-v7a/barebox-stm32mp.config.diff | 195 ---
configs/platform-v7a/barebox.config | 138 +-
.../config/images/stm32mp-optee.config | 2 +-
.../platform-v7a/config/images/stm32mp.config | 5 +-
configs/platform-v7a/platformconfig | 3 +-
.../platform-v7a/platforms/barebox-stm32mp.in | 8 -
.../platforms/image-lxa-mc1-scmi.in | 2 +-
.../platform-v7a/platforms/image-lxa-mc1.in | 2 +-
.../platforms/image-stm32mp135f-dk.in | 2 +-
.../platforms/image-stm32mp157c-dk2.in | 2 +-
.../platforms/image-stm32mp157c-ev1.in | 2 +-
.../platform-v7a/rules/barebox-stm32mp.make | 121 --
20 files changed, 121 insertions(+), 1481 deletions(-)
delete mode 100755 configs/platform-v7a/barebox-stm32mp-defaultenv/init/bootsource
delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.state_prefix
delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot
delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot
delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets
delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/dev.mmc0.broken_cd
delete mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel
delete mode 100644 configs/platform-v7a/barebox-stm32mp.config
delete mode 100644 configs/platform-v7a/barebox-stm32mp.config.diff
delete mode 100644 configs/platform-v7a/platforms/barebox-stm32mp.in
delete mode 100644 configs/platform-v7a/rules/barebox-stm32mp.make
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/init/bootsource b/configs/platform-v7a/barebox-stm32mp-defaultenv/init/bootsource
deleted file mode 100755
index edce471abe78..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/init/bootsource
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -n "$nv.boot.default" ]; then
- exit
-fi
-
-if [ $bootsource = mmc ]; then
- global.boot.default="bootchooser net"
-fi
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.state_prefix
deleted file mode 100644
index 6246412a5c27..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.state_prefix
+++ /dev/null
@@ -1 +0,0 @@
-state.bootstate
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot
deleted file mode 100644
index c0c541c8b2a3..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system0.boot
+++ /dev/null
@@ -1 +0,0 @@
-mmc0.root-A
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot
deleted file mode 100644
index 1d40e339c2fe..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.system1.boot
+++ /dev/null
@@ -1 +0,0 @@
-mmc0.root-B
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets
deleted file mode 100644
index f0fb14eeaad2..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/bootchooser.targets
+++ /dev/null
@@ -1 +0,0 @@
-system0 system1
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/dev.mmc0.broken_cd b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/dev.mmc0.broken_cd
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/dev.mmc0.broken_cd
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel
deleted file mode 100644
index d45c34464422..000000000000
--- a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel
+++ /dev/null
@@ -1 +0,0 @@
-loglevel=5 systemd.show_status=auto
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
deleted file mode 100644
index 69d21b9f5f23..000000000000
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ /dev/null
@@ -1,1105 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2025.05.0 Configuration
-#
-CONFIG_ARM=y
-CONFIG_ARCH_LINUX_NAME="arm"
-CONFIG_ARCH_MKIMAGE_NAME="arm"
-CONFIG_ARM32=y
-CONFIG_ARCH_TEXT_BASE=0x00000000
-CONFIG_ARM_LINUX=y
-
-#
-# System Type
-#
-CONFIG_ARCH_STM32=y
-CONFIG_ARCH_MULTIARCH=y
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_ZYNQ is not set
-# CONFIG_ARCH_BCM283X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_K3 is not set
-# CONFIG_ARCH_SUNXI is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
-# CONFIG_ARCH_OMAP_MULTI is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-CONFIG_ARCH_STM32MP=y
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_VEXPRESS is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-
-#
-# processor features
-#
-# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_ARCH_NR_GPIO=416
-CONFIG_ARCH_STM32MP13=y
-CONFIG_ARCH_STM32MP157=y
-CONFIG_MACH_STM32MP13XX_DK=y
-CONFIG_MACH_STM32MP15XX_DKX=y
-CONFIG_MACH_LXA_MC1=y
-# CONFIG_MACH_LXA_TAC is not set
-# CONFIG_MACH_LXA_FAIRYTUX2 is not set
-# CONFIG_MACH_SEEED_ODYSSEY is not set
-CONFIG_MACH_STM32MP15X_EV1=y
-# CONFIG_MACH_PROTONIC_STM32MP1 is not set
-# CONFIG_MACH_PROTONIC_STM32MP13 is not set
-# CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1 is not set
-CONFIG_BOARD_ARM_GENERIC_DT=y
-CONFIG_AEABI=y
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_ARM_BOARD_APPEND_ATAG=y
-# CONFIG_ARM_BOARD_PREPEND_ATAG is not set
-# end of System Type
-
-# CONFIG_64BIT is not set
-CONFIG_32BIT=y
-
-#
-# ARM specific settings
-#
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_ARM_EXCEPTIONS=y
-CONFIG_ARM_UNWIND=y
-# CONFIG_ARM_SEMIHOSTING is not set
-CONFIG_ARM_SMCCC=y
-CONFIG_ARM_PSCI_OF=y
-CONFIG_ARM_PSCI_CLIENT=y
-# CONFIG_ARM_BOOTM_ELF is not set
-# CONFIG_ARM_BOOTM_FIP is not set
-# end of ARM specific settings
-
-#
-# General architecture-dependent options
-#
-CONFIG_BOARD_GENERIC_DT=y
-# CONFIG_BOARD_GENERIC_FIT is not set
-# end of General architecture-dependent options
-
-CONFIG_ARCH_HAS_STACK_DUMP=y
-CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
-CONFIG_ARCH_HAS_ZERO_PAGE=y
-CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_ARCH_HAS_SJLJ=y
-CONFIG_HAS_DEBUG_LL=y
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140201
-CONFIG_CLANG_VERSION=0
-CONFIG_GREGORIAN_CALENDER=y
-CONFIG_HAS_KALLSYMS=y
-CONFIG_HAS_MODULES=y
-CONFIG_HAS_DMA=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_BLOCK=y
-CONFIG_BLOCK_WRITE=y
-CONFIG_BLOCK_STATS=y
-CONFIG_FILETYPE=y
-CONFIG_BINFMT=y
-CONFIG_UIMAGE=y
-CONFIG_FITIMAGE=y
-CONFIG_LOGBUF=y
-CONFIG_STDDEV=y
-CONFIG_CDEV_ALIAS=y
-CONFIG_MENUTREE=y
-CONFIG_BOOT=y
-CONFIG_FASTBOOT_BASE=y
-
-#
-# General Settings
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAS_INSECURE_DEFAULTS=y
-CONFIG_INSECURE=y
-CONFIG_BANNER=y
-CONFIG_MEMINFO=y
-CONFIG_MEMTEST=y
-CONFIG_ENVIRONMENT_VARIABLES=y
-CONFIG_GLOBALVAR=y
-CONFIG_NVVAR=y
-
-#
-# memory layout
-#
-CONFIG_HAVE_PBL_IMAGE=y
-CONFIG_HAVE_PBL_MULTI_IMAGES=y
-CONFIG_HAVE_IMAGE_COMPRESSION=y
-CONFIG_PBL_IMAGE=y
-CONFIG_PBL_MULTI_IMAGES=y
-CONFIG_USE_COMPRESSED_DTB=y
-CONFIG_PBL_RELOCATABLE=y
-CONFIG_IMAGE_COMPRESSION=y
-# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
-CONFIG_IMAGE_COMPRESSION_LZO=y
-# CONFIG_IMAGE_COMPRESSION_GZIP is not set
-# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
-# CONFIG_IMAGE_COMPRESSION_NONE is not set
-CONFIG_MMU=y
-CONFIG_MMUINFO=y
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
-CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
-CONFIG_STACK_SIZE=0x8000
-CONFIG_MALLOC_SIZE=0x0
-CONFIG_MALLOC_ALIGNMENT=8
-# end of memory layout
-
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_MALLOC_DLMALLOC is not set
-CONFIG_MALLOC_TLSF=y
-CONFIG_KALLSYMS=y
-CONFIG_RELOCATABLE=y
-# CONFIG_PANIC_POWEROFF is not set
-# CONFIG_PANIC_HANG is not set
-CONFIG_PANIC_RESET=y
-CONFIG_PROMPT="barebox:"
-CONFIG_BAUDRATE=115200
-CONFIG_CBSIZE=1024
-CONFIG_FIRMWARE=y
-CONFIG_SHELL_HUSH=y
-# CONFIG_SHELL_SIMPLE is not set
-# CONFIG_SHELL_NONE is not set
-CONFIG_GLOB=y
-CONFIG_GLOB_SORT=y
-CONFIG_PROMPT_HUSH_PS2="> "
-CONFIG_HUSH_FANCY_PROMPT=y
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_MENU=y
-# CONFIG_PASSWORD is not set
-CONFIG_ERRNO_MESSAGES=y
-CONFIG_TIMESTAMP=y
-CONFIG_BOOTM=y
-CONFIG_BOOT_OVERRIDE=y
-CONFIG_BOOTM_SHOW_TYPE=y
-CONFIG_BOOTM_VERBOSE=y
-CONFIG_BOOTM_INITRD=y
-CONFIG_BOOTM_OFTREE=y
-CONFIG_BOOTM_UIMAGE=y
-CONFIG_BOOTM_OFTREE_UIMAGE=y
-# CONFIG_BOOTM_AIMAGE is not set
-CONFIG_BOOTM_FITIMAGE=y
-# CONFIG_BOOTM_FITIMAGE_SIGNATURE is not set
-CONFIG_BOOTM_OPTIONAL_SIGNED_IMAGES=y
-CONFIG_BLSPEC=y
-CONFIG_FLEXIBLE_BOOTARGS=y
-CONFIG_ROOTWAIT_BOOTARG=y
-CONFIG_MMCBLKDEV_ROOTARG=y
-CONFIG_BAREBOX_UPDATE=y
-CONFIG_SYSTEM_PARTITIONS=y
-CONFIG_IMD=y
-CONFIG_CONSOLE_FULL=y
-# CONFIG_CONSOLE_SIMPLE is not set
-# CONFIG_CONSOLE_NONE is not set
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-# CONFIG_CONSOLE_ACTIVATE_ALL is not set
-# CONFIG_CONSOLE_ACTIVATE_ALL_FALLBACK is not set
-CONFIG_CONSOLE_ACTIVATE_NONE=y
-CONFIG_CONSOLE_ALLOW_COLOR=y
-# CONFIG_CONSOLE_DISABLE_INPUT is not set
-CONFIG_PBL_CONSOLE=y
-# CONFIG_CONSOLE_RATP is not set
-CONFIG_PARTITION=y
-CONFIG_PARTITION_MANIPULATION=y
-CONFIG_PARTITION_DISK=y
-CONFIG_PARTITION_DISK_DOS=y
-CONFIG_PARTITION_DISK_EFI=y
-# CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set
-# CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
-CONFIG_ENV_HANDLING=y
-CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_COMPRESSION_NONE=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
-# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set
-CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
-CONFIG_HAS_SCHED=y
-CONFIG_POLLER=y
-CONFIG_BTHREAD=y
-CONFIG_STATE=y
-# CONFIG_STATE_CRYPTO is not set
-# CONFIG_STATE_BACKWARD_COMPATIBLE is not set
-CONFIG_BOOTCHOOSER=y
-CONFIG_BOOT_DEFAULTS=y
-CONFIG_BAREBOX_DT_2ND=y
-CONFIG_RESET_SOURCE=y
-CONFIG_MACHINE_ID=y
-# CONFIG_SYSTEMD_OF_WATCHDOG is not set
-CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
-
-#
-# OP-TEE loading
-#
-CONFIG_HAVE_OPTEE=y
-CONFIG_OPTEE_SIZE=0x03000000
-CONFIG_OPTEE_SHM_SIZE=0x400000
-# CONFIG_BOOTM_OPTEE is not set
-CONFIG_FILETYPE_STRINGS=y
-# end of OP-TEE loading
-
-#
-# Android Fastboot
-#
-CONFIG_FASTBOOT_SPARSE=y
-CONFIG_FASTBOOT_CMD_OEM=y
-# end of Android Fastboot
-# end of General Settings
-
-#
-# Debugging
-#
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_DEFAULT_LOGLEVEL=7
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_INITCALLS is not set
-# CONFIG_DEBUG_PBL is not set
-# CONFIG_DEBUG_PROBES is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_RESOURCES is not set
-# CONFIG_PBL_BREAK is not set
-# CONFIG_PRINTF_FULL is not set
-# CONFIG_UBSAN is not set
-CONFIG_CC_HAS_KASAN_GENERIC=y
-# CONFIG_KASAN is not set
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_WERROR is not set
-
-#
-# arm Debugging
-#
-# end of Debugging
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_HAVE_EFI_STUB=y
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_COMMAND_SUPPORT=y
-CONFIG_COMPILE_HASH=y
-
-#
-# Commands
-#
-
-#
-# Information
-#
-# CONFIG_CMD_TUTORIAL is not set
-CONFIG_CMD_ARM_CPUINFO=y
-CONFIG_CMD_CLASS=y
-CONFIG_CMD_DEVINFO=y
-# CONFIG_CMD_DEVLOOKUP is not set
-# CONFIG_CMD_DEVUNBIND is not set
-CONFIG_CMD_DMESG=y
-CONFIG_CMD_DRVINFO=y
-CONFIG_CMD_HELP=y
-CONFIG_LONGHELP=y
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_IMD=y
-CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_ARM_MMUINFO=y
-CONFIG_CMD_BLKSTATS=y
-CONFIG_CMD_REGULATOR=y
-# CONFIG_CMD_NVMEM is not set
-# CONFIG_CMD_VARINFO is not set
-CONFIG_CMD_VERSION=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_MMC_EXTCSD=y
-# CONFIG_CMD_POLLER is not set
-CONFIG_CMD_BTHREAD=y
-# CONFIG_CMD_SLICE is not set
-# end of Information
-
-#
-# Boot
-#
-CONFIG_CMD_BOOT=y
-CONFIG_CMD_BOOTM=y
-# CONFIG_CMD_BOOTU is not set
-# CONFIG_CMD_BOOTZ is not set
-CONFIG_CMD_GO=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_LOADY is not set
-CONFIG_CMD_RESET=y
-CONFIG_CMD_UIMAGE=y
-CONFIG_CMD_BOOTCHOOSER=y
-# end of Boot
-
-#
-# Partition
-#
-CONFIG_CMD_PARTITION=y
-CONFIG_CMD_AUTOMOUNT=y
-CONFIG_CMD_MOUNT=y
-# CONFIG_CMD_FINDMNT is not set
-CONFIG_CMD_PARTED=y
-CONFIG_CMD_UMOUNT=y
-# end of Partition
-
-#
-# Environment
-#
-CONFIG_CMD_NV=y
-CONFIG_CMD_EXPORT=y
-# CONFIG_CMD_DEFAULTENV is not set
-CONFIG_CMD_GLOBAL=y
-CONFIG_CMD_LOADENV=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_MAGICVAR=y
-CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_SETENV=y
-# end of Environment
-
-#
-# File
-#
-CONFIG_CMD_BASENAME=y
-CONFIG_CMD_CAT=y
-CONFIG_CMD_CD=y
-CONFIG_CMD_CP=y
-# CONFIG_CMD_CMP is not set
-CONFIG_CMD_DIGEST=y
-CONFIG_CMD_DIRNAME=y
-CONFIG_CMD_FILETYPE=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_LS=y
-CONFIG_CMD_TREE=y
-# CONFIG_CMD_STAT is not set
-CONFIG_CMD_MD5SUM=y
-CONFIG_CMD_MKDIR=y
-CONFIG_CMD_PWD=y
-CONFIG_CMD_READLINK=y
-CONFIG_CMD_RM=y
-CONFIG_CMD_RMDIR=y
-CONFIG_CMD_SHA1SUM=y
-# CONFIG_CMD_SHA224SUM is not set
-# CONFIG_CMD_SHA256SUM is not set
-# CONFIG_CMD_BASE64 is not set
-# CONFIG_CMD_SHA384SUM is not set
-# CONFIG_CMD_SHA512SUM is not set
-# CONFIG_CMD_FIPTOOL is not set
-CONFIG_CMD_UNCOMPRESS=y
-# end of File
-
-#
-# Shell scripting
-#
-CONFIG_CMD_FALSE=y
-CONFIG_CMD_GETOPT=y
-CONFIG_CMD_LET=y
-CONFIG_CMD_MSLEEP=y
-CONFIG_CMD_READF=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_TEST=y
-CONFIG_CMD_TRUE=y
-# end of Shell scripting
-
-#
-# Network
-#
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_HOST=y
-CONFIG_NET_CMD_IFUP=y
-CONFIG_CMD_MIITOOL=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TFTP=y
-# CONFIG_CMD_IP is not set
-CONFIG_CMD_IP_ROUTE_GET=y
-# CONFIG_CMD_ETHLOG is not set
-# end of Network
-
-#
-# Console and Framebuffer interaction
-#
-CONFIG_CMD_CLEAR=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_EDIT=y
-# CONFIG_CMD_LOGIN is not set
-CONFIG_CMD_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_MENUTREE=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TIMEOUT=y
-# end of Console and Framebuffer interaction
-
-#
-# Memory
-#
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_MD=y
-CONFIG_CMD_MEMCMP=y
-CONFIG_CMD_MEMCPY=y
-CONFIG_CMD_MEMSET=y
-CONFIG_CMD_MEMTEST=y
-# CONFIG_CMD_MEMTESTER is not set
-CONFIG_CMD_MM=y
-CONFIG_CMD_MW=y
-# end of Memory
-
-#
-# Hardware manipulation
-#
-CONFIG_CMD_CLK=y
-CONFIG_CMD_DETECT=y
-# CONFIG_CMD_TRUNCATE is not set
-CONFIG_CMD_SYNC=y
-CONFIG_CMD_FLASH=y
-CONFIG_CMD_GPIO=y
-# CONFIG_CMD_I2C is not set
-# CONFIG_CMD_PWM is not set
-CONFIG_CMD_LED=y
-CONFIG_CMD_POWEROFF=y
-# CONFIG_CMD_SMC is not set
-CONFIG_CMD_USB=y
-CONFIG_CMD_USBGADGET=y
-CONFIG_CMD_WD=y
-CONFIG_CMD_WD_DEFAULT_TIMOUT=0
-# end of Hardware manipulation
-
-#
-# Miscellaneous
-#
-# CONFIG_CMD_2048 is not set
-CONFIG_CMD_BAREBOX_UPDATE=y
-# CONFIG_CMD_BLOBGEN is not set
-# CONFIG_CMD_FIRMWARELOAD is not set
-# CONFIG_CMD_KALLSYMS is not set
-CONFIG_CMD_OF_COMPATIBLE=y
-CONFIG_CMD_OF_DIFF=y
-CONFIG_CMD_OF_DUMP=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_OF_PROPERTY=y
-# CONFIG_CMD_OF_DISPLAY_TIMINGS is not set
-CONFIG_CMD_OF_FIXUP=y
-CONFIG_CMD_OF_FIXUP_STATUS=y
-CONFIG_CMD_OF_OVERLAY=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_WATCH=y
-# CONFIG_CMD_UPTIME is not set
-CONFIG_CMD_STATE=y
-# CONFIG_CMD_DHRYSTONE is not set
-# CONFIG_CMD_SPD_DECODE is not set
-# CONFIG_CMD_SEED is not set
-# CONFIG_CMD_STACKSMASH is not set
-# end of Miscellaneous
-# end of Commands
-
-CONFIG_NET=y
-CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
-CONFIG_NET_NETCONSOLE=y
-CONFIG_NET_RESOLV=y
-CONFIG_NET_IFUP=y
-CONFIG_NET_DHCP=y
-# CONFIG_NET_SNTP is not set
-CONFIG_NET_FASTBOOT=y
-
-#
-# Drivers
-#
-CONFIG_REGMAP_FORMATTED=y
-CONFIG_REGMAP_I2C=y
-CONFIG_OFTREE=y
-CONFIG_OFTREE_MEM_GENERIC=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_OFDEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_GPIO_PINCONF=y
-CONFIG_OF_BAREBOX_DRIVERS=y
-# CONFIG_OF_BAREBOX_ENV_IN_FS is not set
-CONFIG_OF_OVERLAY=y
-# CONFIG_OF_OVERLAY_LIVE is not set
-# CONFIG_AIODEV is not set
-CONFIG_ARM_AMBA=y
-
-#
-# serial drivers
-#
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
-# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_DRIVER_SERIAL_STM32=y
-# CONFIG_DRIVER_SERIAL_NS16550 is not set
-# CONFIG_DRIVER_SERIAL_CADENCE is not set
-# CONFIG_SERIAL_SIFIVE is not set
-# end of serial drivers
-
-CONFIG_PHYLIB=y
-
-#
-# Network drivers
-#
-# CONFIG_DRIVER_NET_ARC_EMAC is not set
-# CONFIG_DRIVER_NET_BCMGENET is not set
-# CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set
-CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
-CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
-# CONFIG_DRIVER_NET_FSL_FMAN is not set
-# CONFIG_DRIVER_NET_KS8851_MLL is not set
-# CONFIG_DRIVER_NET_SMC911X is not set
-# CONFIG_DRIVER_NET_SMC91111 is not set
-# CONFIG_DRIVER_NET_LITEETH is not set
-
-#
-# phylib
-#
-
-#
-# MII PHY device drivers
-#
-# CONFIG_AR8327N_PHY is not set
-CONFIG_AT803X_PHY=y
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_DP83TD510_PHY is not set
-# CONFIG_DP83TG720_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-CONFIG_MICREL_PHY=y
-# CONFIG_MOTORCOMM_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-
-#
-# MII bus device drivers
-#
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# end of phylib
-
-# CONFIG_NET_USB is not set
-# CONFIG_DSA is not set
-# end of Network drivers
-
-#
-# SPI drivers
-#
-# CONFIG_SPI is not set
-# end of SPI drivers
-
-CONFIG_I2C=y
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_DESIGNWARE is not set
-# CONFIG_I2C_MV64XXX is not set
-CONFIG_I2C_STM32=y
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_MUX is not set
-# CONFIG_MTD is not set
-CONFIG_DISK=y
-CONFIG_DISK_WRITE=y
-
-#
-# drive types
-#
-# CONFIG_DISK_ATA is not set
-# CONFIG_DISK_AHCI is not set
-
-#
-# interface types
-#
-# CONFIG_DISK_INTF_PLATFORM_IDE is not set
-CONFIG_USB=y
-CONFIG_USB_HOST=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_HOST=y
-CONFIG_USB_DWC2_GADGET=y
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_EHCI is not set
-# CONFIG_USB_XHCI is not set
-# CONFIG_USB_ULPI is not set
-CONFIG_USB_OTGDEV=y
-# CONFIG_USB_STORAGE is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_ONBOARD_HUB is not set
-# CONFIG_TYPEC_TUSB320 is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_AUTOSTART is not set
-
-#
-# USB Gadget drivers
-#
-# CONFIG_USB_GADGET_DFU is not set
-CONFIG_USB_GADGET_SERIAL=y
-CONFIG_USB_GADGET_FASTBOOT=y
-CONFIG_USB_GADGET_MASS_STORAGE=y
-# CONFIG_USB_MUSB is not set
-# CONFIG_VIDEO is not set
-# CONFIG_SOUND is not set
-CONFIG_MCI=y
-
-#
-# --- Feature list ---
-#
-# CONFIG_MCI_TUNING is not set
-CONFIG_MCI_STARTUP=y
-CONFIG_MCI_INFO=y
-CONFIG_MCI_WRITE=y
-CONFIG_MCI_ERASE=y
-CONFIG_MCI_MMC_BOOT_PARTITIONS=y
-# CONFIG_MCI_MMC_GPP_PARTITIONS is not set
-# CONFIG_MCI_MMC_RPMB is not set
-
-#
-# --- MCI host drivers ---
-#
-# CONFIG_MCI_DWC_MSHC is not set
-# CONFIG_MCI_DW is not set
-# CONFIG_MCI_SUNXI_SMHC is not set
-# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
-# CONFIG_MCI_MMCI is not set
-# CONFIG_MCI_ARASAN is not set
-# CONFIG_MCI_AM654 is not set
-CONFIG_MCI_STM32_SDMMC2=y
-CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_OF_PROVIDER=y
-CONFIG_COMMON_CLK_STM32MP135=y
-CONFIG_COMMON_CLK_STM32MP157=y
-CONFIG_COMMON_CLK_SCMI=y
-CONFIG_COMMON_CLK_GPIO=y
-
-#
-# Clocksource
-#
-CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
-# CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
-# CONFIG_CLKSRC_STM32 is not set
-# end of Clocksource
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_ACT8846 is not set
-# CONFIG_MFD_DA9053 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_LP3972 is not set
-# CONFIG_MFD_MC13XXX is not set
-# CONFIG_MFD_MC34704 is not set
-# CONFIG_MFD_MC9SDZ60 is not set
-# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TPS65219 is not set
-# CONFIG_MFD_TWL4030 is not set
-# CONFIG_MFD_TWL6030 is not set
-CONFIG_MFD_STPMIC1=y
-# CONFIG_MFD_PCA9450 is not set
-# CONFIG_MFD_RN568PMIC is not set
-CONFIG_MFD_STM32_TIMERS=y
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# end of Multifunction device drivers
-
-#
-# Misc devices
-#
-# CONFIG_JTAG is not set
-# CONFIG_SRAM is not set
-CONFIG_STATE_DRV=y
-CONFIG_DEV_MEM=y
-# CONFIG_UBOOTVAR is not set
-# CONFIG_STORAGE_BY_ALIAS is not set
-# end of Misc devices
-
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_LED_PWM=y
-CONFIG_LED_GPIO_OF=y
-# CONFIG_LED_GPIO_RGB is not set
-# CONFIG_LED_GPIO_BICOLOR is not set
-# CONFIG_LED_TRIGGERS is not set
-# CONFIG_LED_PCA955X is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=y
-# end of EEPROM support
-
-#
-# Input device support
-#
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_USB is not set
-# CONFIG_INPUT_SPECIALKEYS is not set
-# end of Input device support
-
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_POLLER=y
-# CONFIG_WATCHDOG_DW is not set
-CONFIG_STM32_IWDG_WATCHDOG=y
-# CONFIG_STPMIC1_WATCHDOG is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-CONFIG_PWM=y
-CONFIG_PWM_STM32=y
-CONFIG_HWRNG=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HWRNG_STM32=y
-CONFIG_HW_RANDOM_OPTEE=y
-
-#
-# DMA support
-#
-# CONFIG_DMADEVICES is not set
-# end of DMA support
-
-CONFIG_GPIOLIB=y
-
-#
-# GPIO
-#
-CONFIG_HAVE_GPIO_PINCONF=y
-CONFIG_GPIO_PINCONF=y
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_DESIGNWARE is not set
-# CONFIG_GPIO_SX150X is not set
-# CONFIG_GPIO_SIFIVE is not set
-# CONFIG_GPIO_LATCH is not set
-# end of GPIO
-
-# CONFIG_W1 is not set
-
-#
-# Pin controllers
-#
-CONFIG_PINCTRL=y
-# CONFIG_PINCTRL_SINGLE is not set
-CONFIG_PINCTRL_STM32=y
-# end of Pin controllers
-
-CONFIG_NVMEM=y
-# CONFIG_NVMEM_RMEM is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-CONFIG_STM32_BSEC=y
-CONFIG_STM32_BSEC_WRITE=y
-CONFIG_STM32_BSEC_OPTEE_TA=y
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED=y
-# CONFIG_REGULATOR_FAN53555 is not set
-CONFIG_REGULATOR_STM32_PWR=y
-CONFIG_REGULATOR_STM32_VREFBUF=y
-CONFIG_REGULATOR_STPMIC1=y
-# CONFIG_REGULATOR_ANATOP is not set
-CONFIG_REGULATOR_ARM_SCMI=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=y
-CONFIG_STM32_REMOTEPROC=y
-# end of Remoteproc drivers
-
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_SIMPLE=y
-# CONFIG_RESET_IMX7 is not set
-CONFIG_RESET_SCMI=y
-# CONFIG_RTC_CLASS is not set
-
-#
-# Firmware Drivers
-#
-# CONFIG_QEMU_FW_CFG is not set
-
-#
-# ARM System Control and Management Interface Protocol
-#
-CONFIG_ARM_SCMI_PROTOCOL=y
-CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
-CONFIG_ARM_SCMI_HAVE_SHMEM=y
-CONFIG_ARM_SCMI_HAVE_MSG=y
-CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
-CONFIG_ARM_SCMI_TRANSPORT_SMC=y
-# CONFIG_ARM_SCMI_POWER_DOMAIN is not set
-# end of ARM System Control and Management Interface Protocol
-# end of Firmware Drivers
-
-#
-# FPGA Configuration Support
-#
-# CONFIG_FPGA is not set
-# end of FPGA Configuration Support
-
-CONFIG_GENERIC_PHY=y
-# CONFIG_USB_NOP_XCEIV is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-CONFIG_PHY_STM32_USBPHYC=y
-
-#
-# Hardware crypto devices
-#
-# end of Hardware crypto devices
-
-#
-# Memory controller drivers
-#
-CONFIG_STM32_FMC2_EBI=y
-# end of Memory controller drivers
-
-#
-# SoC drivers
-#
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# KVX SoC drivers
-#
-# end of KVX SoC drivers
-# end of SoC drivers
-
-#
-# PM Domains
-#
-
-#
-# i.MX PM Domains
-#
-# end of i.MX PM Domains
-# end of PM Domains
-
-#
-# NVME Support
-#
-# end of NVME Support
-
-# CONFIG_SYSCON_REBOOT_MODE is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_RESET_SYSCON is not set
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-CONFIG_RESET_STM32=y
-# CONFIG_VIRTIO_MENU is not set
-# CONFIG_MAILBOX is not set
-CONFIG_TEE=y
-CONFIG_OPTEE=y
-# CONFIG_OPTEE_AVB_PERSISTENT_VALUES is not set
-CONFIG_OF_FIXUP_OPTEE=y
-# end of Drivers
-
-#
-# Filesystem support
-#
-CONFIG_FS=y
-CONFIG_FS_LEGACY=y
-CONFIG_FS_WRITABLE=y
-
-#
-# Some selected filesystems still use the legacy FS API.
-#
-
-#
-# Consider updating them.
-#
-CONFIG_FS_AUTOMOUNT=y
-# CONFIG_FS_CRAMFS is not set
-CONFIG_FS_EXT4=y
-CONFIG_FS_RAMFS=y
-CONFIG_FS_DEVFS=y
-CONFIG_FS_TFTP=y
-CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128
-CONFIG_FS_NFS=y
-CONFIG_FS_FAT=y
-CONFIG_FS_FAT_WRITE=y
-CONFIG_FS_FAT_LFN=y
-# CONFIG_FS_BPKFS is not set
-# CONFIG_FS_UIMAGEFS is not set
-# CONFIG_FS_PSTORE is not set
-# CONFIG_FS_SQUASHFS is not set
-
-#
-# ZLIB support disabled
-#
-
-#
-# LZ4 support disabled
-#
-
-#
-# LZO support disabled
-#
-
-#
-# XZ support disabled
-#
-
-#
-# ZSTD support disabled
-#
-# end of Filesystem support
-
-#
-# Library routines
-#
-CONFIG_PARAMETER=y
-CONFIG_UNCOMPRESS=y
-CONFIG_ZLIB=y
-# CONFIG_BZLIB is not set
-# CONFIG_LZ4_DECOMPRESS is not set
-# CONFIG_ZSTD_DECOMPRESS is not set
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_BASE64 is not set
-CONFIG_PROCESS_ESCAPE_SEQUENCE=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_FNMATCH=y
-CONFIG_QSORT=y
-CONFIG_IMAGE_SPARSE=y
-CONFIG_LIBFDT=y
-# CONFIG_RATP is not set
-# CONFIG_ALLOW_PRNG_FALLBACK is not set
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC8=y
-
-#
-# Library gui routines
-#
-# end of Library gui routines
-
-CONFIG_PRINTF_UUID=y
-CONFIG_NLS=y
-# CONFIG_BLOBGEN is not set
-CONFIG_IDR=y
-# end of Library routines
-
-#
-# Hardening options
-#
-
-#
-# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating
-#
-
-#
-# that some of the configured options have potentially insecure defaults.
-#
-
-#
-# Extra care needs to be taken in secure booted systems.
-#
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-
-#
-# Memory initialization
-#
-CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
-CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
-# CONFIG_INIT_STACK_NONE is not set
-# CONFIG_INIT_STACK_ALL_PATTERN is not set
-CONFIG_INIT_STACK_ALL_ZERO=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
-# CONFIG_ZERO_CALL_USED_REGS is not set
-# end of Memory initialization
-
-CONFIG_STACK_GUARD_PAGE=y
-CONFIG_STACKPROTECTOR=y
-# CONFIG_STACKPROTECTOR_NONE is not set
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_PBL_STACKPROTECTOR_NONE=y
-# CONFIG_PBL_STACKPROTECTOR_STRONG is not set
-# end of Hardening options
-
-#
-# Crypto support
-#
-CONFIG_CRC32=y
-CONFIG_DIGEST=y
-CONFIG_HAVE_DIGEST_MD5=y
-CONFIG_HAVE_DIGEST_SHA1=y
-CONFIG_HAVE_DIGEST_SHA224=y
-CONFIG_HAVE_DIGEST_SHA256=y
-CONFIG_HAVE_DIGEST_HMAC=y
-# CONFIG_DIGEST_CRC32_GENERIC is not set
-CONFIG_DIGEST_MD5_GENERIC=y
-CONFIG_DIGEST_SHA1_GENERIC=y
-# CONFIG_DIGEST_SHA224_GENERIC is not set
-# CONFIG_DIGEST_SHA256_GENERIC is not set
-# CONFIG_DIGEST_SHA384_GENERIC is not set
-# CONFIG_DIGEST_SHA512_GENERIC is not set
-CONFIG_DIGEST_HMAC_GENERIC=y
-CONFIG_DIGEST_SHA1_ARM=y
-CONFIG_DIGEST_SHA256_ARM=y
-# CONFIG_CRYPTO_RSA is not set
-# CONFIG_CRYPTO_ECDSA is not set
-# CONFIG_CRYPTO_BUILTIN_KEYS is not set
-# CONFIG_CRYPTO_KEYSTORE is not set
-# end of Crypto support
-
-#
-# Firmware files
-#
-CONFIG_EXTRA_FIRMWARE_DIR="firmware"
-CONFIG_MISSING_FIRMWARE_ERROR=y
-# end of Firmware files
-
-#
-# Host Tools
-#
-# CONFIG_COMPILE_HOST_TOOLS is not set
-# end of Host Tools
-
-#
-# Target Tools
-#
-# CONFIG_IMD_TARGET is not set
-# CONFIG_KERNEL_INSTALL_TARGET is not set
-# CONFIG_BAREBOXENV_TARGET is not set
-# CONFIG_BAREBOXCRC32_TARGET is not set
-# CONFIG_MVEBU_KWBOOT_TARGET is not set
-# end of Target Tools
-
-# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
deleted file mode 100644
index d3a707369541..000000000000
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ /dev/null
@@ -1,195 +0,0 @@
-3118a4e72c6ae44b00e041e7fbe80ad3
-# CONFIG_ARCH_BCM283X is not set
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
-CONFIG_ARCH_NR_GPIO=416
-CONFIG_ARCH_STM32=y
-CONFIG_ARCH_STM32MP13=y
-CONFIG_ARCH_STM32MP157=y
-CONFIG_ARCH_STM32MP=y
-CONFIG_ARM_BOARD_APPEND_ATAG=y
-# CONFIG_ARM_BOARD_PREPEND_ATAG is not set
-CONFIG_ARM_PSCI_CLIENT=y
-CONFIG_ARM_PSCI_OF=y
-CONFIG_ARM_SCMI_HAVE_MSG=y
-CONFIG_ARM_SCMI_HAVE_SHMEM=y
-CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
-# CONFIG_ARM_SCMI_POWER_DOMAIN is not set
-CONFIG_ARM_SCMI_PROTOCOL=y
-CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
-CONFIG_ARM_SCMI_TRANSPORT_SMC=y
-# CONFIG_ARM_SECURE_MONITOR is undefined
-CONFIG_AT803X_PHY=y
-CONFIG_BOOTM_OFTREE_UIMAGE=y
-# CONFIG_BZLIB is not set
-# CONFIG_CLKSRC_STM32 is not set
-# CONFIG_CLOCKSOURCE_BCM283X is undefined
-# CONFIG_CMD_BOOTZ is not set
-# CONFIG_CMD_DEFAULTENV is not set
-# CONFIG_CMD_I2C is not set
-# CONFIG_CMD_LED_TRIGGER is undefined
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_MMC_EXTCSD=y
-# CONFIG_CMD_NVMEM is not set
-CONFIG_CMD_POWEROFF=y
-# CONFIG_CMD_PWM is not set
-# CONFIG_CMD_SPI is undefined
-# CONFIG_CMD_STACKSMASH is not set
-CONFIG_COMMON_CLK_SCMI=y
-CONFIG_COMMON_CLK_STM32MP135=y
-CONFIG_COMMON_CLK_STM32MP157=y
-CONFIG_COMPILE_LOGLEVEL=6
-CONFIG_CRC8=y
-# CONFIG_DEBUG_PBL is not set
-CONFIG_DEFAULT_LOGLEVEL=7
-CONFIG_DIGEST_HMAC_GENERIC=y
-# CONFIG_DRIVER_CFI is undefined
-CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
-CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
-# CONFIG_DRIVER_NET_ENC28J60 is undefined
-# CONFIG_DRIVER_NET_MICREL is undefined
-CONFIG_DRIVER_SERIAL_STM32=y
-# CONFIG_DRIVER_SPI_GPIO is undefined
-# CONFIG_DRIVER_SPI_LITEX_SPIFLASH is undefined
-CONFIG_EEPROM_AT24=y
-# CONFIG_EEPROM_AT25 is undefined
-# CONFIG_FIRMWARE_ALTERA_SERIAL is undefined
-# CONFIG_FS_JFFS2 is undefined
-CONFIG_GENERIC_PHY=y
-# CONFIG_GPIO_74164 is undefined
-CONFIG_GPIO_PINCONF=y
-# CONFIG_GPIO_RASPBERRYPI_EXP is undefined
-CONFIG_HAVE_DIGEST_HMAC=y
-CONFIG_HAVE_GPIO_PINCONF=y
-CONFIG_HAVE_OPTEE=y
-CONFIG_HWRNG_STM32=y
-# CONFIG_HW_RANDOM_BCM2835 is undefined
-# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined
-CONFIG_HW_RANDOM_OPTEE=y
-# CONFIG_I2C_ALGOBIT is undefined
-# CONFIG_I2C_BCM283X is undefined
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_STM32=y
-CONFIG_IDR=y
-CONFIG_LED_PWM=y
-# CONFIG_LED_TRIGGERS is not set
-CONFIG_MACHINE_ID=y
-# CONFIG_MACH_LXA_FAIRYTUX2 is not set
-CONFIG_MACH_LXA_MC1=y
-# CONFIG_MACH_LXA_TAC is not set
-# CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1 is not set
-# CONFIG_MACH_PROTONIC_STM32MP13 is not set
-# CONFIG_MACH_PROTONIC_STM32MP1 is not set
-# CONFIG_MACH_RPI2 is undefined
-# CONFIG_MACH_RPI3 is undefined
-# CONFIG_MACH_RPI4 is undefined
-# CONFIG_MACH_RPI is undefined
-# CONFIG_MACH_RPI_AARCH_32_64 is undefined
-# CONFIG_MACH_RPI_CM3 is undefined
-# CONFIG_MACH_RPI_COMMON is undefined
-# CONFIG_MACH_SEEED_ODYSSEY is not set
-CONFIG_MACH_STM32MP13XX_DK=y
-CONFIG_MACH_STM32MP15XX_DKX=y
-CONFIG_MACH_STM32MP15X_EV1=y
-# CONFIG_MCI_BCM283X is undefined
-# CONFIG_MCI_BCM283X_SDHOST is undefined
-# CONFIG_MCI_MMCI is not set
-CONFIG_MCI_MMC_BOOT_PARTITIONS=y
-# CONFIG_MCI_SPI is undefined
-CONFIG_MCI_STM32_SDMMC2=y
-CONFIG_MFD_STM32_TIMERS=y
-CONFIG_MFD_STPMIC1=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MICREL_PHY=y
-# CONFIG_MTD is not set
-# CONFIG_MTD_CONCAT is undefined
-# CONFIG_MTD_DATAFLASH is undefined
-# CONFIG_MTD_DOCG3 is undefined
-# CONFIG_MTD_M25P80 is undefined
-# CONFIG_MTD_MTDRAM is undefined
-# CONFIG_MTD_NAND_ECC_SW_BCH is undefined
-# CONFIG_MTD_NAND_ECC_SW_HAMMING is undefined
-# CONFIG_MTD_OOB_DEVICE is undefined
-# CONFIG_MTD_PEB_DEBUG is undefined
-# CONFIG_MTD_RAW_DEVICE is undefined
-# CONFIG_MTD_SPI_NOR is undefined
-# CONFIG_MTD_UBI is undefined
-# CONFIG_MTD_WRITE is undefined
-# CONFIG_NAND is undefined
-CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
-CONFIG_NET_NETCONSOLE=y
-# CONFIG_NET_USB is not set
-# CONFIG_NET_USB_ASIX is undefined
-# CONFIG_NET_USB_RTL8152 is undefined
-# CONFIG_NET_USB_SMSC95XX is undefined
-CONFIG_NVMEM=y
-# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_RMEM is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-CONFIG_OF_FIXUP_OPTEE=y
-CONFIG_OF_GPIO_PINCONF=y
-CONFIG_OPTEE=y
-# CONFIG_OPTEE_AVB_PERSISTENT_VALUES is not set
-CONFIG_OPTEE_SHM_SIZE=0x400000
-CONFIG_OPTEE_SIZE=0x03000000
-# CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
-# CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set
-CONFIG_PBL_CONSOLE=y
-# CONFIG_PBL_OPTEE is undefined
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-CONFIG_PHY_STM32_USBPHYC=y
-# CONFIG_PINCTRL_BCM283X is undefined
-CONFIG_PINCTRL_STM32=y
-CONFIG_PROMPT="barebox:"
-CONFIG_PWM=y
-CONFIG_PWM_STM32=y
-CONFIG_REGMAP_FORMATTED=y
-CONFIG_REGMAP_I2C=y
-# CONFIG_REGULATOR_ANATOP is not set
-CONFIG_REGULATOR_ARM_SCMI=y
-# CONFIG_REGULATOR_BCM283X is undefined
-CONFIG_REGULATOR_FIXED=y
-CONFIG_REGULATOR_STM32_PWR=y
-CONFIG_REGULATOR_STM32_VREFBUF=y
-CONFIG_REGULATOR_STPMIC1=y
-CONFIG_REMOTEPROC=y
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_IMX7 is not set
-CONFIG_RESET_SCMI=y
-CONFIG_RESET_SIMPLE=y
-CONFIG_RESET_STM32=y
-# CONFIG_SPI is not set
-# CONFIG_SPI_BCM2835 is undefined
-# CONFIG_SPI_MEM is undefined
-CONFIG_STACKPROTECTOR=y
-# CONFIG_STACKPROTECTOR_NONE is not set
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_STACK_GUARD_PAGE=y
-CONFIG_STM32_BSEC=y
-CONFIG_STM32_BSEC_OPTEE_TA=y
-CONFIG_STM32_BSEC_WRITE=y
-CONFIG_STM32_FMC2_EBI=y
-CONFIG_STM32_IWDG_WATCHDOG=y
-CONFIG_STM32_REMOTEPROC=y
-# CONFIG_STPMIC1_WATCHDOG is not set
-# CONFIG_SYSCON_REBOOT_MODE is not set
-CONFIG_TEE=y
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_GADGET=y
-CONFIG_USB_DWC2_HOST=y
-# CONFIG_USB_EHCI is not set
-# CONFIG_USB_GADGET_AUTOSTART is not set
-# CONFIG_USB_NET_AX88179_178A is undefined
-# CONFIG_USB_NOP_XCEIV is not set
-CONFIG_USB_OTGDEV=y
-# CONFIG_USB_STORAGE is not set
-# CONFIG_WATCHDOG_BCM2835 is undefined
-CONFIG_WATCHDOG_POLLER=y
-# CONFIG_XZ_DECOMPRESS is not set
-# CONFIG_XZ_DEC_ARM64 is undefined
-# CONFIG_XZ_DEC_ARM is undefined
-# CONFIG_XZ_DEC_ARMTHUMB is undefined
-# CONFIG_XZ_DEC_IA64 is undefined
-# CONFIG_XZ_DEC_POWERPC is undefined
-# CONFIG_XZ_DEC_SPARC is undefined
-# CONFIG_XZ_DEC_X86 is undefined
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index e031d8534dbc..8d8eaa35b0ad 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -12,6 +12,7 @@ CONFIG_ARM_LINUX=y
#
# System Type
#
+CONFIG_ARCH_STM32=y
CONFIG_ARCH_OMAP=y
CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_AT91 is not set
@@ -29,7 +30,7 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_LAYERSCAPE is not set
CONFIG_ARCH_OMAP_MULTI=y
# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_STM32MP is not set
+CONFIG_ARCH_STM32MP=y
# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_VEXPRESS is not set
@@ -65,6 +66,19 @@ CONFIG_MACH_BEAGLEBONE=y
# CONFIG_MACH_WAGO_PFC_AM35XX is not set
# end of OMAP Features
+CONFIG_ARCH_NR_GPIO=416
+CONFIG_ARCH_STM32MP13=y
+CONFIG_ARCH_STM32MP157=y
+CONFIG_MACH_STM32MP13XX_DK=y
+CONFIG_MACH_STM32MP15XX_DKX=y
+CONFIG_MACH_LXA_MC1=y
+# CONFIG_MACH_LXA_TAC is not set
+# CONFIG_MACH_LXA_FAIRYTUX2 is not set
+# CONFIG_MACH_SEEED_ODYSSEY is not set
+CONFIG_MACH_STM32MP15X_EV1=y
+# CONFIG_MACH_PROTONIC_STM32MP1 is not set
+# CONFIG_MACH_PROTONIC_STM32MP13 is not set
+# CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1 is not set
CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_AEABI=y
CONFIG_THUMB2_BAREBOX=y
@@ -82,7 +96,9 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_ARM_EXCEPTIONS=y
CONFIG_ARM_UNWIND=y
# CONFIG_ARM_SEMIHOSTING is not set
-# CONFIG_ARM_PSCI_CLIENT is not set
+CONFIG_ARM_SMCCC=y
+CONFIG_ARM_PSCI_OF=y
+CONFIG_ARM_PSCI_CLIENT=y
# CONFIG_ARM_BOOTM_ELF is not set
# CONFIG_ARM_BOOTM_FIP is not set
# end of ARM specific settings
@@ -217,7 +233,7 @@ CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_CONSOLE_DISABLE_INPUT is not set
-# CONFIG_PBL_CONSOLE is not set
+CONFIG_PBL_CONSOLE=y
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
CONFIG_PARTITION_MANIPULATION=y
@@ -243,13 +259,16 @@ CONFIG_BOOTCHOOSER=y
CONFIG_BOOT_DEFAULTS=y
CONFIG_BAREBOX_DT_2ND=y
CONFIG_RESET_SOURCE=y
-# CONFIG_MACHINE_ID is not set
+CONFIG_MACHINE_ID=y
# CONFIG_SYSTEMD_OF_WATCHDOG is not set
CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
#
# OP-TEE loading
#
+CONFIG_HAVE_OPTEE=y
+CONFIG_OPTEE_SIZE=0x03000000
+CONFIG_OPTEE_SHM_SIZE=0x400000
# CONFIG_BOOTM_OPTEE is not set
CONFIG_FILETYPE_STRINGS=y
# end of OP-TEE loading
@@ -270,6 +289,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DEBUG_LIST is not set
@@ -323,7 +343,7 @@ CONFIG_CMD_REGULATOR=y
# CONFIG_CMD_VARINFO is not set
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
-# CONFIG_CMD_MMC_EXTCSD is not set
+CONFIG_CMD_MMC_EXTCSD=y
# CONFIG_CMD_POLLER is not set
CONFIG_CMD_BTHREAD=y
# CONFIG_CMD_SLICE is not set
@@ -438,7 +458,7 @@ CONFIG_CMD_ECHO_E=y
CONFIG_CMD_EDIT=y
# CONFIG_CMD_LOGIN is not set
CONFIG_CMD_MENU=y
-# CONFIG_CMD_MENU_MANAGEMENT is not set
+CONFIG_CMD_MENU_MANAGEMENT=y
CONFIG_CMD_MENUTREE=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_TIMEOUT=y
@@ -462,17 +482,20 @@ CONFIG_CMD_MW=y
#
# Hardware manipulation
#
+CONFIG_CMD_CLK=y
CONFIG_CMD_DETECT=y
# CONFIG_CMD_TRUNCATE is not set
CONFIG_CMD_SYNC=y
CONFIG_CMD_FLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
+# CONFIG_CMD_PWM is not set
CONFIG_CMD_LED=y
CONFIG_CMD_NAND=y
# CONFIG_CMD_NANDTEST is not set
# CONFIG_CMD_NAND_BITFLIP is not set
-# CONFIG_CMD_POWEROFF is not set
+CONFIG_CMD_POWEROFF=y
+# CONFIG_CMD_SMC is not set
CONFIG_CMD_SPI=y
CONFIG_CMD_LED_TRIGGER=y
CONFIG_CMD_USB=y
@@ -507,11 +530,13 @@ CONFIG_CMD_STATE=y
# CONFIG_CMD_DHRYSTONE is not set
# CONFIG_CMD_SPD_DECODE is not set
# CONFIG_CMD_SEED is not set
+# CONFIG_CMD_STACKSMASH is not set
# end of Miscellaneous
# end of Commands
CONFIG_NET=y
-# CONFIG_NET_NETCONSOLE is not set
+CONFIG_NET_ETHADDR_FROM_MACHINE_ID=y
+CONFIG_NET_NETCONSOLE=y
CONFIG_NET_RESOLV=y
CONFIG_NET_IFUP=y
CONFIG_NET_DHCP=y
@@ -521,12 +546,15 @@ CONFIG_NET_FASTBOOT=y
#
# Drivers
#
+CONFIG_REGMAP_FORMATTED=y
+CONFIG_REGMAP_I2C=y
CONFIG_OFTREE=y
CONFIG_OFTREE_MEM_GENERIC=y
CONFIG_DTC=y
CONFIG_OF=y
CONFIG_OFDEVICE=y
CONFIG_OF_GPIO=y
+CONFIG_OF_GPIO_PINCONF=y
CONFIG_OF_BAREBOX_DRIVERS=y
# CONFIG_OF_BAREBOX_ENV_IN_FS is not set
CONFIG_OF_OVERLAY=y
@@ -540,6 +568,7 @@ CONFIG_ARM_AMBA=y
# CONFIG_SERIAL_DEV_BUS is not set
# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
# CONFIG_SERIAL_AMBA_PL011 is not set
+CONFIG_DRIVER_SERIAL_STM32=y
CONFIG_DRIVER_SERIAL_NS16550=y
# CONFIG_DRIVER_SERIAL_NS16550_OMAP_TTYS is not set
# CONFIG_DRIVER_SERIAL_CADENCE is not set
@@ -556,6 +585,8 @@ CONFIG_PHYLIB=y
CONFIG_DRIVER_NET_CPSW=y
CONFIG_DRIVER_NET_TI_DAVINCI_MDIO=y
# CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set
+CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
+CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
# CONFIG_DRIVER_NET_ENC28J60 is not set
# CONFIG_DRIVER_NET_FSL_FMAN is not set
# CONFIG_DRIVER_NET_KS8851_MLL is not set
@@ -572,14 +603,14 @@ CONFIG_DRIVER_NET_TI_DAVINCI_MDIO=y
# MII PHY device drivers
#
# CONFIG_AR8327N_PHY is not set
-# CONFIG_AT803X_PHY is not set
+CONFIG_AT803X_PHY=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
-# CONFIG_MICREL_PHY is not set
+CONFIG_MICREL_PHY=y
# CONFIG_MOTORCOMM_PHY is not set
# CONFIG_NATIONAL_PHY is not set
# CONFIG_REALTEK_PHY is not set
@@ -610,6 +641,8 @@ CONFIG_SPI_MEM=y
CONFIG_DRIVER_SPI_GPIO=y
# CONFIG_DRIVER_SPI_LITEX_SPIFLASH is not set
CONFIG_DRIVER_SPI_OMAP3=y
+# CONFIG_STM32_QSPI is not set
+# CONFIG_DRIVER_SPI_STM32 is not set
# end of SPI drivers
CONFIG_I2C=y
@@ -620,7 +653,9 @@ CONFIG_I2C_ALGOBIT=y
#
CONFIG_I2C_GPIO=y
# CONFIG_I2C_DESIGNWARE is not set
+# CONFIG_I2C_MV64XXX is not set
CONFIG_I2C_OMAP=y
+CONFIG_I2C_STM32=y
# end of I2C Hardware Bus support
# CONFIG_I2C_MUX is not set
@@ -661,6 +696,7 @@ CONFIG_NAND_ECC_HW_SYNDROME=y
#
CONFIG_NAND_OMAP_GPMC=y
# CONFIG_MTD_NAND_OMAP_ELM is not set
+# CONFIG_NAND_STM32 is not set
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_DENALI is not set
@@ -693,8 +729,9 @@ CONFIG_DISK_WRITE=y
# CONFIG_DISK_INTF_PLATFORM_IDE is not set
CONFIG_USB=y
CONFIG_USB_HOST=y
-# CONFIG_USB_DWC2_HOST is not set
-# CONFIG_USB_DWC2_GADGET is not set
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+CONFIG_USB_DWC2_GADGET=y
# CONFIG_USB_DWC3 is not set
CONFIG_USB_EHCI=y
# CONFIG_USB_XHCI is not set
@@ -735,7 +772,7 @@ CONFIG_MCI_STARTUP=y
CONFIG_MCI_INFO=y
CONFIG_MCI_WRITE=y
CONFIG_MCI_ERASE=y
-# CONFIG_MCI_MMC_BOOT_PARTITIONS is not set
+CONFIG_MCI_MMC_BOOT_PARTITIONS=y
# CONFIG_MCI_MMC_GPP_PARTITIONS is not set
# CONFIG_MCI_MMC_RPMB is not set
@@ -751,8 +788,16 @@ CONFIG_MCI_OMAP_HSMMC=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
+CONFIG_MCI_STM32_SDMMC2=y
CONFIG_MCI_OMAP_HSMMC_PBL=y
-# CONFIG_COMMON_CLK is not set
+CONFIG_HAVE_CLK=y
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMMON_CLK_OF_PROVIDER=y
+CONFIG_COMMON_CLK_STM32MP135=y
+CONFIG_COMMON_CLK_STM32MP157=y
+CONFIG_COMMON_CLK_SCMI=y
+CONFIG_COMMON_CLK_GPIO=y
#
# Clocksource
@@ -761,6 +806,7 @@ CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
# CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
CONFIG_CLOCKSOURCE_TI_DM=y
+# CONFIG_CLKSRC_STM32 is not set
# end of Clocksource
#
@@ -774,13 +820,14 @@ CONFIG_CLOCKSOURCE_TI_DM=y
# CONFIG_MFD_MC34704 is not set
# CONFIG_MFD_MC9SDZ60 is not set
# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TPS65219 is not set
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
-# CONFIG_MFD_STPMIC1 is not set
+CONFIG_MFD_STPMIC1=y
# CONFIG_MFD_PCA9450 is not set
# CONFIG_MFD_RN568PMIC is not set
+CONFIG_MFD_STM32_TIMERS=y
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_RK808 is not set
# CONFIG_MFD_AXP20X_I2C is not set
@@ -800,6 +847,7 @@ CONFIG_DEV_MEM=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
+CONFIG_LED_PWM=y
CONFIG_LED_GPIO_OF=y
# CONFIG_LED_GPIO_RGB is not set
# CONFIG_LED_GPIO_BICOLOR is not set
@@ -824,14 +872,19 @@ CONFIG_EEPROM_AT24=y
# end of Input device support
CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_POLLER is not set
+CONFIG_WATCHDOG_POLLER=y
# CONFIG_WATCHDOG_DW is not set
CONFIG_WATCHDOG_OMAP=y
+CONFIG_STM32_IWDG_WATCHDOG=y
+# CONFIG_STPMIC1_WATCHDOG is not set
# CONFIG_GPIO_WATCHDOG is not set
# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_PWM is not set
+CONFIG_PWM=y
+CONFIG_PWM_STM32=y
CONFIG_HWRNG=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HWRNG_STM32=y
+CONFIG_HW_RANDOM_OPTEE=y
# CONFIG_HW_RANDOM_OMAP is not set
#
@@ -846,6 +899,8 @@ CONFIG_GPIOLIB=y
# GPIO
#
CONFIG_GPIO_GENERIC=y
+CONFIG_HAVE_GPIO_PINCONF=y
+CONFIG_GPIO_PINCONF=y
# CONFIG_GPIO_74164 is not set
# CONFIG_GPIO_74XX_MMIO is not set
CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -866,12 +921,16 @@ CONFIG_GPIO_OMAP=y
#
CONFIG_PINCTRL=y
CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_STM32=y
# end of Pin controllers
CONFIG_NVMEM=y
# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
# CONFIG_EEPROM_93XX46 is not set
+CONFIG_STM32_BSEC=y
+CONFIG_STM32_BSEC_WRITE=y
+CONFIG_STM32_BSEC_OPTEE_TA=y
#
# Bus devices
@@ -883,14 +942,24 @@ CONFIG_TI_SYSC=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED=y
# CONFIG_REGULATOR_FAN53555 is not set
+CONFIG_REGULATOR_STM32_PWR=y
+CONFIG_REGULATOR_STM32_VREFBUF=y
+CONFIG_REGULATOR_STPMIC1=y
+# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_ARM_SCMI=y
#
# Remoteproc drivers
#
-# CONFIG_REMOTEPROC is not set
+CONFIG_REMOTEPROC=y
+CONFIG_STM32_REMOTEPROC=y
# end of Remoteproc drivers
-# CONFIG_RESET_CONTROLLER is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_SIMPLE=y
+# CONFIG_RESET_IMX7 is not set
+CONFIG_RESET_SCMI=y
# CONFIG_RTC_CLASS is not set
#
@@ -902,7 +971,13 @@ CONFIG_REGULATOR_FIXED=y
#
# ARM System Control and Management Interface Protocol
#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
+CONFIG_ARM_SCMI_HAVE_SHMEM=y
+CONFIG_ARM_SCMI_HAVE_MSG=y
+CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+# CONFIG_ARM_SCMI_POWER_DOMAIN is not set
# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
@@ -912,7 +987,10 @@ CONFIG_REGULATOR_FIXED=y
# CONFIG_FPGA is not set
# end of FPGA Configuration Support
-# CONFIG_GENERIC_PHY is not set
+CONFIG_GENERIC_PHY=y
+# CONFIG_USB_NOP_XCEIV is not set
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
+CONFIG_PHY_STM32_USBPHYC=y
#
# Hardware crypto devices
@@ -922,6 +1000,7 @@ CONFIG_REGULATOR_FIXED=y
#
# Memory controller drivers
#
+CONFIG_STM32_FMC2_EBI=y
# end of Memory controller drivers
#
@@ -954,14 +1033,19 @@ CONFIG_REGULATOR_FIXED=y
#
# end of NVME Support
+# CONFIG_SYSCON_REBOOT_MODE is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_POWER_RESET_SYSCON is not set
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_POWER_RESET_GPIO is not set
# CONFIG_POWER_RESET_GPIO_RESTART is not set
+CONFIG_RESET_STM32=y
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
-# CONFIG_TEE is not set
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+# CONFIG_OPTEE_AVB_PERSISTENT_VALUES is not set
+CONFIG_OF_FIXUP_OPTEE=y
# end of Drivers
#
@@ -1043,7 +1127,7 @@ CONFIG_LIBFDT=y
# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC8 is not set
+CONFIG_CRC8=y
#
# Library gui routines
@@ -1053,6 +1137,7 @@ CONFIG_LIBFDT=y
CONFIG_PRINTF_UUID=y
CONFIG_NLS=y
# CONFIG_BLOBGEN is not set
+CONFIG_IDR=y
# end of Library routines
#
@@ -1088,8 +1173,9 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
# end of Memory initialization
# CONFIG_STACK_GUARD_PAGE is not set
-CONFIG_STACKPROTECTOR_NONE=y
-# CONFIG_STACKPROTECTOR_STRONG is not set
+CONFIG_STACKPROTECTOR=y
+# CONFIG_STACKPROTECTOR_NONE is not set
+CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_PBL_STACKPROTECTOR_NONE=y
# CONFIG_PBL_STACKPROTECTOR_STRONG is not set
# end of Hardening options
diff --git a/configs/platform-v7a/config/images/stm32mp-optee.config b/configs/platform-v7a/config/images/stm32mp-optee.config
index 4b58f3be69ab..49981b27b5bb 100644
--- a/configs/platform-v7a/config/images/stm32mp-optee.config
+++ b/configs/platform-v7a/config/images/stm32mp-optee.config
@@ -52,7 +52,7 @@ image @STM32MP_BOARD@-emmcboot.img {
image @STM32MP_BOARD@.fip {
fip {
fw-config = "stm32mp1-@STM32MP_BOARD@-fw-config.dtb"
- hw-config = "@STM32MP_BOARD@.dtb-bb"
+ hw-config = "barebox-@STM32MP_BOARD@.dtb"
nt-fw = "barebox-stm32mp-generic-bl33.img"
tos-fw = { "tee-header_v2.bin", "tee-pager_v2.bin", "tee-pageable_v2.bin" }
}
diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config
index 247fb49c0a77..854437964388 100644
--- a/configs/platform-v7a/config/images/stm32mp.config
+++ b/configs/platform-v7a/config/images/stm32mp.config
@@ -16,7 +16,6 @@ image @IMAGE@ {
}
partition fip {
image = "@STM32MP_BOARD@@SCMI@.fip"
- size = 1M
}
partition barebox-environment {
@@ -52,11 +51,11 @@ image @STM32MP_BOARD@@SCMI@-emmcboot.img {
image @STM32MP_BOARD@@SCMI@.fip {
fip {
fw-config = "stm32mp1-@STM32MP_BOARD@-fw-config.dtb"
- hw-config = "@STM32MP_BOARD@@SCMI@.dtb-bb"
+ hw-config = "barebox-@STM32MP_BOARD@@SCMI@.dtb"
nt-fw = "barebox-stm32mp-generic-bl33.img"
tos-fw = { "stm32mp1-bl32.bin" }
tos-fw-config = "stm32mp1-@STM32MP_BOARD@-bl32.dtb"
}
- size = 1M
+ size = 2M
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 0d6a0fdcd86a..ad5efc011d80 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -192,7 +192,6 @@ PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AT91=y
PTXCONF_BAREBOX_MX6=y
PTXCONF_BAREBOX_RPI2=y
-PTXCONF_BAREBOX_STM32MP=y
PTXCONF_BAREBOX_VEXPRESS=y
PTXCONF_BAREBOX_ARCH_STRING="arm"
PTXCONF_BAREBOX_DEPENDENCIES=y
@@ -206,7 +205,7 @@ PTXCONF_BAREBOX_CONFIG="barebox.config"
PTXCONF_BAREBOX_EXTRA_ENV=y
PTXCONF_BAREBOX_EXTRA_ENV_PATH="barebox-defaultenv"
# PTXCONF_BAREBOX_BAREBOXENV is not set
-# PTXCONF_BAREBOX_INSTALL_DTBS is not set
+PTXCONF_BAREBOX_INSTALL_DTBS=y
# PTXCONF_BAREBOX_BAREBOXCRC32 is not set
# PTXCONF_BAREBOX_KERNEL_INSTALL is not set
# PTXCONF_BAREBOX_BAREBOXIMD is not set
diff --git a/configs/platform-v7a/platforms/barebox-stm32mp.in b/configs/platform-v7a/platforms/barebox-stm32mp.in
deleted file mode 100644
index 6fc59546d8f4..000000000000
--- a/configs/platform-v7a/platforms/barebox-stm32mp.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=bootloader
-
-config BAREBOX_STM32MP
- tristate
- prompt "Barebox (stm32mp)"
- select BAREBOX_COMMON
- help
- Barebox image for STM32MP
diff --git a/configs/platform-v7a/platforms/image-lxa-mc1-scmi.in b/configs/platform-v7a/platforms/image-lxa-mc1-scmi.in
index 728ce474c472..0e28544bb9b1 100644
--- a/configs/platform-v7a/platforms/image-lxa-mc1-scmi.in
+++ b/configs/platform-v7a/platforms/image-lxa-mc1-scmi.in
@@ -5,7 +5,7 @@ config IMAGE_LXA_MC1_SCMI
select HOST_GENIMAGE
select HOST_TF_A
select IMAGE_ROOT_EXT
- select BAREBOX_STM32MP
+ select BAREBOX
select TF_A
prompt "Generate images/lxa-mc1-scmi.hdimg"
help
diff --git a/configs/platform-v7a/platforms/image-lxa-mc1.in b/configs/platform-v7a/platforms/image-lxa-mc1.in
index affb04eed9de..2fd4b689da7f 100644
--- a/configs/platform-v7a/platforms/image-lxa-mc1.in
+++ b/configs/platform-v7a/platforms/image-lxa-mc1.in
@@ -5,7 +5,7 @@ config IMAGE_LXA_MC1
select HOST_GENIMAGE
select HOST_TF_A
select IMAGE_ROOT_EXT
- select BAREBOX_STM32MP
+ select BAREBOX
select TF_A
prompt "Generate images/lxa-mc1.hdimg"
help
diff --git a/configs/platform-v7a/platforms/image-stm32mp135f-dk.in b/configs/platform-v7a/platforms/image-stm32mp135f-dk.in
index 4b06817a7dfc..08b20a3fa305 100644
--- a/configs/platform-v7a/platforms/image-stm32mp135f-dk.in
+++ b/configs/platform-v7a/platforms/image-stm32mp135f-dk.in
@@ -7,7 +7,7 @@ config IMAGE_STM32MP135F_DK
select IMAGE_ROOT_EXT
select TF_A_STM32MP13
select OPTEE
- select BAREBOX_STM32MP
+ select BAREBOX
prompt "Generate images/stm32mp135f-dk.hdimg"
help
Generate GPT image for the STM32MP135F-DK
diff --git a/configs/platform-v7a/platforms/image-stm32mp157c-dk2.in b/configs/platform-v7a/platforms/image-stm32mp157c-dk2.in
index d146b96bac70..a8ad90ddb879 100644
--- a/configs/platform-v7a/platforms/image-stm32mp157c-dk2.in
+++ b/configs/platform-v7a/platforms/image-stm32mp157c-dk2.in
@@ -5,7 +5,7 @@ config IMAGE_STM32MP157C_DK2
select HOST_GENIMAGE
select HOST_TF_A
select IMAGE_ROOT_EXT
- select BAREBOX_STM32MP
+ select BAREBOX
select TF_A
prompt "Generate images/stm32mp157c-dk2.hdimg"
help
diff --git a/configs/platform-v7a/platforms/image-stm32mp157c-ev1.in b/configs/platform-v7a/platforms/image-stm32mp157c-ev1.in
index 7bc91af9e34c..427918e13ad9 100644
--- a/configs/platform-v7a/platforms/image-stm32mp157c-ev1.in
+++ b/configs/platform-v7a/platforms/image-stm32mp157c-ev1.in
@@ -5,7 +5,7 @@ config IMAGE_STM32MP157C_EV1
select HOST_GENIMAGE
select HOST_TF_A
select IMAGE_ROOT_EXT
- select BAREBOX_STM32MP
+ select BAREBOX
select TF_A
prompt "Generate images/stm32mp157c-ev1.hdimg"
help
diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make
deleted file mode 100644
index c2ee11957240..000000000000
--- a/configs/platform-v7a/rules/barebox-stm32mp.make
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BAREBOX_STM32MP) += barebox-stm32mp
-
-#
-# Paths and names
-#
-BAREBOX_STM32MP_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_STM32MP_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_STM32MP := barebox-stm32mp-$(BAREBOX_STM32MP_VERSION)
-BAREBOX_STM32MP_SUFFIX := tar.bz2
-BAREBOX_STM32MP_URL := $(call barebox-url, BAREBOX_STM32MP)
-BAREBOX_STM32MP_PATCHES := barebox-$(BAREBOX_STM32MP_VERSION)
-BAREBOX_STM32MP_SOURCE := $(SRCDIR)/$(BAREBOX_STM32MP_PATCHES).$(BAREBOX_STM32MP_SUFFIX)
-BAREBOX_STM32MP_DIR := $(BUILDDIR)/$(BAREBOX_STM32MP)
-BAREBOX_STM32MP_BUILD_DIR := $(BAREBOX_STM32MP_DIR)-build
-BAREBOX_STM32MP_CONFIG := $(call ptx/in-platformconfigdir, barebox-stm32mp.config)
-BAREBOX_STM32MP_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
-BAREBOX_STM32MP_LICENSE := GPL-2.0
-BAREBOX_STM32MP_BUILD_OOT := KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-BAREBOX_STM32MP_WRAPPER_BLACKLIST := \
- $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-
-BAREBOX_STM32MP_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_STM32MP_CONF_OPT := \
- -C $(BAREBOX_STM32MP_DIR) \
- O=$(BAREBOX_STM32MP_BUILD_DIR) \
- BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
- $(call barebox-opts, BAREBOX_STM32MP)
-
-BAREBOX_STM32MP_MAKE_OPT := $(BAREBOX_STM32MP_CONF_OPT)
-
-BAREBOX_STM32MP_IMAGES := \
- images/barebox-stm32mp-generic-bl33.img
-
-BAREBOX_STM32MP_FIP_DTBS := \
- stm32mp157c-dk2.dtb \
- stm32mp157c-ev1.dtb \
- stm32mp157c-lxa-mc1.dtb \
- stm32mp157c-lxa-mc1-scmi.dtb \
- stm32mp135f-dk.dtb
-
-BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/,$(BAREBOX_STM32MP_IMAGES))
-BAREBOX_STM32MP_FIP_DTBS := \
- $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/arch/arm/dts/,$(BAREBOX_STM32MP_FIP_DTBS))
-
-ifdef PTXCONF_BAREBOX_STM32MP
-$(BAREBOX_STM32MP_CONFIG):
- @echo
- @echo "****************************************************************************"
- @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-stm32mp'"
- @echo "****************************************************************************"
- @echo
- @echo
- @exit 1
-endif
-
-$(STATEDIR)/barebox-stm32mp.prepare: $(BAREBOX_STM32MP_CONFIG)
- @$(call targetinfo)
- @$(call world/prepare, BAREBOX_STM32MP)
- @rm -f "$(BAREBOX_STM32MP_BUILD_DIR)/.ptxdist-defaultenv"
- @ln -s "$(call ptx/in-platformconfigdir, barebox-stm32mp-defaultenv)" \
- "$(BAREBOX_STM32MP_BUILD_DIR)/.ptxdist-defaultenv"
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-stm32mp.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Targetinstall
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-stm32mp.targetinstall:
- @$(call targetinfo)
- @$(foreach image, $(BAREBOX_STM32MP_IMAGES), \
- install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image));)
- @$(foreach dtb, $(BAREBOX_STM32MP_FIP_DTBS), \
- install -m 644 \
- $(dtb) $(IMAGEDIR)/$(notdir $(dtb))-bb;)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-stm32mp.clean:
- @$(call targetinfo)
- @$(call clean_pkg, BAREBOX_STM32MP)
- @$(foreach image, $(BAREBOX_STM32MP_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
- @$(foreach dtb, $(BAREBOX_STM32MP_FIP_DTBS), \
- rm -fv $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl))
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-barebox-stm32mp_oldconfig barebox-stm32mp_menuconfig barebox-stm32mp_nconfig: $(STATEDIR)/barebox-stm32mp.extract
- @$(call world/kconfig, BAREBOX_STM32MP, $(subst barebox-stm32mp_,,$@))
-
-# vim: syntax=make
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 06/11] v7a: stm32mp: populate default environment in barebox partition
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
` (3 preceding siblings ...)
2025-05-26 10:11 ` [DistroKit] [PATCH 05/11] v7a: stm32mp: switch to upstream barebox recipe Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 07/11] v7a: mx6: switch to upstream barebox recipe Roland Hieber
` (4 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Prevent an unnecessary info message at boot:
envfs: no envfs (magic mismatch) - envfs never written?
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-v7a/config/images/stm32mp-optee.config | 1 +
configs/platform-v7a/config/images/stm32mp.config | 1 +
2 files changed, 2 insertions(+)
diff --git a/configs/platform-v7a/config/images/stm32mp-optee.config b/configs/platform-v7a/config/images/stm32mp-optee.config
index 49981b27b5bb..0dd35da2ca9d 100644
--- a/configs/platform-v7a/config/images/stm32mp-optee.config
+++ b/configs/platform-v7a/config/images/stm32mp-optee.config
@@ -21,6 +21,7 @@ image @IMAGE@ {
partition barebox-environment {
partition-type-uuid = barebox-env
+ image = barebox-default-environment
size = 1M
}
partition barebox-state {
diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config
index 854437964388..30e3d38db2cd 100644
--- a/configs/platform-v7a/config/images/stm32mp.config
+++ b/configs/platform-v7a/config/images/stm32mp.config
@@ -20,6 +20,7 @@ image @IMAGE@ {
partition barebox-environment {
partition-type-uuid = barebox-env
+ image = barebox-default-environment
size = 1M
}
partition barebox-state {
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 07/11] v7a: mx6: switch to upstream barebox recipe
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
` (4 preceding siblings ...)
2025-05-26 10:11 ` [DistroKit] [PATCH 06/11] v7a: stm32mp: populate default environment in barebox partition Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 08/11] v7a: vexpress: " Roland Hieber
` (3 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 08/11] v7a: vexpress: switch to upstream barebox recipe
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
` (5 preceding siblings ...)
2025-05-26 10:11 ` [DistroKit] [PATCH 07/11] v7a: mx6: switch to upstream barebox recipe Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 09/11] v7a: rpi: " Roland Hieber
` (2 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 09/11] v7a: rpi: switch to upstream barebox recipe
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
` (6 preceding siblings ...)
2025-05-26 10:11 ` [DistroKit] [PATCH 08/11] v7a: vexpress: " Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 10/11] v7a: rpi: remove "2" from recipe names Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG Roland Hieber
9 siblings, 0 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Remove the separate barebox-rpi2 recipe in favour of the barebox recipe
from upstream PTXdist, which already supports multi-arch build. Merge
the kconfig config options from the config diff, and pick up the new DTB
filename in the image recipe. The old defaultenv is already the same
like in the upstream recipe, so we don't need to port anything. However,
the BCM283x platforms cannot detect their bootsource yet, so hard-code
our boot disk in the workaround init script.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../init/missing-bootsource | 2 +-
.../barebox-rpi2-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.mci0.broken_cd | 1 -
.../nv/linux.bootargs.loglevel | 1 -
configs/platform-v7a/barebox-rpi2.config | 1114 -----------------
configs/platform-v7a/barebox-rpi2.config.diff | 41 -
configs/platform-v7a/barebox.config | 30 +-
.../platform-v7a/config/images/rpi2.config | 2 +-
configs/platform-v7a/platformconfig | 1 -
.../platform-v7a/platforms/barebox-rpi2.in | 8 -
configs/platform-v7a/platforms/image-rpi2.in | 2 +-
configs/platform-v7a/rules/barebox-rpi2.make | 109 --
16 files changed, 31 insertions(+), 1285 deletions(-)
delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/boot.default
delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.state_prefix
delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system0.boot
delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system1.boot
delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.targets
delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/dev.mci0.broken_cd
delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/nv/linux.bootargs.loglevel
delete mode 100644 configs/platform-v7a/barebox-rpi2.config
delete mode 100644 configs/platform-v7a/barebox-rpi2.config.diff
delete mode 100644 configs/platform-v7a/platforms/barebox-rpi2.in
delete mode 100644 configs/platform-v7a/rules/barebox-rpi2.make
diff --git a/configs/platform-v7a/barebox-defaultenv/init/missing-bootsource b/configs/platform-v7a/barebox-defaultenv/init/missing-bootsource
index 1bf83bb2171c..d8637c540803 100644
--- a/configs/platform-v7a/barebox-defaultenv/init/missing-bootsource
+++ b/configs/platform-v7a/barebox-defaultenv/init/missing-bootsource
@@ -1,6 +1,6 @@
#!/bin/sh
-if of_compatible -k arm,vexpress,v2p-ca9; then
+if of_compatible -k arm,vexpress,v2p-ca9 || of_compatible -k raspberrypi,3-model-b; then
realbootsource="disk0";
fi
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/boot.default b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/boot.default
deleted file mode 100644
index d7d9a373c50b..000000000000
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/boot.default
+++ /dev/null
@@ -1 +0,0 @@
-bootchooser net
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.state_prefix
deleted file mode 100644
index 6246412a5c27..000000000000
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.state_prefix
+++ /dev/null
@@ -1 +0,0 @@
-state.bootstate
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system0.boot
deleted file mode 100644
index 582283c385a7..000000000000
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system0.boot
+++ /dev/null
@@ -1 +0,0 @@
-disk0.root-A
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system1.boot
deleted file mode 100644
index 323bafbde518..000000000000
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.system1.boot
+++ /dev/null
@@ -1 +0,0 @@
-disk0.root-B
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.targets
deleted file mode 100644
index f0fb14eeaad2..000000000000
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/bootchooser.targets
+++ /dev/null
@@ -1 +0,0 @@
-system0 system1
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/dev.mci0.broken_cd b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/dev.mci0.broken_cd
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/dev.mci0.broken_cd
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/linux.bootargs.loglevel
deleted file mode 100644
index d45c34464422..000000000000
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/linux.bootargs.loglevel
+++ /dev/null
@@ -1 +0,0 @@
-loglevel=5 systemd.show_status=auto
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
deleted file mode 100644
index 75ad612ee031..000000000000
--- a/configs/platform-v7a/barebox-rpi2.config
+++ /dev/null
@@ -1,1114 +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=y
-# 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 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_MACH_RPI_COMMON=y
-CONFIG_MACH_RPI_AARCH_32_64=y
-
-#
-# select Broadcom BCM283X boards to be built
-#
-# CONFIG_MACH_RPI is not set
-CONFIG_MACH_RPI2=y
-CONFIG_MACH_RPI3=y
-CONFIG_MACH_RPI_CM3=y
-CONFIG_MACH_RPI4=y
-# end of select Broadcom BCM283X boards to be built
-
-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_SMCCC=y
-CONFIG_ARM_SECURE_MONITOR=y
-# 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_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="R-Pi> "
-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 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_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_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_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 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_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_LED=y
-# CONFIG_CMD_POWEROFF is not set
-# CONFIG_CMD_SMC 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=y
-CONFIG_NET_RESOLV=y
-CONFIG_NET_IFUP=y
-CONFIG_NET_DHCP=y
-# CONFIG_NET_SNTP is not set
-CONFIG_NET_FASTBOOT=y
-
-#
-# Drivers
-#
-CONFIG_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=y
-CONFIG_DRIVER_SERIAL_NS16550=y
-# 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=y
-# 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 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 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
-# 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 is not set
-CONFIG_DRIVER_SPI_GPIO=y
-# CONFIG_DRIVER_SPI_LITEX_SPIFLASH is not set
-# CONFIG_SPI_BCM2835 is not set
-# end of SPI drivers
-
-CONFIG_I2C=y
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_BCM283X=y
-# 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 is not set
-
-#
-# 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 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=y
-CONFIG_USB_DWC2_HOST=y
-# CONFIG_USB_DWC2_GADGET is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_EHCI is not set
-# CONFIG_USB_XHCI is not set
-# CONFIG_USB_ULPI is not set
-CONFIG_USB_OTGDEV=y
-CONFIG_USB_STORAGE=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 is not set
-CONFIG_USB_GADGET_FASTBOOT=y
-# CONFIG_USB_GADGET_MASS_STORAGE is not set
-# CONFIG_USB_MUSB is not set
-# CONFIG_VIDEO 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_BCM283X=y
-CONFIG_MCI_BCM283X_SDHOST=y
-# 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_CLOCKSOURCE_BCM283X=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_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_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 is not set
-# CONFIG_EEPROM_AT24 is not set
-# end of EEPROM support
-
-#
-# Input device support
-#
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_USB is not set
-# CONFIG_INPUT_SPECIALKEYS is not set
-# end of Input device support
-
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_POLLER is not set
-# CONFIG_WATCHDOG_DW is not set
-CONFIG_WATCHDOG_BCM2835=y
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_PWM is not set
-# CONFIG_HWRNG is not set
-
-#
-# DMA support
-#
-# CONFIG_DMADEVICES is not set
-# 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_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_PL061 is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-# 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_BCM283X=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_EEPROM_93XX46 is not set
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_FIXED is not set
-CONFIG_REGULATOR_BCM283X=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_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
-#
-# 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_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_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-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
deleted file mode 100644
index ea62e7d9eef4..000000000000
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-3118a4e72c6ae44b00e041e7fbe80ad3
-# CONFIG_CMD_NVMEM is not set
-CONFIG_DRIVER_NET_BCMGENET=y
-CONFIG_DRIVER_SERIAL_NS16550=y
-# CONFIG_EEPROM_93XX46 is not set
-CONFIG_GENERIC_PHY=y
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-# CONFIG_HWRNG is not set
-# CONFIG_HW_RANDOM_BCM2835 is undefined
-# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined
-# CONFIG_HW_RANDOM_TIMERIOMEM is undefined
-# CONFIG_I2C_ALGOBIT is undefined
-# CONFIG_I2C_GPIO is not set
-CONFIG_MACH_RPI2=y
-CONFIG_MACH_RPI4=y
-CONFIG_MACH_RPI_CM3=y
-CONFIG_MCI_BCM283X=y
-CONFIG_MCI_BCM283X_SDHOST=y
-# CONFIG_MCI_MMCI is not set
-CONFIG_MCI_MMC_BOOT_PARTITIONS=y
-CONFIG_MCI_SDHCI=y
-# CONFIG_MCI_STARTUP is not set
-CONFIG_NET_NETCONSOLE=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_PHY_FSL_IMX8MQ_USB is not set
-CONFIG_PINCTRL_BCM283X=y
-CONFIG_PROMPT="R-Pi> "
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_THUMB2_BAREBOX=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_HOST=y
-# CONFIG_USB_EHCI is not set
-# CONFIG_USB_GADGET_MASS_STORAGE is not set
-# CONFIG_USB_GADGET_SERIAL is not set
-CONFIG_USB_NOP_XCEIV=y
-CONFIG_USB_OTGDEV=y
-CONFIG_WATCHDOG_BCM2835=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index dad3c5e822a1..4780b6493a7a 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -23,7 +23,7 @@ CONFIG_ARCH_MULTIARCH=y
# 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_BCM283X=y
CONFIG_ARCH_IMX=y
# CONFIG_ARCH_K3 is not set
# CONFIG_ARCH_SUNXI is not set
@@ -47,6 +47,19 @@ CONFIG_CPU_32v7=y
# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
CONFIG_ARCH_HAS_L2X0=y
# CONFIG_CACHE_L2X0 is not set
+CONFIG_MACH_RPI_COMMON=y
+CONFIG_MACH_RPI_AARCH_32_64=y
+
+#
+# select Broadcom BCM283X boards to be built
+#
+# CONFIG_MACH_RPI is not set
+CONFIG_MACH_RPI2=y
+CONFIG_MACH_RPI3=y
+CONFIG_MACH_RPI_CM3=y
+CONFIG_MACH_RPI4=y
+# end of select Broadcom BCM283X boards to be built
+
CONFIG_ARCH_IMX_IMXIMAGE=y
CONFIG_RESET_IMX_SRC=y
@@ -214,6 +227,7 @@ CONFIG_ARM_EXCEPTIONS=y
CONFIG_ARM_UNWIND=y
# CONFIG_ARM_SEMIHOSTING is not set
CONFIG_ARM_SMCCC=y
+CONFIG_ARM_SECURE_MONITOR=y
CONFIG_ARM_PSCI_OF=y
CONFIG_ARM_PSCI_CLIENT=y
# CONFIG_ARM_BOOTM_ELF is not set
@@ -711,7 +725,7 @@ CONFIG_PHYLIB=y
# Network drivers
#
# CONFIG_DRIVER_NET_ARC_EMAC is not set
-# CONFIG_DRIVER_NET_BCMGENET is not set
+CONFIG_DRIVER_NET_BCMGENET=y
CONFIG_DRIVER_NET_CPSW=y
CONFIG_DRIVER_NET_TI_DAVINCI_MDIO=y
# CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set
@@ -774,6 +788,7 @@ 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_SPI_BCM2835 is not set
# CONFIG_STM32_QSPI is not set
# CONFIG_DRIVER_SPI_STM32 is not set
# end of SPI drivers
@@ -785,6 +800,7 @@ CONFIG_I2C_ALGOBIT=y
# I2C Hardware Bus support
#
CONFIG_I2C_GPIO=y
+CONFIG_I2C_BCM283X=y
CONFIG_I2C_IMX=y
# CONFIG_I2C_IMX_LPI2C is not set
# CONFIG_I2C_DESIGNWARE is not set
@@ -927,6 +943,7 @@ CONFIG_VIDEO=y
# CONFIG_DRIVER_VIDEO_FB_SSD1307 is not set
CONFIG_VIDEO_VPL=y
# CONFIG_DRIVER_VIDEO_STM32_LTDC is not set
+# CONFIG_DRIVER_VIDEO_BCM283X is not set
# CONFIG_DRIVER_VIDEO_ROCKCHIP is not set
CONFIG_DRIVER_VIDEO_IMX_IPUV3=y
CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y
@@ -971,6 +988,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_BCM283X=y
+CONFIG_MCI_BCM283X_SDHOST=y
CONFIG_MCI_IMX_ESDHC=y
# CONFIG_MCI_IMX_ESDHC_PIO is not set
CONFIG_MCI_OMAP_HSMMC=y
@@ -994,6 +1013,7 @@ CONFIG_COMMON_CLK_GPIO=y
#
CONFIG_ARCH_HAS_IMX_GPT=y
CONFIG_AMBA_SP804=y
+CONFIG_CLOCKSOURCE_BCM283X=y
CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
CONFIG_CLOCKSOURCE_IMX_GPT=y
@@ -1073,6 +1093,7 @@ CONFIG_WATCHDOG_POLLER=y
CONFIG_WATCHDOG_IMX=y
# CONFIG_WATCHDOG_IMXULP is not set
CONFIG_WATCHDOG_OMAP=y
+CONFIG_WATCHDOG_BCM2835=y
CONFIG_STM32_IWDG_WATCHDOG=y
# CONFIG_STPMIC1_WATCHDOG is not set
# CONFIG_GPIO_WATCHDOG is not set
@@ -1085,6 +1106,8 @@ CONFIG_HWRNG=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
CONFIG_HWRNG_STM32=y
CONFIG_HW_RANDOM_OPTEE=y
+# CONFIG_HW_RANDOM_BCM2835 is not set
+# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
# CONFIG_HW_RANDOM_OMAP is not set
#
@@ -1110,6 +1133,7 @@ CONFIG_GPIO_OMAP=y
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_PL061 is not set
+CONFIG_GPIO_RASPBERRYPI_EXP=y
# CONFIG_GPIO_DESIGNWARE is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_SIFIVE is not set
@@ -1122,6 +1146,7 @@ CONFIG_GPIO_OMAP=y
# Pin controllers
#
CONFIG_PINCTRL=y
+CONFIG_PINCTRL_BCM283X=y
CONFIG_PINCTRL_IMX_IOMUX_V3=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_STM32=y
@@ -1147,6 +1172,7 @@ CONFIG_TI_SYSC=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED=y
+CONFIG_REGULATOR_BCM283X=y
# CONFIG_REGULATOR_FAN53555 is not set
# CONFIG_REGULATOR_PFUZE is not set
CONFIG_REGULATOR_STM32_PWR=y
diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi2.config
index 7ec722f397c2..37ce69cf89b0 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi2.config
@@ -2,7 +2,7 @@ image rpi2-boot.vfat {
vfat {
files = { @FIRMWARE_RPI2@ }
file barebox.img { image = barebox-raspberry-pi.img }
- file bcm2711-rpi-4-b.dtb { image = bcm2711-rpi-4.dtb-bb }
+ file bcm2711-rpi-4-b.dtb { image = barebox-bcm2711-rpi-4.dtb }
}
size = 32M
}
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 1230a3424a63..652c13557b7d 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_RPI2=y
PTXCONF_BAREBOX_ARCH_STRING="arm"
PTXCONF_BAREBOX_DEPENDENCIES=y
PTXCONF_BAREBOX=y
diff --git a/configs/platform-v7a/platforms/barebox-rpi2.in b/configs/platform-v7a/platforms/barebox-rpi2.in
deleted file mode 100644
index 82ef1c57cdbc..000000000000
--- a/configs/platform-v7a/platforms/barebox-rpi2.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=bootloader
-
-menuconfig BAREBOX_RPI2
- tristate
- prompt "Barebox (rpi2/3/CM3)"
- select BAREBOX_COMMON
- help
- Raspberry Pi 2, 3, CM3 support for barebox.
diff --git a/configs/platform-v7a/platforms/image-rpi2.in b/configs/platform-v7a/platforms/image-rpi2.in
index cf14b80da82b..77848273dfb3 100644
--- a/configs/platform-v7a/platforms/image-rpi2.in
+++ b/configs/platform-v7a/platforms/image-rpi2.in
@@ -6,7 +6,7 @@ config IMAGE_RPI2
select HOST_DOSFSTOOLS
select HOST_MTOOLS
select IMAGE_ROOT_EXT
- select BAREBOX_RPI2
+ select BAREBOX
prompt "Generate images/rpi.hdimg"
help
SD card image for the Raspberry Pi 2, 3 and CM3
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
deleted file mode 100644
index ffb32d5a3609..000000000000
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2016 by Alexander Aring <aar@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BAREBOX_RPI2) += barebox-rpi2
-
-#
-# Paths and names
-#
-BAREBOX_RPI2_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_RPI2_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_RPI2 := barebox-rpi2-$(BAREBOX_RPI2_VERSION)
-BAREBOX_RPI2_SUFFIX := tar.bz2
-BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2)
-BAREBOX_RPI2_PATCHES := barebox-$(BAREBOX_RPI2_VERSION)
-BAREBOX_RPI2_SOURCE := $(SRCDIR)/$(BAREBOX_RPI2_PATCHES).$(BAREBOX_RPI2_SUFFIX)
-BAREBOX_RPI2_DIR := $(BUILDDIR)/$(BAREBOX_RPI2)
-BAREBOX_RPI2_BUILD_DIR := $(BAREBOX_RPI2_DIR)-build
-BAREBOX_RPI2_CONFIG := $(call ptx/in-platformconfigdir, barebox-rpi2.config)
-BAREBOX_RPI2_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
-BAREBOX_RPI2_LICENSE := GPL-2.0-only
-BAREBOX_RPI2_BUILD_OOT := KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-# use host pkg-config for host tools
-BAREBOX_RPI2_PATH := PATH=$(HOST_PATH)
-
-BAREBOX_RPI2_WRAPPER_BLACKLIST := \
- $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-
-BAREBOX_RPI2_CONF_OPT := \
- -C $(BAREBOX_RPI2_DIR) \
- O=$(BAREBOX_RPI2_BUILD_DIR) \
- BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
- $(call barebox-opts, BAREBOX_RPI2)
-
-BAREBOX_RPI2_MAKE_OPT := $(BAREBOX_RPI2_CONF_OPT)
-
-BAREBOX_RPI2_DTB_DIR := $(BAREBOX_RPI2_BUILD_DIR)/arch/arm/dts
-
-ifdef PTXCONF_BAREBOX_RPI2
-$(BAREBOX_RPI2_CONFIG):
- @echo
- @echo "****************************************************************************"
- @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-rpi2'"
- @echo "****************************************************************************"
- @echo
- @echo
- @exit 1
-endif
-
-$(STATEDIR)/barebox-rpi2.prepare: $(BAREBOX_RPI2_CONFIG)
- @$(call targetinfo)
- @$(call world/prepare, BAREBOX_RPI2)
- @rm -f "$(BAREBOX_RPI2_BUILD_DIR)/.ptxdist-defaultenv"
- @ln -s "$(call ptx/in-platformconfigdir, barebox-rpi2-defaultenv)" \
- "$(BAREBOX_RPI2_BUILD_DIR)/.ptxdist-defaultenv"
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-rpi2.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-rpi2.targetinstall:
- @$(call targetinfo)
- @$(foreach dtb, $(wildcard $(BAREBOX_RPI2_DTB_DIR)/*.dtb), \
- install -m 644 \
- $(dtb) $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl))
- @install -m 644 $(BAREBOX_RPI2_BUILD_DIR)/images/barebox-raspberry-pi.img \
- $(IMAGEDIR)/barebox-raspberry-pi.img
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-rpi2.clean:
- @$(call targetinfo)
- @$(call clean_pkg, BAREBOX_RPI2)
- @$(foreach dtb, $(wildcard $(BAREBOX_RPI2_DTB_DIR)/*.dtb), \
- rm -fv $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl))
- @rm -fv $(IMAGEDIR)/barebox-dt-2nd-rpi.img
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-barebox-rpi2_oldconfig barebox-rpi2_menuconfig barebox-rpi2_nconfig: $(STATEDIR)/barebox-rpi2.extract
- @$(call world/kconfig, BAREBOX_RPI2, $(subst barebox-rpi2_,,$@))
-
-# vim: syntax=make
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 10/11] v7a: rpi: remove "2" from recipe names
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
` (7 preceding siblings ...)
2025-05-26 10:11 ` [DistroKit] [PATCH 09/11] v7a: rpi: " Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG Roland Hieber
9 siblings, 0 replies; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
These recipes also target RPi 3 and CM 3+, so the "2" in the recipe
names might be unnecessarily confusing. The generated image is also
already named rpi.hdimg.
Rename the documentation file accordingly.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../config/images/{rpi2.config => rpi.config} | 6 +--
configs/platform-v7a/platformconfig | 2 +-
.../platforms/{image-rpi2.in => image-rpi.in} | 2 +-
configs/platform-v7a/rules/image-rpi.make | 46 +++++++++++++++++++
configs/platform-v7a/rules/image-rpi2.make | 46 -------------------
doc/hardware.rst | 2 +-
...e_v7a_raspi23.rst => hardware_v7a_rpi.rst} | 0
7 files changed, 52 insertions(+), 52 deletions(-)
rename configs/platform-v7a/config/images/{rpi2.config => rpi.config} (85%)
rename configs/platform-v7a/platforms/{image-rpi2.in => image-rpi.in} (92%)
create mode 100644 configs/platform-v7a/rules/image-rpi.make
delete mode 100644 configs/platform-v7a/rules/image-rpi2.make
rename doc/{hardware_v7a_raspi23.rst => hardware_v7a_rpi.rst} (100%)
diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi.config
similarity index 85%
rename from configs/platform-v7a/config/images/rpi2.config
rename to configs/platform-v7a/config/images/rpi.config
index 37ce69cf89b0..e301e20087e6 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi.config
@@ -1,6 +1,6 @@
-image rpi2-boot.vfat {
+image rpi-boot.vfat {
vfat {
- files = { @FIRMWARE_RPI2@ }
+ files = { @FIRMWARE_RPI@ }
file barebox.img { image = barebox-raspberry-pi.img }
file bcm2711-rpi-4-b.dtb { image = barebox-bcm2711-rpi-4.dtb }
}
@@ -14,7 +14,7 @@ image @IMAGE@ {
}
partition boot {
offset = 4M
- image = rpi2-boot.vfat
+ image = rpi-boot.vfat
partition-type = 0xc
partition-type-uuid = fat32
bootable = true
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 652c13557b7d..9af61ed58b52 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -313,7 +313,7 @@ PTXCONF_IMAGE_ROOT_TGZ=y
PTXCONF_IMAGE_ROOT_TGZ_LABEL=""
# PTXCONF_IMAGE_ROOT_UBI is not set
# PTXCONF_IMAGE_ROOT_UBIFS is not set
-PTXCONF_IMAGE_RPI2=y
+PTXCONF_IMAGE_RPI=y
PTXCONF_IMAGE_SABRELITE=y
PTXCONF_IMAGE_SAMA5D27_GIANTBOARD=y
PTXCONF_IMAGE_SAMA5D27_SOM1_EK=y
diff --git a/configs/platform-v7a/platforms/image-rpi2.in b/configs/platform-v7a/platforms/image-rpi.in
similarity index 92%
rename from configs/platform-v7a/platforms/image-rpi2.in
rename to configs/platform-v7a/platforms/image-rpi.in
index 77848273dfb3..e3236b633bc9 100644
--- a/configs/platform-v7a/platforms/image-rpi2.in
+++ b/configs/platform-v7a/platforms/image-rpi.in
@@ -1,6 +1,6 @@
## SECTION=image
-config IMAGE_RPI2
+config IMAGE_RPI
tristate
select HOST_GENIMAGE
select HOST_DOSFSTOOLS
diff --git a/configs/platform-v7a/rules/image-rpi.make b/configs/platform-v7a/rules/image-rpi.make
new file mode 100644
index 000000000000..d7d91ae7adba
--- /dev/null
+++ b/configs/platform-v7a/rules/image-rpi.make
@@ -0,0 +1,46 @@
+# -*-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
+#
+IMAGE_PACKAGES-$(PTXCONF_IMAGE_RPI) += image-rpi
+
+#
+# Paths and names
+#
+IMAGE_RPI := image-rpi
+IMAGE_RPI_DIR := $(BUILDDIR)/$(IMAGE_RPI)
+IMAGE_RPI_IMAGE := $(IMAGEDIR)/rpi.hdimg
+IMAGE_RPI_FILES := $(IMAGEDIR)/root.tgz
+IMAGE_RPI_CONFIG := rpi.config
+IMAGE_RPI_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
+IMAGE_RPI_DATA := \
+ $(wildcard $(IMAGE_RPI_DATA_DIR)/*.bin) \
+ $(wildcard $(IMAGE_RPI_DATA_DIR)/*.elf) \
+ $(wildcard $(IMAGE_RPI_DATA_DIR)/*.dat) \
+ $(wildcard $(IMAGE_RPI_DATA_DIR)/*.dtb) \
+ $(wildcard $(IMAGE_RPI_DATA_DIR)/config.txt)
+
+# ----------------------------------------------------------------------------
+# Image
+# ----------------------------------------------------------------------------
+
+define squote_and_comma
+$(subst $(ptx/def/space),$(comma) ,$(addsuffix $(ptx/def/squote),$(addprefix $(ptx/def/squote),$(1))))
+endef
+
+IMAGE_RPI_ENV := \
+ FIRMWARE_RPI="$(call squote_and_comma,$(IMAGE_RPI_DATA))"
+
+$(IMAGE_RPI_IMAGE):
+ @$(call targetinfo)
+ @$(call image/genimage, IMAGE_RPI)
+ @$(call finish)
+
+# vim: syntax=make
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
deleted file mode 100644
index 22f11586f814..000000000000
--- a/configs/platform-v7a/rules/image-rpi2.make
+++ /dev/null
@@ -1,46 +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
-#
-IMAGE_PACKAGES-$(PTXCONF_IMAGE_RPI2) += image-rpi2
-
-#
-# Paths and names
-#
-IMAGE_RPI2 := image-rpi2
-IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2)
-IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi.hdimg
-IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz
-IMAGE_RPI2_CONFIG := rpi2.config
-IMAGE_RPI2_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
-IMAGE_RPI2_DATA := \
- $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \
- $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \
- $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.dat) \
- $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.dtb) \
- $(wildcard $(IMAGE_RPI2_DATA_DIR)/config.txt)
-
-# ----------------------------------------------------------------------------
-# Image
-# ----------------------------------------------------------------------------
-
-define squote_and_comma
-$(subst $(ptx/def/space),$(comma) ,$(addsuffix $(ptx/def/squote),$(addprefix $(ptx/def/squote),$(1))))
-endef
-
-IMAGE_RPI2_ENV := \
- FIRMWARE_RPI2="$(call squote_and_comma,$(IMAGE_RPI2_DATA))"
-
-$(IMAGE_RPI2_IMAGE):
- @$(call targetinfo)
- @$(call image/genimage, IMAGE_RPI2)
- @$(call finish)
-
-# vim: syntax=make
diff --git a/doc/hardware.rst b/doc/hardware.rst
index ccec2b4d0722..50a7de1e6701 100644
--- a/doc/hardware.rst
+++ b/doc/hardware.rst
@@ -46,7 +46,7 @@ It supports the following hardware:
hardware_v7a_beaglebone_black
hardware_v7a_nitrogen6x
hardware_v7a_riot
- hardware_v7a_raspi23
+ hardware_v7a_rpi
hardware_v7a_udoo_neo
hardware_v7a_sama5d2
hardware_v7a_sama5d4
diff --git a/doc/hardware_v7a_raspi23.rst b/doc/hardware_v7a_rpi.rst
similarity index 100%
rename from doc/hardware_v7a_raspi23.rst
rename to doc/hardware_v7a_rpi.rst
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
` (8 preceding siblings ...)
2025-05-26 10:11 ` [DistroKit] [PATCH 10/11] v7a: rpi: remove "2" from recipe names Roland Hieber
@ 2025-05-26 10:11 ` Roland Hieber
2025-05-26 10:20 ` Ahmad Fatoum
9 siblings, 1 reply; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:11 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Without ALLOW_PRNG_FALLBACK, barebox prints an unsightly error message
on boot:
ERROR: no HWRNG available!
Since we don't have HWRNG drivers for all available platforms, enable
those that we have (RPi and AM33xx). For the other platforms allow
fallback to the PRNG, which will at least only print a warning on boot
on platforms without HWRNG:
WARNING: falling back to Pseudo RNG source!
… but in this case, this is expected.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-v7a/barebox.config | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 4780b6493a7a..86cb40acbf17 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -1106,9 +1106,9 @@ CONFIG_HWRNG=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
CONFIG_HWRNG_STM32=y
CONFIG_HW_RANDOM_OPTEE=y
-# CONFIG_HW_RANDOM_BCM2835 is not set
+CONFIG_HW_RANDOM_BCM2835=y
# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
-# CONFIG_HW_RANDOM_OMAP is not set
+CONFIG_HW_RANDOM_OMAP=y
#
# DMA support
@@ -1380,7 +1380,7 @@ CONFIG_IMAGE_SPARSE=y
CONFIG_STMP_DEVICE=y
CONFIG_LIBFDT=y
# CONFIG_RATP is not set
-# CONFIG_ALLOW_PRNG_FALLBACK is not set
+CONFIG_ALLOW_PRNG_FALLBACK=y
# CONFIG_CRC_CCITT is not set
CONFIG_CRC8=y
--
2.39.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [DistroKit] [PATCH 03/11] v7a: barebox: boot from bootsource
2025-05-26 10:11 ` [DistroKit] [PATCH 03/11] v7a: barebox: boot from bootsource Roland Hieber
@ 2025-05-26 10:18 ` Ahmad Fatoum
0 siblings, 0 replies; 17+ messages in thread
From: Ahmad Fatoum @ 2025-05-26 10:18 UTC (permalink / raw)
To: Roland Hieber, distrokit
Hi,
On 5/26/25 12:11, Roland Hieber wrote:
> Barebox 2025.05.0 with CONFIG_BOOT_DEFAULTS (which we implicitly
> enabled in the last commit) can resolve the boot target "bootsource" to
> the device from which the board was initially booted, if this is
> supported by the platform code (see barebox commit 6d91022db295 "common:
> bootdef: add new boot entry provider" for more info). This way we won't
> have to hard-code "mmc0", "mmc2", or "disk0" as the boot target for
> different platforms.
>
> Link: https://git.pengutronix.de/cgit/barebox/commit/?id=6d91022db29555c175e9
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> .../platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot | 2 +-
> .../platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot
> index c0c541c8b2a3..5ec387df9ea0 100644
> --- a/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot
> +++ b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot
> @@ -1 +1 @@
> -mmc0.root-A
> + bootsource.root-A
I guess it doesn't matter, but what's up with the space here?
Cheers,
Ahmad
> diff --git a/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot
> index 1d40e339c2fe..cea618acf89a 100644
> --- a/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot
> +++ b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot
> @@ -1 +1 @@
> -mmc0.root-B
> + bootsource.root-B
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG
2025-05-26 10:11 ` [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG Roland Hieber
@ 2025-05-26 10:20 ` Ahmad Fatoum
2025-05-26 10:39 ` Roland Hieber
0 siblings, 1 reply; 17+ messages in thread
From: Ahmad Fatoum @ 2025-05-26 10:20 UTC (permalink / raw)
To: Roland Hieber, distrokit
Hi Roland,
On 5/26/25 12:11, Roland Hieber wrote:
> Without ALLOW_PRNG_FALLBACK, barebox prints an unsightly error message
> on boot:
>
> ERROR: no HWRNG available!
Is this because of the stack protector? Which platforms lack the RNG?
Cheers,
Ahmad
>
> Since we don't have HWRNG drivers for all available platforms, enable
> those that we have (RPi and AM33xx). For the other platforms allow
> fallback to the PRNG, which will at least only print a warning on boot
> on platforms without HWRNG:
>
> WARNING: falling back to Pseudo RNG source!
>
> … but in this case, this is expected.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> configs/platform-v7a/barebox.config | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
> index 4780b6493a7a..86cb40acbf17 100644
> --- a/configs/platform-v7a/barebox.config
> +++ b/configs/platform-v7a/barebox.config
> @@ -1106,9 +1106,9 @@ CONFIG_HWRNG=y
> # CONFIG_HW_RANDOM_TIMERIOMEM is not set
> CONFIG_HWRNG_STM32=y
> CONFIG_HW_RANDOM_OPTEE=y
> -# CONFIG_HW_RANDOM_BCM2835 is not set
> +CONFIG_HW_RANDOM_BCM2835=y
> # CONFIG_HW_RANDOM_IPROC_RNG200 is not set
> -# CONFIG_HW_RANDOM_OMAP is not set
> +CONFIG_HW_RANDOM_OMAP=y
>
> #
> # DMA support
> @@ -1380,7 +1380,7 @@ CONFIG_IMAGE_SPARSE=y
> CONFIG_STMP_DEVICE=y
> CONFIG_LIBFDT=y
> # CONFIG_RATP is not set
> -# CONFIG_ALLOW_PRNG_FALLBACK is not set
> +CONFIG_ALLOW_PRNG_FALLBACK=y
> # CONFIG_CRC_CCITT is not set
> CONFIG_CRC8=y
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG
2025-05-26 10:20 ` Ahmad Fatoum
@ 2025-05-26 10:39 ` Roland Hieber
2025-05-26 10:59 ` Ahmad Fatoum
0 siblings, 1 reply; 17+ messages in thread
From: Roland Hieber @ 2025-05-26 10:39 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: distrokit
On Mon, May 26, 2025 at 12:20:36PM +0200, Ahmad Fatoum wrote:
> Hi Roland,
>
> On 5/26/25 12:11, Roland Hieber wrote:
> > Without ALLOW_PRNG_FALLBACK, barebox prints an unsightly error message
> > on boot:
> >
> > ERROR: no HWRNG available!
>
> Is this because of the stack protector? Which platforms lack the RNG?
No, it's directly from get_crypto_bytes() in lib/random.c:
137 if (!IS_ENABLED(CONFIG_ALLOW_PRNG_FALLBACK)) {
138 pr_err("no HWRNG available!\n");
139 return err;
140 }
That's why I enabled CONFIG_ALLOW_PRNG_FALLBACK.
In menuconfig there is:
--- HWRNG Support
[ ] Timer IOMEM HW Random Number Generator support
[*] STM32 Random Number Generator
[*] OP-TEE based Random Number Generator support
[*] Broadcom BCM2835/BCM63xx Random Number Generator support
[ ] Broadcom iProc/STB RNG200 support
[*] OMAP Random Number Generator support
I'm not sure whether we want CONFIG_HW_RANDOM_TIMERIOMEM, its help text sounds
more like a workaround than a solution:
This driver provides barebox support for a generic Random │
Number Generator used by reading a 'dumb' iomem address that │
is to be read no faster than, for example, once a second.
- Roland
> Cheers,
> Ahmad
>
> >
> > Since we don't have HWRNG drivers for all available platforms, enable
> > those that we have (RPi and AM33xx). For the other platforms allow
> > fallback to the PRNG, which will at least only print a warning on boot
> > on platforms without HWRNG:
> >
> > WARNING: falling back to Pseudo RNG source!
> >
> > … but in this case, this is expected.
> >
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> > configs/platform-v7a/barebox.config | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
> > index 4780b6493a7a..86cb40acbf17 100644
> > --- a/configs/platform-v7a/barebox.config
> > +++ b/configs/platform-v7a/barebox.config
> > @@ -1106,9 +1106,9 @@ CONFIG_HWRNG=y
> > # CONFIG_HW_RANDOM_TIMERIOMEM is not set
> > CONFIG_HWRNG_STM32=y
> > CONFIG_HW_RANDOM_OPTEE=y
> > -# CONFIG_HW_RANDOM_BCM2835 is not set
> > +CONFIG_HW_RANDOM_BCM2835=y
> > # CONFIG_HW_RANDOM_IPROC_RNG200 is not set
> > -# CONFIG_HW_RANDOM_OMAP is not set
> > +CONFIG_HW_RANDOM_OMAP=y
> >
> > #
> > # DMA support
> > @@ -1380,7 +1380,7 @@ CONFIG_IMAGE_SPARSE=y
> > CONFIG_STMP_DEVICE=y
> > CONFIG_LIBFDT=y
> > # CONFIG_RATP is not set
> > -# CONFIG_ALLOW_PRNG_FALLBACK is not set
> > +CONFIG_ALLOW_PRNG_FALLBACK=y
> > # CONFIG_CRC_CCITT is not set
> > CONFIG_CRC8=y
> >
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
>
--
Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG
2025-05-26 10:39 ` Roland Hieber
@ 2025-05-26 10:59 ` Ahmad Fatoum
2025-05-27 9:15 ` Roland Hieber
0 siblings, 1 reply; 17+ messages in thread
From: Ahmad Fatoum @ 2025-05-26 10:59 UTC (permalink / raw)
To: Roland Hieber; +Cc: distrokit
Hello Roland,
On 5/26/25 12:39, Roland Hieber wrote:
> On Mon, May 26, 2025 at 12:20:36PM +0200, Ahmad Fatoum wrote:
>> Hi Roland,
>>
>> On 5/26/25 12:11, Roland Hieber wrote:
>>> Without ALLOW_PRNG_FALLBACK, barebox prints an unsightly error message
>>> on boot:
>>>
>>> ERROR: no HWRNG available!
>>
>> Is this because of the stack protector? Which platforms lack the RNG?
>
> No, it's directly from get_crypto_bytes() in lib/random.c:
>
> 137 if (!IS_ENABLED(CONFIG_ALLOW_PRNG_FALLBACK)) {
> 138 pr_err("no HWRNG available!\n");
> 139 return err;
> 140 }
>
> That's why I enabled CONFIG_ALLOW_PRNG_FALLBACK.
Yes, but why is get_crypto_bytes called in your case? Things like
MAC address generation don't use a non-secure PRNG anyways.
> In menuconfig there is:
>
> --- HWRNG Support
> [ ] Timer IOMEM HW Random Number Generator support
> [*] STM32 Random Number Generator
> [*] OP-TEE based Random Number Generator support
> [*] Broadcom BCM2835/BCM63xx Random Number Generator support
> [ ] Broadcom iProc/STB RNG200 support
> [*] OMAP Random Number Generator support
There is also the CAAM driver for i.MX, which is found separately in
a crypto submenu.
> I'm not sure whether we want CONFIG_HW_RANDOM_TIMERIOMEM, its help text sounds
> more like a workaround than a solution:
>
> This driver provides barebox support for a generic Random │
> Number Generator used by reading a 'dumb' iomem address that │
> is to be read no faster than, for example, once a second.
I don't think we have hardware in DistroKit that this is useful on.
Cheers,
Ahmad
>
> - Roland
>
>> Cheers,
>> Ahmad
>>
>>>
>>> Since we don't have HWRNG drivers for all available platforms, enable
>>> those that we have (RPi and AM33xx). For the other platforms allow
>>> fallback to the PRNG, which will at least only print a warning on boot
>>> on platforms without HWRNG:
>>>
>>> WARNING: falling back to Pseudo RNG source!
>>>
>>> … but in this case, this is expected.
>>>
>>> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
>>> ---
>>> configs/platform-v7a/barebox.config | 6 +++---
>>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
>>> index 4780b6493a7a..86cb40acbf17 100644
>>> --- a/configs/platform-v7a/barebox.config
>>> +++ b/configs/platform-v7a/barebox.config
>>> @@ -1106,9 +1106,9 @@ CONFIG_HWRNG=y
>>> # CONFIG_HW_RANDOM_TIMERIOMEM is not set
>>> CONFIG_HWRNG_STM32=y
>>> CONFIG_HW_RANDOM_OPTEE=y
>>> -# CONFIG_HW_RANDOM_BCM2835 is not set
>>> +CONFIG_HW_RANDOM_BCM2835=y
>>> # CONFIG_HW_RANDOM_IPROC_RNG200 is not set
>>> -# CONFIG_HW_RANDOM_OMAP is not set
>>> +CONFIG_HW_RANDOM_OMAP=y
>>>
>>> #
>>> # DMA support
>>> @@ -1380,7 +1380,7 @@ CONFIG_IMAGE_SPARSE=y
>>> CONFIG_STMP_DEVICE=y
>>> CONFIG_LIBFDT=y
>>> # CONFIG_RATP is not set
>>> -# CONFIG_ALLOW_PRNG_FALLBACK is not set
>>> +CONFIG_ALLOW_PRNG_FALLBACK=y
>>> # CONFIG_CRC_CCITT is not set
>>> CONFIG_CRC8=y
>>>
>>
>> --
>> Pengutronix e.K. | |
>> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
>> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
>> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>>
>>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG
2025-05-26 10:59 ` Ahmad Fatoum
@ 2025-05-27 9:15 ` Roland Hieber
2025-05-27 20:19 ` Ahmad Fatoum
0 siblings, 1 reply; 17+ messages in thread
From: Roland Hieber @ 2025-05-27 9:15 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: distrokit
On Mon, May 26, 2025 at 12:59:33PM +0200, Ahmad Fatoum wrote:
> Hello Roland,
>
> On 5/26/25 12:39, Roland Hieber wrote:
> > On Mon, May 26, 2025 at 12:20:36PM +0200, Ahmad Fatoum wrote:
> >> Hi Roland,
> >>
> >> On 5/26/25 12:11, Roland Hieber wrote:
> >>> Without ALLOW_PRNG_FALLBACK, barebox prints an unsightly error message
> >>> on boot:
> >>>
> >>> ERROR: no HWRNG available!
> >>
> >> Is this because of the stack protector? Which platforms lack the RNG?
> >
> > No, it's directly from get_crypto_bytes() in lib/random.c:
> >
> > 137 if (!IS_ENABLED(CONFIG_ALLOW_PRNG_FALLBACK)) {
> > 138 pr_err("no HWRNG available!\n");
> > 139 return err;
> > 140 }
> >
> > That's why I enabled CONFIG_ALLOW_PRNG_FALLBACK.
>
> Yes, but why is get_crypto_bytes called in your case? Things like
> MAC address generation don't use a non-secure PRNG anyways.
Ah now I get what you mean. In that case, dmesg seems to suggest it's the stack
protector. On riotboard I get:
[…]
register_driver: barebox-environment
probe-> chosen:environment.of
barebox-environment chosen:environment.of: Setting default environment path to /dev/mmc3.barebox-environment
initcall-> stackprot_randomize_guard+0x1/0x38
WARNING: falling back to Pseudo RNG source!
initcall-> eth_register_of_fixup+0x1/0x10
initcall-> dhcp_global_init+0x1/0xf8
[…]
> > In menuconfig there is:
> >
> > --- HWRNG Support
> > [ ] Timer IOMEM HW Random Number Generator support
> > [*] STM32 Random Number Generator
> > [*] OP-TEE based Random Number Generator support
> > [*] Broadcom BCM2835/BCM63xx Random Number Generator support
> > [ ] Broadcom iProc/STB RNG200 support
> > [*] OMAP Random Number Generator support
>
> There is also the CAAM driver for i.MX, which is found separately in
> a crypto submenu.
Thanks, that got rid of the PRNG warning on riotboard :-) I'll enable it in v2
of this series too:
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -1239,7 +1239,9 @@ CONFIG_PHY_STM32_USBPHYC=y
#
# Hardware crypto devices
#
-# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG=y
# end of Hardware crypto devices
- Roland
> > I'm not sure whether we want CONFIG_HW_RANDOM_TIMERIOMEM, its help text sounds
> > more like a workaround than a solution:
> >
> > This driver provides barebox support for a generic Random │
> > Number Generator used by reading a 'dumb' iomem address that │
> > is to be read no faster than, for example, once a second.
>
> I don't think we have hardware in DistroKit that this is useful on.
>
> Cheers,
> Ahmad
>
> >
> > - Roland
> >
> >> Cheers,
> >> Ahmad
> >>
> >>>
> >>> Since we don't have HWRNG drivers for all available platforms, enable
> >>> those that we have (RPi and AM33xx). For the other platforms allow
> >>> fallback to the PRNG, which will at least only print a warning on boot
> >>> on platforms without HWRNG:
> >>>
> >>> WARNING: falling back to Pseudo RNG source!
> >>>
> >>> … but in this case, this is expected.
> >>>
> >>> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> >>> ---
> >>> configs/platform-v7a/barebox.config | 6 +++---
> >>> 1 file changed, 3 insertions(+), 3 deletions(-)
> >>>
> >>> diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
> >>> index 4780b6493a7a..86cb40acbf17 100644
> >>> --- a/configs/platform-v7a/barebox.config
> >>> +++ b/configs/platform-v7a/barebox.config
> >>> @@ -1106,9 +1106,9 @@ CONFIG_HWRNG=y
> >>> # CONFIG_HW_RANDOM_TIMERIOMEM is not set
> >>> CONFIG_HWRNG_STM32=y
> >>> CONFIG_HW_RANDOM_OPTEE=y
> >>> -# CONFIG_HW_RANDOM_BCM2835 is not set
> >>> +CONFIG_HW_RANDOM_BCM2835=y
> >>> # CONFIG_HW_RANDOM_IPROC_RNG200 is not set
> >>> -# CONFIG_HW_RANDOM_OMAP is not set
> >>> +CONFIG_HW_RANDOM_OMAP=y
> >>>
> >>> #
> >>> # DMA support
> >>> @@ -1380,7 +1380,7 @@ CONFIG_IMAGE_SPARSE=y
> >>> CONFIG_STMP_DEVICE=y
> >>> CONFIG_LIBFDT=y
> >>> # CONFIG_RATP is not set
> >>> -# CONFIG_ALLOW_PRNG_FALLBACK is not set
> >>> +CONFIG_ALLOW_PRNG_FALLBACK=y
> >>> # CONFIG_CRC_CCITT is not set
> >>> CONFIG_CRC8=y
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG
2025-05-27 9:15 ` Roland Hieber
@ 2025-05-27 20:19 ` Ahmad Fatoum
0 siblings, 0 replies; 17+ messages in thread
From: Ahmad Fatoum @ 2025-05-27 20:19 UTC (permalink / raw)
To: Roland Hieber; +Cc: distrokit
Hi Roland,
On 27.05.25 11:15, Roland Hieber wrote:
> On Mon, May 26, 2025 at 12:59:33PM +0200, Ahmad Fatoum wrote:
>> Hello Roland,
>>
>> On 5/26/25 12:39, Roland Hieber wrote:
>>> On Mon, May 26, 2025 at 12:20:36PM +0200, Ahmad Fatoum wrote:
>>>> Hi Roland,
>>>>
>>>> On 5/26/25 12:11, Roland Hieber wrote:
>>>>> Without ALLOW_PRNG_FALLBACK, barebox prints an unsightly error message
>>>>> on boot:
>>>>>
>>>>> ERROR: no HWRNG available!
>>>>
>>>> Is this because of the stack protector? Which platforms lack the RNG?
>>>
>>> No, it's directly from get_crypto_bytes() in lib/random.c:
>>>
>>> 137 if (!IS_ENABLED(CONFIG_ALLOW_PRNG_FALLBACK)) {
>>> 138 pr_err("no HWRNG available!\n");
>>> 139 return err;
>>> 140 }
>>>
>>> That's why I enabled CONFIG_ALLOW_PRNG_FALLBACK.
>>
>> Yes, but why is get_crypto_bytes called in your case? Things like
>> MAC address generation don't use a non-secure PRNG anyways.
>
> Ah now I get what you mean. In that case, dmesg seems to suggest it's the stack
> protector. On riotboard I get:
>
> […]
> register_driver: barebox-environment
> probe-> chosen:environment.of
> barebox-environment chosen:environment.of: Setting default environment path to /dev/mmc3.barebox-environment
> initcall-> stackprot_randomize_guard+0x1/0x38
> WARNING: falling back to Pseudo RNG source!
> initcall-> eth_register_of_fixup+0x1/0x10
> initcall-> dhcp_global_init+0x1/0xf8
> […]
Ah, there is a warning in the stack protector code:
WARNING: stackprot: proceeding without randomized stack protector
But it was only printed, when CONFIG_ALLOW_PRNG_FALLBACK was disabled.
I add some extra context to the warning message inside get_crypto_bytes
in [1], so it now looks like this:
WARNING: stackprot_randomize_guard: falling back to Pseudo RNG source!
[1]: https://lore.barebox.org/barebox/20250527201359.889550-9-a.fatoum@pengutronix.de/T/#u
Thanks by the way for enabling the stack protector support!
I have been meaning to do this for some time now. :)
Cheers,
Ahmad
>
>>> In menuconfig there is:
>>>
>>> --- HWRNG Support
>>> [ ] Timer IOMEM HW Random Number Generator support
>>> [*] STM32 Random Number Generator
>>> [*] OP-TEE based Random Number Generator support
>>> [*] Broadcom BCM2835/BCM63xx Random Number Generator support
>>> [ ] Broadcom iProc/STB RNG200 support
>>> [*] OMAP Random Number Generator support
>>
>> There is also the CAAM driver for i.MX, which is found separately in
>> a crypto submenu.
>
> Thanks, that got rid of the PRNG warning on riotboard :-) I'll enable it in v2
> of this series too:
>
> --- a/configs/platform-v7a/barebox.config
> +++ b/configs/platform-v7a/barebox.config
> @@ -1239,7 +1239,9 @@ CONFIG_PHY_STM32_USBPHYC=y
> #
> # Hardware crypto devices
> #
> -# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
> +CONFIG_CRYPTO_DEV_FSL_CAAM=y
> +CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
> +CONFIG_CRYPTO_DEV_FSL_CAAM_RNG=y
> # end of Hardware crypto devices
>
> - Roland
>
>>> I'm not sure whether we want CONFIG_HW_RANDOM_TIMERIOMEM, its help text sounds
>>> more like a workaround than a solution:
>>>
>>> This driver provides barebox support for a generic Random │
>>> Number Generator used by reading a 'dumb' iomem address that │
>>> is to be read no faster than, for example, once a second.
>>
>> I don't think we have hardware in DistroKit that this is useful on.
>>
>> Cheers,
>> Ahmad
>>
>>>
>>> - Roland
>>>
>>>> Cheers,
>>>> Ahmad
>>>>
>>>>>
>>>>> Since we don't have HWRNG drivers for all available platforms, enable
>>>>> those that we have (RPi and AM33xx). For the other platforms allow
>>>>> fallback to the PRNG, which will at least only print a warning on boot
>>>>> on platforms without HWRNG:
>>>>>
>>>>> WARNING: falling back to Pseudo RNG source!
>>>>>
>>>>> … but in this case, this is expected.
>>>>>
>>>>> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
>>>>> ---
>>>>> configs/platform-v7a/barebox.config | 6 +++---
>>>>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>>>>
>>>>> diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
>>>>> index 4780b6493a7a..86cb40acbf17 100644
>>>>> --- a/configs/platform-v7a/barebox.config
>>>>> +++ b/configs/platform-v7a/barebox.config
>>>>> @@ -1106,9 +1106,9 @@ CONFIG_HWRNG=y
>>>>> # CONFIG_HW_RANDOM_TIMERIOMEM is not set
>>>>> CONFIG_HWRNG_STM32=y
>>>>> CONFIG_HW_RANDOM_OPTEE=y
>>>>> -# CONFIG_HW_RANDOM_BCM2835 is not set
>>>>> +CONFIG_HW_RANDOM_BCM2835=y
>>>>> # CONFIG_HW_RANDOM_IPROC_RNG200 is not set
>>>>> -# CONFIG_HW_RANDOM_OMAP is not set
>>>>> +CONFIG_HW_RANDOM_OMAP=y
>>>>>
>>>>> #
>>>>> # DMA support
>>>>> @@ -1380,7 +1380,7 @@ CONFIG_IMAGE_SPARSE=y
>>>>> CONFIG_STMP_DEVICE=y
>>>>> CONFIG_LIBFDT=y
>>>>> # CONFIG_RATP is not set
>>>>> -# CONFIG_ALLOW_PRNG_FALLBACK is not set
>>>>> +CONFIG_ALLOW_PRNG_FALLBACK=y
>>>>> # CONFIG_CRC_CCITT is not set
>>>>> CONFIG_CRC8=y
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2025-05-27 20:19 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-26 10:11 [DistroKit] [PATCH 01/11] platforms: images: use descriptive partition-type-uuids Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 02/11] v7a: barebox: version bump 2025.03.0 -> 2025.05.0 Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 03/11] v7a: barebox: boot from bootsource Roland Hieber
2025-05-26 10:18 ` Ahmad Fatoum
2025-05-26 10:11 ` [DistroKit] [PATCH 04/11] v7a: image-stm32mp*: use new partition-table-type option Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 05/11] v7a: stm32mp: switch to upstream barebox recipe Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 06/11] v7a: stm32mp: populate default environment in barebox partition Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 07/11] v7a: mx6: switch to upstream barebox recipe Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 08/11] v7a: vexpress: " Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 09/11] v7a: rpi: " Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 10/11] v7a: rpi: remove "2" from recipe names Roland Hieber
2025-05-26 10:11 ` [DistroKit] [PATCH 11/11] v7a: barebox: enable HWRNG drivers and allow fallback to PRNG Roland Hieber
2025-05-26 10:20 ` Ahmad Fatoum
2025-05-26 10:39 ` Roland Hieber
2025-05-26 10:59 ` Ahmad Fatoum
2025-05-27 9:15 ` Roland Hieber
2025-05-27 20:19 ` Ahmad Fatoum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox