From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [DistroKit] [PATCH 07/12] v7a: barebox: version bump v2024.01.0 → v2024.03.0
Date: Fri, 15 Mar 2024 22:12:35 +0100 [thread overview]
Message-ID: <20240315211240.3016716-8-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20240315211240.3016716-1-a.fatoum@pengutronix.de>
The latest barebox release incorporates the single patch we had on top
of v2024.01.0, so let's drop it by updating.
Config changes are those of olddefconfig with the exception of
CONFIG_CMD_PARTED.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
.../platform-v7a/barebox-am335x-mlo.config | 17 ++-
configs/platform-v7a/barebox-am335x.config | 19 ++-
.../platform-v7a/barebox-am335x.config.diff | 4 +-
configs/platform-v7a/barebox-at91.config | 18 ++-
configs/platform-v7a/barebox-at91.config.diff | 4 +-
configs/platform-v7a/barebox-mx6.config | 18 ++-
configs/platform-v7a/barebox-mx6.config.diff | 2 +-
configs/platform-v7a/barebox-rpi2.config | 18 ++-
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-stm32mp.config | 18 ++-
.../platform-v7a/barebox-stm32mp.config.diff | 2 +-
configs/platform-v7a/barebox-vexpress.config | 18 ++-
.../platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 18 ++-
...ression-booting-without-VideoCore-DT.patch | 130 ------------------
.../patches/barebox-2024.01.0/series | 1 -
configs/platform-v7a/platformconfig | 4 +-
17 files changed, 139 insertions(+), 156 deletions(-)
delete mode 100644 configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
delete 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 12707b759ab4..2261f70340f1 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 2024.01.0 Configuration
+# Barebox/arm 2024.03.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -16,7 +16,6 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_DIGIC is not set
# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NOMADIK is not set
@@ -28,6 +27,7 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
CONFIG_ARCH_OMAP_MULTI=y
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_STM32MP is not set
@@ -189,6 +189,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_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -313,6 +314,7 @@ CONFIG_MCI_OMAP_HSMMC=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
+# CONFIG_COMMON_CLK is not set
#
# Clocksource
@@ -454,6 +456,16 @@ CONFIG_TI_SYSC=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -553,6 +565,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
# Hardening options
#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_STACK_GUARD_PAGE is not set
CONFIG_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR_STRONG is not set
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index c1ed4742a879..c0f8c11e3039 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 2024.01.0 Configuration
+# Barebox/arm 2024.03.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -17,7 +17,6 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_DIGIC is not set
# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NOMADIK is not set
@@ -29,6 +28,7 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
CONFIG_ARCH_OMAP_MULTI=y
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_STM32MP is not set
@@ -199,6 +199,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -247,6 +248,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_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -318,6 +320,7 @@ CONFIG_CMD_BOOTCHOOSER=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UMOUNT=y
# end of Partition
@@ -684,6 +687,7 @@ CONFIG_MCI_OMAP_HSMMC=y
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
+# CONFIG_COMMON_CLK is not set
#
# Clocksource
@@ -864,6 +868,16 @@ CONFIG_REGULATOR_FIXED=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -975,6 +989,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
# Hardening options
#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_STACK_GUARD_PAGE is not set
CONFIG_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR_STRONG is not set
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index 08263f1550e4..c0fb0f8c6e55 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-d3e92d2ec90d9be624961ebc5d6342c0
+7b026e83521009fb334bf433e0530043
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
@@ -25,7 +25,7 @@ CONFIG_CMD_NAND=y
# CONFIG_CMD_NAND_BITFLIP is not set
# CONFIG_CMD_NVMEM is not set
# CONFIG_CMD_SMC is undefined
-# CONFIG_COMMON_CLK is undefined
+# CONFIG_COMMON_CLK is not set
# CONFIG_COMMON_CLK_GPIO is undefined
# CONFIG_COMMON_CLK_OF_PROVIDER is undefined
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index e72af942d5e1..90ca63089cee 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 2024.01.0 Configuration
+# Barebox/arm 2024.03.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -16,7 +16,6 @@ CONFIG_ARCH_AT91=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_DIGIC is not set
# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NOMADIK is not set
@@ -54,6 +53,7 @@ CONFIG_HAVE_AT91_DDRAMC=y
CONFIG_AT91_MCI_PBL=y
CONFIG_AT91SAM9_SMC=y
CONFIG_HAVE_AT91SAM9_RST=y
+CONFIG_SOC_SAM_V7=y
CONFIG_SOC_SAMA5=y
CONFIG_SOC_SAMA5_MULTI=y
CONFIG_SOC_SAMA5D2=y
@@ -207,6 +207,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
CONFIG_PBL_CONSOLE=y
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -257,6 +258,7 @@ CONFIG_DEBUG_AT91_UART_BASE=0xfc069000
# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -330,6 +332,7 @@ CONFIG_CMD_BOOTCHOOSER=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFORMAT=y
CONFIG_CMD_UMOUNT=y
@@ -870,6 +873,16 @@ CONFIG_ATMEL_EBI=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -982,6 +995,7 @@ CONFIG_GENERIC_ALLOCATOR=y
#
# Hardening options
#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_STACK_GUARD_PAGE is not set
CONFIG_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR_STRONG is not set
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index b79f60e95cd2..3ee11b6754a7 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,7 +1,8 @@
-d3e92d2ec90d9be624961ebc5d6342c0
+7b026e83521009fb334bf433e0530043
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
+# CONFIG_ARCH_LAYERSCAPE is undefined
# CONFIG_ARCH_MULTIARCH is not set
# CONFIG_ARCH_OMAP_MULTI is undefined
# CONFIG_ARCH_ROCKCHIP is undefined
@@ -139,6 +140,7 @@ CONFIG_SOC_SAMA5=y
CONFIG_SOC_SAMA5D2=y
CONFIG_SOC_SAMA5D4=y
CONFIG_SOC_SAMA5_MULTI=y
+CONFIG_SOC_SAM_V7=y
CONFIG_SPI_ATMEL_QUADSPI=y
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_MEM=y
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 42d90a59ee41..bafa946749aa 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 2024.01.0 Configuration
+# Barebox/arm 2024.03.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -15,7 +15,6 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_DIGIC is not set
# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NOMADIK is not set
@@ -27,6 +26,7 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_IMX=y
+# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_OMAP_MULTI is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_STM32MP is not set
@@ -291,6 +291,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -340,6 +341,7 @@ CONFIG_DEBUG_IMX_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -412,6 +414,7 @@ CONFIG_CMD_BOOTCHOOSER=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFORMAT=y
CONFIG_CMD_UMOUNT=y
@@ -1034,6 +1037,16 @@ CONFIG_USB_NOP_XCEIV=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -1162,6 +1175,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
# Hardening options
#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_STACK_GUARD_PAGE is not set
CONFIG_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR_STRONG is not set
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 80ca60d3c9f6..b98585bbc6f3 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-d3e92d2ec90d9be624961ebc5d6342c0
+7b026e83521009fb334bf433e0530043
# 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 6ed303661e5e..f79b68eced96 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 2024.01.0 Configuration
+# Barebox/arm 2024.03.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -16,7 +16,6 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_DIGIC is not set
# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NOMADIK is not set
@@ -28,6 +27,7 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_ZYNQ is not set
CONFIG_ARCH_BCM283X=y
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_OMAP_MULTI is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_STM32MP is not set
@@ -192,6 +192,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -239,6 +240,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -310,6 +312,7 @@ CONFIG_CMD_BOOTCHOOSER=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UMOUNT=y
# end of Partition
@@ -845,6 +848,16 @@ CONFIG_USB_NOP_XCEIV=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -956,6 +969,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
# Hardening options
#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_STACK_GUARD_PAGE is not set
CONFIG_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR_STRONG is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 9b287d415fd5..c42da95432cd 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-d3e92d2ec90d9be624961ebc5d6342c0
+7b026e83521009fb334bf433e0530043
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 69fd19862896..ba40c44bdb74 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 2024.01.0 Configuration
+# Barebox/arm 2024.03.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -17,7 +17,6 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_DIGIC is not set
# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NOMADIK is not set
@@ -29,6 +28,7 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_OMAP_MULTI is not set
# CONFIG_ARCH_ROCKCHIP is not set
CONFIG_ARCH_STM32MP=y
@@ -188,6 +188,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
CONFIG_PBL_CONSOLE=y
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -236,6 +237,7 @@ CONFIG_DEFAULT_LOGLEVEL=7
# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -307,6 +309,7 @@ CONFIG_CMD_BOOTCHOOSER=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UMOUNT=y
# end of Partition
@@ -824,6 +827,16 @@ CONFIG_STM32_FMC2_EBI=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -928,6 +941,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
# Hardening options
#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
CONFIG_STACK_GUARD_PAGE=y
CONFIG_STACKPROTECTOR=y
# CONFIG_STACKPROTECTOR_NONE is not set
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 3536924668d3..eddcb3a5ef5b 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-d3e92d2ec90d9be624961ebc5d6342c0
+7b026e83521009fb334bf433e0530043
# 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 06b9ee62b7ef..33acadf69bcf 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 2024.01.0 Configuration
+# Barebox/arm 2024.03.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -15,7 +15,6 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_DIGIC is not set
# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NOMADIK is not set
@@ -27,6 +26,7 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_OMAP_MULTI is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_STM32MP is not set
@@ -175,6 +175,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
CONFIG_PBL_CONSOLE=y
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -224,6 +225,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -294,6 +296,7 @@ CONFIG_CMD_BOOTCHOOSER=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UMOUNT=y
# end of Partition
@@ -788,6 +791,16 @@ CONFIG_REGULATOR=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -896,6 +909,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
# Hardening options
#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_STACK_GUARD_PAGE is not set
CONFIG_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR_STRONG is not set
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 9ed9b5a6e4d3..3186417803a3 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-d3e92d2ec90d9be624961ebc5d6342c0
+7b026e83521009fb334bf433e0530043
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 a4ee3a1c619a..855e83cd98a4 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 2024.01.0 Configuration
+# Barebox/arm 2024.03.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -16,7 +16,6 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_DIGIC is not set
# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_NOMADIK is not set
@@ -28,6 +27,7 @@ CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_ZYNQ is not set
CONFIG_ARCH_BCM283X=y
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_OMAP_MULTI is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_STM32MP is not set
@@ -191,6 +191,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -239,6 +240,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -309,6 +311,7 @@ CONFIG_CMD_BOOTCHOOSER=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UMOUNT=y
# end of Partition
@@ -837,6 +840,16 @@ CONFIG_REGULATOR_BCM283X=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -947,6 +960,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
#
# Hardening options
#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
# CONFIG_STACK_GUARD_PAGE is not set
CONFIG_STACKPROTECTOR_NONE=y
# CONFIG_STACKPROTECTOR_STRONG is not set
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
deleted file mode 100644
index 6f261b86cd68..000000000000
--- a/configs/platform-v7a/patches/barebox-2024.01.0/0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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
deleted file mode 100644
index 6822bd532ad5..000000000000
--- a/configs/platform-v7a/patches/barebox-2024.01.0/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-ARM-rpi-fix-regression-booting-without-VideoCore-DT.patch
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index bdeb0525d27d..2efae02cb241 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -183,8 +183,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="2024.01.0"
-PTXCONF_BAREBOX_COMMON_MD5="8a94bdde5eaa1362b6c752f975f9e954"
+PTXCONF_BAREBOX_COMMON_VERSION="2024.03.0"
+PTXCONF_BAREBOX_COMMON_MD5="dcb443c48b64662b52974502c502427e"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AM335X=y
--
2.39.2
next prev parent reply other threads:[~2024-03-15 21:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-15 21:12 [DistroKit] [PATCH 00/12] update and add STM32MP135F-DK support Ahmad Fatoum
2024-03-15 21:12 ` [DistroKit] [PATCH 01/12] ptxdist: migrate 2023.02.0 → 2024.03.0 Ahmad Fatoum
2024-03-16 9:26 ` Alexander Dahl
2024-03-17 19:14 ` Robert Schwebel
2024-03-21 9:37 ` Alexander Dahl
2024-03-25 18:45 ` [DistroKit] [PATCH] blspec-entry: remove superfluous file Roland Hieber
2024-03-25 20:51 ` Robert Schwebel
2024-03-15 21:12 ` [DistroKit] [PATCH 02/12] tf-a: update from v2.8 → v2.10 Ahmad Fatoum
2024-04-24 11:15 ` Alexander Dahl
2024-04-24 11:48 ` Ahmad Fatoum
2024-04-24 11:58 ` Alexander Dahl
2024-03-15 21:12 ` [DistroKit] [PATCH 03/12] v8a: imx8mq-evk: disable PCI nodes Ahmad Fatoum
2024-03-15 21:12 ` [DistroKit] [PATCH 04/12] v8a: update kernel from v6.6 → v6.8 Ahmad Fatoum
2024-03-16 11:18 ` Michael Olbrich
2024-03-16 13:09 ` Ahmad Fatoum
2024-03-15 21:12 ` [DistroKit] [PATCH 05/12] v8a: barebox: version bump v2023.12.0 → v2024.03.0 Ahmad Fatoum
2024-03-15 21:12 ` [DistroKit] [PATCH 06/12] v7a: update kernel from v6.6 → v6.8 Ahmad Fatoum
2024-03-15 21:12 ` Ahmad Fatoum [this message]
2024-03-15 21:12 ` [DistroKit] [PATCH 08/12] v7a: barebox: enable STM32MP135F-DK support Ahmad Fatoum
2024-03-15 21:12 ` [DistroKit] [PATCH 09/12] v7a: build OP-TEE for STM32MP13 Ahmad Fatoum
2024-03-15 21:12 ` [DistroKit] [PATCH 10/12] v7a: stm32mp: add TF-A recipe " Ahmad Fatoum
2024-04-26 8:03 ` Alexander Dahl
2024-03-15 21:12 ` [DistroKit] [PATCH 11/12] v7a: kernel: enable STM32MP135F-DK support Ahmad Fatoum
2024-03-18 13:07 ` Michael Olbrich
2024-03-18 14:23 ` Robert Schwebel
2024-03-15 21:12 ` [DistroKit] [PATCH 12/12] v7a: stm32mp: add image recipe for STM32MP135F-DK Ahmad Fatoum
2024-03-17 19:27 ` [DistroKit] [PATCH 00/12] update and add STM32MP135F-DK support Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240315211240.3016716-8-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox