diff options
Diffstat (limited to 'configs/platform-v7a')
17 files changed, 52 insertions, 84 deletions
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index aa1eb19..e60609e 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.04.0 Configuration +# Barebox/arm 2021.05.0 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -415,6 +415,8 @@ CONFIG_TI_SYSC=y # CONFIG_POWER_RESET_SYSCON is not set # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_POWER_RESET_GPIO is not set +# CONFIG_POWER_RESET_GPIO_RESTART 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 87d7cb2..0c0d5d3 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.04.0 Configuration +# Barebox/arm 2021.05.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -205,6 +205,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y +# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set @@ -711,6 +712,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_POLLER is not set # CONFIG_WATCHDOG_DW is not set CONFIG_WATCHDOG_OMAP=y +# CONFIG_GPIO_WATCHDOG is not set # CONFIG_PWM is not set CONFIG_HWRNG=y @@ -793,6 +795,8 @@ CONFIG_REGULATOR_FIXED=y # CONFIG_POWER_RESET_SYSCON is not set # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_POWER_RESET_GPIO is not set +# CONFIG_POWER_RESET_GPIO_RESTART 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 79d06b5..40622cc 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -ce95be8f999c1d51c97a3eeb3fd3737f +6b419fc845318242cfb0fda6f05c56d1 # 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 82c0382..28b44b9 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.04.0 Configuration +# Barebox/arm 2021.05.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -68,6 +68,7 @@ CONFIG_ARCH_TEXT_BASE=0x23f00000 # Atmel AT91 System-on-Chip # CONFIG_AT91_MULTI_BOARDS=y +# CONFIG_MACH_SKOV_ARM9CPU is not set # CONFIG_MACH_AT91SAM9263EK is not set # CONFIG_MACH_AT91SAM9X5EK is not set # CONFIG_MACH_MICROCHIP_KSZ9477_EVB is not set @@ -205,6 +206,7 @@ CONFIG_DEFAULT_COMPRESSION_BZIP2=y # CONFIG_DEFAULT_COMPRESSION_NONE is not set CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y +# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set @@ -670,6 +672,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_POLLER is not set CONFIG_WATCHDOG_AT91SAM9=y # CONFIG_WATCHDOG_DW is not set +# CONFIG_GPIO_WATCHDOG is not set # CONFIG_PWM is not set # CONFIG_HWRNG is not set @@ -748,6 +751,8 @@ CONFIG_REGULATOR_FIXED=y # CONFIG_SYSCON_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 +# CONFIG_POWER_RESET_GPIO_RESTART 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 7051f52..4cba0c1 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -ce95be8f999c1d51c97a3eeb3fd3737f +6b419fc845318242cfb0fda6f05c56d1 CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_TEXT_BASE=0x23f00000 @@ -67,6 +67,7 @@ CONFIG_IMD_TARGET=y # CONFIG_MACH_RPI_COMMON is undefined CONFIG_MACH_SAMA5D27_GIANTBOARD=y CONFIG_MACH_SAMA5D27_SOM1=y +# CONFIG_MACH_SKOV_ARM9CPU is not set CONFIG_MCI_ATMEL=y CONFIG_MCI_ATMEL_SDHCI=y CONFIG_MCI_ATMEL_SDHCI_PBL=y diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 69da1f7..74ae229 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.04.0 Configuration +# Barebox/arm 2021.05.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -110,6 +110,7 @@ CONFIG_MACH_UDOO_NEO=y # CONFIG_MACH_ZII_IMX7D_DEV is not set # CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set # CONFIG_MACH_FREESCALE_MX7_SABRESD is not set +# CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR 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 @@ -119,6 +120,7 @@ CONFIG_MACH_UDOO_NEO=y # CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set # CONFIG_MACH_WEBASTO_CCBV2 is not set # CONFIG_MACH_MNT_REFORM is not set +# CONFIG_MACH_SKOV_IMX6 is not set # # Board specific settings @@ -272,6 +274,7 @@ CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y +# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set @@ -828,6 +831,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_POLLER is not set # CONFIG_WATCHDOG_DW is not set CONFIG_WATCHDOG_IMX=y +# CONFIG_GPIO_WATCHDOG is not set CONFIG_PWM=y CONFIG_PWM_IMX=y # CONFIG_HWRNG is not set @@ -927,6 +931,8 @@ CONFIG_USB_NOP_XCEIV=y # CONFIG_SYSCON_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 +# CONFIG_POWER_RESET_GPIO_RESTART 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 40f2391..1cd88be 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -ce95be8f999c1d51c97a3eeb3fd3737f +6b419fc845318242cfb0fda6f05c56d1 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -114,6 +114,7 @@ CONFIG_MACH_EMBEST_RIOTBOARD=y # CONFIG_MACH_GUF_SANTARO is not set # CONFIG_MACH_GUF_VINCELL is not set # CONFIG_MACH_GW_VENTANA is not set +# CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set # CONFIG_MACH_KINDLE_MX50 is not set # CONFIG_MACH_KONTRON_SAMX6I is not set # CONFIG_MACH_MNT_REFORM is not set @@ -137,6 +138,7 @@ CONFIG_MACH_NITROGEN6=y CONFIG_MACH_SABRELITE=y # CONFIG_MACH_SABRESD is not set # CONFIG_MACH_SCB9328 is not set +# CONFIG_MACH_SKOV_IMX6 is not set # CONFIG_MACH_SOLIDRUN_MICROSOM is not set # CONFIG_MACH_TECHNEXION_PICO_HOBBIT is not set # CONFIG_MACH_TECHNEXION_WANDBOARD is not set diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index aac7f18..2b0406d 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.04.0 Configuration +# Barebox/arm 2021.05.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -193,6 +193,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y +# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set @@ -643,6 +644,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_POLLER is not set # CONFIG_WATCHDOG_DW is not set CONFIG_WATCHDOG_BCM2835=y +# CONFIG_GPIO_WATCHDOG is not set # CONFIG_PWM is not set # CONFIG_HWRNG is not set @@ -723,6 +725,8 @@ CONFIG_USB_NOP_XCEIV=y # CONFIG_POWER_RESET_SYSCON is not set # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_POWER_RESET_GPIO is not set +# CONFIG_POWER_RESET_GPIO_RESTART 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 5e86a3d..ace57a4 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -ce95be8f999c1d51c97a3eeb3fd3737f +6b419fc845318242cfb0fda6f05c56d1 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 cf5a1ac..423540c 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.04.0 Configuration +# Barebox/arm 2021.05.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -190,6 +190,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y +# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set @@ -617,6 +618,7 @@ CONFIG_WATCHDOG_POLLER=y # CONFIG_WATCHDOG_DW is not set CONFIG_STM32_IWDG_WATCHDOG=y # CONFIG_STPMIC1_WATCHDOG is not set +# CONFIG_GPIO_WATCHDOG is not set CONFIG_PWM=y CONFIG_PWM_STM32=y # CONFIG_HWRNG is not set @@ -704,6 +706,8 @@ CONFIG_RESET_STM32=y # CONFIG_SYSCON_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 +# CONFIG_POWER_RESET_GPIO_RESTART 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 5592085..cc9399f 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -ce95be8f999c1d51c97a3eeb3fd3737f +6b419fc845318242cfb0fda6f05c56d1 # 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 c404788..a1bd6b3 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.04.0 Configuration +# Barebox/arm 2021.05.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -182,6 +182,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y +# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index d9bd76f..c91a0f3 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -ce95be8f999c1d51c97a3eeb3fd3737f +6b419fc845318242cfb0fda6f05c56d1 CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y @@ -31,6 +31,7 @@ CONFIG_DRIVER_NET_SMC911X=y # CONFIG_GPIO_PL061 is undefined # CONFIG_GPIO_RASPBERRYPI_EXP is undefined # CONFIG_GPIO_SX150X is undefined +# CONFIG_GPIO_WATCHDOG is undefined # CONFIG_I2C_ALGOBIT is undefined # CONFIG_I2C_GPIO is undefined # CONFIG_JTAG is undefined @@ -54,6 +55,8 @@ CONFIG_MTD_CONCAT=y # CONFIG_OF_GPIO is undefined CONFIG_PBL_CONSOLE=y # CONFIG_PINCTRL_BCM283X is undefined +# CONFIG_POWER_RESET_GPIO is undefined +# CONFIG_POWER_RESET_GPIO_RESTART is undefined CONFIG_PROMPT="vexpress: " # CONFIG_REGULATOR_BCM283X is undefined # CONFIG_REGULATOR_FIXED is undefined diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index 0912372..dbfe066 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.04.0 Configuration +# Barebox/arm 2021.05.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -194,6 +194,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y CONFIG_DEFAULT_COMPRESSION_NONE=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y +# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set @@ -678,6 +679,7 @@ CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_POLLER is not set # CONFIG_WATCHDOG_DW is not set # CONFIG_WATCHDOG_BCM2835 is not set +# CONFIG_GPIO_WATCHDOG is not set # CONFIG_PWM is not set CONFIG_HWRNG=y @@ -757,6 +759,8 @@ CONFIG_REGULATOR_BCM283X=y # CONFIG_POWER_RESET_SYSCON is not set # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_POWER_RESET_GPIO is not set +# CONFIG_POWER_RESET_GPIO_RESTART is not set # CONFIG_VIRTIO_MENU is not set # end of Drivers 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 deleted file mode 100644 index 06908ca..0000000 --- a/configs/platform-v7a/patches/barebox-2021.04.0/0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 91d5f4dfeaa72957bb8349c8af2da36a615b05a4 Mon Sep 17 00:00:00 2001 -From: Ahmad Fatoum <a.fatoum@pengutronix.de> -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 <a.fatoum@pengutronix.de> -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 deleted file mode 100644 index 69f6558..0000000 --- a/configs/platform-v7a/patches/barebox-2021.04.0/series +++ /dev/null @@ -1 +0,0 @@ -0001-usb-dwc2-increase-timeout-for-waiting-on-host-mode.patch diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index f818805..e611fc7 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.04.0" -PTXCONF_BAREBOX_COMMON_MD5="2153af53e606d3a747acf11b2d49723b" +PTXCONF_BAREBOX_COMMON_VERSION="2021.05.0" +PTXCONF_BAREBOX_COMMON_MD5="be859cfa667f73765708924e13b99839" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y |