* [DistroKit] [PATCH] v8a: barebox: version bump 2025.06.1 -> 2025.07.0
@ 2025-07-31 15:51 Lars Schmidt
2025-07-31 19:02 ` Robert Schwebel
2025-08-01 9:14 ` [DistroKit] [PATCH 1/3] fixup! " Lars Schmidt
0 siblings, 2 replies; 9+ messages in thread
From: Lars Schmidt @ 2025-07-31 15:51 UTC (permalink / raw)
To: distrokit; +Cc: Lars Schmidt
barebox v2025.05.0 introduced a regression which broke the
FIT image booting on ARM32. That is fixed with this release
Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
---
configs/platform-v8a/barebox-r5.config | 26 +++++++++++++++++++++++---
configs/platform-v8a/barebox.config | 23 ++++++++++++++++++++---
configs/platform-v8a/platformconfig | 4 ++--
3 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/configs/platform-v8a/barebox-r5.config b/configs/platform-v8a/barebox-r5.config
index 2ae6363..2ab059a 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 2025.06.1 Configuration
+# Barebox/arm 2025.07.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm"
@@ -47,9 +47,11 @@ CONFIG_ARMV7R_MPU=y
#
# K3 boards
#
+CONFIG_MACH_AM62X=y
CONFIG_MACH_K3_CORTEX_R5=y
CONFIG_MACH_AM625_SK=y
CONFIG_MACH_BEAGLEPLAY=y
+# CONFIG_MACH_AM62LX_EVM is not set
# CONFIG_ARCH_K3_AUTHENTICATE_IMAGE is not set
# end of K3 boards
@@ -79,6 +81,7 @@ CONFIG_ARM_EXCEPTIONS=y
CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
CONFIG_ARCH_HAS_ZERO_PAGE=y
CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
+CONFIG_HAVE_ARCH_BOOTM_OFTREE=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_ARCH_HAS_SJLJ=y
CONFIG_HAS_DEBUG_LL=y
@@ -127,11 +130,11 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_STACK_SIZE=0x8000
CONFIG_MALLOC_SIZE=0x0
+CONFIG_SCRATCH_SIZE=0x8000
CONFIG_MALLOC_ALIGNMENT=8
# end of memory layout
# CONFIG_EXPERIMENTAL is not set
-# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
# CONFIG_MALLOC_DUMMY is not set
CONFIG_KALLSYMS=y
@@ -175,6 +178,7 @@ CONFIG_DEFAULT_COMPRESSION_NONE=y
CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
CONFIG_BTHREAD=y
+# CONFIG_TLV is not set
# CONFIG_STATE is not set
# CONFIG_BOOTCHOOSER is not set
# CONFIG_BOOT_DEFAULTS is not set
@@ -185,8 +189,9 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS=""
# OP-TEE loading
#
# CONFIG_PBL_OPTEE is not set
-CONFIG_FILETYPE_STRINGS=y
# end of OP-TEE loading
+
+CONFIG_FILETYPE_STRINGS=y
# end of General Settings
#
@@ -227,6 +232,7 @@ CONFIG_HAVE_EFI_STUB=y
#
# Drivers
#
+# CONFIG_DEEP_PROBE_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS=y
CONFIG_REGMAP_FORMATTED=y
CONFIG_REGMAP_I2C=y
@@ -463,6 +469,15 @@ CONFIG_REMOTEPROC_K3_SYSTEM_CONTROLLER=y
# 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_ECAM_GENERIC is not set
+# end of PCI bus options
+
# CONFIG_RTC_CLASS is not set
#
@@ -589,6 +604,7 @@ CONFIG_FS_FAT_LFN=y
#
# ZSTD support disabled
#
+# CONFIG_FS_QEMU_FW_CFG is not set
# end of Filesystem support
#
@@ -656,10 +672,14 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
# CONFIG_ZERO_CALL_USED_REGS is not set
# end of Memory initialization
+#
+# Buffer overflow protection
+#
CONFIG_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR_STRONG is not set
CONFIG_PBL_STACKPROTECTOR_NONE=y
# CONFIG_PBL_STACKPROTECTOR_STRONG is not set
+# end of Buffer overflow protection
# end of Hardening options
#
diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config
index 7457525..3da10e1 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 2025.06.1 Configuration
+# Barebox/arm 2025.07.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARCH_LINUX_NAME="arm64"
@@ -91,9 +91,11 @@ CONFIG_AHAB=y
#
# K3 boards
#
+CONFIG_MACH_AM62X=y
CONFIG_MACH_K3_CORTEX_A=y
CONFIG_MACH_AM625_SK=y
CONFIG_MACH_BEAGLEPLAY=y
+# CONFIG_MACH_AM62LX_EVM is not set
# CONFIG_ARCH_K3_AUTHENTICATE_IMAGE is not set
# CONFIG_ARCH_K3_COMMAND_AUTHENTICATE is not set
# end of K3 boards
@@ -123,6 +125,8 @@ CONFIG_MACH_RADXA_ROCK3=y
# select board features:
#
CONFIG_ARCH_ROCKCHIP_ATF=y
+# CONFIG_ARCH_ROCKCHIP_ATF_PASS_FDT is not set
+CONFIG_ARCH_ROCKCHIP_ATF_FDT_SIZE=0x0
# CONFIG_ARCH_ROCKCHIP_OPTEE is not set
# end of Rockchip Features
@@ -157,6 +161,7 @@ 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_ARCH_BOOTM_OFTREE=y
CONFIG_ARCH_HAS_SJLJ=y
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
@@ -221,11 +226,11 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_STACK_SIZE=0x8000
CONFIG_MALLOC_SIZE=0x0
+CONFIG_SCRATCH_SIZE=0x8000
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
@@ -255,6 +260,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
CONFIG_BOOTM_VERBOSE=y
CONFIG_BOOTM_INITRD=y
CONFIG_BOOTM_OFTREE=y
+CONFIG_BOOTM_OFTREE_FALLBACK=y
CONFIG_BOOTM_UIMAGE=y
CONFIG_BOOTM_OFTREE_UIMAGE=y
# CONFIG_BOOTM_AIMAGE is not set
@@ -296,6 +302,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
# CONFIG_BTHREAD is not set
+# CONFIG_TLV is not set
CONFIG_STATE=y
# CONFIG_STATE_CRYPTO is not set
# CONFIG_STATE_BACKWARD_COMPATIBLE is not set
@@ -304,6 +311,7 @@ CONFIG_BOOT_DEFAULTS=y
CONFIG_BAREBOX_DT_2ND=y
CONFIG_RESET_SOURCE=y
CONFIG_MACHINE_ID=y
+# CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set
# CONFIG_SYSTEMD_OF_WATCHDOG is not set
CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
@@ -311,9 +319,10 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
# OP-TEE loading
#
# CONFIG_PBL_OPTEE is not set
-CONFIG_FILETYPE_STRINGS=y
# end of OP-TEE loading
+CONFIG_FILETYPE_STRINGS=y
+
#
# Android Fastboot
#
@@ -584,10 +593,12 @@ CONFIG_NET_IFUP=y
CONFIG_NET_DHCP=y
# CONFIG_NET_SNTP is not set
CONFIG_NET_FASTBOOT=y
+# CONFIG_NET_9P is not set
#
# Drivers
#
+# CONFIG_DEEP_PROBE_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS=y
CONFIG_FEATURE_CONTROLLER=y
CONFIG_SOC_BUS=y
@@ -1135,6 +1146,7 @@ CONFIG_TI_MESSAGE_MANAGER=y
CONFIG_FS=y
CONFIG_FS_LEGACY=y
CONFIG_FS_WRITABLE=y
+CONFIG_NETFS_SUPPORT=y
#
# Some selected filesystems still use the legacy FS API.
@@ -1179,6 +1191,7 @@ CONFIG_FS_FAT_LFN=y
#
# ZSTD support disabled
#
+# CONFIG_FS_QEMU_FW_CFG is not set
# end of Filesystem support
#
@@ -1254,11 +1267,15 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
# CONFIG_ZERO_CALL_USED_REGS is not set
# end of Memory initialization
+#
+# Buffer overflow protection
+#
# 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 Buffer overflow protection
# end of Hardening options
#
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index 48235d0..c3bb5e1 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -181,10 +181,10 @@ PTXCONF_COMPILERPREFIX_R5="arm-v7a-linux-gnueabihf-"
PTXCONF_BAREBOX_ARCH_STRING="arm"
PTXCONF_BAREBOX_DEPENDENCIES=y
PTXCONF_BAREBOX=y
-PTXCONF_BAREBOX_VERSION="2025.06.1"
+PTXCONF_BAREBOX_VERSION="2025.07.0"
PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
-PTXCONF_BAREBOX_MD5="b2ba4b194894fb6c4848d260f4e849ff"
+PTXCONF_BAREBOX_MD5="043d58d05040b16d22c7879ae3c8a11b"
PTXCONF_BAREBOX_CONFIG="barebox.config"
PTXCONF_BAREBOX_FIRMWARE=y
PTXCONF_BAREBOX_EXTRA_ENV=y
--
2.39.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [DistroKit] [PATCH] v8a: barebox: version bump 2025.06.1 -> 2025.07.0
2025-07-31 15:51 [DistroKit] [PATCH] v8a: barebox: version bump 2025.06.1 -> 2025.07.0 Lars Schmidt
@ 2025-07-31 19:02 ` Robert Schwebel
2025-08-01 9:14 ` [DistroKit] [PATCH 1/3] fixup! " Lars Schmidt
1 sibling, 0 replies; 9+ messages in thread
From: Robert Schwebel @ 2025-07-31 19:02 UTC (permalink / raw)
To: Lars Schmidt; +Cc: distrokit
On Thu, Jul 31, 2025 at 05:51:29PM +0200, Lars Schmidt wrote:
> barebox v2025.05.0 introduced a regression which broke the
> FIT image booting on ARM32. That is fixed with this release
>
> Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
> ---
> configs/platform-v8a/barebox-r5.config | 26 +++++++++++++++++++++++---
> configs/platform-v8a/barebox.config | 23 ++++++++++++++++++++---
> configs/platform-v8a/platformconfig | 4 ++--
> 3 files changed, 45 insertions(+), 8 deletions(-)
Please test again, it fails with not finding the cortex-r toolchain.
> diff --git a/configs/platform-v8a/barebox-r5.config b/configs/platform-v8a/barebox-r5.config
> index 2ae6363..2ab059a 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 2025.06.1 Configuration
> +# Barebox/arm 2025.07.0 Configuration
> #
> CONFIG_ARM=y
> CONFIG_ARCH_LINUX_NAME="arm"
> @@ -47,9 +47,11 @@ CONFIG_ARMV7R_MPU=y
> #
> # K3 boards
> #
> +CONFIG_MACH_AM62X=y
> CONFIG_MACH_K3_CORTEX_R5=y
> CONFIG_MACH_AM625_SK=y
> CONFIG_MACH_BEAGLEPLAY=y
> +# CONFIG_MACH_AM62LX_EVM is not set
> # CONFIG_ARCH_K3_AUTHENTICATE_IMAGE is not set
> # end of K3 boards
>
> @@ -79,6 +81,7 @@ CONFIG_ARM_EXCEPTIONS=y
> CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
> CONFIG_ARCH_HAS_ZERO_PAGE=y
> CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y
> +CONFIG_HAVE_ARCH_BOOTM_OFTREE=y
> CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
> CONFIG_ARCH_HAS_SJLJ=y
> CONFIG_HAS_DEBUG_LL=y
> @@ -127,11 +130,11 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
> CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
> CONFIG_STACK_SIZE=0x8000
> CONFIG_MALLOC_SIZE=0x0
> +CONFIG_SCRATCH_SIZE=0x8000
> CONFIG_MALLOC_ALIGNMENT=8
> # end of memory layout
>
> # CONFIG_EXPERIMENTAL is not set
> -# CONFIG_MALLOC_DLMALLOC is not set
> CONFIG_MALLOC_TLSF=y
> # CONFIG_MALLOC_DUMMY is not set
> CONFIG_KALLSYMS=y
> @@ -175,6 +178,7 @@ CONFIG_DEFAULT_COMPRESSION_NONE=y
> CONFIG_HAS_SCHED=y
> CONFIG_POLLER=y
> CONFIG_BTHREAD=y
> +# CONFIG_TLV is not set
> # CONFIG_STATE is not set
> # CONFIG_BOOTCHOOSER is not set
> # CONFIG_BOOT_DEFAULTS is not set
> @@ -185,8 +189,9 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS=""
> # OP-TEE loading
> #
> # CONFIG_PBL_OPTEE is not set
> -CONFIG_FILETYPE_STRINGS=y
> # end of OP-TEE loading
> +
> +CONFIG_FILETYPE_STRINGS=y
> # end of General Settings
>
> #
> @@ -227,6 +232,7 @@ CONFIG_HAVE_EFI_STUB=y
> #
> # Drivers
> #
> +# CONFIG_DEEP_PROBE_DEFAULT is not set
> CONFIG_PM_GENERIC_DOMAINS=y
> CONFIG_REGMAP_FORMATTED=y
> CONFIG_REGMAP_I2C=y
> @@ -463,6 +469,15 @@ CONFIG_REMOTEPROC_K3_SYSTEM_CONTROLLER=y
> # 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_ECAM_GENERIC is not set
> +# end of PCI bus options
> +
> # CONFIG_RTC_CLASS is not set
>
> #
> @@ -589,6 +604,7 @@ CONFIG_FS_FAT_LFN=y
> #
> # ZSTD support disabled
> #
> +# CONFIG_FS_QEMU_FW_CFG is not set
> # end of Filesystem support
>
> #
> @@ -656,10 +672,14 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
> # CONFIG_ZERO_CALL_USED_REGS is not set
> # end of Memory initialization
>
> +#
> +# Buffer overflow protection
> +#
> CONFIG_STACKPROTECTOR_NONE=y
> # CONFIG_STACKPROTECTOR_STRONG is not set
> CONFIG_PBL_STACKPROTECTOR_NONE=y
> # CONFIG_PBL_STACKPROTECTOR_STRONG is not set
> +# end of Buffer overflow protection
> # end of Hardening options
>
> #
> diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config
> index 7457525..3da10e1 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 2025.06.1 Configuration
> +# Barebox/arm 2025.07.0 Configuration
> #
> CONFIG_ARM=y
> CONFIG_ARCH_LINUX_NAME="arm64"
> @@ -91,9 +91,11 @@ CONFIG_AHAB=y
> #
> # K3 boards
> #
> +CONFIG_MACH_AM62X=y
> CONFIG_MACH_K3_CORTEX_A=y
> CONFIG_MACH_AM625_SK=y
> CONFIG_MACH_BEAGLEPLAY=y
> +# CONFIG_MACH_AM62LX_EVM is not set
> # CONFIG_ARCH_K3_AUTHENTICATE_IMAGE is not set
> # CONFIG_ARCH_K3_COMMAND_AUTHENTICATE is not set
> # end of K3 boards
> @@ -123,6 +125,8 @@ CONFIG_MACH_RADXA_ROCK3=y
> # select board features:
> #
> CONFIG_ARCH_ROCKCHIP_ATF=y
> +# CONFIG_ARCH_ROCKCHIP_ATF_PASS_FDT is not set
> +CONFIG_ARCH_ROCKCHIP_ATF_FDT_SIZE=0x0
> # CONFIG_ARCH_ROCKCHIP_OPTEE is not set
> # end of Rockchip Features
>
> @@ -157,6 +161,7 @@ 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_ARCH_BOOTM_OFTREE=y
> CONFIG_ARCH_HAS_SJLJ=y
> CONFIG_PHYS_ADDR_T_64BIT=y
> CONFIG_ARCH_DMA_ADDR_T_64BIT=y
> @@ -221,11 +226,11 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
> CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
> CONFIG_STACK_SIZE=0x8000
> CONFIG_MALLOC_SIZE=0x0
> +CONFIG_SCRATCH_SIZE=0x8000
> 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
> @@ -255,6 +260,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
> CONFIG_BOOTM_VERBOSE=y
> CONFIG_BOOTM_INITRD=y
> CONFIG_BOOTM_OFTREE=y
> +CONFIG_BOOTM_OFTREE_FALLBACK=y
> CONFIG_BOOTM_UIMAGE=y
> CONFIG_BOOTM_OFTREE_UIMAGE=y
> # CONFIG_BOOTM_AIMAGE is not set
> @@ -296,6 +302,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
> CONFIG_HAS_SCHED=y
> CONFIG_POLLER=y
> # CONFIG_BTHREAD is not set
> +# CONFIG_TLV is not set
> CONFIG_STATE=y
> # CONFIG_STATE_CRYPTO is not set
> # CONFIG_STATE_BACKWARD_COMPATIBLE is not set
> @@ -304,6 +311,7 @@ CONFIG_BOOT_DEFAULTS=y
> CONFIG_BAREBOX_DT_2ND=y
> CONFIG_RESET_SOURCE=y
> CONFIG_MACHINE_ID=y
> +# CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set
> # CONFIG_SYSTEMD_OF_WATCHDOG is not set
> CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
>
> @@ -311,9 +319,10 @@ CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi"
> # OP-TEE loading
> #
> # CONFIG_PBL_OPTEE is not set
> -CONFIG_FILETYPE_STRINGS=y
> # end of OP-TEE loading
>
> +CONFIG_FILETYPE_STRINGS=y
> +
> #
> # Android Fastboot
> #
> @@ -584,10 +593,12 @@ CONFIG_NET_IFUP=y
> CONFIG_NET_DHCP=y
> # CONFIG_NET_SNTP is not set
> CONFIG_NET_FASTBOOT=y
> +# CONFIG_NET_9P is not set
>
> #
> # Drivers
> #
> +# CONFIG_DEEP_PROBE_DEFAULT is not set
> CONFIG_PM_GENERIC_DOMAINS=y
> CONFIG_FEATURE_CONTROLLER=y
> CONFIG_SOC_BUS=y
> @@ -1135,6 +1146,7 @@ CONFIG_TI_MESSAGE_MANAGER=y
> CONFIG_FS=y
> CONFIG_FS_LEGACY=y
> CONFIG_FS_WRITABLE=y
> +CONFIG_NETFS_SUPPORT=y
>
> #
> # Some selected filesystems still use the legacy FS API.
> @@ -1179,6 +1191,7 @@ CONFIG_FS_FAT_LFN=y
> #
> # ZSTD support disabled
> #
> +# CONFIG_FS_QEMU_FW_CFG is not set
> # end of Filesystem support
>
> #
> @@ -1254,11 +1267,15 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
> # CONFIG_ZERO_CALL_USED_REGS is not set
> # end of Memory initialization
>
> +#
> +# Buffer overflow protection
> +#
> # 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 Buffer overflow protection
> # end of Hardening options
>
> #
> diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
> index 48235d0..c3bb5e1 100644
> --- a/configs/platform-v8a/platformconfig
> +++ b/configs/platform-v8a/platformconfig
> @@ -181,10 +181,10 @@ PTXCONF_COMPILERPREFIX_R5="arm-v7a-linux-gnueabihf-"
> PTXCONF_BAREBOX_ARCH_STRING="arm"
> PTXCONF_BAREBOX_DEPENDENCIES=y
> PTXCONF_BAREBOX=y
> -PTXCONF_BAREBOX_VERSION="2025.06.1"
> +PTXCONF_BAREBOX_VERSION="2025.07.0"
> PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
> PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
> -PTXCONF_BAREBOX_MD5="b2ba4b194894fb6c4848d260f4e849ff"
> +PTXCONF_BAREBOX_MD5="043d58d05040b16d22c7879ae3c8a11b"
> PTXCONF_BAREBOX_CONFIG="barebox.config"
> PTXCONF_BAREBOX_FIRMWARE=y
> PTXCONF_BAREBOX_EXTRA_ENV=y
> --
> 2.39.5
>
>
>
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [DistroKit] [PATCH 1/3] fixup! v8a: barebox: version bump 2025.06.1 -> 2025.07.0
2025-07-31 15:51 [DistroKit] [PATCH] v8a: barebox: version bump 2025.06.1 -> 2025.07.0 Lars Schmidt
2025-07-31 19:02 ` Robert Schwebel
@ 2025-08-01 9:14 ` Lars Schmidt
2025-08-01 9:14 ` [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist Lars Schmidt
2025-08-01 9:14 ` [DistroKit] [PATCH 3/3] " Lars Schmidt
1 sibling, 2 replies; 9+ messages in thread
From: Lars Schmidt @ 2025-08-01 9:14 UTC (permalink / raw)
To: distrokit; +Cc: Lars Schmidt
---
The target dir for firmware files changed, so the target directory needs adaption.
configs/platform-v8a/rules/firmware-ti.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/platform-v8a/rules/firmware-ti.make b/configs/platform-v8a/rules/firmware-ti.make
index 16ff4de..9c12764 100644
--- a/configs/platform-v8a/rules/firmware-ti.make
+++ b/configs/platform-v8a/rules/firmware-ti.make
@@ -34,7 +34,7 @@ FIRMWARE_TI_FIRMWARE_FILES := \
#
ifdef PTXCONF_FIRMWARE_TI
BAREBOX_R5_INJECT_FILES += \
- $(foreach f,$(FIRMWARE_TI_FIRMWARE_FILES),ti-sysfw/$(f):firmware/$(f))
+ $(foreach f,$(FIRMWARE_TI_FIRMWARE_FILES),ti-sysfw/$(f):firmware/ti-linux-firmware/ti-sysfw/$(f))
endif
# ----------------------------------------------------------------------------
--
2.39.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist
2025-08-01 9:14 ` [DistroKit] [PATCH 1/3] fixup! " Lars Schmidt
@ 2025-08-01 9:14 ` Lars Schmidt
2025-08-01 9:29 ` Alexander Dahl
2025-08-01 9:14 ` [DistroKit] [PATCH 3/3] " Lars Schmidt
1 sibling, 1 reply; 9+ messages in thread
From: Lars Schmidt @ 2025-08-01 9:14 UTC (permalink / raw)
To: distrokit; +Cc: Lars Schmidt
This inject script just copies from source to target and
does not create the target directory. So if the target dir
does not exist yet, the injection of files is not happening.
Until a ptxdist patch is upstream, this script is copied we
will apply the patch here.
Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
---
scripts/lib/ptxd_make_world_inject.sh | 60 +++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 scripts/lib/ptxd_make_world_inject.sh
diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
new file mode 100644
index 0000000..e8e94fb
--- /dev/null
+++ b/scripts/lib/ptxd_make_world_inject.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Copyright (C) 2021 by Michael Riesch <michael.riesch@wolfvision.net>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+ptxd_make_inject() {
+ local source target
+
+ source="$(echo ${inject_file} | cut -d ":" -f 1)"
+ target="${inject_dest}/$(echo ${inject_file} | cut -d ":" -f 2)"
+
+ if [[ "${source}" =~ ^/.* ]]; then
+ ptxd_bailout "'${source}' must not be an absolute path!" \
+ "Use <PKG>_INJECT_PATH to specify the search path."
+ fi
+
+ if ! ptxd_in_path pkg_inject_path "${source}"; then
+ ptxd_bailout "Blob '${source}' not found in '${pkg_inject_path}'."
+ fi
+ source="${ptxd_reply}"
+
+ echo -e "\nInject file $(ptxd_print_path ${source}) into" \
+ "$(ptxd_print_path ${target})..."
+ cp ${source} ${target}
+}
+export -f ptxd_make_inject
+
+
+ptxd_make_world_inject() {
+ ptxd_make_world_init || return
+
+ if [ -z "${pkg_inject_oot}" ]; then
+ pkg_inject_oot=NO
+ fi
+
+ case "${pkg_inject_oot}" in
+ "YES") inject_dest="${pkg_build_dir}" ;;
+ "NO") inject_dest="${pkg_dir}" ;;
+ *) ptxd_bailout "<PKG>_INJECT_OOT: please set to YES or NO" ;;
+ esac
+
+ if [ "${pkg_build_oot:-NO}" = 'NO' ] && [ "${pkg_inject_oot}" != 'NO' ]; then
+ ptxd_warning "<PKG>_BUILD_OOT and <PKG>_INJECT_OOT contradict each other." \
+ "Using $(ptxd_print_path ${inject_dest}) as inject destination anyways."
+ fi
+
+ if [ ! -d "${inject_dest}" ]; then
+ ptxd_bailout "<PKG> inject destination dir missing." \
+ "Correct placement of world/inject depends on <PKG>_BUILD_OOT and <PKG>_INJECT_OOT." \
+ "Check order of calls in prepare stage!"
+ fi
+
+ for inject_file in ${pkg_inject_files}; do
+ ptxd_make_inject || return
+ done
+}
+export -f ptxd_make_world_inject
--
2.39.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* [DistroKit] [PATCH 3/3] scripts: create target path in ptxd_make_world_inject
2025-08-01 9:14 ` [DistroKit] [PATCH 1/3] fixup! " Lars Schmidt
2025-08-01 9:14 ` [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist Lars Schmidt
@ 2025-08-01 9:14 ` Lars Schmidt
1 sibling, 0 replies; 9+ messages in thread
From: Lars Schmidt @ 2025-08-01 9:14 UTC (permalink / raw)
To: distrokit; +Cc: Lars Schmidt
If the target path does not exist yet, the injection is not happening.
To avoid that, we create the target path in advance to copying the
files.
Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
---
scripts/lib/ptxd_make_world_inject.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
index e8e94fb..a31184d 100644
--- a/scripts/lib/ptxd_make_world_inject.sh
+++ b/scripts/lib/ptxd_make_world_inject.sh
@@ -24,6 +24,7 @@ ptxd_make_inject() {
echo -e "\nInject file $(ptxd_print_path ${source}) into" \
"$(ptxd_print_path ${target})..."
+ mkdir -p "$(dirname "${target}")"
cp ${source} ${target}
}
export -f ptxd_make_inject
--
2.39.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist
2025-08-01 9:14 ` [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist Lars Schmidt
@ 2025-08-01 9:29 ` Alexander Dahl
2025-08-01 12:01 ` [DistroKit] [PATCH 1/2] " Lars Schmidt
0 siblings, 1 reply; 9+ messages in thread
From: Alexander Dahl @ 2025-08-01 9:29 UTC (permalink / raw)
To: Lars Schmidt; +Cc: distrokit
Hello Lars,
Am Fri, Aug 01, 2025 at 11:14:55AM +0200 schrieb Lars Schmidt:
> This inject script just copies from source to target and
> does not create the target directory. So if the target dir
> does not exist yet, the injection of files is not happening.
> Until a ptxdist patch is upstream, this script is copied we
> will apply the patch here.
I assume you copied the script from ptxdist here, this is the
unmodified script, and the actual change happens in the other patch
right?
This is not reflected in this commit message, which is actually rather
confusing, at least to me.
In the past I followed the same approach when "patching" things in a
BSP before porting it back to ptxdist. It's easier like this, because
you can just apply the same patch from the BSP to ptxdist.
Would be easier to understand though if the commit message here just
states a file is copied from ptxdist version xyz, as preparation for
an upcoming change, and not describe that change in detail here
already.
Greets
Alex
>
> Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
> ---
> scripts/lib/ptxd_make_world_inject.sh | 60 +++++++++++++++++++++++++++
> 1 file changed, 60 insertions(+)
> create mode 100644 scripts/lib/ptxd_make_world_inject.sh
>
> diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
> new file mode 100644
> index 0000000..e8e94fb
> --- /dev/null
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -0,0 +1,60 @@
> +#!/bin/bash
> +#
> +# Copyright (C) 2021 by Michael Riesch <michael.riesch@wolfvision.net>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +ptxd_make_inject() {
> + local source target
> +
> + source="$(echo ${inject_file} | cut -d ":" -f 1)"
> + target="${inject_dest}/$(echo ${inject_file} | cut -d ":" -f 2)"
> +
> + if [[ "${source}" =~ ^/.* ]]; then
> + ptxd_bailout "'${source}' must not be an absolute path!" \
> + "Use <PKG>_INJECT_PATH to specify the search path."
> + fi
> +
> + if ! ptxd_in_path pkg_inject_path "${source}"; then
> + ptxd_bailout "Blob '${source}' not found in '${pkg_inject_path}'."
> + fi
> + source="${ptxd_reply}"
> +
> + echo -e "\nInject file $(ptxd_print_path ${source}) into" \
> + "$(ptxd_print_path ${target})..."
> + cp ${source} ${target}
> +}
> +export -f ptxd_make_inject
> +
> +
> +ptxd_make_world_inject() {
> + ptxd_make_world_init || return
> +
> + if [ -z "${pkg_inject_oot}" ]; then
> + pkg_inject_oot=NO
> + fi
> +
> + case "${pkg_inject_oot}" in
> + "YES") inject_dest="${pkg_build_dir}" ;;
> + "NO") inject_dest="${pkg_dir}" ;;
> + *) ptxd_bailout "<PKG>_INJECT_OOT: please set to YES or NO" ;;
> + esac
> +
> + if [ "${pkg_build_oot:-NO}" = 'NO' ] && [ "${pkg_inject_oot}" != 'NO' ]; then
> + ptxd_warning "<PKG>_BUILD_OOT and <PKG>_INJECT_OOT contradict each other." \
> + "Using $(ptxd_print_path ${inject_dest}) as inject destination anyways."
> + fi
> +
> + if [ ! -d "${inject_dest}" ]; then
> + ptxd_bailout "<PKG> inject destination dir missing." \
> + "Correct placement of world/inject depends on <PKG>_BUILD_OOT and <PKG>_INJECT_OOT." \
> + "Check order of calls in prepare stage!"
> + fi
> +
> + for inject_file in ${pkg_inject_files}; do
> + ptxd_make_inject || return
> + done
> +}
> +export -f ptxd_make_world_inject
> --
> 2.39.5
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [DistroKit] [PATCH 1/2] script: add ptxd_make_world_inject from ptxdist
2025-08-01 9:29 ` Alexander Dahl
@ 2025-08-01 12:01 ` Lars Schmidt
2025-08-01 12:01 ` [DistroKit] [PATCH 2/2] scripts: create target path in ptxd_make_world_inject Lars Schmidt
0 siblings, 1 reply; 9+ messages in thread
From: Lars Schmidt @ 2025-08-01 12:01 UTC (permalink / raw)
To: distrokit; +Cc: Lars Schmidt
Copy the script from ptxdist v2025.07.0 as preparation for
upcoming changes.
Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
---
scripts/lib/ptxd_make_world_inject.sh | 60 +++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 scripts/lib/ptxd_make_world_inject.sh
diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
new file mode 100644
index 0000000..e8e94fb
--- /dev/null
+++ b/scripts/lib/ptxd_make_world_inject.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Copyright (C) 2021 by Michael Riesch <michael.riesch@wolfvision.net>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+ptxd_make_inject() {
+ local source target
+
+ source="$(echo ${inject_file} | cut -d ":" -f 1)"
+ target="${inject_dest}/$(echo ${inject_file} | cut -d ":" -f 2)"
+
+ if [[ "${source}" =~ ^/.* ]]; then
+ ptxd_bailout "'${source}' must not be an absolute path!" \
+ "Use <PKG>_INJECT_PATH to specify the search path."
+ fi
+
+ if ! ptxd_in_path pkg_inject_path "${source}"; then
+ ptxd_bailout "Blob '${source}' not found in '${pkg_inject_path}'."
+ fi
+ source="${ptxd_reply}"
+
+ echo -e "\nInject file $(ptxd_print_path ${source}) into" \
+ "$(ptxd_print_path ${target})..."
+ cp ${source} ${target}
+}
+export -f ptxd_make_inject
+
+
+ptxd_make_world_inject() {
+ ptxd_make_world_init || return
+
+ if [ -z "${pkg_inject_oot}" ]; then
+ pkg_inject_oot=NO
+ fi
+
+ case "${pkg_inject_oot}" in
+ "YES") inject_dest="${pkg_build_dir}" ;;
+ "NO") inject_dest="${pkg_dir}" ;;
+ *) ptxd_bailout "<PKG>_INJECT_OOT: please set to YES or NO" ;;
+ esac
+
+ if [ "${pkg_build_oot:-NO}" = 'NO' ] && [ "${pkg_inject_oot}" != 'NO' ]; then
+ ptxd_warning "<PKG>_BUILD_OOT and <PKG>_INJECT_OOT contradict each other." \
+ "Using $(ptxd_print_path ${inject_dest}) as inject destination anyways."
+ fi
+
+ if [ ! -d "${inject_dest}" ]; then
+ ptxd_bailout "<PKG> inject destination dir missing." \
+ "Correct placement of world/inject depends on <PKG>_BUILD_OOT and <PKG>_INJECT_OOT." \
+ "Check order of calls in prepare stage!"
+ fi
+
+ for inject_file in ${pkg_inject_files}; do
+ ptxd_make_inject || return
+ done
+}
+export -f ptxd_make_world_inject
--
2.39.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* [DistroKit] [PATCH 2/2] scripts: create target path in ptxd_make_world_inject
2025-08-01 12:01 ` [DistroKit] [PATCH 1/2] " Lars Schmidt
@ 2025-08-01 12:01 ` Lars Schmidt
2025-08-02 5:38 ` Robert Schwebel
0 siblings, 1 reply; 9+ messages in thread
From: Lars Schmidt @ 2025-08-01 12:01 UTC (permalink / raw)
To: distrokit; +Cc: Lars Schmidt
If the target path does not exist, the files are not copied.
To avoid that, create the target path in advance to copying the files.
Patch copied from ptxdist, see [1].
[1]: https://lore.ptxdist.org/ptxdist/20250801092153.610071-1-l.schmidt@pengutronix.de/
Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
---
scripts/lib/ptxd_make_world_inject.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
index e8e94fb..a31184d 100644
--- a/scripts/lib/ptxd_make_world_inject.sh
+++ b/scripts/lib/ptxd_make_world_inject.sh
@@ -24,6 +24,7 @@ ptxd_make_inject() {
echo -e "\nInject file $(ptxd_print_path ${source}) into" \
"$(ptxd_print_path ${target})..."
+ mkdir -p "$(dirname "${target}")"
cp ${source} ${target}
}
export -f ptxd_make_inject
--
2.39.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [DistroKit] [PATCH 2/2] scripts: create target path in ptxd_make_world_inject
2025-08-01 12:01 ` [DistroKit] [PATCH 2/2] scripts: create target path in ptxd_make_world_inject Lars Schmidt
@ 2025-08-02 5:38 ` Robert Schwebel
0 siblings, 0 replies; 9+ messages in thread
From: Robert Schwebel @ 2025-08-02 5:38 UTC (permalink / raw)
To: Lars Schmidt; +Cc: distrokit
Applied this variant to next.
On Fri, Aug 01, 2025 at 02:01:32PM +0200, Lars Schmidt wrote:
> If the target path does not exist, the files are not copied.
> To avoid that, create the target path in advance to copying the files.
> Patch copied from ptxdist, see [1].
>
> [1]: https://lore.ptxdist.org/ptxdist/20250801092153.610071-1-l.schmidt@pengutronix.de/
>
> Signed-off-by: Lars Schmidt <l.schmidt@pengutronix.de>
> ---
> scripts/lib/ptxd_make_world_inject.sh | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
> index e8e94fb..a31184d 100644
> --- a/scripts/lib/ptxd_make_world_inject.sh
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -24,6 +24,7 @@ ptxd_make_inject() {
>
> echo -e "\nInject file $(ptxd_print_path ${source}) into" \
> "$(ptxd_print_path ${target})..."
> + mkdir -p "$(dirname "${target}")"
> cp ${source} ${target}
> }
> export -f ptxd_make_inject
> --
> 2.39.5
>
>
>
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-08-02 5:38 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-31 15:51 [DistroKit] [PATCH] v8a: barebox: version bump 2025.06.1 -> 2025.07.0 Lars Schmidt
2025-07-31 19:02 ` Robert Schwebel
2025-08-01 9:14 ` [DistroKit] [PATCH 1/3] fixup! " Lars Schmidt
2025-08-01 9:14 ` [DistroKit] [PATCH 2/3] script: add ptxd_make_world_inject from ptxdist Lars Schmidt
2025-08-01 9:29 ` Alexander Dahl
2025-08-01 12:01 ` [DistroKit] [PATCH 1/2] " Lars Schmidt
2025-08-01 12:01 ` [DistroKit] [PATCH 2/2] scripts: create target path in ptxd_make_world_inject Lars Schmidt
2025-08-02 5:38 ` Robert Schwebel
2025-08-01 9:14 ` [DistroKit] [PATCH 3/3] " Lars Schmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox