From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 12/15] v7a: barebox: version bump 2020.06.0 -> 2020.08.1
Date: Tue, 15 Sep 2020 20:59:17 +0200 [thread overview]
Message-ID: <20200915185920.3353-12-rhi@pengutronix.de> (raw)
In-Reply-To: <20200915185920.3353-1-rhi@pengutronix.de>
Update to the most recent barebox release, which includes our patch.
CONFIG_USB_GADGET_FASTBOOT_* have been renamed to CONFIG_FASTBOOT_*, for
all other new options use the default values.
Tested-by: Roland Hieber <rhi@pengutronix.de> on qemu-vexpress, rpi3-b
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../platform-v7a/barebox-am335x-mlo.config | 5 +-
configs/platform-v7a/barebox-am335x.config | 18 ++-
.../platform-v7a/barebox-am335x.config.diff | 9 +-
configs/platform-v7a/barebox-mx6.config | 21 ++--
configs/platform-v7a/barebox-mx6.config.diff | 10 +-
configs/platform-v7a/barebox-rpi2.config | 7 +-
configs/platform-v7a/barebox-rpi2.config.diff | 3 +-
configs/platform-v7a/barebox-stm32mp.config | 7 +-
.../platform-v7a/barebox-stm32mp.config.diff | 2 +-
configs/platform-v7a/barebox-vexpress.config | 8 +-
.../platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 8 +-
...x-MMIO-resources-clash-breaking-boot.patch | 106 ------------------
...0-customers-pengutronix-distrokit-v7.patch | 22 ----
.../patches/barebox-2020.06.0/series | 11 --
configs/platform-v7a/platformconfig | 4 +-
16 files changed, 59 insertions(+), 184 deletions(-)
delete mode 100644 configs/platform-v7a/patches/barebox-2020.06.0/0001-ARM-rpi-dts-fix-MMIO-resources-clash-breaking-boot.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2020.06.0/0101-Release-2020.06.0-customers-pengutronix-distrokit-v7.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2020.06.0/series
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index b6713d0127ca..cc960392a9c2 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 2020.06.0-20200617-1 Configuration
+# Barebox/arm 2020.08.1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -130,6 +130,7 @@ CONFIG_MALLOC_SIZE=0x0
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
# CONFIG_MALLOC_DUMMY is not set
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
# CONFIG_KALLSYMS is not set
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_HANG is not set
@@ -312,8 +313,6 @@ CONFIG_CLOCKSOURCE_TI_DM=y
#
# CONFIG_MFD_MC13XXX is not set
# CONFIG_MFD_SYSCON is not set
-# CONFIG_FINTEK_SUPERIO is not set
-# CONFIG_SMSC_SUPERIO is not set
# end of Multifunction device drivers
#
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 630b1a0b2b4a..ee8f8e84a21c 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 2020.06.0-20200617-1 Configuration
+# Barebox/arm 2020.08.1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -106,6 +106,7 @@ CONFIG_MENUTREE=y
CONFIG_FILE_LIST=y
CONFIG_USBGADGET_START=y
CONFIG_BOOT=y
+CONFIG_FASTBOOT_BASE=y
#
# General Settings
@@ -144,6 +145,7 @@ CONFIG_MALLOC_SIZE=0x0
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_HANG is not set
@@ -171,6 +173,7 @@ CONFIG_BOOTM_VERBOSE=y
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_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
@@ -216,6 +219,13 @@ CONFIG_RESET_SOURCE=y
#
# CONFIG_BOOTM_OPTEE is not set
# end of OP-TEE loading
+
+#
+# Android Fastboot
+#
+CONFIG_FASTBOOT_SPARSE=y
+CONFIG_FASTBOOT_CMD_OEM=y
+# end of Android Fastboot
# end of General Settings
#
@@ -256,6 +266,7 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
# CONFIG_CMD_MMC_EXTCSD is not set
+# CONFIG_CMD_POLLER is not set
# end of Information
#
@@ -602,9 +613,6 @@ 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_FASTBOOT_SPARSE=y
-# CONFIG_USB_GADGET_FASTBOOT_BUF is not set
-CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y
CONFIG_USB_MUSB=y
CONFIG_USB_MUSB_DSPS=y
CONFIG_USB_MUSB_AM335X=y
@@ -654,8 +662,6 @@ CONFIG_CLOCKSOURCE_TI_DM=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
# CONFIG_MFD_STPMIC1 is not set
-# CONFIG_FINTEK_SUPERIO is not set
-# CONFIG_SMSC_SUPERIO is not set
# end of Multifunction device drivers
#
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index b9b25a4a4ac1..c6326099bb61 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-109c946cbc1413f3a576b02078a10c8b
+13a81bc35e62247636060ddc6df36f77
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
@@ -40,6 +40,9 @@
CONFIG_DRIVER_SPI_OMAP3=y
# CONFIG_EEPROM_93XX46 is not set
CONFIG_EEPROM_AT24=y
+CONFIG_FASTBOOT_BASE=y
+CONFIG_FASTBOOT_CMD_OEM=y
+CONFIG_FASTBOOT_SPARSE=y
CONFIG_GPIO_GENERIC=y
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_OMAP=y
@@ -48,7 +51,6 @@
# CONFIG_HAVE_CLK is undefined
# CONFIG_I2C_MV64XXX is undefined
CONFIG_I2C_OMAP=y
-# CONFIG_I2C_STM32 is undefined
CONFIG_IMAGE_SPARSE=y
CONFIG_MACH_AFI_GF=y
# CONFIG_MACH_BEAGLE is not set
@@ -103,9 +105,6 @@
# CONFIG_TIMESTAMP is not set
CONFIG_TI_SYSC=y
CONFIG_USB_GADGET_FASTBOOT=y
-# CONFIG_USB_GADGET_FASTBOOT_BUF is not set
-CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y
-CONFIG_USB_GADGET_FASTBOOT_SPARSE=y
CONFIG_USB_MUSB=y
CONFIG_USB_MUSB_AM335X=y
CONFIG_USB_MUSB_DSPS=y
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 814a878c9320..9dfab1ebd50e 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 2020.06.0-20200617-1 Configuration
+# Barebox/arm 2020.08.1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -77,6 +77,7 @@ CONFIG_IMX_MULTI_BOARDS=y
# CONFIG_MACH_FREESCALE_MX53_VMX53 is not set
# CONFIG_MACH_TX53 is not set
# CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
+# CONFIG_MACH_PROTONIC_IMX6 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
@@ -111,6 +112,7 @@ CONFIG_MACH_UDOO_NEO=y
# CONFIG_MACH_FREESCALE_MX7_SABRESD is not set
# CONFIG_MACH_NXP_IMX6ULL_EVK is not set
# CONFIG_MACH_NXP_IMX8MM_EVK is not set
+# CONFIG_MACH_NXP_IMX8MP_EVK is not set
# CONFIG_MACH_NXP_IMX8MQ_EVK is not set
# CONFIG_MACH_PHYTEC_SOM_IMX8MQ is not set
# CONFIG_MACH_GRINN_LITEBOARD is not set
@@ -166,6 +168,7 @@ CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y
CONFIG_UBIFORMAT=y
CONFIG_USBGADGET_START=y
CONFIG_BOOT=y
+CONFIG_FASTBOOT_BASE=y
#
# General Settings
@@ -204,6 +207,7 @@ CONFIG_MALLOC_SIZE=0x0
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_HANG is not set
@@ -231,6 +235,7 @@ CONFIG_BOOTM_INITRD=y
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_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
@@ -279,6 +284,13 @@ CONFIG_RESET_SOURCE=y
#
# CONFIG_BOOTM_OPTEE is not set
# end of OP-TEE loading
+
+#
+# Android Fastboot
+#
+CONFIG_FASTBOOT_SPARSE=y
+CONFIG_FASTBOOT_CMD_OEM=y
+# end of Android Fastboot
# end of General Settings
#
@@ -319,6 +331,7 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
CONFIG_CMD_MMC_EXTCSD=y
+# CONFIG_CMD_POLLER is not set
# end of Information
#
@@ -593,7 +606,6 @@ CONFIG_I2C_GPIO=y
CONFIG_I2C_IMX=y
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_MV64XXX is not set
-# CONFIG_I2C_STM32 is not set
# end of I2C Hardware Bus support
# CONFIG_I2C_MUX is not set
@@ -692,9 +704,6 @@ CONFIG_USB_GADGET_AUTOSTART=y
CONFIG_USB_GADGET_DFU=y
CONFIG_USB_GADGET_SERIAL=y
CONFIG_USB_GADGET_FASTBOOT=y
-CONFIG_USB_GADGET_FASTBOOT_SPARSE=y
-# CONFIG_USB_GADGET_FASTBOOT_BUF is not set
-CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y
# CONFIG_USB_MUSB is not set
CONFIG_VIDEO=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
@@ -762,8 +771,6 @@ CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
# CONFIG_MFD_STPMIC1 is not set
-# CONFIG_FINTEK_SUPERIO is not set
-# CONFIG_SMSC_SUPERIO is not set
# end of Multifunction device drivers
#
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index ec01384a27c6..e27ba96ca08a 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-109c946cbc1413f3a576b02078a10c8b
+13a81bc35e62247636060ddc6df36f77
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
@@ -62,6 +62,9 @@
# CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set
# CONFIG_EEPROM_93XX46 is not set
CONFIG_EEPROM_AT25=y
+CONFIG_FASTBOOT_BASE=y
+CONFIG_FASTBOOT_CMD_OEM=y
+CONFIG_FASTBOOT_SPARSE=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
CONFIG_FS_UBIFS=y
CONFIG_FS_UBIFS_COMPRESSION_LZO=y
@@ -114,12 +117,14 @@
CONFIG_MACH_NITROGEN6=y
# CONFIG_MACH_NXP_IMX6ULL_EVK is not set
# CONFIG_MACH_NXP_IMX8MM_EVK is not set
+# CONFIG_MACH_NXP_IMX8MP_EVK is not set
# CONFIG_MACH_NXP_IMX8MQ_EVK is not set
# CONFIG_MACH_PCA100 is not set
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set
# 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_REALQ7 is not set
# CONFIG_MACH_RPI2 is undefined
# CONFIG_MACH_RPI3 is undefined
@@ -217,9 +222,6 @@
CONFIG_USB_GADGET_DRIVER_ARC=y
CONFIG_USB_GADGET_DUALSPEED=y
CONFIG_USB_GADGET_FASTBOOT=y
-# CONFIG_USB_GADGET_FASTBOOT_BUF is not set
-CONFIG_USB_GADGET_FASTBOOT_CMD_OEM=y
-CONFIG_USB_GADGET_FASTBOOT_SPARSE=y
CONFIG_USB_IMX_CHIPIDEA=y
CONFIG_USB_IMX_CHIPIDEA_USBMISC=y
CONFIG_USB_IMX_PHY=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index a4403c01bf5f..9569d74d5a8b 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 2020.06.0-20200617-1 Configuration
+# Barebox/arm 2020.08.1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -134,6 +134,7 @@ CONFIG_MALLOC_SIZE=0x0
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_HANG is not set
@@ -161,6 +162,7 @@ CONFIG_BOOTM_INITRD=y
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_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
@@ -245,6 +247,7 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
# CONFIG_CMD_MMC_EXTCSD is not set
+# CONFIG_CMD_POLLER is not set
# end of Information
#
@@ -585,8 +588,6 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
#
# CONFIG_MFD_MC13XXX is not set
# CONFIG_MFD_SYSCON is not set
-# CONFIG_FINTEK_SUPERIO is not set
-# CONFIG_SMSC_SUPERIO is not set
# end of Multifunction device drivers
#
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index dc66dad6e217..0e8ff24726f0 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-109c946cbc1413f3a576b02078a10c8b
+13a81bc35e62247636060ddc6df36f77
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_BOOTM_INITRD=y
# CONFIG_CMD_I2C is undefined
@@ -19,7 +19,6 @@
# CONFIG_I2C_GPIO is undefined
# CONFIG_I2C_MUX is undefined
# CONFIG_I2C_MV64XXX is undefined
-# CONFIG_I2C_STM32 is undefined
# CONFIG_KEYBOARD_QT1070 is undefined
# CONFIG_LED_PCA955X is undefined
CONFIG_MACH_RPI2=y
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 8a3deee05de5..992f6f113bf3 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 2020.06.0-20200617-1 Configuration
+# Barebox/arm 2020.08.1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -128,6 +128,7 @@ CONFIG_MALLOC_SIZE=0x0
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_HANG is not set
@@ -156,6 +157,7 @@ CONFIG_BOOTM_INITRD=y
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_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
@@ -240,6 +242,7 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
# CONFIG_CMD_MMC_EXTCSD is not set
+# CONFIG_CMD_POLLER is not set
# end of Information
#
@@ -556,8 +559,6 @@ CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
CONFIG_MFD_STPMIC1=y
-# CONFIG_FINTEK_SUPERIO is not set
-# CONFIG_SMSC_SUPERIO is not set
CONFIG_MFD_STM32_TIMERS=y
# end of Multifunction device drivers
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index d2a5c42d9fec..9fd5d54c5c46 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-109c946cbc1413f3a576b02078a10c8b
+13a81bc35e62247636060ddc6df36f77
# 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 53c2943a1a1c..1fed6298207f 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 2020.06.0-20200617-1 Configuration
+# Barebox/arm 2020.08.1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -122,6 +122,7 @@ CONFIG_MALLOC_SIZE=0x0
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_HANG is not set
@@ -149,6 +150,7 @@ CONFIG_BOOTM_INITRD=y
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_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
@@ -234,6 +236,7 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
# CONFIG_CMD_MMC_EXTCSD is not set
+# CONFIG_CMD_POLLER is not set
# end of Information
#
@@ -487,7 +490,6 @@ CONFIG_I2C=y
#
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_MV64XXX is not set
-# CONFIG_I2C_STM32 is not set
# end of I2C Hardware Bus support
# CONFIG_I2C_MUX is not set
@@ -605,8 +607,6 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
# CONFIG_MFD_STPMIC1 is not set
-# CONFIG_FINTEK_SUPERIO is not set
-# CONFIG_SMSC_SUPERIO is not set
# end of Multifunction device drivers
#
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 2150908d8be8..f685c750f7b5 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-109c946cbc1413f3a576b02078a10c8b
+13a81bc35e62247636060ddc6df36f77
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 4cd815be85c7..266c6e2fb860 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 2020.06.0-20200617-1 Configuration
+# Barebox/arm 2020.08.1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -135,6 +135,7 @@ CONFIG_MALLOC_SIZE=0x0
# CONFIG_EXPERIMENTAL is not set
# CONFIG_MALLOC_DLMALLOC is not set
CONFIG_MALLOC_TLSF=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
# CONFIG_PANIC_HANG is not set
@@ -162,6 +163,7 @@ CONFIG_BOOTM_VERBOSE=y
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_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
@@ -247,6 +249,7 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_VERSION=y
CONFIG_CMD_MMC=y
# CONFIG_CMD_MMC_EXTCSD is not set
+# CONFIG_CMD_POLLER is not set
# end of Information
#
@@ -507,7 +510,6 @@ CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_MV64XXX is not set
-# CONFIG_I2C_STM32 is not set
# end of I2C Hardware Bus support
# CONFIG_I2C_MUX is not set
@@ -619,8 +621,6 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
# CONFIG_MFD_STPMIC1 is not set
-# CONFIG_FINTEK_SUPERIO is not set
-# CONFIG_SMSC_SUPERIO is not set
# end of Multifunction device drivers
#
diff --git a/configs/platform-v7a/patches/barebox-2020.06.0/0001-ARM-rpi-dts-fix-MMIO-resources-clash-breaking-boot.patch b/configs/platform-v7a/patches/barebox-2020.06.0/0001-ARM-rpi-dts-fix-MMIO-resources-clash-breaking-boot.patch
deleted file mode 100644
index 20ab6f1a424d..000000000000
--- a/configs/platform-v7a/patches/barebox-2020.06.0/0001-ARM-rpi-dts-fix-MMIO-resources-clash-breaking-boot.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Wed, 17 Jun 2020 15:05:58 +0200
-Subject: [PATCH] ARM: rpi: dts: fix MMIO resources clash breaking boot
-
-The rpi3b device tree specifies 1G of RAM in the memory node, but maps
-the highest 16M of RAM's physical address range for peripheral use.
-
-When support for device tree probing was first added for the rpi3b
-in e8fab18835a1 ("ARM: rpi: switch to DT probe and multi-image build"),
-it had a memory { } node overriding the kernel node size with 0, so the
-size is computed later correctly.
-
-1dc748b3b202 ("dts: update to v5.1-rc1") came and renamed the upstream
-memory { } node to memory@0. So instead of overriding the old, we
-now created a second dummy along with the broken node.
-barebox did only parse the dummy, so it continued to limp along.
-
-8226f7f90973 ("of: base: parse all available memory nodes") started
-considering both nodes and rendered barebox v2020.05.0 unable to start
-up on the rpi3b because of the conflict between RAM range and peripherals
-like the bcm2835_mbox caused by parsing the broken memory node.
-
-At least one board also was broken for the same reason[1], so a more
-robust approach is in order. For nodes that lack a phandle, the
-&{/path} syntax can be used instead. This has the benefit that should
-the path disappear in future, a compile failure would result.
-
-[1] 0d26ce1c11a1 ("ARM: Phytec phyFLEX i.MX6: delete wrong memory node")
-
-Fixes: 1dc748b3b202 ("dts: update to v5.1-rc1")
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- arch/arm/dts/bcm2835-rpi.dts | 6 +++---
- arch/arm/dts/bcm2836-rpi-2.dts | 6 +++---
- arch/arm/dts/bcm2837-rpi-3.dts | 6 +++---
- arch/arm/dts/bcm2837-rpi-cm3.dts | 6 +++---
- 4 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts
-index c23e7c7c142b..4f227508010b 100644
---- a/arch/arm/dts/bcm2835-rpi.dts
-+++ b/arch/arm/dts/bcm2835-rpi.dts
-@@ -4,10 +4,10 @@
- chosen {
- stdout-path = &uart0;
- };
-+};
-
-- memory {
-- reg = <0x0 0x0>;
-- };
-+&{/memory@0} {
-+ reg = <0x0 0x0>;
- };
-
- &sdhci {
-diff --git a/arch/arm/dts/bcm2836-rpi-2.dts b/arch/arm/dts/bcm2836-rpi-2.dts
-index 42b6abb180de..c9c3892d6a21 100644
---- a/arch/arm/dts/bcm2836-rpi-2.dts
-+++ b/arch/arm/dts/bcm2836-rpi-2.dts
-@@ -4,8 +4,8 @@
- chosen {
- stdout-path = &uart0;
- };
-+};
-
-- memory {
-- reg = <0x0 0x0>;
-- };
-+&{/memory@0} {
-+ reg = <0x0 0x0>;
- };
-diff --git a/arch/arm/dts/bcm2837-rpi-3.dts b/arch/arm/dts/bcm2837-rpi-3.dts
-index 420525b9e857..d66beddb2281 100644
---- a/arch/arm/dts/bcm2837-rpi-3.dts
-+++ b/arch/arm/dts/bcm2837-rpi-3.dts
-@@ -4,10 +4,10 @@
- chosen {
- stdout-path = &uart1;
- };
-+};
-
-- memory {
-- reg = <0x0 0x0>;
-- };
-+&{/memory@0} {
-+ reg = <0x0 0x0>;
- };
-
- &sdhci {
-diff --git a/arch/arm/dts/bcm2837-rpi-cm3.dts b/arch/arm/dts/bcm2837-rpi-cm3.dts
-index 01c1f9a67714..85a6ac46619a 100644
---- a/arch/arm/dts/bcm2837-rpi-cm3.dts
-+++ b/arch/arm/dts/bcm2837-rpi-cm3.dts
-@@ -4,8 +4,8 @@
- chosen {
- stdout-path = &uart0;
- };
-+};
-
-- memory {
-- reg = <0x0 0x0>;
-- };
-+&{/memory@0} {
-+ reg = <0x0 0x0>;
- };
diff --git a/configs/platform-v7a/patches/barebox-2020.06.0/0101-Release-2020.06.0-customers-pengutronix-distrokit-v7.patch b/configs/platform-v7a/patches/barebox-2020.06.0/0101-Release-2020.06.0-customers-pengutronix-distrokit-v7.patch
deleted file mode 100644
index bbee24d4a4c7..000000000000
--- a/configs/platform-v7a/patches/barebox-2020.06.0/0101-Release-2020.06.0-customers-pengutronix-distrokit-v7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Wed, 17 Jun 2020 16:50:59 +0200
-Subject: [PATCH] Release
- 2020.06.0/customers/pengutronix/distrokit-v7a/20200617-1
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 0531a712d758..b3986a6ca995 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- VERSION = 2020
- PATCHLEVEL = 06
- SUBLEVEL = 0
--EXTRAVERSION =
-+EXTRAVERSION =-20200617-1
- NAME = None
-
- # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2020.06.0/series b/configs/platform-v7a/patches/barebox-2020.06.0/series
deleted file mode 100644
index 4c135073c6d9..000000000000
--- a/configs/platform-v7a/patches/barebox-2020.06.0/series
+++ /dev/null
@@ -1,11 +0,0 @@
-# umpf-base: v2020.06.0
-# umpf-name: 2020.06.0/customers/pengutronix/distrokit-v7a
-# umpf-version: 2020.06.0/customers/pengutronix/distrokit-v7a/20200617-1
-# umpf-topic: v2020.06.0/topic/rpi-memory
-# umpf-hashinfo: 8ee934de1a8334b19f9e9caad6be29e0a8e93fdb
-# umpf-topic-range: ff087598f4cdc426ba883a8720367a4ff3d6b9fe..1607cbfce2ba75e7455c9ab7c3251a68b290c68e
-0001-ARM-rpi-dts-fix-MMIO-resources-clash-breaking-boot.patch
-# umpf-release: 2020.06.0/customers/pengutronix/distrokit-v7a/20200617-1
-# umpf-topic-range: 1607cbfce2ba75e7455c9ab7c3251a68b290c68e..af8e8583ac0ed9f48ef13a81caa4ec17030778d8
-0101-Release-2020.06.0-customers-pengutronix-distrokit-v7.patch
-# umpf-end
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index e1f6b211ac29..7075705bc32c 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -167,8 +167,8 @@ PTXCONF_CONSOLE_SPEED="115200"
# PTXCONF_AT91BOOTSTRAP2 is not set
PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm"
PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2020.06.0"
-PTXCONF_BAREBOX_COMMON_MD5="466e436389ab1c771ddfffb5ee16e7b8"
+PTXCONF_BAREBOX_COMMON_VERSION="2020.08.1"
+PTXCONF_BAREBOX_COMMON_MD5="d57031878390cb267f6641aedffcda9f"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AM335X=y
--
2.28.0
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev parent reply other threads:[~2020-09-15 18:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 18:59 [DistroKit] [PATCH 01/15] PTXdist: migrate 2020.08.0 -> 2020.09.0 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 02/15] strace: remove local version bump Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 03/15] iproute2: document upstream fix for our local fork Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 04/15] mips: kernel: version bump 5.6.2 -> 5.8.9 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 05/15] rpi: " Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 06/15] rpi: install kernel into /boot so that barebox can find it Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 07/15] rpi: barebox: version bump 2018.03.0 -> 2020.08.1 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 08/15] rpi: barebox: migrate defaultenv from /env/config to nv variables Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 09/15] doc: rpi: mention that Raspberry Pi Zero W is also supported Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 10/15] v7a: kernel: version bump 5.8 -> 5.8.9 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 11/15] v7a: images: add more helpful kconfig help texts Roland Hieber
2020-09-15 18:59 ` Roland Hieber [this message]
2020-09-15 18:59 ` [DistroKit] [PATCH 13/15] v7a: image-vexpress: slim down image Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 14/15] v8a: kernel: version bump 5.8 -> 5.8.9 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 15/15] x86_64: kernel: version bump 5.6.2 " Roland Hieber
2020-09-17 18:44 ` [DistroKit] [PATCH 01/15] PTXdist: migrate 2020.08.0 -> 2020.09.0 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=20200915185920.3353-12-rhi@pengutronix.de \
--to=rhi@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