From 18eaac17bf76f5b1cba0ee5ca42137b23047f476 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Wed, 21 Apr 2021 09:38:20 +0200 Subject: v7a: barebox: version bump v2021.02.0 → v2021.04.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updating to v2021.04.0 lets us drop the patches we have, but unfortunately we need to import a new patch in return to fix a USB/Ethernet breakage on barebox-rpi2. Kconfig changes are those produced by oldconfig, except for the following: - BTHREAD: new feature that's not used by default, but could use some extra coverage. Enable it for all configuration, except for am335x-mlo, where we have a restrictive size limitation. - MACH_STM32MP15X_EV1: The EV1 is the full featured STM32MP1 evaluation kit. In preperation for supporting this, enable its newly added barebox support. Signed-off-by: Ahmad Fatoum Link: https://lore.pengutronix.de/20210421073820.1318-1-a.fatoum@pengutronix.de Signed-off-by: Robert Schwebel --- configs/platform-v7a/barebox-am335x-mlo.config | 13 ++++- configs/platform-v7a/barebox-am335x.config | 16 +++++- configs/platform-v7a/barebox-am335x.config.diff | 4 +- configs/platform-v7a/barebox-at91.config | 13 ++++- configs/platform-v7a/barebox-at91.config.diff | 4 +- configs/platform-v7a/barebox-mx6.config | 15 ++++- configs/platform-v7a/barebox-mx6.config.diff | 4 +- configs/platform-v7a/barebox-rpi2.config | 14 ++++- configs/platform-v7a/barebox-rpi2.config.diff | 2 +- configs/platform-v7a/barebox-stm32mp.config | 15 ++++- configs/platform-v7a/barebox-stm32mp.config.diff | 6 +- configs/platform-v7a/barebox-vexpress.config | 14 ++++- configs/platform-v7a/barebox-vexpress.config.diff | 2 +- configs/platform-v7a/barebox.config | 14 ++++- .../bcm283X-Select-OF-clock-providers.patch | 30 ---------- .../net-phy-fix-waiting-for-link.patch | 35 ----------- ...base-probe-simple-pm-bus-children-as-well.patch | 40 ------------- .../platform-v7a/patches/barebox-2021.02.0/series | 6 -- ...increase-timeout-for-waiting-on-host-mode.patch | 67 ++++++++++++++++++++++ .../platform-v7a/patches/barebox-2021.04.0/series | 1 + configs/platform-v7a/platformconfig | 4 +- 21 files changed, 176 insertions(+), 143 deletions(-) delete mode 100644 configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch delete mode 100644 configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch delete mode 100644 configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch delete mode 100644 configs/platform-v7a/patches/barebox-2021.02.0/series create mode 100644 configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch create mode 100644 configs/platform-v7a/patches/barebox-2021.04.0/series diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index c24227a..aa1eb19 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.02.0 Configuration +# Barebox/arm 2021.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -15,7 +15,6 @@ CONFIG_TEXT_BASE=0x0 # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set @@ -35,7 +34,7 @@ CONFIG_ARCH_OMAP=y # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_QEMU is not set +# CONFIG_ARCH_ARM64_VIRT is not set # # Processor Type @@ -89,8 +88,10 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y +CONFIG_HAS_ARCH_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y +CONFIG_USE_COMPRESSED_DTB=y CONFIG_FILETYPE=y # @@ -168,6 +169,7 @@ CONFIG_DEFAULT_COMPRESSION_NONE=y # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set # CONFIG_POLLER is not set +# CONFIG_BTHREAD is not set # CONFIG_STATE is not set # CONFIG_BOOTCHOOSER is not set @@ -278,6 +280,7 @@ CONFIG_DISK=y # CONFIG_USB_GADGET is not set # CONFIG_USB_MUSB is not set # CONFIG_VIDEO is not set +# CONFIG_SOUND is not set CONFIG_MCI=y # @@ -409,6 +412,10 @@ CONFIG_TI_SYSC=y # NVME Support # # end of NVME Support + +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_VIRTIO_MENU is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index f2393f9..87d7cb2 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.02.0 Configuration +# Barebox/arm 2021.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -16,7 +16,6 @@ CONFIG_TEXT_BASE=0x0 # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set @@ -36,7 +35,7 @@ CONFIG_ARCH_OMAP=y # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_QEMU is not set +# CONFIG_ARCH_ARM64_VIRT is not set # # Processor Type @@ -94,9 +93,11 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y +CONFIG_HAS_ARCH_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y +CONFIG_USE_COMPRESSED_DTB=y CONFIG_FILETYPE=y CONFIG_BINFMT=y CONFIG_UIMAGE=y @@ -128,6 +129,7 @@ CONFIG_HAVE_IMAGE_COMPRESSION=y CONFIG_PBL_IMAGE=y CONFIG_PBL_MULTI_IMAGES=y CONFIG_PBL_RELOCATABLE=y +CONFIG_BOARD_GENERIC_DT=y CONFIG_IMAGE_COMPRESSION=y # CONFIG_IMAGE_COMPRESSION_LZ4 is not set CONFIG_IMAGE_COMPRESSION_LZO=y @@ -207,6 +209,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y +CONFIG_BTHREAD=y CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -271,6 +274,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +CONFIG_CMD_BTHREAD=y # CONFIG_CMD_SLICE is not set # end of Information @@ -404,6 +408,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_NAND=y +# CONFIG_CMD_NANDTEST is not set # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_POWEROFF is not set CONFIG_CMD_SPI=y @@ -620,6 +625,7 @@ CONFIG_USB_MUSB_AM335X=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y # CONFIG_VIDEO is not set +# CONFIG_SOUND is not set CONFIG_MCI=y # @@ -784,6 +790,10 @@ CONFIG_REGULATOR_FIXED=y # NVME Support # # end of NVME Support + +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_VIRTIO_MENU is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index cdc62eb..79d06b5 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -a9df31c9913608b3be91d64ddcc7edb8 +ce95be8f999c1d51c97a3eeb3fd3737f # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set @@ -22,6 +22,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y # CONFIG_CMD_KEYSTORE is not set CONFIG_CMD_MIITOOL=y CONFIG_CMD_NAND=y +# CONFIG_CMD_NANDTEST is not set # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_SMC is undefined # CONFIG_COMMON_CLK is undefined @@ -103,5 +104,6 @@ CONFIG_USB_MUSB_DSPS=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_OTGDEV=y +CONFIG_USE_COMPRESSED_DTB=y # CONFIG_WATCHDOG_BCM2835 is undefined CONFIG_WATCHDOG_OMAP=y diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index ea2ea6e..82c0382 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.02.0 Configuration +# Barebox/arm 2021.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -17,7 +17,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_HIGHBANK is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set @@ -37,7 +36,7 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_QEMU is not set +# CONFIG_ARCH_ARM64_VIRT is not set # # Processor Type @@ -100,9 +99,11 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y +CONFIG_HAS_ARCH_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y +CONFIG_USE_COMPRESSED_DTB=y CONFIG_FILETYPE=y CONFIG_BINFMT=y CONFIG_UIMAGE=y @@ -208,6 +209,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y +CONFIG_BTHREAD=y CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -267,6 +269,7 @@ CONFIG_CMD_VERSION=y # CONFIG_CMD_MMC is not set # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +CONFIG_CMD_BTHREAD=y # CONFIG_CMD_SLICE is not set # end of Information @@ -576,6 +579,7 @@ CONFIG_DISK_WRITE=y # CONFIG_USB_GADGET is not set # CONFIG_USB_MUSB is not set # CONFIG_VIDEO is not set +# CONFIG_SOUND is not set CONFIG_MCI_SDHCI=y CONFIG_MCI=y @@ -742,6 +746,9 @@ CONFIG_REGULATOR_FIXED=y # end of NVME Support # CONFIG_SYSCON_REBOOT_MODE is not set +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_VIRTIO_MENU is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index 6eb2eb3..7051f52 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -a9df31c9913608b3be91d64ddcc7edb8 +ce95be8f999c1d51c97a3eeb3fd3737f CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_TEXT_BASE=0x23f00000 @@ -10,6 +10,7 @@ CONFIG_AT91SAM9_SMC=y CONFIG_AT91_MCI_PBL=y CONFIG_AT91_MULTI_BOARDS=y # CONFIG_BOARD_ARM_GENERIC_DT is not set +# CONFIG_BOARD_GENERIC_DT is undefined CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_CLOCKSOURCE_ATMEL_PIT=y # CONFIG_CLOCKSOURCE_BCM283X is undefined @@ -117,6 +118,7 @@ CONFIG_SPI_MEM=y # CONFIG_USB_STORAGE is undefined # CONFIG_USB_ULPI is undefined # CONFIG_USB_XHCI is undefined +CONFIG_USE_COMPRESSED_DTB=y CONFIG_WATCHDOG_AT91SAM9=y # CONFIG_WATCHDOG_BCM2835 is undefined # CONFIG_XZ_DECOMPRESS is not set diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index dea0182..69da1f7 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.02.0 Configuration +# Barebox/arm 2021.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -15,7 +15,6 @@ CONFIG_TEXT_BASE=0x0 # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_HIGHBANK is not set CONFIG_ARCH_IMX=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set @@ -35,7 +34,7 @@ CONFIG_ARCH_IMX=y # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_QEMU is not set +# CONFIG_ARCH_ARM64_VIRT is not set # # Processor Type @@ -157,6 +156,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y +CONFIG_HAS_ARCH_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -193,6 +193,7 @@ CONFIG_HAVE_IMAGE_COMPRESSION=y CONFIG_PBL_IMAGE=y CONFIG_PBL_MULTI_IMAGES=y CONFIG_PBL_RELOCATABLE=y +CONFIG_BOARD_GENERIC_DT=y CONFIG_IMAGE_COMPRESSION=y # CONFIG_IMAGE_COMPRESSION_LZ4 is not set CONFIG_IMAGE_COMPRESSION_LZO=y @@ -275,6 +276,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y +CONFIG_BTHREAD=y CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -339,6 +341,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y CONFIG_CMD_MMC_EXTCSD=y # CONFIG_CMD_POLLER is not set +CONFIG_CMD_BTHREAD=y # CONFIG_CMD_SLICE is not set # end of Information @@ -477,6 +480,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_NAND=y +# CONFIG_CMD_NANDTEST is not set # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_POWEROFF is not set CONFIG_CMD_SPI=y @@ -717,6 +721,7 @@ CONFIG_DRIVER_VIDEO_IMX_IPUV3=y CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y # CONFIG_DRIVER_VIDEO_IMX_IPUV3_PARALLEL is not set # CONFIG_DRIVER_VIDEO_BOCHS_ISA is not set +# CONFIG_DRIVER_VIDEO_SIMPLEFB_CLIENT is not set CONFIG_DRIVER_VIDEO_SIMPLEFB=y # CONFIG_DRIVER_VIDEO_EDID is not set # CONFIG_DRIVER_VIDEO_BACKLIGHT is not set @@ -726,6 +731,7 @@ CONFIG_DRIVER_VIDEO_SIMPLEFB=y # # CONFIG_DRIVER_VIDEO_MTL017 is not set # CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set +# CONFIG_SOUND is not set CONFIG_MCI_SDHCI=y CONFIG_MCI=y @@ -919,6 +925,9 @@ CONFIG_USB_NOP_XCEIV=y # end of NVME Support # CONFIG_SYSCON_REBOOT_MODE is not set +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_VIRTIO_MENU is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index ebe17c2..40f2391 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -a9df31c9913608b3be91d64ddcc7edb8 +ce95be8f999c1d51c97a3eeb3fd3737f # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -26,6 +26,7 @@ CONFIG_CLOCKSOURCE_IMX_GPT=y CONFIG_CMD_MIITOOL=y CONFIG_CMD_MMC_EXTCSD=y CONFIG_CMD_NAND=y +# CONFIG_CMD_NANDTEST is not set # CONFIG_CMD_NAND_BITFLIP is not set # CONFIG_CMD_SMC is undefined CONFIG_CMD_SPLASH=y @@ -58,6 +59,7 @@ CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y # CONFIG_DRIVER_VIDEO_IMX_IPUV3_PARALLEL is not set # CONFIG_DRIVER_VIDEO_MTL017 is not set CONFIG_DRIVER_VIDEO_SIMPLEFB=y +# CONFIG_DRIVER_VIDEO_SIMPLEFB_CLIENT is not set # CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set # CONFIG_EEPROM_93XX46 is not set CONFIG_EEPROM_AT25=y diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 2f8646a..aac7f18 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.02.0 Configuration +# Barebox/arm 2021.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -15,7 +15,6 @@ CONFIG_ARCH_BCM283X=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set @@ -35,7 +34,7 @@ CONFIG_ARCH_BCM283X=y # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_QEMU is not set +# CONFIG_ARCH_ARM64_VIRT is not set # # Processor Type @@ -86,6 +85,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y +CONFIG_HAS_ARCH_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -117,6 +117,7 @@ CONFIG_HAVE_IMAGE_COMPRESSION=y CONFIG_PBL_IMAGE=y CONFIG_PBL_MULTI_IMAGES=y CONFIG_PBL_RELOCATABLE=y +CONFIG_BOARD_GENERIC_DT=y CONFIG_IMAGE_COMPRESSION=y # CONFIG_IMAGE_COMPRESSION_LZ4 is not set CONFIG_IMAGE_COMPRESSION_LZO=y @@ -196,6 +197,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y +CONFIG_BTHREAD=y CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -252,6 +254,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +CONFIG_CMD_BTHREAD=y # CONFIG_CMD_SLICE is not set # end of Information @@ -561,6 +564,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_GADGET is not set # CONFIG_USB_MUSB is not set # CONFIG_VIDEO is not set +# CONFIG_SOUND is not set CONFIG_MCI_SDHCI=y CONFIG_MCI=y @@ -716,6 +720,10 @@ CONFIG_USB_NOP_XCEIV=y # NVME Support # # end of NVME Support + +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_VIRTIO_MENU is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index 743d9f5..5e86a3d 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -a9df31c9913608b3be91d64ddcc7edb8 +ce95be8f999c1d51c97a3eeb3fd3737f CONFIG_ARM_ASM_UNIFIED=y CONFIG_BOOTM_INITRD=y # CONFIG_CMD_I2C is undefined diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index 1f4618d..cf5a1ac 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.02.0 Configuration +# Barebox/arm 2021.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -16,7 +16,6 @@ CONFIG_TEXT_BASE=0x0 # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set @@ -36,7 +35,7 @@ CONFIG_ARCH_STM32MP=y # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_QEMU is not set +# CONFIG_ARCH_ARM64_VIRT is not set # # Processor Type @@ -55,6 +54,7 @@ CONFIG_ARCH_STM32MP157=y CONFIG_MACH_STM32MP15XX_DKX=y CONFIG_MACH_LXA_MC1=y # CONFIG_MACH_SEEED_ODYSSEY is not set +CONFIG_MACH_STM32MP15X_EV1=y # CONFIG_BOARD_ARM_GENERIC_DT is not set CONFIG_ARM_ASM_UNIFIED=y CONFIG_AEABI=y @@ -81,9 +81,11 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y +CONFIG_HAS_ARCH_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y +CONFIG_USE_COMPRESSED_DTB=y CONFIG_FILETYPE=y CONFIG_BINFMT=y CONFIG_UIMAGE=y @@ -192,6 +194,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y +CONFIG_BTHREAD=y CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -248,6 +251,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y CONFIG_CMD_MMC_EXTCSD=y # CONFIG_CMD_POLLER is not set +CONFIG_CMD_BTHREAD=y # CONFIG_CMD_SLICE is not set # end of Information @@ -524,6 +528,7 @@ CONFIG_DISK_WRITE=y # CONFIG_USB_GADGET is not set # CONFIG_USB_MUSB is not set # CONFIG_VIDEO is not set +# CONFIG_SOUND is not set CONFIG_MCI=y # @@ -656,6 +661,7 @@ CONFIG_STM32_BSEC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED=y # CONFIG_REGULATOR_STM32_PWR is not set +CONFIG_REGULATOR_STM32_VREFBUF=y CONFIG_REGULATOR_STPMIC1=y # CONFIG_REGULATOR_ANATOP is not set @@ -696,6 +702,9 @@ CONFIG_RESET_STM32=y # end of NVME Support # CONFIG_SYSCON_REBOOT_MODE is not set +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_VIRTIO_MENU is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index da9534c..5592085 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -a9df31c9913608b3be91d64ddcc7edb8 +ce95be8f999c1d51c97a3eeb3fd3737f # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_NR_GPIO=416 @@ -14,6 +14,7 @@ CONFIG_ARM_PSCI_OF=y CONFIG_ARM_USE_COMPRESSED_DTB=y CONFIG_AT803X_PHY=y # CONFIG_BOARD_ARM_GENERIC_DT is not set +# CONFIG_BOARD_GENERIC_DT is undefined CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BZLIB is not set @@ -69,6 +70,7 @@ CONFIG_MACH_LXA_MC1=y # CONFIG_MACH_RPI_COMMON is undefined # CONFIG_MACH_SEEED_ODYSSEY is not set CONFIG_MACH_STM32MP15XX_DKX=y +CONFIG_MACH_STM32MP15X_EV1=y # CONFIG_MCI_BCM283X is undefined # CONFIG_MCI_BCM283X_SDHOST is undefined # CONFIG_MCI_MMCI is not set @@ -114,6 +116,7 @@ CONFIG_PWM_STM32=y # CONFIG_REGULATOR_BCM283X is undefined CONFIG_REGULATOR_FIXED=y # CONFIG_REGULATOR_STM32_PWR is not set +CONFIG_REGULATOR_STM32_VREFBUF=y CONFIG_REGULATOR_STPMIC1=y CONFIG_REMOTEPROC=y CONFIG_RESET_CONTROLLER=y @@ -144,6 +147,7 @@ CONFIG_THUMB2_BAREBOX=y # CONFIG_USB_STORAGE is undefined # CONFIG_USB_ULPI is undefined # CONFIG_USB_XHCI is undefined +CONFIG_USE_COMPRESSED_DTB=y # CONFIG_WATCHDOG_BCM2835 is undefined CONFIG_WATCHDOG_POLLER=y # CONFIG_XZ_DECOMPRESS is not set diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index 1e46f68..c404788 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.02.0 Configuration +# Barebox/arm 2021.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -15,7 +15,6 @@ CONFIG_TEXT_BASE=0x0 # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set @@ -35,7 +34,7 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_QEMU is not set +# CONFIG_ARCH_ARM64_VIRT is not set # # Processor Type @@ -74,6 +73,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y +CONFIG_HAS_ARCH_SJLJ=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y CONFIG_FILETYPE=y @@ -106,6 +106,7 @@ CONFIG_HAVE_IMAGE_COMPRESSION=y CONFIG_PBL_IMAGE=y CONFIG_PBL_MULTI_IMAGES=y CONFIG_PBL_RELOCATABLE=y +CONFIG_BOARD_GENERIC_DT=y CONFIG_IMAGE_COMPRESSION=y # CONFIG_IMAGE_COMPRESSION_LZ4 is not set CONFIG_IMAGE_COMPRESSION_LZO=y @@ -185,6 +186,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y +CONFIG_BTHREAD=y CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -242,6 +244,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +CONFIG_CMD_BTHREAD=y # CONFIG_CMD_SLICE is not set # end of Information @@ -572,6 +575,7 @@ CONFIG_USB_GADGET_SERIAL=y # CONFIG_USB_GADGET_FASTBOOT is not set # CONFIG_USB_MUSB is not set # CONFIG_VIDEO is not set +# CONFIG_SOUND is not set CONFIG_MCI=y # @@ -709,6 +713,10 @@ CONFIG_REGULATOR=y # NVME Support # # end of NVME Support + +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_VIRTIO_MENU is not set # end of Drivers # diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 5d0b1d6..d9bd76f 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -a9df31c9913608b3be91d64ddcc7edb8 +ce95be8f999c1d51c97a3eeb3fd3737f 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 eac7175..0912372 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.02.0 Configuration +# Barebox/arm 2021.04.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -15,7 +15,6 @@ CONFIG_ARCH_BCM283X=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DIGIC is not set # CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MVEBU is not set @@ -35,7 +34,7 @@ CONFIG_ARCH_BCM283X=y # CONFIG_ARCH_UEMD is not set # CONFIG_ARCH_ZYNQ is not set # CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_QEMU is not set +# CONFIG_ARCH_ARM64_VIRT is not set # # Processor Type @@ -85,6 +84,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y +CONFIG_HAS_ARCH_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -118,6 +118,7 @@ CONFIG_HAVE_IMAGE_COMPRESSION=y CONFIG_PBL_IMAGE=y CONFIG_PBL_MULTI_IMAGES=y CONFIG_PBL_RELOCATABLE=y +CONFIG_BOARD_GENERIC_DT=y CONFIG_IMAGE_COMPRESSION=y # CONFIG_IMAGE_COMPRESSION_LZ4 is not set CONFIG_IMAGE_COMPRESSION_LZO=y @@ -197,6 +198,7 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y +CONFIG_BTHREAD=y CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -254,6 +256,7 @@ CONFIG_CMD_VERSION=y CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set +CONFIG_CMD_BTHREAD=y # CONFIG_CMD_SLICE is not set # end of Information @@ -584,6 +587,7 @@ CONFIG_USB_GADGET_SERIAL=y # CONFIG_USB_GADGET_FASTBOOT is not set # CONFIG_USB_MUSB is not set # CONFIG_VIDEO is not set +# CONFIG_SOUND is not set CONFIG_MCI=y # @@ -750,6 +754,10 @@ CONFIG_REGULATOR_BCM283X=y # NVME Support # # end of NVME Support + +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_VIRTIO_MENU is not set # end of Drivers # diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch b/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch deleted file mode 100644 index 8b08428..0000000 --- a/configs/platform-v7a/patches/barebox-2021.02.0/bcm283X-Select-OF-clock-providers.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= -Date: Thu, 11 Mar 2021 13:10:47 +0100 -Subject: [PATCH] bcm283X: Select OF clock providers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This makes available the fixed clock needed on rpi3 for USB. - -USB stopped working when the dwc driver started to require an otg clock. - -Fixes: f73ca701bb85 ("usb: dwc2: add clk dependency for probe via oftree") -Signed-off-by: Uwe Kleine-König -Link: https://lore.pengutronix.de/20210312133030.521569-1-u.kleine-koenig@pengutronix.de ---- - arch/arm/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index ab0bf030131c..f9be9d42ecff 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -44,6 +44,7 @@ config ARCH_BCM283X - select GPIOLIB - select CLKDEV_LOOKUP - select COMMON_CLK -+ select COMMON_CLK_OF_PROVIDER - select CLOCKSOURCE_BCM283X - select ARM_AMBA - select HAS_DEBUG_LL diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch b/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch deleted file mode 100644 index cf42798..0000000 --- a/configs/platform-v7a/patches/barebox-2021.02.0/net-phy-fix-waiting-for-link.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Sascha Hauer -Date: Fri, 12 Mar 2021 11:13:09 +0100 -Subject: [PATCH] net: phy: fix waiting for link - -phydev->adjust_link() is called only from phy_update_status() when the -link status changes during that function. phydev->link is also updated -in genphy_update_link() called from phy_wait_aneg_done(), so it can -happen that phydev->link changes outside of phy_update_status(), thus -phydev->adjust_link is never called and no link change notice is -printed. - -Instead of calling genphy_update_link() from phy_wait_aneg_done(), call -phy_update_status(). This makes sure that a link change is properly -noticed. - -Fixes: 8f75aa496dcb ("net: reply to ping requests") -Signed-off-by: Sascha Hauer -Link: https://lore.pengutronix.de/20210312101309.29650-1-s.hauer@pengutronix.de ---- - drivers/net/phy/phy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c -index 622acbe40dd9..e8e8dad5bd25 100644 ---- a/drivers/net/phy/phy.c -+++ b/drivers/net/phy/phy.c -@@ -571,7 +571,7 @@ int phy_wait_aneg_done(struct phy_device *phydev) - } - - do { -- genphy_update_link(phydev); -+ phy_update_status(phydev); - if (phydev->link == 1) - return 0; - } while (!is_timeout(start, PHY_AN_TIMEOUT * SECOND)); diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch b/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch deleted file mode 100644 index 7873666..0000000 --- a/configs/platform-v7a/patches/barebox-2021.02.0/of-base-probe-simple-pm-bus-children-as-well.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Ahmad Fatoum -Date: Fri, 12 Mar 2021 08:27:46 +0100 -Subject: [PATCH] of: base: probe simple-pm-bus children as well - -Upstream is migrating device trees like those of the am33xx to use -simple-pm-bus, where applicable. These are buses that reference a clock -or a power domain that needs to be enabled in order to use devices on it. - -As we didn't yet support this binding, this broke the Beaglebone -and all other am33xx board since v2021.02.0. - -Fix this by adding simple-pm-bus to the of_default_bus_match_table. -Note that this is only an adequate solution for when the power domain -and clocks referenced are already enabled prior to barebox startup. - -For all other cases, driver support must be available for the clock -and power domains in questions and this driver must be extended to -make use of them. For the am33xx, the relevant buses are powered -and clocked on boot up, so we leave general support to another day.. - -Fixes: 6ea3de1b8ce7 ("dts: update to v5.11-rc1") -Signed-off-by: Ahmad Fatoum -Link: https://lore.pengutronix.de/20210312082218.17058-1-a.fatoum@pengutronix.de ---- - drivers/of/base.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/of/base.c b/drivers/of/base.c -index 8759099d7480..6fe02649ee53 100644 ---- a/drivers/of/base.c -+++ b/drivers/of/base.c -@@ -2272,6 +2272,8 @@ const char *of_get_model(void) - const struct of_device_id of_default_bus_match_table[] = { - { - .compatible = "simple-bus", -+ }, { -+ .compatible = "simple-pm-bus", - }, { - .compatible = "simple-mfd", - }, { diff --git a/configs/platform-v7a/patches/barebox-2021.02.0/series b/configs/platform-v7a/patches/barebox-2021.02.0/series deleted file mode 100644 index 0654fa5..0000000 --- a/configs/platform-v7a/patches/barebox-2021.02.0/series +++ /dev/null @@ -1,6 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -of-base-probe-simple-pm-bus-children-as-well.patch -net-phy-fix-waiting-for-link.patch -bcm283X-Select-OF-clock-providers.patch -# ad5056773d1eb319e6b321f55c67cc0c - git-ptx-patches magic diff --git a/configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch b/configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch new file mode 100644 index 0000000..06908ca --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch @@ -0,0 +1,67 @@ +From 91d5f4dfeaa72957bb8349c8af2da36a615b05a4 Mon Sep 17 00:00:00 2001 +From: Ahmad Fatoum +Date: Wed, 21 Apr 2021 09:27:04 +0200 +Subject: [PATCH master] usb: dwc2: increase timeout for waiting on host mode + +Commit 26459ab7803a ("usb: dwc2: Rework wait for host mode during +core reset") effectively reduced the timeout on switch to host mode +from 200ms to 110 us, which is insufficient for the IP on the Raspberry +Pi 3b, leading to: + + dwc2 3f980000.usb@7e980000.of: dwc2_wait_for_mode: Couldn't set host mode + +and an unusable USB (and Ethernet) after. + +Bump up the timeout to 200ms and help future debugging by logging how +much time it actually took. For the Raspberry 3b I got a value of 49ms. + +Note that this is also called from dwc2_force_mode, so worst case is +that a stuck IP delays barebox startup by 200ms. +An error message would alert to this fact, so it can be corrected. + +Fixes: 26459ab7803a ("usb: dwc2: Rework wait for host mode during core reset") +Signed-off-by: Ahmad Fatoum +Link: https://lore.pengutronix.de/20210421072704.520-1-a.fatoum@pengutronix.de +--- + drivers/usb/dwc2/core.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c +index 5d04a07b0393..7813344ffa65 100644 +--- a/drivers/usb/dwc2/core.c ++++ b/drivers/usb/dwc2/core.c +@@ -688,19 +688,23 @@ int dwc2_get_dr_mode(struct dwc2 *dwc2) + */ + void dwc2_wait_for_mode(struct dwc2 *dwc2, bool host_mode) + { +- unsigned int timeout = 110 * USECOND; +- int ret; ++ unsigned int timeout = 200 * MSECOND; ++ uint64_t start; + + dev_vdbg(dwc2->dev, "Waiting for %s mode\n", + host_mode ? "host" : "device"); + +- ret = wait_on_timeout(timeout, dwc2_is_host_mode(dwc2) == host_mode); +- if (ret) +- dev_err(dwc2->dev, "%s: Couldn't set %s mode\n", +- __func__, host_mode ? "host" : "device"); ++ start = get_time_ns(); ++ while (dwc2_is_host_mode(dwc2) != host_mode) { ++ if (is_timeout(start, timeout)) { ++ dev_err(dwc2->dev, "%s: Couldn't set %s mode\n", ++ __func__, host_mode ? "host" : "device"); ++ return; ++ } ++ } + +- dev_vdbg(dwc2->dev, "%s mode set\n", +- host_mode ? "Host" : "Device"); ++ dev_vdbg(dwc2->dev, "%s mode set after %lluns\n", ++ host_mode ? "Host" : "Device", get_time_ns() - start); + } + + /** +-- +2.29.2 + diff --git a/configs/platform-v7a/patches/barebox-2021.04.0/series b/configs/platform-v7a/patches/barebox-2021.04.0/series new file mode 100644 index 0000000..69f6558 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2021.04.0/series @@ -0,0 +1 @@ +0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index bcc2149..f818805 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.02.0" -PTXCONF_BAREBOX_COMMON_MD5="07045e34faa1135d9cd18503186b2d7f" +PTXCONF_BAREBOX_COMMON_VERSION="2021.04.0" +PTXCONF_BAREBOX_COMMON_MD5="2153af53e606d3a747acf11b2d49723b" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y -- cgit v1.2.3