* [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images
@ 2024-03-06 9:25 Ahmad Fatoum
2024-03-06 9:25 ` [DistroKit] [PATCH v2 1/3] platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0 Ahmad Fatoum
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2024-03-06 9:25 UTC (permalink / raw)
To: distrokit; +Cc: Alexander Dahl, Roland Hieber
In coordination with Alex, I am sending a v2 with a fix for the rpi
regression reported by Roland. The fix will be part of v2024.03.0, which
is not yet released. Since then, v2024.02.0 was released, but I think
we should just update to v2024.03.0, once that's released and add FIT
support on top of v2024.01.0.
Changelog is alongside the individual patches.
Original coverletter:
Hei hei,
while working on a BSP using DistroKit as a base layer I try to support
boards supported by DistroKit already plus some more boards where the
necessary things are in my upper layer. One task is to use a FIT image
for kernel and dts usable with both U-Boot and barebox. This is
possible with this series and some tweaks which hit ptxdist master
lately.
One nasty problem is bootstate.dtsi referenced in barebox config option
CONFIG_EXTERNAL_DTS_FRAGMENTS as
'${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi' currently. When using
DistroKit as a base layer that file can not be found. I experimented
with '$(call ptx/in-platformconfigdir, …' as adviced in docs, but that's
probably not meant for Kconfig? Build runs successfully, but no
bootstate.dtsi is included at all then, leading to barebox not booting
anything because it can not find its state.
The only solution I could come up with is to use a symbolic link with a
relative path in the upper layer to bootstate.dtsi in the base layer,
but I don't consider that elegant. And it would have to be done in each
layer stacked on top for everyone using DistroKit as a base layer.
If anyone can propose a better solution for that, please advice!
Otherwise I think all three patches are useful for themselves. I could
not test on other platforms however so the two patches touching barebox
might be somewhat incomplete?
Alexander Dahl (3):
platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0
blspec-entry: Backport fix from ptxdist master
platform: v7a: barebox: Enable FIT image support
.../platform-v7a/barebox-am335x-mlo.config | 10 +-
configs/platform-v7a/barebox-am335x.config | 19 ++-
.../platform-v7a/barebox-am335x.config.diff | 3 +-
configs/platform-v7a/barebox-at91.config | 19 ++-
configs/platform-v7a/barebox-at91.config.diff | 3 +-
configs/platform-v7a/barebox-mx6.config | 20 ++-
configs/platform-v7a/barebox-mx6.config.diff | 4 +-
configs/platform-v7a/barebox-rpi2.config | 20 ++-
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-stm32mp.config | 21 ++-
.../platform-v7a/barebox-stm32mp.config.diff | 3 +-
configs/platform-v7a/barebox-vexpress.config | 19 ++-
.../platform-v7a/barebox-vexpress.config.diff | 3 +-
configs/platform-v7a/barebox.config | 20 ++-
...ression-booting-without-VideoCore-DT.patch | 130 ++++++++++++++++++
.../patches/barebox-2024.01.0/series | 1 +
configs/platform-v7a/platformconfig | 4 +-
rules/blspec-entry.make | 2 +-
18 files changed, 265 insertions(+), 38 deletions(-)
create mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
create mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/series
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [DistroKit] [PATCH v2 1/3] platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0
2024-03-06 9:25 [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images Ahmad Fatoum
@ 2024-03-06 9:25 ` Ahmad Fatoum
2024-03-13 11:59 ` Roland Hieber
2024-03-06 9:25 ` [DistroKit] [PATCH v2 2/3] blspec-entry: Backport fix from ptxdist master Ahmad Fatoum
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Ahmad Fatoum @ 2024-03-06 9:25 UTC (permalink / raw)
To: distrokit; +Cc: Alexander Dahl, Ahmad Fatoum, Roland Hieber
From: Alexander Dahl <ada@thorsis.com>
The latest and greatest. Has the nice support for 'noload' sub-images
in FIT images conforming for spec.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
- import patch from barebox master branch to address v2024.01.0
rpi-without-videocore-dt
---
.../platform-v7a/barebox-am335x-mlo.config | 10 +-
configs/platform-v7a/barebox-am335x.config | 11 +-
.../platform-v7a/barebox-am335x.config.diff | 3 +-
configs/platform-v7a/barebox-at91.config | 11 +-
configs/platform-v7a/barebox-at91.config.diff | 3 +-
configs/platform-v7a/barebox-mx6.config | 12 +-
configs/platform-v7a/barebox-mx6.config.diff | 4 +-
configs/platform-v7a/barebox-rpi2.config | 12 +-
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-stm32mp.config | 13 +-
.../platform-v7a/barebox-stm32mp.config.diff | 3 +-
configs/platform-v7a/barebox-vexpress.config | 11 +-
.../platform-v7a/barebox-vexpress.config.diff | 3 +-
configs/platform-v7a/barebox.config | 12 +-
...ression-booting-without-VideoCore-DT.patch | 130 ++++++++++++++++++
.../patches/barebox-2024.01.0/series | 1 +
configs/platform-v7a/platformconfig | 4 +-
17 files changed, 222 insertions(+), 23 deletions(-)
create mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
create mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/series
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index b652d28850c1..12707b759ab4 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.12.0 Configuration
+# Barebox/arm 2024.01.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -188,6 +188,7 @@ CONFIG_DEFAULT_LOGLEVEL=7
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -412,6 +413,12 @@ CONFIG_TI_SYSC=y
#
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -458,6 +465,7 @@ CONFIG_TI_SYSC=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 54453aedf649..fbcdc25e2f16 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.12.0 Configuration
+# Barebox/arm 2024.01.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -244,6 +244,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -529,6 +530,7 @@ CONFIG_DRIVER_NET_CPSW=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -819,6 +821,12 @@ CONFIG_REGULATOR_FIXED=y
#
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -866,6 +874,7 @@ CONFIG_REGULATOR_FIXED=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index 7354b58a06c7..c0c929c239a3 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-53d21fb44946357f79471694e33102cc
+60c98fdd624cc491e6ab694be209074e
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
@@ -8,7 +8,6 @@ CONFIG_ARCH_OMAP_MULTI=y
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_ARM_BOARD_APPEND_ATAG=y
# CONFIG_ARM_BOARD_PREPEND_ATAG is not set
-# CONFIG_ARM_SCMI_PROTOCOL is undefined
# CONFIG_ARM_SECURE_MONITOR is undefined
# CONFIG_ARM_SMCCC is undefined
# CONFIG_BAREBOX_UPDATE_AM33XX_EMMC is not set
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index eac526659940..a8bef5382f57 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.12.0 Configuration
+# Barebox/arm 2024.01.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -254,6 +254,7 @@ CONFIG_DEBUG_AT91_UART_BASE=0xfc069000
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -542,6 +543,7 @@ CONFIG_DRIVER_NET_MICREL=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -824,6 +826,12 @@ CONFIG_REGULATOR_FIXED=y
#
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -873,6 +881,7 @@ CONFIG_ATMEL_EBI=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index b2e86af201b5..34e71cbee6ee 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-53d21fb44946357f79471694e33102cc
+60c98fdd624cc491e6ab694be209074e
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
@@ -7,7 +7,6 @@ CONFIG_ARCH_AT91=y
# CONFIG_ARCH_ROCKCHIP is undefined
CONFIG_ARCH_TEXT_BASE=0x23f00000
# CONFIG_ARM_AMBA is undefined
-# CONFIG_ARM_SCMI_PROTOCOL is undefined
# CONFIG_ARM_SECURE_MONITOR is undefined
# CONFIG_ARM_SMCCC is undefined
CONFIG_AT91SAM9_SMC=y
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index b23558510ec5..5e2d64903720 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.12.0 Configuration
+# Barebox/arm 2024.01.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -140,6 +140,7 @@ CONFIG_MACH_UDOO_NEO=y
# CONFIG_MACH_WARP7 is not set
# CONFIG_MACH_FREESCALE_MX7_SABRESD is not set
# CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set
+# CONFIG_MACH_VARISCITE_SOM_MX7 is not set
# CONFIG_MACH_ZII_IMX7D_DEV is not set
# CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set
@@ -336,6 +337,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
CONFIG_DEBUG_IMX_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -631,6 +633,7 @@ CONFIG_AT803X_PHY=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
CONFIG_MICREL_PHY=y
@@ -985,6 +988,12 @@ CONFIG_HW_HAS_PCI=y
#
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -1036,6 +1045,7 @@ CONFIG_USB_NOP_XCEIV=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 90a8680f65dd..dd4df80b7ade 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-53d21fb44946357f79471694e33102cc
+60c98fdd624cc491e6ab694be209074e
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
@@ -10,7 +10,6 @@ CONFIG_ARCH_IMX_IMXIMAGE=y
# CONFIG_ARCH_IMX_USBLOADER is not set
# CONFIG_ARCH_TEXT_BASE is undefined
CONFIG_ARM_ASM_UNIFIED=y
-# CONFIG_ARM_SCMI_PROTOCOL is undefined
# CONFIG_ARM_SECURE_MONITOR is undefined
# CONFIG_ARM_SMCCC is undefined
# CONFIG_ARM_USE_COMPRESSED_DTB is undefined
@@ -157,6 +156,7 @@ CONFIG_MACH_SABRELITE=y
# CONFIG_MACH_UDOO is not set
CONFIG_MACH_UDOO_NEO=y
# CONFIG_MACH_VARISCITE_MX6 is not set
+# CONFIG_MACH_VARISCITE_SOM_MX7 is not set
# CONFIG_MACH_VF610_TWR is not set
# CONFIG_MACH_WARP7 is not set
# CONFIG_MACH_WEBASTO_CCBV2 is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 252c11544fed..43e5ba62ff0d 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.12.0 Configuration
+# Barebox/arm 2024.01.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -236,6 +236,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -518,6 +519,7 @@ CONFIG_DRIVER_NET_BCMGENET=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -797,8 +799,13 @@ CONFIG_REGULATOR_BCM283X=y
# Firmware Drivers
#
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
-# CONFIG_ARM_SCMI_PROTOCOL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -848,6 +855,7 @@ CONFIG_USB_NOP_XCEIV=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 996186382782..692f645fd4c9 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-53d21fb44946357f79471694e33102cc
+60c98fdd624cc491e6ab694be209074e
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 7bbae9cc0f88..539f0a9dcd08 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.12.0 Configuration
+# Barebox/arm 2024.01.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -233,6 +233,7 @@ CONFIG_DEFAULT_LOGLEVEL=7
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -518,6 +519,7 @@ CONFIG_AT803X_PHY=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
CONFIG_MICREL_PHY=y
@@ -626,6 +628,7 @@ CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
CONFIG_COMMON_CLK_OF_PROVIDER=y
+CONFIG_COMMON_CLK_STM32MP157=y
CONFIG_COMMON_CLK_GPIO=y
#
@@ -773,8 +776,13 @@ CONFIG_RESET_SIMPLE=y
#
# Firmware Drivers
#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -828,6 +836,7 @@ CONFIG_STM32_FMC2_EBI=y
CONFIG_RESET_STM32=y
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 1d495508c4b0..f5b6775cee10 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-53d21fb44946357f79471694e33102cc
+60c98fdd624cc491e6ab694be209074e
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_NR_GPIO=416
@@ -30,6 +30,7 @@ CONFIG_CMD_POWEROFF=y
# CONFIG_CMD_PWM is not set
# CONFIG_CMD_SPI is undefined
# CONFIG_CMD_STACKSMASH is not set
+CONFIG_COMMON_CLK_STM32MP157=y
CONFIG_COMPILE_LOGLEVEL=6
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
CONFIG_CONSOLE_ACTIVATE_NONE=y
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 3b9ab3a0d1fc..4fde5e020bc7 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.12.0 Configuration
+# Barebox/arm 2024.01.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -221,6 +221,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -499,6 +500,7 @@ CONFIG_DRIVER_NET_SMC911X=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -743,6 +745,12 @@ CONFIG_REGULATOR=y
# Firmware Drivers
#
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -787,6 +795,7 @@ CONFIG_REGULATOR=y
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 973db9d3b772..2d9168e02dbc 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,8 +1,7 @@
-53d21fb44946357f79471694e33102cc
+60c98fdd624cc491e6ab694be209074e
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
-# CONFIG_ARM_SCMI_PROTOCOL is undefined
# CONFIG_ARM_SECURE_MONITOR is undefined
# CONFIG_ARM_SMCCC is undefined
# CONFIG_ARM_USE_COMPRESSED_DTB is undefined
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index 91288607f3cc..375aa9ab3915 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.12.0 Configuration
+# Barebox/arm 2024.01.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -236,6 +236,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -517,6 +518,7 @@ CONFIG_PHYLIB=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -791,8 +793,13 @@ CONFIG_REGULATOR_BCM283X=y
# Firmware Drivers
#
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
-# CONFIG_ARM_SCMI_PROTOCOL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -839,6 +846,7 @@ CONFIG_REGULATOR_BCM283X=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
diff --git a/configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch b/configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
new file mode 100644
index 000000000000..6f261b86cd68
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
@@ -0,0 +1,130 @@
+From 3ff500b014f4e7901721e5e581d50d7b5a7ff337 Mon Sep 17 00:00:00 2001
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Tue, 5 Mar 2024 10:31:22 +0100
+Subject: [PATCH] ARM: rpi: fix regression booting without VideoCore DT
+
+The Raspberry Pi firmware running prior to barebox can load a kernel
+directly and thus can boot barebox-dt-2nd.img straight without having to
+use the Raspberry Pi specific entry points.
+
+However, the Raspberry Pi specific entry points, store the VideoCore DT
+into a handover area for earlier extraction of fixups done by the
+VideoCore firmware. This doesn't happen with barebox-dt-2nd.img.
+
+Commit 5ea6e19737e1 ("raspi: support to read vc values via dt-2nd boot")
+worked around this by using the barebox-internal DT, when a VideoCore DT
+wasn't saved, but this in turn added a slew of warnings to the valid setup
+of having no VideoCore DT at all and just using a proper Raspberry Pi
+PBL with their embedded DTs:
+
+ WARNING: no property 'serial-number' found in vc fdt's '' node
+ no '/system' node found in vc fdt
+ no '/axi' node found in vc fdt
+ no '/hat' node found in vc fdt
+ no '/chosen/bootloader' node found in vc fdt
+ WARNING: no property 'bootargs' found in vc fdt's '/chosen' node
+ WARNING: no property 'overlay_prefix' found in vc fdt's '/chosen' node
+ WARNING: no property 'os_prefix' found in vc fdt's '/chosen' node
+ WARNING: 'pm_rsts' value not found in vc fdt
+ ERROR: Won't delete root device node
+
+Fix this by not calling rpi_vc_fdt_parse on the barebox DT if a previous
+Raspberry Pi PBL has written VIDEOCORE_FDT_ERROR into the handoff area
+to indicate a missing VideoCore DT.
+
+Fixes: 5ea6e19737e1 ("raspi: support to read vc values via dt-2nd boot")
+Reported-by: Roland Hieber <rhi@pengutronix.de>
+Cc: Denis Osterland-Heim <denis.osterland@gmail.com>
+Link: https://lore.barebox.org/barebox/20240219191400.do7ib5rxy7tupv4i@pengutronix.de/
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+---
+ arch/arm/boards/raspberry-pi/rpi-common.c | 43 +++++++++++++++++------
+ 1 file changed, 33 insertions(+), 10 deletions(-)
+
+diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
+index 1dfd0b0a10f4..7c82c740e256 100644
+--- a/arch/arm/boards/raspberry-pi/rpi-common.c
++++ b/arch/arm/boards/raspberry-pi/rpi-common.c
+@@ -332,7 +332,7 @@ static void rpi_vc_fdt_parse(struct device_node *root)
+ chosen = register_vc_fixup(root, "/chosen");
+ if (!chosen) {
+ pr_err("no '/chosen' node found in vc fdt\n");
+- goto out;
++ return;
+ }
+
+ bootloader = of_find_node_by_name(chosen, "bootloader");
+@@ -385,13 +385,20 @@ static void rpi_vc_fdt_parse(struct device_node *root)
+
+ of_add_memory(memory, false);
+ }
+-
+-out:
+- if (root)
+- of_delete_node(root);
+- return;
+ }
+
++/**
++ * rpi_vc_fdt - unflatten VideoCore provided DT
++ *
++ * If configured via config.txt, the VideoCore firmware will pass barebox PBL
++ * a device-tree in a register. This is saved to a handover memory area by
++ * the Raspberry Pi PBL, which is parsed here. barebox-dt-2nd doesn't
++ * populate this area, instead it uses the VideoCore DT as its own DT.
++ *
++ * Return: an unflattened DT on success, an error pointer if parsing the DT
++ * fails and NULL if a Raspberry Pi PBL has run, but no VideoCore FDT was
++ * saved.
++ */
+ static struct device_node *rpi_vc_fdt(void)
+ {
+ void *saved_vc_fdt;
+@@ -408,7 +415,7 @@ static struct device_node *rpi_vc_fdt(void)
+ if (oftree->totalsize)
+ pr_err("there was an error copying fdt in pbl: %d\n",
+ be32_to_cpu(oftree->totalsize));
+- return ERR_PTR(-EINVAL);
++ return NULL;
+ }
+
+ if (magic != FDT_MAGIC)
+@@ -481,7 +488,7 @@ static int rpi_devices_probe(struct device *dev)
+ const struct rpi_machine_data *dcfg;
+ struct regulator *reg;
+ struct rpi_priv *priv;
+- struct device_node *root;
++ struct device_node *vc_root;
+ const char *name, *ptr;
+ char *hostname;
+ int ret;
+@@ -510,8 +517,24 @@ static int rpi_devices_probe(struct device *dev)
+ bcm2835_register_fb();
+ armlinux_set_architecture(MACH_TYPE_BCM2708);
+ rpi_env_init();
+- root = rpi_vc_fdt();
+- rpi_vc_fdt_parse(IS_ERR(root) ? priv->dev->device_node : root);
++
++ vc_root = rpi_vc_fdt();
++ if (!vc_root) {
++ dev_dbg(dev, "No VideoCore FDT was provided\n");
++ } else if (!IS_ERR(vc_root)) {
++ dev_dbg(dev, "VideoCore FDT was provided\n");
++ rpi_vc_fdt_parse(vc_root);
++ of_delete_node(vc_root);
++ } else if (IS_ERR(vc_root)) {
++ /* This is intentionally at a higher logging level, because we can't
++ * be sure that the external DT is indeed a barebox DT (and not a
++ * kernel DT that happened to be in the partition). So for ease
++ * of debugging, we report this at info log level.
++ */
++ dev_info(dev, "barebox FDT will be used for VideoCore FDT\n");
++ rpi_vc_fdt_parse(priv->dev->device_node);
++ }
++
+ rpi_set_kernel_name();
+
+ if (dcfg && dcfg->init)
+--
+2.39.2
+
diff --git a/configs/platform-v7a/patches/barebox-2024.01.0/series b/configs/platform-v7a/patches/barebox-2024.01.0/series
new file mode 100644
index 000000000000..6822bd532ad5
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2024.01.0/series
@@ -0,0 +1 @@
+0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 45b5477957a6..bd3463ea9b7b 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.12.0"
-PTXCONF_BAREBOX_COMMON_MD5="e1513be5a2995203b75ac45043eac6d0"
+PTXCONF_BAREBOX_COMMON_VERSION="2024.01.0"
+PTXCONF_BAREBOX_COMMON_MD5="8a94bdde5eaa1362b6c752f975f9e954"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AM335X=y
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [DistroKit] [PATCH v2 2/3] blspec-entry: Backport fix from ptxdist master
2024-03-06 9:25 [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images Ahmad Fatoum
2024-03-06 9:25 ` [DistroKit] [PATCH v2 1/3] platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0 Ahmad Fatoum
@ 2024-03-06 9:25 ` Ahmad Fatoum
2024-03-06 9:25 ` [DistroKit] [PATCH v2 3/3] platform: v7a: barebox: Enable FIT image support Ahmad Fatoum
2024-03-11 12:05 ` [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images Robert Schwebel
3 siblings, 0 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2024-03-06 9:25 UTC (permalink / raw)
To: distrokit; +Cc: Alexander Dahl, Ahmad Fatoum, Roland Hieber
From: Alexander Dahl <ada@thorsis.com>
Backport PTXdist commit 0d360df876bc26f709cf (2024-02-02, Alexander
Dahl: "blspec-entry: Fix kernel entry for FIT image"), otherwise
barebox fails when trying to boot a FIT image like this:
ERROR: could not open /mnt/mmc0.1//boot//boot/linux.fit: No such file or directory
ERROR: blspec: Booting failed
Signed-off-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
- amended commit message like suggested by Roland
---
rules/blspec-entry.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
index 7523009f6197..4421594016e1 100644
--- a/rules/blspec-entry.make
+++ b/rules/blspec-entry.make
@@ -30,7 +30,7 @@ endif
BLSPEC_ENTRY_LICENSE = ignore
ifdef PTXCONF_KERNEL_FIT
-BLSPEC_KERNEL_IMAGE = /boot/linux.fit
+BLSPEC_KERNEL_IMAGE = linux.fit
else
BLSPEC_KERNEL_IMAGE = $(KERNEL_IMAGE)
endif
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [DistroKit] [PATCH v2 3/3] platform: v7a: barebox: Enable FIT image support
2024-03-06 9:25 [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images Ahmad Fatoum
2024-03-06 9:25 ` [DistroKit] [PATCH v2 1/3] platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0 Ahmad Fatoum
2024-03-06 9:25 ` [DistroKit] [PATCH v2 2/3] blspec-entry: Backport fix from ptxdist master Ahmad Fatoum
@ 2024-03-06 9:25 ` Ahmad Fatoum
2024-03-11 12:05 ` [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images Robert Schwebel
3 siblings, 0 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2024-03-06 9:25 UTC (permalink / raw)
To: distrokit; +Cc: Alexander Dahl, Ahmad Fatoum, Roland Hieber
From: Alexander Dahl <ada@thorsis.com>
Already enabled for v8a. Tested on Beaglebone Black and RIoTboard.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
- no changes
---
configs/platform-v7a/barebox-am335x.config | 8 ++++++--
configs/platform-v7a/barebox-am335x.config.diff | 2 +-
configs/platform-v7a/barebox-at91.config | 8 ++++++--
configs/platform-v7a/barebox-at91.config.diff | 2 +-
configs/platform-v7a/barebox-mx6.config | 8 ++++++--
configs/platform-v7a/barebox-mx6.config.diff | 2 +-
configs/platform-v7a/barebox-rpi2.config | 8 ++++++--
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-stm32mp.config | 8 ++++++--
configs/platform-v7a/barebox-stm32mp.config.diff | 2 +-
configs/platform-v7a/barebox-vexpress.config | 8 ++++++--
configs/platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 8 ++++++--
13 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index fbcdc25e2f16..c1ed4742a879 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -101,6 +101,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
@@ -179,7 +180,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
@@ -987,6 +989,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_HAVE_DIGEST_HMAC=y
# CONFIG_DIGEST_CRC32_GENERIC is not set
CONFIG_DIGEST_MD5_GENERIC=y
@@ -997,7 +1001,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA512_GENERIC is not set
CONFIG_DIGEST_HMAC_GENERIC=y
# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
+CONFIG_DIGEST_SHA256_ARM=y
CONFIG_CRYPTO_KEYSTORE=y
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index c0c929c239a3..08263f1550e4 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-60c98fdd624cc491e6ab694be209074e
+d3e92d2ec90d9be624961ebc5d6342c0
# 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 a8bef5382f57..e72af942d5e1 100644
--- a/configs/platform-v7a/barebox-at91.config
+++ b/configs/platform-v7a/barebox-at91.config
@@ -109,6 +109,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
@@ -187,7 +188,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
@@ -994,6 +996,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 is not set
CONFIG_DIGEST_MD5_GENERIC=y
CONFIG_DIGEST_SHA1_GENERIC=y
@@ -1003,7 +1007,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
+CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 34e71cbee6ee..b79f60e95cd2 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-60c98fdd624cc491e6ab694be209074e
+d3e92d2ec90d9be624961ebc5d6342c0
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 5e2d64903720..42d90a59ee41 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -192,6 +192,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
@@ -271,7 +272,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
@@ -1174,6 +1176,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_HAVE_DIGEST_HMAC=y
# CONFIG_DIGEST_CRC32_GENERIC is not set
CONFIG_DIGEST_MD5_GENERIC=y
@@ -1184,7 +1188,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA512_GENERIC is not set
CONFIG_DIGEST_HMAC_GENERIC=y
# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
+CONFIG_DIGEST_SHA256_ARM=y
CONFIG_CRYPTO_KEYSTORE=y
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index dd4df80b7ade..80ca60d3c9f6 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-60c98fdd624cc491e6ab694be209074e
+d3e92d2ec90d9be624961ebc5d6342c0
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 43e5ba62ff0d..6ed303661e5e 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -94,6 +94,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
@@ -172,7 +173,8 @@ CONFIG_BOOTM_OFTREE=y
# CONFIG_BOOTM_OFTREE_UIMAGE is not set
# 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
@@ -968,6 +970,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 is not set
CONFIG_DIGEST_MD5_GENERIC=y
CONFIG_DIGEST_SHA1_GENERIC=y
@@ -977,7 +981,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
+CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 692f645fd4c9..9b287d415fd5 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-60c98fdd624cc491e6ab694be209074e
+d3e92d2ec90d9be624961ebc5d6342c0
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 539f0a9dcd08..69fd19862896 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -91,6 +91,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
@@ -168,7 +169,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 is not set
@@ -941,6 +943,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 is not set
CONFIG_DIGEST_MD5_GENERIC=y
CONFIG_DIGEST_SHA1_GENERIC=y
@@ -950,7 +954,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
+CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index f5b6775cee10..3536924668d3 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-60c98fdd624cc491e6ab694be209074e
+d3e92d2ec90d9be624961ebc5d6342c0
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_NR_GPIO=416
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 4fde5e020bc7..06b9ee62b7ef 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -78,6 +78,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
@@ -155,7 +156,8 @@ CONFIG_BOOTM_OFTREE=y
# CONFIG_BOOTM_OFTREE_UIMAGE is not set
# 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
@@ -908,6 +910,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 is not set
CONFIG_DIGEST_MD5_GENERIC=y
CONFIG_DIGEST_SHA1_GENERIC=y
@@ -917,7 +921,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
+CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 2d9168e02dbc..9ed9b5a6e4d3 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-60c98fdd624cc491e6ab694be209074e
+d3e92d2ec90d9be624961ebc5d6342c0
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 375aa9ab3915..a4ee3a1c619a 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -93,6 +93,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
@@ -171,7 +172,8 @@ CONFIG_BOOTM_OFTREE=y
# CONFIG_BOOTM_OFTREE_UIMAGE is not set
# 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
@@ -959,6 +961,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 is not set
CONFIG_DIGEST_MD5_GENERIC=y
CONFIG_DIGEST_SHA1_GENERIC=y
@@ -968,7 +972,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
+CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images
2024-03-06 9:25 [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images Ahmad Fatoum
` (2 preceding siblings ...)
2024-03-06 9:25 ` [DistroKit] [PATCH v2 3/3] platform: v7a: barebox: Enable FIT image support Ahmad Fatoum
@ 2024-03-11 12:05 ` Robert Schwebel
3 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2024-03-11 12:05 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: Alexander Dahl, distrokit, Roland Hieber
Applied to next.
On Wed, Mar 06, 2024 at 10:25:27AM +0100, Ahmad Fatoum wrote:
> In coordination with Alex, I am sending a v2 with a fix for the rpi
> regression reported by Roland. The fix will be part of v2024.03.0, which
> is not yet released. Since then, v2024.02.0 was released, but I think
> we should just update to v2024.03.0, once that's released and add FIT
> support on top of v2024.01.0.
>
> Changelog is alongside the individual patches.
>
> Original coverletter:
>
> Hei hei,
>
> while working on a BSP using DistroKit as a base layer I try to support
> boards supported by DistroKit already plus some more boards where the
> necessary things are in my upper layer. One task is to use a FIT image
> for kernel and dts usable with both U-Boot and barebox. This is
> possible with this series and some tweaks which hit ptxdist master
> lately.
>
> One nasty problem is bootstate.dtsi referenced in barebox config option
> CONFIG_EXTERNAL_DTS_FRAGMENTS as
> '${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi' currently. When using
> DistroKit as a base layer that file can not be found. I experimented
> with '$(call ptx/in-platformconfigdir, …' as adviced in docs, but that's
> probably not meant for Kconfig? Build runs successfully, but no
> bootstate.dtsi is included at all then, leading to barebox not booting
> anything because it can not find its state.
>
> The only solution I could come up with is to use a symbolic link with a
> relative path in the upper layer to bootstate.dtsi in the base layer,
> but I don't consider that elegant. And it would have to be done in each
> layer stacked on top for everyone using DistroKit as a base layer.
> If anyone can propose a better solution for that, please advice!
>
> Otherwise I think all three patches are useful for themselves. I could
> not test on other platforms however so the two patches touching barebox
> might be somewhat incomplete?
>
>
> Alexander Dahl (3):
> platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0
> blspec-entry: Backport fix from ptxdist master
> platform: v7a: barebox: Enable FIT image support
>
> .../platform-v7a/barebox-am335x-mlo.config | 10 +-
> configs/platform-v7a/barebox-am335x.config | 19 ++-
> .../platform-v7a/barebox-am335x.config.diff | 3 +-
> configs/platform-v7a/barebox-at91.config | 19 ++-
> configs/platform-v7a/barebox-at91.config.diff | 3 +-
> configs/platform-v7a/barebox-mx6.config | 20 ++-
> configs/platform-v7a/barebox-mx6.config.diff | 4 +-
> configs/platform-v7a/barebox-rpi2.config | 20 ++-
> configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
> configs/platform-v7a/barebox-stm32mp.config | 21 ++-
> .../platform-v7a/barebox-stm32mp.config.diff | 3 +-
> configs/platform-v7a/barebox-vexpress.config | 19 ++-
> .../platform-v7a/barebox-vexpress.config.diff | 3 +-
> configs/platform-v7a/barebox.config | 20 ++-
> ...ression-booting-without-VideoCore-DT.patch | 130 ++++++++++++++++++
> .../patches/barebox-2024.01.0/series | 1 +
> configs/platform-v7a/platformconfig | 4 +-
> rules/blspec-entry.make | 2 +-
> 18 files changed, 265 insertions(+), 38 deletions(-)
> create mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
> create mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/series
>
> --
> 2.39.2
>
>
>
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [DistroKit] [PATCH v2 1/3] platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0
2024-03-06 9:25 ` [DistroKit] [PATCH v2 1/3] platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0 Ahmad Fatoum
@ 2024-03-13 11:59 ` Roland Hieber
0 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2024-03-13 11:59 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: Alexander Dahl, distrokit
On Wed, Mar 06, 2024 at 10:25:28AM +0100, Ahmad Fatoum wrote:
> From: Alexander Dahl <ada@thorsis.com>
>
> The latest and greatest. Has the nice support for 'noload' sub-images
> in FIT images conforming for spec.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> v1 -> v2:
> - import patch from barebox master branch to address v2024.01.0
> rpi-without-videocore-dt
Thanks for taking care for that fix!
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-13 12:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-06 9:25 [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images Ahmad Fatoum
2024-03-06 9:25 ` [DistroKit] [PATCH v2 1/3] platform: v7a: barebox: Upgrade from 2023.12.0 to 2024.01.0 Ahmad Fatoum
2024-03-13 11:59 ` Roland Hieber
2024-03-06 9:25 ` [DistroKit] [PATCH v2 2/3] blspec-entry: Backport fix from ptxdist master Ahmad Fatoum
2024-03-06 9:25 ` [DistroKit] [PATCH v2 3/3] platform: v7a: barebox: Enable FIT image support Ahmad Fatoum
2024-03-11 12:05 ` [DistroKit] [PATCH v2 0/3] v7a: barebox: Support FIT images Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox