* [DistroKit] [PATCH 1/6] v8a: barebox: disable RATP support
@ 2024-01-02 15:45 Ahmad Fatoum
2024-01-02 15:45 ` [DistroKit] [PATCH 2/6] v8a: barebox: disable unnecessary commands Ahmad Fatoum
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2024-01-02 15:45 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
barebox supports Ethernet and USB OTG in host and device mode on the
Rockchip and i.MX boards, so there's little use if any for RATP.
Disable it and reclaim the space.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
configs/platform-v8a/barebox.config | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config
index e1f3a2bf39b9..ce1ae5a1dea7 100644
--- a/configs/platform-v8a/barebox.config
+++ b/configs/platform-v8a/barebox.config
@@ -211,9 +211,7 @@ CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_CONSOLE_DISABLE_INPUT is not set
CONFIG_PBL_CONSOLE=y
-CONFIG_CONSOLE_RATP=y
-# CONFIG_RATP_CMD_I2C is not set
-# CONFIG_RATP_CMD_GPIO is not set
+# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
@@ -1011,7 +1009,6 @@ CONFIG_FS_FAT_LFN=y
#
# ZSTD support disabled
#
-CONFIG_FS_RATP=y
# end of Filesystem support
#
@@ -1031,7 +1028,7 @@ CONFIG_LZO_DECOMPRESS=y
CONFIG_FNMATCH=y
CONFIG_QSORT=y
CONFIG_IMAGE_SPARSE=y
-CONFIG_RATP=y
+# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
CONFIG_CRC_CCITT=y
# CONFIG_CRC8 is not set
@@ -1053,7 +1050,6 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
# Crypto support
#
CONFIG_CRC32=y
-CONFIG_CRC_ITU_T=y
CONFIG_DIGEST=y
CONFIG_HAVE_DIGEST_MD5=y
CONFIG_HAVE_DIGEST_SHA1=y
--
2.39.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [DistroKit] [PATCH 2/6] v8a: barebox: disable unnecessary commands 2024-01-02 15:45 [DistroKit] [PATCH 1/6] v8a: barebox: disable RATP support Ahmad Fatoum @ 2024-01-02 15:45 ` Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 3/6] v8a: barebox: disable RAVE SP coprocessor support Ahmad Fatoum ` (3 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Ahmad Fatoum @ 2024-01-02 15:45 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum - We don't boot uImages anymore - We can reinstate the default environment using saveenv -z - We have a TFTP file system and don't need an extra tftp command - PSCI communication can be tested with reset -r psci and doesn't need a dedicated command Therefore disable all this commands, as replacements for their functionality are already enabled. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v8a/barebox.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config index ce1ae5a1dea7..a6ac7e8fc687 100644 --- a/configs/platform-v8a/barebox.config +++ b/configs/platform-v8a/barebox.config @@ -326,7 +326,7 @@ CONFIG_CMD_GO=y # CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADY is not set CONFIG_CMD_RESET=y -CONFIG_CMD_UIMAGE=y +# CONFIG_CMD_UIMAGE is not set CONFIG_CMD_BOOTCHOOSER=y # end of Boot @@ -344,7 +344,7 @@ CONFIG_CMD_UMOUNT=y # CONFIG_CMD_NV=y CONFIG_CMD_EXPORT=y -CONFIG_CMD_DEFAULTENV=y +# CONFIG_CMD_DEFAULTENV is not set CONFIG_CMD_GLOBAL=y CONFIG_CMD_LOADENV=y CONFIG_CMD_PRINTENV=y @@ -403,7 +403,7 @@ CONFIG_CMD_HOST=y CONFIG_NET_CMD_IFUP=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_PING=y -CONFIG_CMD_TFTP=y +# CONFIG_CMD_TFTP is not set CONFIG_CMD_IP_ROUTE_GET=y # CONFIG_CMD_ETHLOG is not set # end of Network @@ -450,7 +450,7 @@ CONFIG_CMD_HWMON=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_POWEROFF=y -CONFIG_CMD_SMC=y +# CONFIG_CMD_SMC is not set CONFIG_CMD_SPI=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_USB=y -- 2.39.2 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [DistroKit] [PATCH 3/6] v8a: barebox: disable RAVE SP coprocessor support 2024-01-02 15:45 [DistroKit] [PATCH 1/6] v8a: barebox: disable RATP support Ahmad Fatoum 2024-01-02 15:45 ` [DistroKit] [PATCH 2/6] v8a: barebox: disable unnecessary commands Ahmad Fatoum @ 2024-01-02 15:46 ` Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 4/6] v8a: barebox: version bump v2023.09.0 -> v2023.12.0 Ahmad Fatoum ` (2 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Ahmad Fatoum @ 2024-01-02 15:46 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum The RAVE SP is a board management controller connected over serial link. We have no boards that have this controller built-in, so there's no need to include its driver. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v8a/barebox.config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config index a6ac7e8fc687..fef9397c784c 100644 --- a/configs/platform-v8a/barebox.config +++ b/configs/platform-v8a/barebox.config @@ -745,7 +745,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y CONFIG_MFD_SYSCON=y # CONFIG_MFD_TWL4030 is not set # CONFIG_MFD_TWL6030 is not set -CONFIG_RAVE_SP_CORE=y +# CONFIG_RAVE_SP_CORE is not set # CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_RN568PMIC is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set @@ -795,7 +795,6 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_POLLER is not set CONFIG_WATCHDOG_DW=y CONFIG_WATCHDOG_IMX=y -CONFIG_RAVE_SP_WATCHDOG=y # CONFIG_GPIO_WATCHDOG is not set # CONFIG_PWM is not set # CONFIG_HWRNG is not set @@ -840,7 +839,6 @@ CONFIG_NVMEM=y # CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_IMX_OCOTP=y # CONFIG_IMX_OCOTP_WRITE is not set -CONFIG_RAVE_SP_EEPROM=y # CONFIG_EEPROM_93XX46 is not set # -- 2.39.2 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [DistroKit] [PATCH 4/6] v8a: barebox: version bump v2023.09.0 -> v2023.12.0 2024-01-02 15:45 [DistroKit] [PATCH 1/6] v8a: barebox: disable RATP support Ahmad Fatoum 2024-01-02 15:45 ` [DistroKit] [PATCH 2/6] v8a: barebox: disable unnecessary commands Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 3/6] v8a: barebox: disable RAVE SP coprocessor support Ahmad Fatoum @ 2024-01-02 15:46 ` Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 5/6] v7a: update barebox to " Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 6/6] v8a: barebox: enable support for booting FIT images Ahmad Fatoum 4 siblings, 0 replies; 7+ messages in thread From: Ahmad Fatoum @ 2024-01-02 15:46 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum There's not much new features relevant to our v8a platform in this version bump, but there are a number of bug fixes, that may be relevant, like improved support for HAB on i.MX8M and reworked regulator initialization. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v8a/barebox.config | 40 +++++++++++++++++++++++++---- configs/platform-v8a/platformconfig | 4 +-- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config index fef9397c784c..f90264d489b3 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 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -15,6 +15,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_ARM64_VIRT is not set # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_IMX=y +# CONFIG_ARCH_K3 is not set CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_ZYNQMP is not set @@ -32,6 +33,9 @@ CONFIG_CPU_64v8=y # CONFIG_BOOT_ENDIANNESS_SWITCH is not set CONFIG_ARCH_TEXT_BASE=0x0 CONFIG_ARCH_IMX_IMXIMAGE=y +CONFIG_USB_GADGET_DRIVER_ARC_PBL=y +CONFIG_ARCH_IMX_ATF=y +CONFIG_ARCH_IMX_ROMAPI=y # # i.MX boards @@ -51,6 +55,7 @@ CONFIG_MACH_NXP_IMX8MM_EVK=y CONFIG_MACH_NXP_IMX8MN_EVK=y CONFIG_MACH_NXP_IMX8MP_EVK=y CONFIG_MACH_NXP_IMX8MQ_EVK=y +# CONFIG_MACH_PHYTEC_SOM_IMX8MM is not set CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y # CONFIG_MACH_POLYHEX_DEBIX is not set # CONFIG_MACH_PROTONIC_IMX8M is not set @@ -58,6 +63,11 @@ CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y # CONFIG_MACH_TQ_MBA8MPXL is not set # CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP is not set # CONFIG_MACH_ZII_IMX8MQ_DEV is not set + +# +# i.MX93 boards +# +# CONFIG_MACH_TQ_MBA9XXXCA is not set # end of i.MX boards # @@ -161,6 +171,7 @@ 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 @@ -184,7 +195,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_PASSWORD is not set -CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -504,6 +514,7 @@ CONFIG_REGMAP_I2C=y CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y +CONFIG_OF=y CONFIG_OFDEVICE=y CONFIG_FEATURE_CONTROLLER_FIXUP=y CONFIG_OF_GPIO=y @@ -524,6 +535,7 @@ CONFIG_SERIAL_DEV_BUS=y CONFIG_DRIVER_SERIAL_IMX=y CONFIG_DRIVER_SERIAL_NS16550=y # CONFIG_DRIVER_SERIAL_CADENCE is not set +# CONFIG_DRIVER_SERIAL_LPUART32 is not set # CONFIG_SERIAL_SIFIVE is not set # end of serial drivers @@ -605,6 +617,7 @@ CONFIG_I2C=y # # CONFIG_I2C_GPIO is not set 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_RK3X=y @@ -678,7 +691,6 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_ONBOARD_HUB is not set # CONFIG_TYPEC_TUSB320 is not set CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DRIVER_ARC_PBL=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_GADGET_DRIVER_ARC=y CONFIG_USB_GADGET_AUTOSTART=y @@ -715,6 +727,7 @@ CONFIG_MCI_ROCKCHIP_DWCMSHC=y CONFIG_MCI_IMX_ESDHC=y # CONFIG_MCI_IMX_ESDHC_PIO is not set CONFIG_MCI_ARASAN=y +# CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set CONFIG_MCI_IMX_ESDHC_PBL=y CONFIG_HAVE_CLK=y @@ -747,6 +760,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_TWL6030 is not set # CONFIG_RAVE_SP_CORE 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=y @@ -795,7 +809,9 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_POLLER is not set CONFIG_WATCHDOG_DW=y CONFIG_WATCHDOG_IMX=y +# CONFIG_WATCHDOG_IMXULP is not set # CONFIG_GPIO_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set # CONFIG_PWM is not set # CONFIG_HWRNG is not set @@ -840,6 +856,7 @@ CONFIG_NVMEM=y CONFIG_IMX_OCOTP=y # CONFIG_IMX_OCOTP_WRITE is not set # CONFIG_EEPROM_93XX46 is not set +CONFIG_NVMEM_ROCKCHIP_OTP=y # # Bus devices @@ -943,10 +960,12 @@ CONFIG_IMX8M_FEATCTRL=y # end of NVME Support # -# i.MX8M DDR controllers +# i.MX DDR controllers # +CONFIG_IMX_DRAM=y CONFIG_IMX8M_DRAM=y -# end of i.MX8M DDR controllers +# CONFIG_IMX9_DRAM is not set +# end of i.MX DDR controllers CONFIG_REBOOT_MODE=y CONFIG_SYSCON_REBOOT_MODE=y @@ -956,6 +975,7 @@ CONFIG_SYSCON_REBOOT_MODE=y # 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 # end of Drivers # @@ -1044,6 +1064,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines +# +# Hardening options +# +# 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 # diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig index cfbaea98a2bc..b71b361952ae 100644 --- a/configs/platform-v8a/platformconfig +++ b/configs/platform-v8a/platformconfig @@ -180,10 +180,10 @@ PTXCONF_CONSOLE_SPEED="115200" PTXCONF_BAREBOX_ARCH_STRING="arm" PTXCONF_BAREBOX_DEPENDENCIES=y PTXCONF_BAREBOX=y -PTXCONF_BAREBOX_VERSION="2023.09.0" +PTXCONF_BAREBOX_VERSION="2023.12.0" PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}" -PTXCONF_BAREBOX_MD5="a605929ca1d8295fc43b5e1f309152c9" +PTXCONF_BAREBOX_MD5="e1513be5a2995203b75ac45043eac6d0" PTXCONF_BAREBOX_CONFIG="barebox.config" PTXCONF_BAREBOX_FIRMWARE=y PTXCONF_BAREBOX_EXTRA_ENV=y -- 2.39.2 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [DistroKit] [PATCH 5/6] v7a: update barebox to v2023.09.0 -> v2023.12.0 2024-01-02 15:45 [DistroKit] [PATCH 1/6] v8a: barebox: disable RATP support Ahmad Fatoum ` (2 preceding siblings ...) 2024-01-02 15:46 ` [DistroKit] [PATCH 4/6] v8a: barebox: version bump v2023.09.0 -> v2023.12.0 Ahmad Fatoum @ 2024-01-02 15:46 ` Ahmad Fatoum 2024-01-02 21:31 ` Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 6/6] v8a: barebox: enable support for booting FIT images Ahmad Fatoum 4 siblings, 1 reply; 7+ messages in thread From: Ahmad Fatoum @ 2024-01-02 15:46 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum This lets us drop two patches that fixed issues with v2023.09.0. This update also enables some options that are useful for the hardware we support: - on STM32MP1, support for the NAND controller is enabled - on platforms with HWRNG, we enable it for use with stack protector and stack guard mechanisms to harden barebox against stack overflows The latter could be enabled universally for all platforms that are no size constrained, but it prints an ugly error message if there's no HWRNG as using the fixed fallback canary is insecure. We'll just postpone enabling stack protector there until there is HWRNG support for these platforms. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- .../platform-v7a/barebox-am335x-mlo.config | 17 ++- configs/platform-v7a/barebox-am335x.config | 20 ++- .../platform-v7a/barebox-am335x.config.diff | 2 +- configs/platform-v7a/barebox-at91.config | 20 ++- configs/platform-v7a/barebox-at91.config.diff | 4 +- configs/platform-v7a/barebox-mx6.config | 25 +++- configs/platform-v7a/barebox-mx6.config.diff | 10 +- configs/platform-v7a/barebox-rpi2.config | 20 ++- configs/platform-v7a/barebox-rpi2.config.diff | 2 +- configs/platform-v7a/barebox-stm32mp.config | 26 +++- .../platform-v7a/barebox-stm32mp.config.diff | 12 +- configs/platform-v7a/barebox-vexpress.config | 20 ++- .../platform-v7a/barebox-vexpress.config.diff | 2 +- configs/platform-v7a/barebox.config | 20 ++- ...roc-stm32-fix-typo-in-Kconfig-symbol.patch | 26 ---- ...-fix-breakage-after-DT-sync-with-ups.patch | 135 ------------------ .../patches/barebox-2023.09.0/series | 5 - configs/platform-v7a/platformconfig | 4 +- 18 files changed, 179 insertions(+), 191 deletions(-) delete mode 100644 configs/platform-v7a/patches/barebox-2023.09.0/0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch delete mode 100644 configs/platform-v7a/patches/barebox-2023.09.0/0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch delete mode 100644 configs/platform-v7a/patches/barebox-2023.09.0/series diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index 4eaae17bfe8a..b652d28850c1 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 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -126,6 +126,7 @@ 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 @@ -211,6 +212,7 @@ CONFIG_HAS_DEBUG_LL=y CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y +CONFIG_OF=y CONFIG_OFDEVICE=y CONFIG_OF_GPIO=y # CONFIG_OF_OVERLAY is not set @@ -308,6 +310,7 @@ CONFIG_MCI=y # CONFIG_MCI_ROCKCHIP_DWCMSHC is not set CONFIG_MCI_OMAP_HSMMC=y # CONFIG_MCI_ARASAN is not set +# CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set # @@ -454,6 +457,7 @@ CONFIG_TI_SYSC=y # 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 # end of Drivers # @@ -518,6 +522,7 @@ 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_LZO_DECOMPRESS=y CONFIG_XYMODEM=y @@ -537,6 +542,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines +# +# Hardening options +# +# 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 # diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index a85bbe294886..54453aedf649 100644 --- a/configs/platform-v7a/barebox-am335x.config +++ b/configs/platform-v7a/barebox-am335x.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -144,6 +144,7 @@ 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 @@ -168,7 +169,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_PASSWORD is not set -CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y # CONFIG_TIMESTAMP is not set CONFIG_BOOTM=y @@ -479,6 +479,7 @@ CONFIG_NET_FASTBOOT=y 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 @@ -677,6 +678,7 @@ CONFIG_MCI_WRITE=y CONFIG_MCI_OMAP_HSMMC=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 # @@ -703,6 +705,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y # 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 @@ -750,6 +753,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_DW is not set CONFIG_WATCHDOG_OMAP=y # CONFIG_GPIO_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set # CONFIG_PWM is not set CONFIG_HWRNG=y @@ -861,6 +865,7 @@ CONFIG_REGULATOR_FIXED=y # 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 # end of Drivers # @@ -930,6 +935,7 @@ 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 @@ -955,6 +961,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines +# +# Hardening options +# +# 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 # diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index 273b6c346982..7354b58a06c7 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -ec05109bb691f36043a0a4f1bf9c20ad +53d21fb44946357f79471694e33102cc # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index 389599629374..eac526659940 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 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -64,6 +64,7 @@ CONFIG_ARCH_TEXT_BASE=0x23f00000 # Atmel AT91 System-on-Chip # CONFIG_AT91_MULTI_BOARDS=y +# CONFIG_MACH_CALAO is not set # CONFIG_MACH_SKOV_ARM9CPU is not set # CONFIG_MACH_AT91SAM9263EK is not set # CONFIG_MACH_AT91SAM9X5EK is not set @@ -151,6 +152,7 @@ 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 @@ -175,7 +177,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_PASSWORD is not set -CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -491,6 +492,7 @@ CONFIG_NET_FASTBOOT=y 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 @@ -677,6 +679,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_ATMEL=y CONFIG_MCI_ATMEL_SDHCI=y # CONFIG_MCI_ARASAN is not set +# CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set CONFIG_MCI_ATMEL_SDHCI_PBL=y CONFIG_HAVE_CLK=y @@ -709,6 +712,7 @@ CONFIG_MFD_SYSCON=y # 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=y # CONFIG_MFD_RK808 is not set @@ -756,6 +760,7 @@ CONFIG_WATCHDOG=y CONFIG_WATCHDOG_AT91SAM9=y # CONFIG_WATCHDOG_DW is not set # CONFIG_GPIO_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set # CONFIG_PWM is not set # CONFIG_HWRNG is not set @@ -867,6 +872,7 @@ CONFIG_ATMEL_EBI=y # 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 # end of Drivers # @@ -962,6 +968,16 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y CONFIG_GENERIC_ALLOCATOR=y # end of Library routines +# +# Hardening options +# +# 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 # diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index 8b093ab0fdaf..b2e86af201b5 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -ec05109bb691f36043a0a4f1bf9c20ad +53d21fb44946357f79471694e33102cc CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined @@ -75,6 +75,7 @@ CONFIG_LIBSCAN=y CONFIG_LIBUBIGEN=y # CONFIG_MACH_AT91SAM9263EK is not set # CONFIG_MACH_AT91SAM9X5EK is not set +# CONFIG_MACH_CALAO is not set # CONFIG_MACH_MICROCHIP_KSZ9477_EVB is not set # CONFIG_MACH_MICROCHIP_SAMA5D3_EDS is not set # CONFIG_MACH_RPI2 is undefined @@ -166,6 +167,7 @@ CONFIG_WATCHDOG_AT91SAM9=y # CONFIG_WATCHDOG_BCM2835 is undefined CONFIG_XXHASH=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 diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 49b0c0fb31dc..a82d1d5511c1 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 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -235,6 +235,7 @@ 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 @@ -259,7 +260,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_PASSWORD is not set -CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -560,6 +560,7 @@ 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 @@ -578,6 +579,7 @@ CONFIG_NET_FASTBOOT=y 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 @@ -596,6 +598,7 @@ CONFIG_ARM_AMBA=y 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 @@ -673,6 +676,7 @@ CONFIG_I2C_ALGOBIT=y # 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 @@ -815,6 +819,7 @@ 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 @@ -847,6 +852,7 @@ CONFIG_MFD_SYSCON=y # 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 @@ -897,7 +903,9 @@ 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_HWRNG is not set @@ -1028,6 +1036,7 @@ CONFIG_USB_NOP_XCEIV=y # 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 # end of Drivers # @@ -1102,6 +1111,7 @@ 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 @@ -1138,6 +1148,17 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines +# +# Hardening options +# +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 # diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index cc7d235ee68b..19fa32bff76b 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -ec05109bb691f36043a0a4f1bf9c20ad +53d21fb44946357f79471694e33102cc # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -34,6 +34,7 @@ CONFIG_CMD_NAND=y # CONFIG_CMD_PWM is not set # CONFIG_CMD_SMC is undefined CONFIG_CMD_SPLASH=y +# CONFIG_CMD_STACKSMASH is not set CONFIG_CMD_UBI=y CONFIG_CMD_UBIFORMAT=y # CONFIG_CONSOLE_ACTIVATE_FIRST is not set @@ -51,6 +52,7 @@ 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 @@ -84,6 +86,7 @@ CONFIG_HAVE_DIGEST_HMAC=y CONFIG_HW_HAS_PCI=y # 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 @@ -218,6 +221,10 @@ CONFIG_RESET_IMX_SRC=y # CONFIG_SPI_CADENCE_QUADSPI is not set CONFIG_SPI_MEM=y # CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set +CONFIG_STACKPROTECTOR=y +# CONFIG_STACKPROTECTOR_NONE is not set +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_STACK_GUARD_PAGE=y CONFIG_STMP_DEVICE=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_THUMB2_BAREBOX=y @@ -236,6 +243,7 @@ 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-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index f72910d5d75a..252c11544fed 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 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -137,6 +137,7 @@ 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 @@ -161,7 +162,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_PASSWORD is not set -CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -469,6 +469,7 @@ CONFIG_NET_FASTBOOT=y 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 @@ -652,6 +653,7 @@ 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 @@ -683,6 +685,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y # 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 @@ -730,6 +733,7 @@ CONFIG_WATCHDOG=y # 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 @@ -843,6 +847,7 @@ CONFIG_USB_NOP_XCEIV=y # 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 # end of Drivers # @@ -912,6 +917,7 @@ 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 @@ -937,6 +943,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines +# +# Hardening options +# +# 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 # diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index b26e7a4f56a0..996186382782 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -ec05109bb691f36043a0a4f1bf9c20ad +53d21fb44946357f79471694e33102cc CONFIG_ARM_ASM_UNIFIED=y # CONFIG_CMD_NVMEM is not set CONFIG_DRIVER_NET_BCMGENET=y diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index 76f051a68bb1..7bbae9cc0f88 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 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -133,6 +133,7 @@ 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 @@ -157,7 +158,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_PASSWORD is not set -CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -447,6 +447,7 @@ 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 @@ -467,6 +468,7 @@ 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_BAREBOX_DRIVERS=y @@ -618,6 +620,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y # 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 @@ -649,6 +652,7 @@ CONFIG_MFD_SYSCON=y # 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 @@ -698,9 +702,11 @@ CONFIG_WATCHDOG_POLLER=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_STM32=y -# CONFIG_HWRNG is not set +CONFIG_HWRNG=y +CONFIG_HWRNG_STM32=y # # DMA support @@ -760,6 +766,7 @@ CONFIG_STM32_REMOTEPROC=y CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_SIMPLE=y # CONFIG_RESET_IMX7 is not set # CONFIG_RTC_CLASS is not set @@ -789,6 +796,7 @@ CONFIG_PHY_STM32_USBPHYC=y # # Memory controller drivers # +CONFIG_STM32_FMC2_EBI=y # end of Memory controller drivers # @@ -819,6 +827,7 @@ CONFIG_PHY_STM32_USBPHYC=y # CONFIG_POWER_RESET_GPIO_RESTART is not set CONFIG_RESET_STM32=y # CONFIG_VIRTIO_MENU is not set +# CONFIG_MAILBOX is not set # end of Drivers # @@ -905,6 +914,17 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines +# +# Hardening options +# +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 # diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index f1511064ff62..1d495508c4b0 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -ec05109bb691f36043a0a4f1bf9c20ad +53d21fb44946357f79471694e33102cc # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_NR_GPIO=416 @@ -29,6 +29,7 @@ CONFIG_CMD_MMC_EXTCSD=y CONFIG_CMD_POWEROFF=y # CONFIG_CMD_PWM is not set # CONFIG_CMD_SPI is undefined +# CONFIG_CMD_STACKSMASH is not set CONFIG_COMPILE_LOGLEVEL=6 # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_NONE=y @@ -50,7 +51,7 @@ CONFIG_EEPROM_AT24=y CONFIG_GENERIC_PHY=y # CONFIG_GPIO_74164 is undefined # CONFIG_GPIO_RASPBERRYPI_EXP is undefined -# CONFIG_HWRNG is not set +CONFIG_HWRNG_STM32=y # CONFIG_I2C_ALGOBIT is undefined # CONFIG_I2C_BCM283X is undefined # CONFIG_I2C_GPIO is not set @@ -128,11 +129,17 @@ CONFIG_REGULATOR_STPMIC1=y CONFIG_REMOTEPROC=y CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_IMX7 is not set +CONFIG_RESET_SIMPLE=y CONFIG_RESET_STM32=y # CONFIG_SPI is not set # 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_WRITE=y +CONFIG_STM32_FMC2_EBI=y CONFIG_STM32_IMAGE=y CONFIG_STM32_IWDG_WATCHDOG=y CONFIG_STM32_REMOTEPROC=y @@ -151,6 +158,7 @@ CONFIG_USB_OTGDEV=y # 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 diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index baf5420ed58f..3b9ab3a0d1fc 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 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -120,6 +120,7 @@ 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 @@ -144,7 +145,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_PASSWORD is not set -CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -451,6 +451,7 @@ CONFIG_NET_FASTBOOT=y 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 @@ -631,6 +632,7 @@ CONFIG_MCI_WRITE=y # 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 @@ -662,6 +664,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y # 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 @@ -700,6 +703,7 @@ CONFIG_LED_TRIGGERS=y 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 @@ -782,6 +786,7 @@ CONFIG_REGULATOR=y # 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 # end of Drivers # @@ -851,6 +856,7 @@ 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 @@ -876,6 +882,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines +# +# Hardening options +# +# 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 # diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 5baaca56eb7b..973db9d3b772 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -ec05109bb691f36043a0a4f1bf9c20ad +53d21fb44946357f79471694e33102cc 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 70e4c1de3970..91288607f3cc 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 2023.09.0 Configuration +# Barebox/arm 2023.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -136,6 +136,7 @@ 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 @@ -160,7 +161,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y # CONFIG_PASSWORD is not set -CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -468,6 +468,7 @@ CONFIG_NET_FASTBOOT=y 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 @@ -649,6 +650,7 @@ CONFIG_MCI_WRITE=y # CONFIG_MCI_BCM283X_SDHOST 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 @@ -680,6 +682,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y # 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 @@ -727,6 +730,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_DW is not set # CONFIG_WATCHDOG_BCM2835 is not set # CONFIG_GPIO_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set # CONFIG_PWM is not set CONFIG_HWRNG=y @@ -834,6 +838,7 @@ CONFIG_REGULATOR_BCM283X=y # 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 # end of Drivers # @@ -903,6 +908,7 @@ 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 @@ -928,6 +934,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines +# +# Hardening options +# +# 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 # diff --git a/configs/platform-v7a/patches/barebox-2023.09.0/0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch b/configs/platform-v7a/patches/barebox-2023.09.0/0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch deleted file mode 100644 index acb5ba3c4a80..000000000000 --- a/configs/platform-v7a/patches/barebox-2023.09.0/0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Ahmad Fatoum <a.fatoum@pengutronix.de> -Date: Fri, 20 Oct 2023 15:37:43 +0200 -Subject: [PATCH] remoteproc: stm32: fix typo in Kconfig symbol - -The Kconfig symbol for enabling support for the ARM Secure Monitor Call -Calling Convention if CONFIG_ARM_SMCCC and not CONFIG_ARM_SMCC, but the -latter is checked with IS_ENABLED() in the driver. Fix the typo. - -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> ---- - drivers/remoteproc/stm32_rproc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c -index b6a62634842f..b2282f2fac5b 100644 ---- a/drivers/remoteproc/stm32_rproc.c -+++ b/drivers/remoteproc/stm32_rproc.c -@@ -56,7 +56,7 @@ static int stm32_rproc_set_hold_boot(struct rproc *rproc, bool hold) - - val = hold ? HOLD_BOOT : RELEASE_BOOT; - -- if (IS_ENABLED(CONFIG_ARM_SMCC) && ddata->secured_soc) { -+ if (IS_ENABLED(CONFIG_ARM_SMCCC) && ddata->secured_soc) { - arm_smccc_smc(STM32_SMC_RCC, STM32_SMC_REG_WRITE, - hold_boot->reg, val, 0, 0, 0, 0, &smc_res); - err = smc_res.a0; diff --git a/configs/platform-v7a/patches/barebox-2023.09.0/0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch b/configs/platform-v7a/patches/barebox-2023.09.0/0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch deleted file mode 100644 index 8d932859c324..000000000000 --- a/configs/platform-v7a/patches/barebox-2023.09.0/0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch +++ /dev/null @@ -1,135 +0,0 @@ -From: Ahmad Fatoum <a.fatoum@pengutronix.de> -Date: Fri, 20 Oct 2023 15:37:44 +0200 -Subject: [PATCH] remoteproc: stm32: fix breakage after DT sync with upstream - -Once more, a device tree sync with Linux breaks a barebox driver. - -This time, the STM32 remoteproc driver ported from Linux was broken by -the upstream stm32mp151.dtsi removing the st,syscfg-tz property. - -This property is only needed for the SiP secure monitor call case, -but was so far always specified and the driver required its presence, -even if it went unused. - -The Linux driver has since removed this hard requirement and added a new -third way to do co-processor reset: Besides direct access to hardware -and Silicon Provider specific secure monitor call, there's also support -for doing it over SCMI now. - -Sync that part with the Linux driver to fix following boot-time error -message: - - ERROR: stm32-rproc 10000000.m4@10000000.of: failed to get tz syscfg - -Reported-by: Robert Schwebel <rsc@pengutronix.de> -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> ---- - drivers/remoteproc/stm32_rproc.c | 70 ++++++++++++++++++++++++++++------------ - 1 file changed, 50 insertions(+), 20 deletions(-) - -diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c -index b2282f2fac5b..a7df29e57051 100644 ---- a/drivers/remoteproc/stm32_rproc.c -+++ b/drivers/remoteproc/stm32_rproc.c -@@ -30,8 +30,9 @@ struct stm32_syscon { - - struct stm32_rproc { - struct reset_control *rst; -+ struct reset_control *hold_boot_rst; - struct stm32_syscon hold_boot; -- bool secured_soc; -+ bool hold_boot_smc; - }; - - static void *stm32_rproc_da_to_va(struct rproc *rproc, u64 da, int len) -@@ -54,13 +55,28 @@ static int stm32_rproc_set_hold_boot(struct rproc *rproc, bool hold) - struct arm_smccc_res smc_res; - int val, err; - -+ /* -+ * Three ways to manage the hold boot -+ * - using SCMI: the hold boot is managed as a reset, -+ * - using Linux(no SCMI): the hold boot is managed as a syscon register -+ * - using SMC call (deprecated): use SMC reset interface -+ */ -+ - val = hold ? HOLD_BOOT : RELEASE_BOOT; - -- if (IS_ENABLED(CONFIG_ARM_SMCCC) && ddata->secured_soc) { -+ if (ddata->hold_boot_rst) { -+ /* Use the SCMI reset controller */ -+ if (!hold) -+ err = reset_control_deassert(ddata->hold_boot_rst); -+ else -+ err = reset_control_assert(ddata->hold_boot_rst); -+ } else if (IS_ENABLED(CONFIG_HAVE_ARM_SMCCC) && ddata->hold_boot_smc) { -+ /* Use the SMC call */ - arm_smccc_smc(STM32_SMC_RCC, STM32_SMC_REG_WRITE, - hold_boot->reg, val, 0, 0, 0, 0, &smc_res); - err = smc_res.a0; - } else { -+ /* Use syscon */ - err = regmap_update_bits(hold_boot->map, hold_boot->reg, - hold_boot->mask, val); - } -@@ -142,28 +158,42 @@ static int stm32_rproc_parse_dt(struct device *dev, struct stm32_rproc *ddata) - } - - /* -- * if platform is secured the hold boot bit must be written by -- * smc call and read normally. -- * if not secure the hold boot bit could be read/write normally -+ * Three ways to manage the hold boot -+ * - using SCMI: the hold boot is managed as a reset -+ * The DT "reset-mames" property should be defined with 2 items: -+ * reset-names = "mcu_rst", "hold_boot"; -+ * - using SMC call (deprecated): use SMC reset interface -+ * The DT "reset-mames" property is optional, "st,syscfg-tz" is required -+ * - default(no SCMI, no SMC): the hold boot is managed as a syscon register -+ * The DT "reset-mames" property is optional, "st,syscfg-holdboot" is required - */ -- err = stm32_rproc_get_syscon(np, "st,syscfg-tz", &tz); -- if (err) { -- dev_err(dev, "failed to get tz syscfg\n"); -- return err; -- } - -- err = regmap_read(tz.map, tz.reg, &tzen); -- if (err) { -- dev_err(dev, "failed to read tzen\n"); -- return err; -+ ddata->hold_boot_rst = reset_control_get_optional(dev, "hold_boot"); -+ if (IS_ERR(ddata->hold_boot_rst)) -+ return dev_err_probe(dev, PTR_ERR(ddata->hold_boot_rst), -+ "failed to get hold_boot reset\n"); -+ -+ if (!ddata->hold_boot_rst && IS_ENABLED(CONFIG_HAVE_ARM_SMCCC)) { -+ /* Manage the MCU_BOOT using SMC call */ -+ err = stm32_rproc_get_syscon(np, "st,syscfg-tz", &tz); -+ if (!err) { -+ err = regmap_read(tz.map, tz.reg, &tzen); -+ if (err) { -+ dev_err(dev, "failed to read tzen\n"); -+ return err; -+ } -+ ddata->hold_boot_smc = tzen & tz.mask; -+ } - } -- ddata->secured_soc = tzen & tz.mask; - -- err = stm32_rproc_get_syscon(np, "st,syscfg-holdboot", -- &ddata->hold_boot); -- if (err) { -- dev_err(dev, "failed to get hold boot\n"); -- return err; -+ if (!ddata->hold_boot_rst && !ddata->hold_boot_smc) { -+ /* Default: hold boot manage it through the syscon controller */ -+ err = stm32_rproc_get_syscon(np, "st,syscfg-holdboot", -+ &ddata->hold_boot); -+ if (err) { -+ dev_err(dev, "failed to get hold boot\n"); -+ return err; -+ } - } - - return 0; diff --git a/configs/platform-v7a/patches/barebox-2023.09.0/series b/configs/platform-v7a/patches/barebox-2023.09.0/series deleted file mode 100644 index 7dadf912ccb5..000000000000 --- a/configs/platform-v7a/patches/barebox-2023.09.0/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch -0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch -# 3e889491708d7a397dcb8350d8babf58 - git-ptx-patches magic diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 2162b6e5d1b5..45b5477957a6 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -186,8 +186,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="2023.09.0" -PTXCONF_BAREBOX_COMMON_MD5="a605929ca1d8295fc43b5e1f309152c9" +PTXCONF_BAREBOX_COMMON_VERSION="2023.12.0" +PTXCONF_BAREBOX_COMMON_MD5="e1513be5a2995203b75ac45043eac6d0" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y -- 2.39.2 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [DistroKit] [PATCH 5/6] v7a: update barebox to v2023.09.0 -> v2023.12.0 2024-01-02 15:46 ` [DistroKit] [PATCH 5/6] v7a: update barebox to " Ahmad Fatoum @ 2024-01-02 21:31 ` Ahmad Fatoum 0 siblings, 0 replies; 7+ messages in thread From: Ahmad Fatoum @ 2024-01-02 21:31 UTC (permalink / raw) To: ptxdist@pengutronix.de distrokit@pengutronix.de On 02.01.24 16:46, Ahmad Fatoum wrote: > This lets us drop two patches that fixed issues with v2023.09.0. > This update also enables some options that are useful for the hardware > we support: > > - on STM32MP1, support for the NAND controller is enabled > - on platforms with HWRNG, we enable it for use with stack protector > and stack guard mechanisms to harden barebox against stack overflows This commit enables stack protector for i.MX6, but doesn't enable the CAAM RNG driver, leading to the below mentioned error message. I will send out a v2 soon. > > The latter could be enabled universally for all platforms that are no > size constrained, but it prints an ugly error message if there's no > HWRNG as using the fixed fallback canary is insecure. We'll just > postpone enabling stack protector there until there is HWRNG support for > these platforms. > > Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > --- > .../platform-v7a/barebox-am335x-mlo.config | 17 ++- > configs/platform-v7a/barebox-am335x.config | 20 ++- > .../platform-v7a/barebox-am335x.config.diff | 2 +- > configs/platform-v7a/barebox-at91.config | 20 ++- > configs/platform-v7a/barebox-at91.config.diff | 4 +- > configs/platform-v7a/barebox-mx6.config | 25 +++- > configs/platform-v7a/barebox-mx6.config.diff | 10 +- > configs/platform-v7a/barebox-rpi2.config | 20 ++- > configs/platform-v7a/barebox-rpi2.config.diff | 2 +- > configs/platform-v7a/barebox-stm32mp.config | 26 +++- > .../platform-v7a/barebox-stm32mp.config.diff | 12 +- > configs/platform-v7a/barebox-vexpress.config | 20 ++- > .../platform-v7a/barebox-vexpress.config.diff | 2 +- > configs/platform-v7a/barebox.config | 20 ++- > ...roc-stm32-fix-typo-in-Kconfig-symbol.patch | 26 ---- > ...-fix-breakage-after-DT-sync-with-ups.patch | 135 ------------------ > .../patches/barebox-2023.09.0/series | 5 - > configs/platform-v7a/platformconfig | 4 +- > 18 files changed, 179 insertions(+), 191 deletions(-) > delete mode 100644 configs/platform-v7a/patches/barebox-2023.09.0/0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch > delete mode 100644 configs/platform-v7a/patches/barebox-2023.09.0/0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch > delete mode 100644 configs/platform-v7a/patches/barebox-2023.09.0/series > > diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config > index 4eaae17bfe8a..b652d28850c1 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 2023.09.0 Configuration > +# Barebox/arm 2023.12.0 Configuration > # > CONFIG_ARM=y > CONFIG_ARM_USE_COMPRESSED_DTB=y > @@ -126,6 +126,7 @@ 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 > @@ -211,6 +212,7 @@ CONFIG_HAS_DEBUG_LL=y > CONFIG_OFTREE=y > CONFIG_OFTREE_MEM_GENERIC=y > CONFIG_DTC=y > +CONFIG_OF=y > CONFIG_OFDEVICE=y > CONFIG_OF_GPIO=y > # CONFIG_OF_OVERLAY is not set > @@ -308,6 +310,7 @@ CONFIG_MCI=y > # CONFIG_MCI_ROCKCHIP_DWCMSHC is not set > CONFIG_MCI_OMAP_HSMMC=y > # CONFIG_MCI_ARASAN is not set > +# CONFIG_MCI_AM654 is not set > # CONFIG_MCI_SPI is not set > > # > @@ -454,6 +457,7 @@ CONFIG_TI_SYSC=y > # 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 > # end of Drivers > > # > @@ -518,6 +522,7 @@ 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_LZO_DECOMPRESS=y > CONFIG_XYMODEM=y > @@ -537,6 +542,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +# 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 > # > diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config > index a85bbe294886..54453aedf649 100644 > --- a/configs/platform-v7a/barebox-am335x.config > +++ b/configs/platform-v7a/barebox-am335x.config > @@ -1,6 +1,6 @@ > # > # Automatically generated file; DO NOT EDIT. > -# Barebox/arm 2023.09.0 Configuration > +# Barebox/arm 2023.12.0 Configuration > # > CONFIG_ARM=y > CONFIG_ARM_LINUX=y > @@ -144,6 +144,7 @@ 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 > @@ -168,7 +169,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > # CONFIG_TIMESTAMP is not set > CONFIG_BOOTM=y > @@ -479,6 +479,7 @@ CONFIG_NET_FASTBOOT=y > 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 > @@ -677,6 +678,7 @@ CONFIG_MCI_WRITE=y > CONFIG_MCI_OMAP_HSMMC=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 > > # > @@ -703,6 +705,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y > # 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 > @@ -750,6 +753,7 @@ CONFIG_WATCHDOG=y > # CONFIG_WATCHDOG_DW is not set > CONFIG_WATCHDOG_OMAP=y > # CONFIG_GPIO_WATCHDOG is not set > +# CONFIG_CADENCE_WATCHDOG is not set > # CONFIG_PWM is not set > CONFIG_HWRNG=y > > @@ -861,6 +865,7 @@ CONFIG_REGULATOR_FIXED=y > # 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 > # end of Drivers > > # > @@ -930,6 +935,7 @@ 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 > @@ -955,6 +961,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +# 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 > # > diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff > index 273b6c346982..7354b58a06c7 100644 > --- a/configs/platform-v7a/barebox-am335x.config.diff > +++ b/configs/platform-v7a/barebox-am335x.config.diff > @@ -1,4 +1,4 @@ > -ec05109bb691f36043a0a4f1bf9c20ad > +53d21fb44946357f79471694e33102cc > # CONFIG_AM33XX_NET_BOOT is not set > CONFIG_ARCH_AM33XX=y > # CONFIG_ARCH_BCM283X is not set > diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config > index 389599629374..eac526659940 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 2023.09.0 Configuration > +# Barebox/arm 2023.12.0 Configuration > # > CONFIG_ARM=y > CONFIG_ARM_LINUX=y > @@ -64,6 +64,7 @@ CONFIG_ARCH_TEXT_BASE=0x23f00000 > # Atmel AT91 System-on-Chip > # > CONFIG_AT91_MULTI_BOARDS=y > +# CONFIG_MACH_CALAO is not set > # CONFIG_MACH_SKOV_ARM9CPU is not set > # CONFIG_MACH_AT91SAM9263EK is not set > # CONFIG_MACH_AT91SAM9X5EK is not set > @@ -151,6 +152,7 @@ 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 > @@ -175,7 +177,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -491,6 +492,7 @@ CONFIG_NET_FASTBOOT=y > 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 > @@ -677,6 +679,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y > CONFIG_MCI_ATMEL=y > CONFIG_MCI_ATMEL_SDHCI=y > # CONFIG_MCI_ARASAN is not set > +# CONFIG_MCI_AM654 is not set > # CONFIG_MCI_SPI is not set > CONFIG_MCI_ATMEL_SDHCI_PBL=y > CONFIG_HAVE_CLK=y > @@ -709,6 +712,7 @@ CONFIG_MFD_SYSCON=y > # 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=y > # CONFIG_MFD_RK808 is not set > @@ -756,6 +760,7 @@ CONFIG_WATCHDOG=y > CONFIG_WATCHDOG_AT91SAM9=y > # CONFIG_WATCHDOG_DW is not set > # CONFIG_GPIO_WATCHDOG is not set > +# CONFIG_CADENCE_WATCHDOG is not set > # CONFIG_PWM is not set > # CONFIG_HWRNG is not set > > @@ -867,6 +872,7 @@ CONFIG_ATMEL_EBI=y > # 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 > # end of Drivers > > # > @@ -962,6 +968,16 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y > CONFIG_GENERIC_ALLOCATOR=y > # end of Library routines > > +# > +# Hardening options > +# > +# 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 > # > diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff > index 8b093ab0fdaf..b2e86af201b5 100644 > --- a/configs/platform-v7a/barebox-at91.config.diff > +++ b/configs/platform-v7a/barebox-at91.config.diff > @@ -1,4 +1,4 @@ > -ec05109bb691f36043a0a4f1bf9c20ad > +53d21fb44946357f79471694e33102cc > CONFIG_ARCH_AT91=y > # CONFIG_ARCH_BCM283X is not set > # CONFIG_ARCH_IMX is undefined > @@ -75,6 +75,7 @@ CONFIG_LIBSCAN=y > CONFIG_LIBUBIGEN=y > # CONFIG_MACH_AT91SAM9263EK is not set > # CONFIG_MACH_AT91SAM9X5EK is not set > +# CONFIG_MACH_CALAO is not set > # CONFIG_MACH_MICROCHIP_KSZ9477_EVB is not set > # CONFIG_MACH_MICROCHIP_SAMA5D3_EDS is not set > # CONFIG_MACH_RPI2 is undefined > @@ -166,6 +167,7 @@ CONFIG_WATCHDOG_AT91SAM9=y > # CONFIG_WATCHDOG_BCM2835 is undefined > CONFIG_XXHASH=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 > diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config > index 49b0c0fb31dc..a82d1d5511c1 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 2023.09.0 Configuration > +# Barebox/arm 2023.12.0 Configuration > # > CONFIG_ARM=y > CONFIG_ARM_LINUX=y > @@ -235,6 +235,7 @@ 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 > @@ -259,7 +260,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -560,6 +560,7 @@ 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 > > @@ -578,6 +579,7 @@ CONFIG_NET_FASTBOOT=y > 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 > @@ -596,6 +598,7 @@ CONFIG_ARM_AMBA=y > 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 > > @@ -673,6 +676,7 @@ CONFIG_I2C_ALGOBIT=y > # > 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 > @@ -815,6 +819,7 @@ 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 > @@ -847,6 +852,7 @@ CONFIG_MFD_SYSCON=y > # 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 > @@ -897,7 +903,9 @@ 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_HWRNG is not set > @@ -1028,6 +1036,7 @@ CONFIG_USB_NOP_XCEIV=y > # 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 > # end of Drivers > > # > @@ -1102,6 +1111,7 @@ 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 > @@ -1138,6 +1148,17 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +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 > # > diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff > index cc7d235ee68b..19fa32bff76b 100644 > --- a/configs/platform-v7a/barebox-mx6.config.diff > +++ b/configs/platform-v7a/barebox-mx6.config.diff > @@ -1,4 +1,4 @@ > -ec05109bb691f36043a0a4f1bf9c20ad > +53d21fb44946357f79471694e33102cc > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_HAS_FEC_IMX=y > CONFIG_ARCH_HAS_IMX_GPT=y > @@ -34,6 +34,7 @@ CONFIG_CMD_NAND=y > # CONFIG_CMD_PWM is not set > # CONFIG_CMD_SMC is undefined > CONFIG_CMD_SPLASH=y > +# CONFIG_CMD_STACKSMASH is not set > CONFIG_CMD_UBI=y > CONFIG_CMD_UBIFORMAT=y > # CONFIG_CONSOLE_ACTIVATE_FIRST is not set > @@ -51,6 +52,7 @@ 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 > @@ -84,6 +86,7 @@ CONFIG_HAVE_DIGEST_HMAC=y > CONFIG_HW_HAS_PCI=y > # 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 > @@ -218,6 +221,10 @@ CONFIG_RESET_IMX_SRC=y > # CONFIG_SPI_CADENCE_QUADSPI is not set > CONFIG_SPI_MEM=y > # CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set > +CONFIG_STACKPROTECTOR=y > +# CONFIG_STACKPROTECTOR_NONE is not set > +CONFIG_STACKPROTECTOR_STRONG=y > +CONFIG_STACK_GUARD_PAGE=y > CONFIG_STMP_DEVICE=y > # CONFIG_SYSCON_REBOOT_MODE is not set > CONFIG_THUMB2_BAREBOX=y > @@ -236,6 +243,7 @@ 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-rpi2.config b/configs/platform-v7a/barebox-rpi2.config > index f72910d5d75a..252c11544fed 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 2023.09.0 Configuration > +# Barebox/arm 2023.12.0 Configuration > # > CONFIG_ARM=y > CONFIG_ARM_LINUX=y > @@ -137,6 +137,7 @@ 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 > @@ -161,7 +162,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -469,6 +469,7 @@ CONFIG_NET_FASTBOOT=y > 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 > @@ -652,6 +653,7 @@ 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 > @@ -683,6 +685,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y > # 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 > @@ -730,6 +733,7 @@ CONFIG_WATCHDOG=y > # 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 > > @@ -843,6 +847,7 @@ CONFIG_USB_NOP_XCEIV=y > # 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 > # end of Drivers > > # > @@ -912,6 +917,7 @@ 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 > @@ -937,6 +943,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +# 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 > # > diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff > index b26e7a4f56a0..996186382782 100644 > --- a/configs/platform-v7a/barebox-rpi2.config.diff > +++ b/configs/platform-v7a/barebox-rpi2.config.diff > @@ -1,4 +1,4 @@ > -ec05109bb691f36043a0a4f1bf9c20ad > +53d21fb44946357f79471694e33102cc > CONFIG_ARM_ASM_UNIFIED=y > # CONFIG_CMD_NVMEM is not set > CONFIG_DRIVER_NET_BCMGENET=y > diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config > index 76f051a68bb1..7bbae9cc0f88 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 2023.09.0 Configuration > +# Barebox/arm 2023.12.0 Configuration > # > CONFIG_ARM=y > CONFIG_ARM_LINUX=y > @@ -133,6 +133,7 @@ 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 > @@ -157,7 +158,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -447,6 +447,7 @@ 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 > > @@ -467,6 +468,7 @@ 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_BAREBOX_DRIVERS=y > @@ -618,6 +620,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y > # 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 > @@ -649,6 +652,7 @@ CONFIG_MFD_SYSCON=y > # 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 > @@ -698,9 +702,11 @@ CONFIG_WATCHDOG_POLLER=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_STM32=y > -# CONFIG_HWRNG is not set > +CONFIG_HWRNG=y > +CONFIG_HWRNG_STM32=y > > # > # DMA support > @@ -760,6 +766,7 @@ CONFIG_STM32_REMOTEPROC=y > > CONFIG_ARCH_HAS_RESET_CONTROLLER=y > CONFIG_RESET_CONTROLLER=y > +CONFIG_RESET_SIMPLE=y > # CONFIG_RESET_IMX7 is not set > # CONFIG_RTC_CLASS is not set > > @@ -789,6 +796,7 @@ CONFIG_PHY_STM32_USBPHYC=y > # > # Memory controller drivers > # > +CONFIG_STM32_FMC2_EBI=y > # end of Memory controller drivers > > # > @@ -819,6 +827,7 @@ CONFIG_PHY_STM32_USBPHYC=y > # CONFIG_POWER_RESET_GPIO_RESTART is not set > CONFIG_RESET_STM32=y > # CONFIG_VIRTIO_MENU is not set > +# CONFIG_MAILBOX is not set > # end of Drivers > > # > @@ -905,6 +914,17 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +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 > # > diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff > index f1511064ff62..1d495508c4b0 100644 > --- a/configs/platform-v7a/barebox-stm32mp.config.diff > +++ b/configs/platform-v7a/barebox-stm32mp.config.diff > @@ -1,4 +1,4 @@ > -ec05109bb691f36043a0a4f1bf9c20ad > +53d21fb44946357f79471694e33102cc > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_HAS_RESET_CONTROLLER=y > CONFIG_ARCH_NR_GPIO=416 > @@ -29,6 +29,7 @@ CONFIG_CMD_MMC_EXTCSD=y > CONFIG_CMD_POWEROFF=y > # CONFIG_CMD_PWM is not set > # CONFIG_CMD_SPI is undefined > +# CONFIG_CMD_STACKSMASH is not set > CONFIG_COMPILE_LOGLEVEL=6 > # CONFIG_CONSOLE_ACTIVATE_FIRST is not set > CONFIG_CONSOLE_ACTIVATE_NONE=y > @@ -50,7 +51,7 @@ CONFIG_EEPROM_AT24=y > CONFIG_GENERIC_PHY=y > # CONFIG_GPIO_74164 is undefined > # CONFIG_GPIO_RASPBERRYPI_EXP is undefined > -# CONFIG_HWRNG is not set > +CONFIG_HWRNG_STM32=y > # CONFIG_I2C_ALGOBIT is undefined > # CONFIG_I2C_BCM283X is undefined > # CONFIG_I2C_GPIO is not set > @@ -128,11 +129,17 @@ CONFIG_REGULATOR_STPMIC1=y > CONFIG_REMOTEPROC=y > CONFIG_RESET_CONTROLLER=y > # CONFIG_RESET_IMX7 is not set > +CONFIG_RESET_SIMPLE=y > CONFIG_RESET_STM32=y > # CONFIG_SPI is not set > # 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_WRITE=y > +CONFIG_STM32_FMC2_EBI=y > CONFIG_STM32_IMAGE=y > CONFIG_STM32_IWDG_WATCHDOG=y > CONFIG_STM32_REMOTEPROC=y > @@ -151,6 +158,7 @@ CONFIG_USB_OTGDEV=y > # 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 > diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config > index baf5420ed58f..3b9ab3a0d1fc 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 2023.09.0 Configuration > +# Barebox/arm 2023.12.0 Configuration > # > CONFIG_ARM=y > CONFIG_ARM_LINUX=y > @@ -120,6 +120,7 @@ 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 > @@ -144,7 +145,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -451,6 +451,7 @@ CONFIG_NET_FASTBOOT=y > 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 > @@ -631,6 +632,7 @@ CONFIG_MCI_WRITE=y > # 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 > @@ -662,6 +664,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y > # 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 > @@ -700,6 +703,7 @@ CONFIG_LED_TRIGGERS=y > 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 > > @@ -782,6 +786,7 @@ CONFIG_REGULATOR=y > # 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 > # end of Drivers > > # > @@ -851,6 +856,7 @@ 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 > @@ -876,6 +882,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +# 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 > # > diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff > index 5baaca56eb7b..973db9d3b772 100644 > --- a/configs/platform-v7a/barebox-vexpress.config.diff > +++ b/configs/platform-v7a/barebox-vexpress.config.diff > @@ -1,4 +1,4 @@ > -ec05109bb691f36043a0a4f1bf9c20ad > +53d21fb44946357f79471694e33102cc > 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 70e4c1de3970..91288607f3cc 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 2023.09.0 Configuration > +# Barebox/arm 2023.12.0 Configuration > # > CONFIG_ARM=y > CONFIG_ARM_LINUX=y > @@ -136,6 +136,7 @@ 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 > @@ -160,7 +161,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -468,6 +468,7 @@ CONFIG_NET_FASTBOOT=y > 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 > @@ -649,6 +650,7 @@ CONFIG_MCI_WRITE=y > # CONFIG_MCI_BCM283X_SDHOST 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 > @@ -680,6 +682,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y > # 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 > @@ -727,6 +730,7 @@ CONFIG_WATCHDOG=y > # CONFIG_WATCHDOG_DW is not set > # CONFIG_WATCHDOG_BCM2835 is not set > # CONFIG_GPIO_WATCHDOG is not set > +# CONFIG_CADENCE_WATCHDOG is not set > # CONFIG_PWM is not set > CONFIG_HWRNG=y > > @@ -834,6 +838,7 @@ CONFIG_REGULATOR_BCM283X=y > # 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 > # end of Drivers > > # > @@ -903,6 +908,7 @@ 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 > @@ -928,6 +934,16 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +# 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 > # > diff --git a/configs/platform-v7a/patches/barebox-2023.09.0/0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch b/configs/platform-v7a/patches/barebox-2023.09.0/0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch > deleted file mode 100644 > index acb5ba3c4a80..000000000000 > --- a/configs/platform-v7a/patches/barebox-2023.09.0/0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From: Ahmad Fatoum <a.fatoum@pengutronix.de> > -Date: Fri, 20 Oct 2023 15:37:43 +0200 > -Subject: [PATCH] remoteproc: stm32: fix typo in Kconfig symbol > - > -The Kconfig symbol for enabling support for the ARM Secure Monitor Call > -Calling Convention if CONFIG_ARM_SMCCC and not CONFIG_ARM_SMCC, but the > -latter is checked with IS_ENABLED() in the driver. Fix the typo. > - > -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > ---- > - drivers/remoteproc/stm32_rproc.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c > -index b6a62634842f..b2282f2fac5b 100644 > ---- a/drivers/remoteproc/stm32_rproc.c > -+++ b/drivers/remoteproc/stm32_rproc.c > -@@ -56,7 +56,7 @@ static int stm32_rproc_set_hold_boot(struct rproc *rproc, bool hold) > - > - val = hold ? HOLD_BOOT : RELEASE_BOOT; > - > -- if (IS_ENABLED(CONFIG_ARM_SMCC) && ddata->secured_soc) { > -+ if (IS_ENABLED(CONFIG_ARM_SMCCC) && ddata->secured_soc) { > - arm_smccc_smc(STM32_SMC_RCC, STM32_SMC_REG_WRITE, > - hold_boot->reg, val, 0, 0, 0, 0, &smc_res); > - err = smc_res.a0; > diff --git a/configs/platform-v7a/patches/barebox-2023.09.0/0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch b/configs/platform-v7a/patches/barebox-2023.09.0/0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch > deleted file mode 100644 > index 8d932859c324..000000000000 > --- a/configs/platform-v7a/patches/barebox-2023.09.0/0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch > +++ /dev/null > @@ -1,135 +0,0 @@ > -From: Ahmad Fatoum <a.fatoum@pengutronix.de> > -Date: Fri, 20 Oct 2023 15:37:44 +0200 > -Subject: [PATCH] remoteproc: stm32: fix breakage after DT sync with upstream > - > -Once more, a device tree sync with Linux breaks a barebox driver. > - > -This time, the STM32 remoteproc driver ported from Linux was broken by > -the upstream stm32mp151.dtsi removing the st,syscfg-tz property. > - > -This property is only needed for the SiP secure monitor call case, > -but was so far always specified and the driver required its presence, > -even if it went unused. > - > -The Linux driver has since removed this hard requirement and added a new > -third way to do co-processor reset: Besides direct access to hardware > -and Silicon Provider specific secure monitor call, there's also support > -for doing it over SCMI now. > - > -Sync that part with the Linux driver to fix following boot-time error > -message: > - > - ERROR: stm32-rproc 10000000.m4@10000000.of: failed to get tz syscfg > - > -Reported-by: Robert Schwebel <rsc@pengutronix.de> > -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > ---- > - drivers/remoteproc/stm32_rproc.c | 70 ++++++++++++++++++++++++++++------------ > - 1 file changed, 50 insertions(+), 20 deletions(-) > - > -diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c > -index b2282f2fac5b..a7df29e57051 100644 > ---- a/drivers/remoteproc/stm32_rproc.c > -+++ b/drivers/remoteproc/stm32_rproc.c > -@@ -30,8 +30,9 @@ struct stm32_syscon { > - > - struct stm32_rproc { > - struct reset_control *rst; > -+ struct reset_control *hold_boot_rst; > - struct stm32_syscon hold_boot; > -- bool secured_soc; > -+ bool hold_boot_smc; > - }; > - > - static void *stm32_rproc_da_to_va(struct rproc *rproc, u64 da, int len) > -@@ -54,13 +55,28 @@ static int stm32_rproc_set_hold_boot(struct rproc *rproc, bool hold) > - struct arm_smccc_res smc_res; > - int val, err; > - > -+ /* > -+ * Three ways to manage the hold boot > -+ * - using SCMI: the hold boot is managed as a reset, > -+ * - using Linux(no SCMI): the hold boot is managed as a syscon register > -+ * - using SMC call (deprecated): use SMC reset interface > -+ */ > -+ > - val = hold ? HOLD_BOOT : RELEASE_BOOT; > - > -- if (IS_ENABLED(CONFIG_ARM_SMCCC) && ddata->secured_soc) { > -+ if (ddata->hold_boot_rst) { > -+ /* Use the SCMI reset controller */ > -+ if (!hold) > -+ err = reset_control_deassert(ddata->hold_boot_rst); > -+ else > -+ err = reset_control_assert(ddata->hold_boot_rst); > -+ } else if (IS_ENABLED(CONFIG_HAVE_ARM_SMCCC) && ddata->hold_boot_smc) { > -+ /* Use the SMC call */ > - arm_smccc_smc(STM32_SMC_RCC, STM32_SMC_REG_WRITE, > - hold_boot->reg, val, 0, 0, 0, 0, &smc_res); > - err = smc_res.a0; > - } else { > -+ /* Use syscon */ > - err = regmap_update_bits(hold_boot->map, hold_boot->reg, > - hold_boot->mask, val); > - } > -@@ -142,28 +158,42 @@ static int stm32_rproc_parse_dt(struct device *dev, struct stm32_rproc *ddata) > - } > - > - /* > -- * if platform is secured the hold boot bit must be written by > -- * smc call and read normally. > -- * if not secure the hold boot bit could be read/write normally > -+ * Three ways to manage the hold boot > -+ * - using SCMI: the hold boot is managed as a reset > -+ * The DT "reset-mames" property should be defined with 2 items: > -+ * reset-names = "mcu_rst", "hold_boot"; > -+ * - using SMC call (deprecated): use SMC reset interface > -+ * The DT "reset-mames" property is optional, "st,syscfg-tz" is required > -+ * - default(no SCMI, no SMC): the hold boot is managed as a syscon register > -+ * The DT "reset-mames" property is optional, "st,syscfg-holdboot" is required > - */ > -- err = stm32_rproc_get_syscon(np, "st,syscfg-tz", &tz); > -- if (err) { > -- dev_err(dev, "failed to get tz syscfg\n"); > -- return err; > -- } > - > -- err = regmap_read(tz.map, tz.reg, &tzen); > -- if (err) { > -- dev_err(dev, "failed to read tzen\n"); > -- return err; > -+ ddata->hold_boot_rst = reset_control_get_optional(dev, "hold_boot"); > -+ if (IS_ERR(ddata->hold_boot_rst)) > -+ return dev_err_probe(dev, PTR_ERR(ddata->hold_boot_rst), > -+ "failed to get hold_boot reset\n"); > -+ > -+ if (!ddata->hold_boot_rst && IS_ENABLED(CONFIG_HAVE_ARM_SMCCC)) { > -+ /* Manage the MCU_BOOT using SMC call */ > -+ err = stm32_rproc_get_syscon(np, "st,syscfg-tz", &tz); > -+ if (!err) { > -+ err = regmap_read(tz.map, tz.reg, &tzen); > -+ if (err) { > -+ dev_err(dev, "failed to read tzen\n"); > -+ return err; > -+ } > -+ ddata->hold_boot_smc = tzen & tz.mask; > -+ } > - } > -- ddata->secured_soc = tzen & tz.mask; > - > -- err = stm32_rproc_get_syscon(np, "st,syscfg-holdboot", > -- &ddata->hold_boot); > -- if (err) { > -- dev_err(dev, "failed to get hold boot\n"); > -- return err; > -+ if (!ddata->hold_boot_rst && !ddata->hold_boot_smc) { > -+ /* Default: hold boot manage it through the syscon controller */ > -+ err = stm32_rproc_get_syscon(np, "st,syscfg-holdboot", > -+ &ddata->hold_boot); > -+ if (err) { > -+ dev_err(dev, "failed to get hold boot\n"); > -+ return err; > -+ } > - } > - > - return 0; > diff --git a/configs/platform-v7a/patches/barebox-2023.09.0/series b/configs/platform-v7a/patches/barebox-2023.09.0/series > deleted file mode 100644 > index 7dadf912ccb5..000000000000 > --- a/configs/platform-v7a/patches/barebox-2023.09.0/series > +++ /dev/null > @@ -1,5 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-remoteproc-stm32-fix-typo-in-Kconfig-symbol.patch > -0002-remoteproc-stm32-fix-breakage-after-DT-sync-with-ups.patch > -# 3e889491708d7a397dcb8350d8babf58 - git-ptx-patches magic > diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig > index 2162b6e5d1b5..45b5477957a6 100644 > --- a/configs/platform-v7a/platformconfig > +++ b/configs/platform-v7a/platformconfig > @@ -186,8 +186,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="2023.09.0" > -PTXCONF_BAREBOX_COMMON_MD5="a605929ca1d8295fc43b5e1f309152c9" > +PTXCONF_BAREBOX_COMMON_VERSION="2023.12.0" > +PTXCONF_BAREBOX_COMMON_MD5="e1513be5a2995203b75ac45043eac6d0" > PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y > PTXCONF_BAREBOX_AM335X_MLO=y > PTXCONF_BAREBOX_AM335X=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] 7+ messages in thread
* [DistroKit] [PATCH 6/6] v8a: barebox: enable support for booting FIT images 2024-01-02 15:45 [DistroKit] [PATCH 1/6] v8a: barebox: disable RATP support Ahmad Fatoum ` (3 preceding siblings ...) 2024-01-02 15:46 ` [DistroKit] [PATCH 5/6] v7a: update barebox to " Ahmad Fatoum @ 2024-01-02 15:46 ` Ahmad Fatoum 4 siblings, 0 replies; 7+ messages in thread From: Ahmad Fatoum @ 2024-01-02 15:46 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum There's ongoing work to have Linux generate a FIT image with all enabled DTs[1]. Let's prepare for that by enabling FIT image support for the ARMv8 boards. [1]: https://lore.kernel.org/all/20231202035511.487946-1-sjg@chromium.org/ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v8a/barebox.config | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config index f90264d489b3..02d314fb20bc 100644 --- a/configs/platform-v8a/barebox.config +++ b/configs/platform-v8a/barebox.config @@ -129,6 +129,7 @@ CONFIG_BLOCK_WRITE=y CONFIG_FILETYPE=y CONFIG_BINFMT=y CONFIG_UIMAGE=y +CONFIG_FITIMAGE=y CONFIG_LOGBUF=y CONFIG_STDDEV=y CONFIG_MENUTREE=y @@ -205,7 +206,8 @@ CONFIG_BOOTM_OFTREE=y CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BOOTM_AIMAGE is not set # CONFIG_BOOTM_ELF is not set -# CONFIG_BOOTM_FITIMAGE is not set +CONFIG_BOOTM_FITIMAGE=y +# CONFIG_BOOTM_FITIMAGE_SIGNATURE is not set CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y CONFIG_MMCBLKDEV_ROOTARG=y @@ -1081,6 +1083,8 @@ 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=y CONFIG_DIGEST_MD5_GENERIC=y CONFIG_DIGEST_SHA1_GENERIC=y @@ -1090,7 +1094,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y # CONFIG_DIGEST_SHA512_GENERIC is not set # CONFIG_DIGEST_HMAC_GENERIC is not set CONFIG_DIGEST_SHA1_ARM64_CE=y -# CONFIG_DIGEST_SHA256_ARM64_CE is not set +CONFIG_DIGEST_SHA256_ARM64_CE=y # CONFIG_CRYPTO_KEYSTORE is not set # end of Crypto support -- 2.39.2 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-01-02 21:31 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-01-02 15:45 [DistroKit] [PATCH 1/6] v8a: barebox: disable RATP support Ahmad Fatoum 2024-01-02 15:45 ` [DistroKit] [PATCH 2/6] v8a: barebox: disable unnecessary commands Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 3/6] v8a: barebox: disable RAVE SP coprocessor support Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 4/6] v8a: barebox: version bump v2023.09.0 -> v2023.12.0 Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 5/6] v7a: update barebox to " Ahmad Fatoum 2024-01-02 21:31 ` Ahmad Fatoum 2024-01-02 15:46 ` [DistroKit] [PATCH 6/6] v8a: barebox: enable support for booting FIT images Ahmad Fatoum
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox