* [DistroKit] [PATCH 1/2] barebox: update to v2026.05.0
@ 2026-05-20 8:04 Ahmad Fatoum
2026-05-20 8:04 ` [DistroKit] [PATCH 2/2] barebox: make use of new env/match.of_compatible feature Ahmad Fatoum
0 siblings, 1 reply; 2+ messages in thread
From: Ahmad Fatoum @ 2026-05-20 8:04 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
As has become tradition so far, bump to the newest barebox release.
No especially exciting features for what we are currently using, but a
number of bug fixes. The bug fixes would go into upcoming v2026.04.1,
but we'll continue to track the newest barebox version here.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
configs/platform-v7a/barebox-am335x-mlo.config | 4 ++--
configs/platform-v7a/barebox-at91.config | 4 ++--
configs/platform-v7a/barebox-at91.config.diff | 4 ++--
configs/platform-v7a/barebox-common.config | 4 ++--
configs/platform-v7a/barebox.config | 4 ++--
configs/platform-v7a/platformconfig | 8 ++++----
configs/platform-v7a_noneon/barebox-at91.config | 4 ++--
configs/platform-v7a_noneon/barebox-at91.config.diff | 4 ++--
configs/platform-v7a_noneon/barebox-common.config | 4 ++--
configs/platform-v7a_noneon/barebox-vexpress.config | 4 ++--
configs/platform-v7a_noneon/barebox-vexpress.config.diff | 4 ++--
configs/platform-v7a_noneon/platformconfig | 4 ++--
configs/platform-v8a/barebox-r5.config | 4 ++--
configs/platform-v8a/barebox.config | 4 ++--
configs/platform-v8a/platformconfig | 4 ++--
15 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index e1bdbb1b0eb9..1598df04ed98 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 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -315,7 +315,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_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_MCI_OMAP_HSMMC_PBL=y
# CONFIG_COMMON_CLK is not set
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index 920efe3fb7af..c6d0f61573f4 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 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -777,7 +777,7 @@ CONFIG_MCI_ATMEL_SDHCI=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
-# CONFIG_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_MCI_ATMEL_SDHCI_PBL=y
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index eb204117fe03..e2d8f268b845 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,5 +1,5 @@
-d111683f44bc8d09073cd24138890699
-9b8b375fc5ee94f73aebcc73bba9166c
+f8419d7879db7d522e36fbf1242269c3
+ed25269abea31a9204a82edb2c610efa
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
diff --git a/configs/platform-v7a/barebox-common.config b/configs/platform-v7a/barebox-common.config
index ac9adccd9c05..10420fd7bb1e 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 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -740,7 +740,7 @@ CONFIG_MCI_MMCI=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
-# CONFIG_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index f4042f7b24da..bf6ebb963f06 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 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -1038,7 +1038,7 @@ CONFIG_MCI_MMCI=y
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
CONFIG_MCI_STM32_SDMMC2=y
-# CONFIG_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_MCI_OMAP_HSMMC_PBL=y
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 95358d36615a..4f8962661fe7 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -186,18 +186,18 @@ PTXCONF_AT91BOOTSTRAP2_MD5="f76ff2a39f9549b5b4ecdf7cf585218c"
PTXCONF_AT91BOOTSTRAP2_CONFIG="at91bootstrap-wifx-l1.config"
PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm"
PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2026.04.0"
-PTXCONF_BAREBOX_COMMON_MD5="517660e0e657d740c0dc5343b22ddc66"
+PTXCONF_BAREBOX_COMMON_VERSION="2026.05.0"
+PTXCONF_BAREBOX_COMMON_MD5="484b26cf5f01f6200cc72f2852da5079"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AT91=y
PTXCONF_BAREBOX_ARCH_STRING="arm"
PTXCONF_BAREBOX_DEPENDENCIES=y
PTXCONF_BAREBOX=y
-PTXCONF_BAREBOX_VERSION="2026.04.0"
+PTXCONF_BAREBOX_VERSION="2026.05.0"
PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
-PTXCONF_BAREBOX_MD5="517660e0e657d740c0dc5343b22ddc66"
+PTXCONF_BAREBOX_MD5="484b26cf5f01f6200cc72f2852da5079"
PTXCONF_BAREBOX_CONFIG="barebox.config"
# PTXCONF_BAREBOX_FIRMWARE is not set
PTXCONF_BAREBOX_EXTRA_ENV=y
diff --git a/configs/platform-v7a_noneon/barebox-at91.config b/configs/platform-v7a_noneon/barebox-at91.config
index 3aaaa0273b17..1f19d6841a73 100644
--- a/configs/platform-v7a_noneon/barebox-at91.config
+++ b/configs/platform-v7a_noneon/barebox-at91.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -782,7 +782,7 @@ CONFIG_MCI_ATMEL_SDHCI=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
-# CONFIG_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_MCI_ATMEL_PBL=y
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
diff --git a/configs/platform-v7a_noneon/barebox-at91.config.diff b/configs/platform-v7a_noneon/barebox-at91.config.diff
index 375ee8d71231..4ce9521704d9 100644
--- a/configs/platform-v7a_noneon/barebox-at91.config.diff
+++ b/configs/platform-v7a_noneon/barebox-at91.config.diff
@@ -1,5 +1,5 @@
-d6fdec229ce00e5261e7d96d2db1ff1b
-bca8b19fe2e1fd36d38a3ec46aedf6fa
+b79f37d83922799b996c630325210702
+4d9ffda04383c8387e30a7568675a8c3
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
diff --git a/configs/platform-v7a_noneon/barebox-common.config b/configs/platform-v7a_noneon/barebox-common.config
index 7169b2d064ec..3cd632cd29c6 100644
--- a/configs/platform-v7a_noneon/barebox-common.config
+++ b/configs/platform-v7a_noneon/barebox-common.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -736,7 +736,7 @@ CONFIG_MCI_MMCI=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
-# CONFIG_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config
index 1d216f848afb..ee1941dc2f8f 100644
--- a/configs/platform-v7a_noneon/barebox-vexpress.config
+++ b/configs/platform-v7a_noneon/barebox-vexpress.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -719,7 +719,7 @@ CONFIG_MCI_MMCI=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
-# CONFIG_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff
index c6d24c287a47..73643710dbe6 100644
--- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff
+++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff
@@ -1,5 +1,5 @@
-d6fdec229ce00e5261e7d96d2db1ff1b
-e6555e3a48a2fb400e8a13a6cecee00d
+b79f37d83922799b996c630325210702
+d0eb3e48755c216115784349f9eb9b03
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig
index 49a2a88a1fd6..bc77b094cd3c 100644
--- a/configs/platform-v7a_noneon/platformconfig
+++ b/configs/platform-v7a_noneon/platformconfig
@@ -180,8 +180,8 @@ PTXCONF_CONSOLE_SPEED="115200"
# PTXCONF_AT91BOOTSTRAP2 is not set
PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm"
PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2026.04.0"
-PTXCONF_BAREBOX_COMMON_MD5="517660e0e657d740c0dc5343b22ddc66"
+PTXCONF_BAREBOX_COMMON_VERSION="2026.05.0"
+PTXCONF_BAREBOX_COMMON_MD5="484b26cf5f01f6200cc72f2852da5079"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AT91=y
PTXCONF_BAREBOX_VEXPRESS=y
diff --git a/configs/platform-v8a/barebox-r5.config b/configs/platform-v8a/barebox-r5.config
index 77af83ba496c..6558daf9d630 100644
--- a/configs/platform-v8a/barebox-r5.config
+++ b/configs/platform-v8a/barebox-r5.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -350,7 +350,7 @@ CONFIG_MCI_MMC_RPMB=y
# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
# CONFIG_MCI_ARASAN is not set
CONFIG_MCI_AM654=y
-# CONFIG_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config
index a413865bc62d..a60404236d9c 100644
--- a/configs/platform-v8a/barebox.config
+++ b/configs/platform-v8a/barebox.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2026.04.0 Configuration
+# Barebox/arm 2026.05.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm64"
@@ -891,7 +891,7 @@ CONFIG_MCI_IMX_ESDHC=y
CONFIG_MCI_ARASAN=y
CONFIG_MCI_AM654=y
# CONFIG_MCI_SPI is not set
-# CONFIG_MMC_CADENCE_SDHCI is not set
+# CONFIG_MCI_CADENCE_SDHCI is not set
CONFIG_MCI_IMX_ESDHC_PBL=y
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index acbfa89d5de5..897d3c0ed424 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -182,10 +182,10 @@ PTXCONF_COMPILERPREFIX_R5="arm-v7a-linux-gnueabihf-"
PTXCONF_BAREBOX_ARCH_STRING="arm"
PTXCONF_BAREBOX_DEPENDENCIES=y
PTXCONF_BAREBOX=y
-PTXCONF_BAREBOX_VERSION="2026.04.0"
+PTXCONF_BAREBOX_VERSION="2026.05.0"
PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
-PTXCONF_BAREBOX_MD5="517660e0e657d740c0dc5343b22ddc66"
+PTXCONF_BAREBOX_MD5="484b26cf5f01f6200cc72f2852da5079"
PTXCONF_BAREBOX_CONFIG="barebox.config"
PTXCONF_BAREBOX_FIRMWARE=y
PTXCONF_BAREBOX_EXTRA_ENV=y
--
2.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* [DistroKit] [PATCH 2/2] barebox: make use of new env/match.of_compatible feature
2026-05-20 8:04 [DistroKit] [PATCH 1/2] barebox: update to v2026.05.0 Ahmad Fatoum
@ 2026-05-20 8:04 ` Ahmad Fatoum
0 siblings, 0 replies; 2+ messages in thread
From: Ahmad Fatoum @ 2026-05-20 8:04 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
We switched most boards to use a single barebox recipe a while ago. This
meant that the same environment is used on all boards sharing the recipe
and so we had to add some calls to the of_compatible command to prevent
board-specific init script to run outside of their specific board.
The newest barebox release provides an alternative in the form of
board-specific environment directories:
If we want /boot/9p to be specific only to arm,vexpress compatible
boards, we can move it to match.of_compatible/arm,vexpress/boot/9p and
it will only be available there.
Let's make use of it for the two scripts that are targeting only a
single board. Further simplification may be possible in future by
replacing other users of the of_compatible command as well.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
.../{ => match.of_compatible/arm,vexpress}/boot/9p | 7 +------
.../fsl,imx8mq-evk/init/disable-imx8mq-pci | 5 +++++
.../barebox-common-defaultenv/init/disable-imx8mq-pci | 7 -------
3 files changed, 6 insertions(+), 13 deletions(-)
rename configs/platform-v7a/barebox-defaultenv/{ => match.of_compatible/arm,vexpress}/boot/9p (69%)
create mode 100755 configs/platform-v7a/barebox-defaultenv/match.of_compatible/fsl,imx8mq-evk/init/disable-imx8mq-pci
delete mode 100755 configs/platform-v8a/barebox-common-defaultenv/init/disable-imx8mq-pci
diff --git a/configs/platform-v7a/barebox-defaultenv/boot/9p b/configs/platform-v7a/barebox-defaultenv/match.of_compatible/arm,vexpress/boot/9p
similarity index 69%
rename from configs/platform-v7a/barebox-defaultenv/boot/9p
rename to configs/platform-v7a/barebox-defaultenv/match.of_compatible/arm,vexpress/boot/9p
index 3f388a47064a..4e4985c9aff2 100644
--- a/configs/platform-v7a/barebox-defaultenv/boot/9p
+++ b/configs/platform-v7a/barebox-defaultenv/match.of_compatible/arm,vexpress/boot/9p
@@ -1,10 +1,5 @@
#!/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"
@@ -12,4 +7,4 @@ global.bootm.oftree="/dev/nor0.dtb"
global linux.bootargs.base="console=ttyAMA0,115200 loglevel=5 ptxdist-devel"
-global linux.bootargs.root="root=/dev/root rootfstype=9p rootflags=trans=virtio"
\ No newline at end of file
+global linux.bootargs.root="root=/dev/root rootfstype=9p rootflags=trans=virtio"
diff --git a/configs/platform-v7a/barebox-defaultenv/match.of_compatible/fsl,imx8mq-evk/init/disable-imx8mq-pci b/configs/platform-v7a/barebox-defaultenv/match.of_compatible/fsl,imx8mq-evk/init/disable-imx8mq-pci
new file mode 100755
index 000000000000..a0eae2501eb9
--- /dev/null
+++ b/configs/platform-v7a/barebox-defaultenv/match.of_compatible/fsl,imx8mq-evk/init/disable-imx8mq-pci
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Disabling PCI to avoid issues with older EVK revisions"
+of_property -fs /soc@0/pcie@33800000 status disabled
+of_property -fs /soc@0/pcie@33c00000 status disabled
diff --git a/configs/platform-v8a/barebox-common-defaultenv/init/disable-imx8mq-pci b/configs/platform-v8a/barebox-common-defaultenv/init/disable-imx8mq-pci
deleted file mode 100755
index 68536e7baa5f..000000000000
--- a/configs/platform-v8a/barebox-common-defaultenv/init/disable-imx8mq-pci
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if of_compatible -k fsl,imx8mq-evk; then
- echo "Disabling PCI to avoid issues with older EVK revisions"
- of_property -fs /soc@0/pcie@33800000 status disabled
- of_property -fs /soc@0/pcie@33c00000 status disabled
-fi
--
2.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-20 8:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-20 8:04 [DistroKit] [PATCH 1/2] barebox: update to v2026.05.0 Ahmad Fatoum
2026-05-20 8:04 ` [DistroKit] [PATCH 2/2] barebox: make use of new env/match.of_compatible feature Ahmad Fatoum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox