v7a: barebox: version bump v2021.05.0 → v2021.07.0

barebox v2021.07.0 now comes with support for first stage boot on the
SAMA5D3. The SAMA5D3 has a v7a CPU but lacks NEON, so it doesn't make
sense to enable for the v7a platform. Unfortunately, barebox master
is upset if you don't build both sama5d2 and sama5d3 at the same time.
Instead of working around this in the defconfig and enabling a board
we don't need and may forget to disable, import a small patch.

We should be able to drop this with v2021.08.0.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.pengutronix.de/20210722133520.17946-1-a.fatoum@pengutronix.de
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

17 files changed, 109 insertions, 23 deletions

diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index e60609e..5c21445 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 2021.05.0 Configuration
+# Barebox/arm 2021.07.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -217,6 +217,7 @@ CONFIG_OF_GPIO=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 #
@@ -295,6 +296,7 @@ CONFIG_MCI=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 CONFIG_MCI_OMAP_HSMMC=y
 # CONFIG_MCI_ARASAN is not set
 # CONFIG_MCI_SPI is not set
@@ -358,6 +360,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_OMAP=y
 # CONFIG_GPIO_DESIGNWARE is not set
+# CONFIG_GPIO_SIFIVE is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -514,3 +517,5 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 #
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # end of Host Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 0c0d5d3..1fddc9a 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 2021.05.0 Configuration
+# Barebox/arm 2021.07.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -104,7 +104,6 @@ CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
 CONFIG_MENUTREE=y
-CONFIG_FILE_LIST=y
 CONFIG_USBGADGET_START=y
 CONFIG_BOOT=y
 CONFIG_FASTBOOT_BASE=y
@@ -179,7 +178,9 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+# CONFIG_MMCBLKDEV_ROOTARG is not set
 CONFIG_BAREBOX_UPDATE=y
+# CONFIG_SYSTEM_PARTITIONS is not set
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -477,6 +478,7 @@ CONFIG_ARM_AMBA=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 CONFIG_PHYLIB=y
@@ -642,6 +644,7 @@ CONFIG_MCI_WRITE=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 CONFIG_MCI_OMAP_HSMMC=y
 # CONFIG_MCI_MMCI is not set
 # CONFIG_MCI_ARASAN is not set
@@ -735,6 +738,7 @@ CONFIG_GPIO_OMAP=y
 # CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_DESIGNWARE is not set
 # CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SIFIVE is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -922,3 +926,5 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 #
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # end of Host Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index 40622cc..2ede5d0 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-6b419fc845318242cfb0fda6f05c56d1
+16fa9fc0a362b865332f662c12ee79f6
 # 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 28b44b9..bf17a24 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 2021.05.0 Configuration
+# Barebox/arm 2021.07.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -182,7 +182,9 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+# CONFIG_MMCBLKDEV_ROOTARG is not set
 CONFIG_BAREBOX_UPDATE=y
+# CONFIG_SYSTEM_PARTITIONS is not set
 CONFIG_IMD=y
 CONFIG_IMD_TARGET=y
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -467,6 +469,7 @@ CONFIG_OF_OVERLAY=y
 # CONFIG_DRIVER_SERIAL_NS16550 is not set
 CONFIG_DRIVER_SERIAL_ATMEL=y
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 CONFIG_HAS_MACB=y
@@ -598,6 +601,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 CONFIG_MCI_ATMEL=y
 CONFIG_MCI_ATMEL_SDHCI=y
 # CONFIG_MCI_ARASAN is not set
@@ -692,6 +696,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_DESIGNWARE is not set
 # CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SIFIVE is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -869,3 +874,5 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 #
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # end of Host Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 4cba0c1..5f7671f 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-6b419fc845318242cfb0fda6f05c56d1
+16fa9fc0a362b865332f662c12ee79f6
 CONFIG_ARCH_AT91=y
 # CONFIG_ARCH_BCM283X is not set
 CONFIG_ARCH_TEXT_BASE=0x23f00000
@@ -35,7 +35,6 @@ CONFIG_DRIVER_SERIAL_ATMEL=y
 # CONFIG_DRIVER_SPI_ATMEL is not set
 # CONFIG_DRIVER_SPI_FSL_QUADSPI is not set
 # CONFIG_DRIVER_SPI_GPIO is not set
-# CONFIG_FILE_LIST is undefined
 # CONFIG_GPIO_PL061 is undefined
 # CONFIG_GPIO_RASPBERRYPI_EXP is undefined
 CONFIG_HAS_MACB=y
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 74ae229..2c12ff1 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 2021.05.0 Configuration
+# Barebox/arm 2021.07.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -77,6 +77,7 @@ CONFIG_IMX_MULTI_BOARDS=y
 # CONFIG_MACH_TX53 is not set
 # CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
 # CONFIG_MACH_PROTONIC_IMX6 is not set
+# CONFIG_MACH_PROTONIC_IMX8M is not set
 # CONFIG_MACH_KONTRON_SAMX6I is not set
 # CONFIG_MACH_DFI_FS700_M60 is not set
 # CONFIG_MACH_GUF_SANTARO is not set
@@ -168,7 +169,6 @@ CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
 CONFIG_MENUTREE=y
-CONFIG_FILE_LIST=y
 CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y
 CONFIG_UBIFORMAT=y
 CONFIG_USBGADGET_START=y
@@ -245,7 +245,9 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+# CONFIG_MMCBLKDEV_ROOTARG is not set
 CONFIG_BAREBOX_UPDATE=y
+# CONFIG_SYSTEM_PARTITIONS is not set
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -551,6 +553,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_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 CONFIG_ARCH_HAS_FEC_IMX=y
@@ -751,6 +754,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 CONFIG_MCI_IMX_ESDHC=y
 # CONFIG_MCI_IMX_ESDHC_PIO is not set
 # CONFIG_MCI_MMCI is not set
@@ -855,6 +859,7 @@ CONFIG_GPIO_IMX=y
 # CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_DESIGNWARE is not set
 # CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SIFIVE is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -1072,3 +1077,5 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # CONFIG_ARCH_IMX_USBLOADER is not set
 # end of Host Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 1cd88be..6912106 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-6b419fc845318242cfb0fda6f05c56d1
+16fa9fc0a362b865332f662c12ee79f6
 # CONFIG_ARCH_BCM283X is not set
 CONFIG_ARCH_HAS_FEC_IMX=y
 CONFIG_ARCH_HAS_IMX_GPT=y
@@ -129,6 +129,7 @@ CONFIG_MACH_NITROGEN6=y
 # CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
 # CONFIG_MACH_PHYTEC_SOM_IMX8MQ is not set
 # CONFIG_MACH_PROTONIC_IMX6 is not set
+# CONFIG_MACH_PROTONIC_IMX8M is not set
 # CONFIG_MACH_REALQ7 is not set
 # CONFIG_MACH_RPI2 is undefined
 # CONFIG_MACH_RPI3 is undefined
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 2b0406d..d28dc33 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 2021.05.0 Configuration
+# Barebox/arm 2021.07.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -167,7 +167,9 @@ CONFIG_BOOTM_OFTREE=y
 # CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+# CONFIG_MMCBLKDEV_ROOTARG is not set
 CONFIG_BAREBOX_UPDATE=y
+# CONFIG_SYSTEM_PARTITIONS is not set
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -452,6 +454,7 @@ CONFIG_ARM_AMBA=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 CONFIG_PHYLIB=y
@@ -582,6 +585,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 CONFIG_MCI_BCM283X=y
 CONFIG_MCI_BCM283X_SDHOST=y
 # CONFIG_MCI_MMCI is not set
@@ -663,6 +667,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PL061 is not set
 CONFIG_GPIO_RASPBERRYPI_EXP=y
 # CONFIG_GPIO_DESIGNWARE is not set
+# CONFIG_GPIO_SIFIVE is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -850,3 +855,5 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 #
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # end of Host Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index ace57a4..1b87ea2 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-6b419fc845318242cfb0fda6f05c56d1
+16fa9fc0a362b865332f662c12ee79f6
 CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_BOOTM_INITRD=y
 # CONFIG_CMD_I2C is undefined
@@ -7,7 +7,6 @@ CONFIG_CMD_MIITOOL=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_AT24 is undefined
-# CONFIG_FILE_LIST is undefined
 CONFIG_GENERIC_PHY=y
 # CONFIG_GPIO_PCA953X is undefined
 # CONFIG_GPIO_PCF857X is undefined
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 423540c..6afc4fe 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 2021.05.0 Configuration
+# Barebox/arm 2021.07.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -164,7 +164,9 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+# CONFIG_MMCBLKDEV_ROOTARG is not set
 CONFIG_BAREBOX_UPDATE=y
+# CONFIG_SYSTEM_PARTITIONS is not set
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -448,6 +450,7 @@ CONFIG_ARM_AMBA=y
 CONFIG_DRIVER_SERIAL_STM32=y
 # CONFIG_DRIVER_SERIAL_NS16550 is not set
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 CONFIG_PHYLIB=y
@@ -461,6 +464,7 @@ CONFIG_PHYLIB=y
 CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
 CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
 # CONFIG_DRIVER_NET_DESIGNWARE_TEGRA186 is not set
+# CONFIG_DRIVER_NET_DESIGNWARE_ROCKCHIP is not set
 # CONFIG_DRIVER_NET_FSL_FMAN is not set
 # CONFIG_DRIVER_NET_KS8851_MLL is not set
 # CONFIG_DRIVER_NET_SMC911X is not set
@@ -545,6 +549,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 # CONFIG_MCI_MMCI is not set
 # CONFIG_MCI_ARASAN is not set
 CONFIG_MCI_STM32_SDMMC2=y
@@ -639,6 +644,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_DESIGNWARE is not set
 # CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SIFIVE is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -824,3 +830,5 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 #
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # end of Host Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index cc9399f..4650a52 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-6b419fc845318242cfb0fda6f05c56d1
+16fa9fc0a362b865332f662c12ee79f6
 # CONFIG_ARCH_BCM283X is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_ARCH_NR_GPIO=416
@@ -40,6 +40,7 @@ CONFIG_CRC8=y
 CONFIG_DEFAULT_LOGLEVEL=7
 # CONFIG_DRIVER_CFI is undefined
 CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
+# CONFIG_DRIVER_NET_DESIGNWARE_ROCKCHIP is not set
 CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
 # CONFIG_DRIVER_NET_DESIGNWARE_TEGRA186 is not set
 # CONFIG_DRIVER_NET_ENC28J60 is undefined
@@ -48,7 +49,6 @@ CONFIG_DRIVER_SERIAL_STM32=y
 # CONFIG_DRIVER_SPI_GPIO is undefined
 CONFIG_EEPROM_AT24=y
 # CONFIG_EEPROM_AT25 is undefined
-# CONFIG_FILE_LIST is undefined
 CONFIG_FIRMWARE=y
 # CONFIG_FIRMWARE_ALTERA_SERIAL is undefined
 # CONFIG_FS_JFFS2 is undefined
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index a1bd6b3..3742f9e 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 2021.05.0 Configuration
+# Barebox/arm 2021.07.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -82,7 +82,6 @@ CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
 CONFIG_MENUTREE=y
-CONFIG_FILE_LIST=y
 CONFIG_USBGADGET_START=y
 CONFIG_BOOT=y
 
@@ -156,7 +155,9 @@ CONFIG_BOOTM_OFTREE=y
 # CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+# CONFIG_MMCBLKDEV_ROOTARG is not set
 CONFIG_BAREBOX_UPDATE=y
+# CONFIG_SYSTEM_PARTITIONS is not set
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -441,6 +442,7 @@ CONFIG_ARM_AMBA=y
 CONFIG_SERIAL_AMBA_PL011=y
 # CONFIG_DRIVER_SERIAL_NS16550 is not set
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 CONFIG_PHYLIB=y
@@ -592,6 +594,7 @@ CONFIG_MCI_WRITE=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 CONFIG_MCI_MMCI=y
 # CONFIG_MCI_ARASAN is not set
 # CONFIG_MCI_SPI is not set
@@ -840,3 +843,5 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 #
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # end of Host Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index c91a0f3..a6c1ce7 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-6b419fc845318242cfb0fda6f05c56d1
+16fa9fc0a362b865332f662c12ee79f6
 CONFIG_AMBA_SP804=y
 # CONFIG_ARCH_BCM283X is not set
 CONFIG_ARCH_VEXPRESS=y
@@ -30,6 +30,7 @@ CONFIG_DRIVER_NET_SMC911X=y
 # CONFIG_GPIO_PCF857X is undefined
 # CONFIG_GPIO_PL061 is undefined
 # CONFIG_GPIO_RASPBERRYPI_EXP is undefined
+# CONFIG_GPIO_SIFIVE is undefined
 # CONFIG_GPIO_SX150X is undefined
 # CONFIG_GPIO_WATCHDOG is undefined
 # CONFIG_I2C_ALGOBIT is undefined
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index dbfe066..b0c3510 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 2021.05.0 Configuration
+# Barebox/arm 2021.07.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -94,7 +94,6 @@ CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
 CONFIG_MENUTREE=y
-CONFIG_FILE_LIST=y
 CONFIG_USBGADGET_START=y
 CONFIG_BOOT=y
 
@@ -168,7 +167,9 @@ CONFIG_BOOTM_OFTREE=y
 # CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+# CONFIG_MMCBLKDEV_ROOTARG is not set
 CONFIG_BAREBOX_UPDATE=y
+# CONFIG_SYSTEM_PARTITIONS is not set
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -456,6 +457,7 @@ CONFIG_ARM_AMBA=y
 # CONFIG_SERIAL_AMBA_PL011 is not set
 # CONFIG_DRIVER_SERIAL_NS16550 is not set
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 CONFIG_PHYLIB=y
@@ -604,6 +606,7 @@ CONFIG_MCI_WRITE=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 # CONFIG_MCI_BCM283X is not set
 # CONFIG_MCI_BCM283X_SDHOST is not set
 CONFIG_MCI_MMCI=y
@@ -701,6 +704,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_RASPBERRYPI_EXP is not set
 # CONFIG_GPIO_DESIGNWARE is not set
 # CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SIFIVE is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -884,3 +888,5 @@ CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 #
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # end of Host Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch b/configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch
new file mode 100644
index 0000000..a755c6c
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch
@@ -0,0 +1,31 @@
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Thu, 22 Jul 2021 13:52:58 +0200
+Subject: [PATCH] ARM: at91: fix building samad2 images without sama5d3
+
+Addition of first stage support for SAMA5D3 added a dependency
+between sama5d2 and sama5d3 first stages: They both needed to be
+enabled to generate images for either. Break up this dependency
+to fix build failures for configs that e.g. only build one SoC.
+
+Fixes: e30fb46597d3 ("ARM: at91: xload-mmc: add sama5d3_atmci_start_image() helper")
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+---
+ arch/arm/mach-at91/Kconfig | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
+index 28a82c1a9351..290178706a40 100644
+--- a/arch/arm/mach-at91/Kconfig
++++ b/arch/arm/mach-at91/Kconfig
+@@ -44,10 +44,7 @@ config HAVE_AT91_DDRAMC
+ 	bool
+ 
+ config AT91_MCI_PBL
+-	bool
+-	depends on MCI_ATMEL_PBL
+-	depends on MCI_ATMEL_SDHCI_PBL
+-	default y
++	def_bool MCI_ATMEL_PBL || MCI_ATMEL_SDHCI_PBL
+ 
+ # Select if board uses the common at91sam926x_board_init
+ config AT91SAM926X_BOARD_INIT
diff --git a/configs/platform-v7a/patches/barebox-2021.07.0/series b/configs/platform-v7a/patches/barebox-2021.07.0/series
new file mode 100644
index 0000000..8408441
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2021.07.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch
+# 3632b7775588d8916f5d8c68ef5db538  - git-ptx-patches magic
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 7f64bd8..0a6edf6 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -176,8 +176,8 @@ PTXCONF_CONSOLE_SPEED="115200"
 # PTXCONF_AT91BOOTSTRAP2 is not set
 PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm"
 PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2021.05.0"
-PTXCONF_BAREBOX_COMMON_MD5="be859cfa667f73765708924e13b99839"
+PTXCONF_BAREBOX_COMMON_VERSION="2021.07.0"
+PTXCONF_BAREBOX_COMMON_MD5="df3651a395e1420c2818dd464c63069d"
 PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
 PTXCONF_BAREBOX_AM335X_MLO=y
 PTXCONF_BAREBOX_AM335X=y