* [DistroKit] [PATCH] v7a: barebox: version bump v2021.07.0 → v2021.08.0
@ 2021-08-24 12:52 Ahmad Fatoum
2021-08-24 13:15 ` Robert Schwebel
0 siblings, 1 reply; 2+ messages in thread
From: Ahmad Fatoum @ 2021-08-24 12:52 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
Update to latest barebox release. Config changes are the default.
In return we can drop the one patch that went upstream in the mean time.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
.../platform-v7a/barebox-am335x-mlo.config | 10 +++++-
configs/platform-v7a/barebox-am335x.config | 16 +++++++++-
.../platform-v7a/barebox-am335x.config.diff | 5 ++-
configs/platform-v7a/barebox-at91.config | 12 ++++++-
configs/platform-v7a/barebox-at91.config.diff | 3 +-
configs/platform-v7a/barebox-mx6.config | 16 +++++++++-
configs/platform-v7a/barebox-mx6.config.diff | 5 ++-
configs/platform-v7a/barebox-rpi2.config | 15 ++++++++-
configs/platform-v7a/barebox-rpi2.config.diff | 6 +++-
configs/platform-v7a/barebox-stm32mp.config | 14 ++++++++-
.../platform-v7a/barebox-stm32mp.config.diff | 7 +++--
configs/platform-v7a/barebox-vexpress.config | 13 +++++++-
.../platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 13 +++++++-
...ilding-samad2-images-without-sama5d3.patch | 31 -------------------
.../patches/barebox-2021.07.0/series | 4 ---
configs/platform-v7a/platformconfig | 4 +--
17 files changed, 124 insertions(+), 52 deletions(-)
delete mode 100644 configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2021.07.0/series
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index 5c21445c294d..50ae35db1260 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.07.0 Configuration
+# Barebox/arm 2021.08.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -67,6 +67,7 @@ CONFIG_MACH_PHYTEC_SOM_AM335X=y
# CONFIG_PHYTEC_SOM_AM335X_OF_AUTOENABLE is not set
# end of OMAP Features
+# CONFIG_ARCH_RK3568_OPTEE is not set
# CONFIG_BOARD_ARM_GENERIC_DT is not set
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_AEABI=y
@@ -187,6 +188,7 @@ CONFIG_DEFAULT_LOGLEVEL=7
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KASAN=y
@@ -398,6 +400,12 @@ CONFIG_TI_SYSC=y
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# end of Firmware Drivers
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
# CONFIG_GENERIC_PHY is not set
# CONFIG_CRYPTO_HW is not set
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 1fddc9aa1628..0987801ad5d2 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.07.0 Configuration
+# Barebox/arm 2021.08.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -70,6 +70,7 @@ CONFIG_MACH_BEAGLEBONE=y
# CONFIG_MACH_WAGO_PFC_AM35XX is not set
# end of OMAP Features
+# CONFIG_ARCH_RK3568_OPTEE is not set
CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_AEABI=y
@@ -153,6 +154,7 @@ CONFIG_RELOCATABLE=y
CONFIG_PROMPT="barebox> "
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
+CONFIG_FIRMWARE=y
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
# CONFIG_SHELL_NONE is not set
@@ -210,6 +212,7 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
CONFIG_BTHREAD=y
CONFIG_STATE=y
@@ -242,6 +245,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KASAN=y
@@ -272,6 +276,7 @@ CONFIG_CMD_IMD=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_ARM_MMUINFO=y
CONFIG_CMD_REGULATOR=y
+# CONFIG_CMD_NVMEM is not set
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
# CONFIG_CMD_MMC_EXTCSD is not set
@@ -622,6 +627,7 @@ CONFIG_USB_GADGET_AUTOSTART=y
# CONFIG_USB_GADGET_DFU is not set
CONFIG_USB_GADGET_SERIAL=y
CONFIG_USB_GADGET_FASTBOOT=y
+# CONFIG_USB_GADGET_MASS_STORAGE is not set
CONFIG_USB_MUSB=y
CONFIG_USB_MUSB_DSPS=y
CONFIG_USB_MUSB_AM335X=y
@@ -751,6 +757,7 @@ CONFIG_PINCTRL_SINGLE=y
# end of Pin controllers
CONFIG_NVMEM=y
+# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
# CONFIG_EEPROM_93XX46 is not set
@@ -779,6 +786,12 @@ CONFIG_REGULATOR_FIXED=y
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# end of Firmware Drivers
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
# CONFIG_GENERIC_PHY is not set
# CONFIG_CRYPTO_HW is not set
@@ -797,6 +810,7 @@ CONFIG_REGULATOR_FIXED=y
#
# end of NVME Support
+# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_POWER_RESET_SYSCON is not set
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_POWER_RESET_GPIO is not set
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index 2ede5d06f712..6946657b1943 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-16fa9fc0a362b865332f662c12ee79f6
+65719ca0e82fb5940a2621b62f242422
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
@@ -24,6 +24,7 @@ CONFIG_CMD_MIITOOL=y
CONFIG_CMD_NAND=y
# CONFIG_CMD_NANDTEST is not set
# 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_OF_PROVIDER is undefined
@@ -81,6 +82,8 @@ CONFIG_NAND=y
CONFIG_NAND_ECC_HW_SYNDROME=y
CONFIG_NAND_OMAP_GPMC=y
CONFIG_NVMEM=y
+# CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
# CONFIG_OMAP_BUILD_IFT is not set
# CONFIG_OMAP_BUILD_SPI is not set
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index bf17a24d0f99..0bacf5c7f94f 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.07.0 Configuration
+# Barebox/arm 2021.08.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -79,6 +79,7 @@ CONFIG_MACH_SAMA5D27_GIANTBOARD=y
# AT91 Board Options
#
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+# CONFIG_ARCH_RK3568_OPTEE is not set
# CONFIG_BOARD_ARM_GENERIC_DT is not set
CONFIG_AEABI=y
# CONFIG_ARM_BOARD_APPEND_ATAG is not set
@@ -157,6 +158,7 @@ CONFIG_RELOCATABLE=y
CONFIG_PROMPT="barebox:"
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
+CONFIG_FIRMWARE=y
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
# CONFIG_SHELL_NONE is not set
@@ -212,6 +214,7 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
CONFIG_BTHREAD=y
CONFIG_STATE=y
@@ -238,6 +241,7 @@ CONFIG_DEFAULT_LOGLEVEL=7
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_AT91_UART_BASE=0xf8020000
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KASAN=y
@@ -735,6 +739,12 @@ CONFIG_REGULATOR_FIXED=y
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# end of Firmware Drivers
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
# CONFIG_GENERIC_PHY is not set
# CONFIG_CRYPTO_HW is not set
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 5f7671f9f1fb..483833180a82 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-16fa9fc0a362b865332f662c12ee79f6
+65719ca0e82fb5940a2621b62f242422
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_TEXT_BASE=0x23f00000
@@ -111,6 +111,7 @@ CONFIG_SPI_MEM=y
# CONFIG_USB_GADGET_AUTOSTART is undefined
# CONFIG_USB_GADGET_DFU is undefined
# CONFIG_USB_GADGET_FASTBOOT is undefined
+# CONFIG_USB_GADGET_MASS_STORAGE is undefined
# CONFIG_USB_GADGET_SERIAL is undefined
# CONFIG_USB_HOST is not set
# CONFIG_USB_HUB_USB251XB is undefined
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 2c12ff1e5266..9f5ce6246f5e 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.07.0 Configuration
+# Barebox/arm 2021.08.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -136,6 +136,7 @@ CONFIG_IMX_IIM_FUSE_BLOW=y
# CONFIG_HABV4 is not set
# end of i.MX specific settings
+# CONFIG_ARCH_RK3568_OPTEE is not set
CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_AEABI=y
@@ -220,6 +221,7 @@ CONFIG_RELOCATABLE=y
CONFIG_PROMPT="barebox:"
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
+CONFIG_FIRMWARE=y
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
# CONFIG_SHELL_NONE is not set
@@ -280,6 +282,7 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
CONFIG_BTHREAD=y
CONFIG_STATE=y
@@ -312,6 +315,7 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_IMX_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KASAN=y
@@ -342,6 +346,7 @@ CONFIG_CMD_IMD=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_ARM_MMUINFO=y
CONFIG_CMD_REGULATOR=y
+# CONFIG_CMD_NVMEM is not set
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
CONFIG_CMD_MMC_EXTCSD=y
@@ -718,6 +723,7 @@ CONFIG_USB_GADGET_AUTOSTART=y
CONFIG_USB_GADGET_DFU=y
CONFIG_USB_GADGET_SERIAL=y
CONFIG_USB_GADGET_FASTBOOT=y
+# CONFIG_USB_GADGET_MASS_STORAGE is not set
# CONFIG_USB_MUSB is not set
CONFIG_VIDEO=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
@@ -873,6 +879,7 @@ CONFIG_PINCTRL_IMX_IOMUX_V3=y
# end of Pin controllers
CONFIG_NVMEM=y
+# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_IMX_OCOTP=y
# CONFIG_IMX_OCOTP_WRITE is not set
@@ -913,6 +920,12 @@ CONFIG_HW_HAS_PCI=y
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# end of Firmware Drivers
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
CONFIG_GENERIC_PHY=y
CONFIG_USB_NOP_XCEIV=y
# CONFIG_PHY_FSL_IMX8MQ_USB is not set
@@ -934,6 +947,7 @@ CONFIG_USB_NOP_XCEIV=y
# end of NVME Support
# CONFIG_SYSCON_REBOOT_MODE is not set
+# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_POWER_RESET_SYSCON is not set
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_POWER_RESET_GPIO is not set
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 6912106de115..109eb509dc13 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-16fa9fc0a362b865332f662c12ee79f6
+65719ca0e82fb5940a2621b62f242422
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
@@ -28,6 +28,7 @@ CONFIG_CMD_MMC_EXTCSD=y
CONFIG_CMD_NAND=y
# CONFIG_CMD_NANDTEST is not set
# CONFIG_CMD_NAND_BITFLIP is not set
+# CONFIG_CMD_NVMEM is not set
# CONFIG_CMD_SMC is undefined
CONFIG_CMD_SPLASH=y
CONFIG_CMD_UBI=y
@@ -191,6 +192,8 @@ CONFIG_NAND_ECC_HW_SYNDROME=y
CONFIG_NAND_IMX=y
CONFIG_NAND_MXS=y
CONFIG_NVMEM=y
+# CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_PARTITION_DISK_EFI=y
CONFIG_PARTITION_DISK_EFI_GPT_COMPARE=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index d28dc33d3c49..234a6cb63cb6 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.07.0 Configuration
+# Barebox/arm 2021.08.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -60,6 +60,7 @@ CONFIG_MACH_RPI_CM3=y
# end of select Broadcom BCM283X boards to be built
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+# CONFIG_ARCH_RK3568_OPTEE is not set
CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_AEABI=y
@@ -142,6 +143,7 @@ CONFIG_RELOCATABLE=y
CONFIG_PROMPT="R-Pi> "
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
+CONFIG_FIRMWARE=y
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
# CONFIG_SHELL_NONE is not set
@@ -199,6 +201,7 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
CONFIG_BTHREAD=y
CONFIG_STATE=y
@@ -223,6 +226,7 @@ CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KASAN=y
@@ -253,6 +257,7 @@ CONFIG_CMD_IMD=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_ARM_MMUINFO=y
CONFIG_CMD_REGULATOR=y
+# CONFIG_CMD_NVMEM is not set
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
# CONFIG_CMD_MMC_EXTCSD is not set
@@ -681,6 +686,7 @@ CONFIG_PINCTRL_BCM283X=y
# end of Pin controllers
CONFIG_NVMEM=y
+# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
# CONFIG_EEPROM_93XX46 is not set
@@ -708,6 +714,12 @@ CONFIG_REGULATOR_BCM283X=y
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# end of Firmware Drivers
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
CONFIG_GENERIC_PHY=y
CONFIG_USB_NOP_XCEIV=y
# CONFIG_PHY_FSL_IMX8MQ_USB is not set
@@ -728,6 +740,7 @@ CONFIG_USB_NOP_XCEIV=y
#
# end of NVME Support
+# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_POWER_RESET_SYSCON is not set
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_POWER_RESET_GPIO is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 1b87ea2237ae..61afae8282ba 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,8 +1,9 @@
-16fa9fc0a362b865332f662c12ee79f6
+65719ca0e82fb5940a2621b62f242422
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_BOOTM_INITRD=y
# CONFIG_CMD_I2C is undefined
CONFIG_CMD_MIITOOL=y
+# CONFIG_CMD_NVMEM is not set
# CONFIG_CMD_USBGADGET is undefined
CONFIG_DRIVER_SERIAL_NS16550=y
# CONFIG_EEPROM_93XX46 is not set
@@ -42,6 +43,8 @@ CONFIG_MCI_SDHCI=y
CONFIG_NET_NETCONSOLE=y
# CONFIG_NET_NFS is not set
CONFIG_NVMEM=y
+# CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
# CONFIG_PBL_OPTEE is undefined
# CONFIG_PHY_FSL_IMX8MQ_USB is not set
@@ -58,6 +61,7 @@ CONFIG_USB_DWC2_HOST=y
# CONFIG_USB_GADGET_AUTOSTART is undefined
# CONFIG_USB_GADGET_DFU is undefined
# CONFIG_USB_GADGET_FASTBOOT is undefined
+# CONFIG_USB_GADGET_MASS_STORAGE is undefined
# CONFIG_USB_GADGET_SERIAL is undefined
# CONFIG_USB_HUB_USB251XB is undefined
CONFIG_USB_NOP_XCEIV=y
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 6afc4fe73501..13babb3bcd86 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.07.0 Configuration
+# Barebox/arm 2021.08.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -49,6 +49,7 @@ CONFIG_CPU_32v7=y
#
# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+# CONFIG_ARCH_RK3568_OPTEE is not set
CONFIG_ARCH_NR_GPIO=416
CONFIG_ARCH_STM32MP157=y
CONFIG_MACH_STM32MP15XX_DKX=y
@@ -196,6 +197,7 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
CONFIG_BTHREAD=y
CONFIG_STATE=y
@@ -220,6 +222,7 @@ CONFIG_COMPILE_LOGLEVEL=6
CONFIG_DEFAULT_LOGLEVEL=7
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KASAN=y
@@ -250,6 +253,7 @@ CONFIG_CMD_IMD=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_ARM_MMUINFO=y
CONFIG_CMD_REGULATOR=y
+# CONFIG_CMD_NVMEM is not set
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
CONFIG_CMD_MMC_EXTCSD=y
@@ -658,6 +662,7 @@ CONFIG_PINCTRL_STM32=y
# end of Pin controllers
CONFIG_NVMEM=y
+# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_STM32_BSEC=y
@@ -691,6 +696,12 @@ CONFIG_RESET_STM32=y
#
# end of Firmware Drivers
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
# CONFIG_GENERIC_PHY is not set
# CONFIG_CRYPTO_HW is not set
@@ -710,6 +721,7 @@ CONFIG_RESET_STM32=y
# end of NVME Support
# CONFIG_SYSCON_REBOOT_MODE is not set
+# CONFIG_NVMEM_REBOOT_MODE is not set
# CONFIG_POWER_RESET_SYSCON is not set
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_POWER_RESET_GPIO is not set
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 4650a525be27..261c367621db 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-16fa9fc0a362b865332f662c12ee79f6
+65719ca0e82fb5940a2621b62f242422
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_NR_GPIO=416
@@ -26,6 +26,7 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y
CONFIG_CMD_MENU_MANAGEMENT=y
CONFIG_CMD_MIITOOL=y
CONFIG_CMD_MMC_EXTCSD=y
+# CONFIG_CMD_NVMEM is not set
CONFIG_CMD_OF_DIFF=y
CONFIG_CMD_POWEROFF=y
# CONFIG_CMD_SPI is undefined
@@ -49,7 +50,6 @@ CONFIG_DRIVER_SERIAL_STM32=y
# CONFIG_DRIVER_SPI_GPIO is undefined
CONFIG_EEPROM_AT24=y
# CONFIG_EEPROM_AT25 is undefined
-CONFIG_FIRMWARE=y
# CONFIG_FIRMWARE_ALTERA_SERIAL is undefined
# CONFIG_FS_JFFS2 is undefined
# CONFIG_GPIO_74164 is undefined
@@ -100,6 +100,8 @@ CONFIG_NET_NETCONSOLE=y
# CONFIG_NET_USB_ASIX is undefined
# CONFIG_NET_USB_SMSC95XX is undefined
CONFIG_NVMEM=y
+# CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_NVMEM_RMEM is not set
# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_PARTITION_DISK_EFI=y
# CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
@@ -140,6 +142,7 @@ CONFIG_THUMB2_BAREBOX=y
# CONFIG_USB_GADGET_AUTOSTART is undefined
# CONFIG_USB_GADGET_DFU is undefined
# CONFIG_USB_GADGET_FASTBOOT is undefined
+# CONFIG_USB_GADGET_MASS_STORAGE is undefined
# CONFIG_USB_GADGET_SERIAL is undefined
# CONFIG_USB_HOST is not set
# CONFIG_USB_HUB_USB251XB is undefined
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 3742f9e910ec..bedcda7410e7 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.07.0 Configuration
+# Barebox/arm 2021.08.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -49,6 +49,7 @@ CONFIG_CPU_32v7=y
# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
CONFIG_ARCH_TEXT_BASE=0x0
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+# CONFIG_ARCH_RK3568_OPTEE is not set
CONFIG_MACH_VEXPRESS=y
# CONFIG_MACH_VIRT is not set
CONFIG_BOARD_ARM_GENERIC_DT=y
@@ -130,6 +131,7 @@ CONFIG_RELOCATABLE=y
CONFIG_PROMPT="vexpress: "
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
+CONFIG_FIRMWARE=y
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
# CONFIG_SHELL_NONE is not set
@@ -187,6 +189,7 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
CONFIG_BTHREAD=y
CONFIG_STATE=y
@@ -212,6 +215,7 @@ CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KASAN=y
@@ -576,6 +580,7 @@ CONFIG_USB_GADGET_AUTOSTART=y
# CONFIG_USB_GADGET_DFU is not set
CONFIG_USB_GADGET_SERIAL=y
# CONFIG_USB_GADGET_FASTBOOT is not set
+# CONFIG_USB_GADGET_MASS_STORAGE is not set
# CONFIG_USB_MUSB is not set
# CONFIG_VIDEO is not set
# CONFIG_SOUND is not set
@@ -700,6 +705,12 @@ CONFIG_REGULATOR=y
#
# end of Firmware Drivers
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
# CONFIG_GENERIC_PHY is not set
# CONFIG_CRYPTO_HW is not set
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index a6c1ce7283c0..4ca912e5da87 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-16fa9fc0a362b865332f662c12ee79f6
+65719ca0e82fb5940a2621b62f242422
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 b0c351026ca9..18e97f29aa2a 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.07.0 Configuration
+# Barebox/arm 2021.08.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -60,6 +60,7 @@ CONFIG_MACH_RPI3=y
# end of select Broadcom BCM283X boards to be built
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+# CONFIG_ARCH_RK3568_OPTEE is not set
CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_AEABI=y
# CONFIG_THUMB2_BAREBOX is not set
@@ -142,6 +143,7 @@ CONFIG_RELOCATABLE=y
CONFIG_PROMPT="barebox>"
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
+CONFIG_FIRMWARE=y
CONFIG_SHELL_HUSH=y
# CONFIG_SHELL_SIMPLE is not set
# CONFIG_SHELL_NONE is not set
@@ -199,6 +201,7 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_HAS_SCHED=y
CONFIG_POLLER=y
CONFIG_BTHREAD=y
CONFIG_STATE=y
@@ -224,6 +227,7 @@ CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_ARCH_KASAN=y
@@ -588,6 +592,7 @@ CONFIG_USB_GADGET_AUTOSTART=y
# CONFIG_USB_GADGET_DFU is not set
CONFIG_USB_GADGET_SERIAL=y
# CONFIG_USB_GADGET_FASTBOOT is not set
+# CONFIG_USB_GADGET_MASS_STORAGE is not set
# CONFIG_USB_MUSB is not set
# CONFIG_VIDEO is not set
# CONFIG_SOUND is not set
@@ -743,6 +748,12 @@ CONFIG_REGULATOR_BCM283X=y
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# end of Firmware Drivers
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
# CONFIG_GENERIC_PHY is not set
# CONFIG_CRYPTO_HW 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
deleted file mode 100644
index a755c6ccbff2..000000000000
--- a/configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 8408441d39f0..000000000000
--- a/configs/platform-v7a/patches/barebox-2021.07.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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 f664f4714604..0eec636a3bae 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.07.0"
-PTXCONF_BAREBOX_COMMON_MD5="df3651a395e1420c2818dd464c63069d"
+PTXCONF_BAREBOX_COMMON_VERSION="2021.08.0"
+PTXCONF_BAREBOX_COMMON_MD5="eddcd7bc7e9d3836f0d68e3abce210ec"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AM335X=y
--
2.30.2
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [DistroKit] [PATCH] v7a: barebox: version bump v2021.07.0 → v2021.08.0
2021-08-24 12:52 [DistroKit] [PATCH] v7a: barebox: version bump v2021.07.0 → v2021.08.0 Ahmad Fatoum
@ 2021-08-24 13:15 ` Robert Schwebel
0 siblings, 0 replies; 2+ messages in thread
From: Robert Schwebel @ 2021-08-24 13:15 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: distrokit
On Tue, Aug 24, 2021 at 02:52:48PM +0200, Ahmad Fatoum wrote:
> Update to latest barebox release. Config changes are the default.
> In return we can drop the one patch that went upstream in the mean time.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> .../platform-v7a/barebox-am335x-mlo.config | 10 +++++-
> configs/platform-v7a/barebox-am335x.config | 16 +++++++++-
> .../platform-v7a/barebox-am335x.config.diff | 5 ++-
> configs/platform-v7a/barebox-at91.config | 12 ++++++-
> configs/platform-v7a/barebox-at91.config.diff | 3 +-
> configs/platform-v7a/barebox-mx6.config | 16 +++++++++-
> configs/platform-v7a/barebox-mx6.config.diff | 5 ++-
> configs/platform-v7a/barebox-rpi2.config | 15 ++++++++-
> configs/platform-v7a/barebox-rpi2.config.diff | 6 +++-
> configs/platform-v7a/barebox-stm32mp.config | 14 ++++++++-
> .../platform-v7a/barebox-stm32mp.config.diff | 7 +++--
> configs/platform-v7a/barebox-vexpress.config | 13 +++++++-
> .../platform-v7a/barebox-vexpress.config.diff | 2 +-
> configs/platform-v7a/barebox.config | 13 +++++++-
> ...ilding-samad2-images-without-sama5d3.patch | 31 -------------------
> .../patches/barebox-2021.07.0/series | 4 ---
> configs/platform-v7a/platformconfig | 4 +--
> 17 files changed, 124 insertions(+), 52 deletions(-)
> delete mode 100644 configs/platform-v7a/patches/barebox-2021.07.0/0001-ARM-at91-fix-building-samad2-images-without-sama5d3.patch
> delete mode 100644 configs/platform-v7a/patches/barebox-2021.07.0/series
Applied to next.
rsc
--
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 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-24 13:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-24 12:52 [DistroKit] [PATCH] v7a: barebox: version bump v2021.07.0 → v2021.08.0 Ahmad Fatoum
2021-08-24 13:15 ` Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox