[DistroKit] [PATCH] v7a: barebox: version bump 2020.02.0 -> 2020.04.0

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

This lets us drop the am335x USB fixes, because they were already in the
v2020.03.0 release. Only new enabled config option is
CONFIG_USB_GADGET_FASTBOOT_CMD_OEM, which was non-configurable before.
Marking it as enabled avoid a regression for people using `fastboot oem exec`

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 .../platform-v7a/barebox-am335x-mlo.config    |  16 +-
 configs/platform-v7a/barebox-am335x.config    |  20 +-
 .../platform-v7a/barebox-am335x.config.diff   |   4 +-
 configs/platform-v7a/barebox-mx6.config       |  22 +-
 configs/platform-v7a/barebox-mx6.config.diff  |   6 +-
 configs/platform-v7a/barebox-rpi2.config      |  19 +-
 configs/platform-v7a/barebox-rpi2.config.diff |   4 +-
 configs/platform-v7a/barebox-stm32mp.config   |  19 +-
 .../platform-v7a/barebox-stm32mp.config.diff  |   6 +-
 configs/platform-v7a/barebox-vexpress.config  |  21 +-
 .../platform-v7a/barebox-vexpress.config.diff |   2 +-
 configs/platform-v7a/barebox.config           |  21 +-
 ...Y-scrap-singleton-am335x_get_usb_phy.patch | 136 ------------
 ...-defer-driver-probes-where-necessary.patch | 201 ------------------
 ...0-customers-pengutronix-distrokit-v7.patch |  22 --
 .../patches/barebox-2020.02.0/series          |  12 --
 configs/platform-v7a/platformconfig           |   4 +-
 17 files changed, 104 insertions(+), 431 deletions(-)
 delete mode 100644 configs/platform-v7a/patches/barebox-2020.02.0/0001-USB-MUSB-PHY-scrap-singleton-am335x_get_usb_phy.patch
 delete mode 100644 configs/platform-v7a/patches/barebox-2020.02.0/0002-USB-MUSB-defer-driver-probes-where-necessary.patch
 delete mode 100644 configs/platform-v7a/patches/barebox-2020.02.0/0101-Release-2020.02.0-customers-pengutronix-distrokit-v7.patch
 delete mode 100644 configs/platform-v7a/patches/barebox-2020.02.0/series

diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index 909b51860df1..a680c87a291e 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.02.0-20200302-1 Configuration
+# Barebox/arm 2020.04.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -145,6 +145,7 @@ CONFIG_SHELL_NONE=y
 # CONFIG_ERRNO_MESSAGES is not set
 # CONFIG_TIMESTAMP is not set
 # CONFIG_BOOTM is not set
+# CONFIG_BAREBOX_UPDATE is not set
 # CONFIG_IMD is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
 CONFIG_CONSOLE_FULL=y
@@ -168,6 +169,11 @@ CONFIG_DEFAULT_COMPRESSION_NONE=y
 # CONFIG_POLLER is not set
 # CONFIG_STATE is not set
 # CONFIG_BOOTCHOOSER is not set
+
+#
+# OP-TEE loading
+#
+# end of OP-TEE loading
 # end of General Settings
 
 #
@@ -180,7 +186,6 @@ CONFIG_DEBUG_OMAP_UART_PORT=1
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_PBL_BREAK is not set
 # CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
 # end of Debugging
 
 CONFIG_HAS_DEBUG_LL=y
@@ -296,19 +301,19 @@ CONFIG_MCI_OMAP_HSMMC=y
 # Clocksource
 #
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
+CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 CONFIG_CLOCKSOURCE_TI_DM=y
 # end of Clocksource
 
 #
-# MFD
+# Multifunction device drivers
 #
 # 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 MFD
+# end of Multifunction device drivers
 
 #
 # Misc devices
@@ -428,6 +433,7 @@ CONFIG_FS_RAMFS=y
 CONFIG_FS_FAT=y
 # CONFIG_FS_FAT_WRITE is not set
 CONFIG_FS_FAT_LFN=y
+# CONFIG_FS_JFFS2 is not set
 # CONFIG_FS_BPKFS is not set
 # CONFIG_FS_UIMAGEFS is not set
 # CONFIG_FS_PSTORE is not set
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index dcd70e2503be..62c4246ee72a 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.02.0-20200302-1 Configuration
+# Barebox/arm 2020.04.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -102,7 +102,6 @@ CONFIG_BINFMT=y
 CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
-CONFIG_BAREBOX_UPDATE=y
 CONFIG_MENUTREE=y
 CONFIG_FILE_LIST=y
 CONFIG_USBGADGET_START=y
@@ -173,9 +172,9 @@ CONFIG_BOOTM_OFTREE=y
 CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_AIMAGE is not set
 # CONFIG_BOOTM_FITIMAGE is not set
-# CONFIG_BOOTM_OPTEE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_BAREBOX_UPDATE=y
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -211,6 +210,12 @@ CONFIG_STATE=y
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
 # CONFIG_MACHINE_ID is not set
+
+#
+# OP-TEE loading
+#
+# CONFIG_BOOTM_OPTEE is not set
+# end of OP-TEE loading
 # end of General Settings
 
 #
@@ -223,7 +228,6 @@ CONFIG_DEBUG_OMAP_UART_PORT=1
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_PBL_BREAK is not set
 # CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
 # end of Debugging
 
 CONFIG_HAS_DEBUG_LL=y
@@ -599,6 +603,7 @@ 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
@@ -628,13 +633,13 @@ CONFIG_MCI_OMAP_HSMMC=y
 # Clocksource
 #
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
+CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 CONFIG_CLOCKSOURCE_TI_DM=y
 # end of Clocksource
 
 #
-# MFD
+# Multifunction device drivers
 #
 # CONFIG_MFD_ACT8846 is not set
 # CONFIG_MFD_DA9053 is not set
@@ -650,7 +655,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_FINTEK_SUPERIO is not set
 # CONFIG_SMSC_SUPERIO is not set
-# end of MFD
+# end of Multifunction device drivers
 
 #
 # Misc devices
@@ -794,6 +799,7 @@ CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
+# CONFIG_FS_JFFS2 is not set
 # CONFIG_FS_BPKFS is not set
 # CONFIG_FS_UIMAGEFS is not set
 # CONFIG_FS_PSTORE is not set
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index 355e45d3fa3e..a3045113fb09 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-3535341c60838c5a3a5b02da35648d4a
+3bfd0a3556e630878dfbff7b733b494e
 # CONFIG_AM33XX_NET_BOOT is not set
 CONFIG_ARCH_AM33XX=y
 # CONFIG_ARCH_BCM283X is not set
@@ -91,6 +91,7 @@ CONFIG_NVMEM=y
 # CONFIG_OMAP_BUILD_SPI is not set
 CONFIG_OMAP_GPMC=y
 CONFIG_OMAP_MULTI_BOARDS=y
+# CONFIG_PBL_OPTEE is undefined
 # CONFIG_PINCTRL_BCM283X is undefined
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PROMPT="barebox> "
@@ -103,6 +104,7 @@ CONFIG_THUMB2_BAREBOX=y
 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
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 7a549a4bba9e..8c931343e3b0 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.02.0-20200302-1 Configuration
+# Barebox/arm 2020.04.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -110,6 +110,7 @@ CONFIG_MACH_UDOO_NEO=y
 # CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set
 # 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_IMX8MQ_EVK is not set
 # CONFIG_MACH_PHYTEC_SOM_IMX8MQ is not set
 # CONFIG_MACH_GRINN_LITEBOARD is not set
@@ -159,7 +160,6 @@ CONFIG_BINFMT=y
 CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
-CONFIG_BAREBOX_UPDATE=y
 CONFIG_MENUTREE=y
 CONFIG_FILE_LIST=y
 CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y
@@ -232,9 +232,9 @@ CONFIG_BOOTM_OFTREE=y
 CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_AIMAGE is not set
 # CONFIG_BOOTM_FITIMAGE is not set
-# CONFIG_BOOTM_OPTEE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_BAREBOX_UPDATE=y
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -273,6 +273,12 @@ CONFIG_STATE=y
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
 # CONFIG_MACHINE_ID is not set
+
+#
+# OP-TEE loading
+#
+# CONFIG_BOOTM_OPTEE is not set
+# end of OP-TEE loading
 # end of General Settings
 
 #
@@ -285,7 +291,6 @@ CONFIG_DEBUG_IMX_UART_PORT=1
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_PBL_BREAK is not set
 # CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
 # end of Debugging
 
 CONFIG_HAS_DEBUG_LL=y
@@ -626,7 +631,6 @@ CONFIG_NAND_READ_OOB=y
 CONFIG_NAND_BBT=y
 CONFIG_NAND_ALLOW_ERASE_BAD=y
 CONFIG_NAND_IMX=y
-CONFIG_NAND_IMX_BBM=y
 CONFIG_NAND_MXS=y
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND_IDS=y
@@ -688,6 +692,7 @@ 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
@@ -735,13 +740,13 @@ CONFIG_COMMON_CLK_OF_PROVIDER=y
 #
 CONFIG_ARCH_HAS_IMX_GPT=y
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
+CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 CONFIG_CLOCKSOURCE_IMX_GPT=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 # end of Clocksource
 
 #
-# MFD
+# Multifunction device drivers
 #
 # CONFIG_MFD_ACT8846 is not set
 # CONFIG_MFD_DA9053 is not set
@@ -757,7 +762,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_FINTEK_SUPERIO is not set
 # CONFIG_SMSC_SUPERIO is not set
-# end of MFD
+# end of Multifunction device drivers
 
 #
 # Misc devices
@@ -921,6 +926,7 @@ CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
+# CONFIG_FS_JFFS2 is not set
 CONFIG_FS_UBIFS=y
 CONFIG_FS_UBIFS_COMPRESSION_LZO=y
 # CONFIG_FS_UBIFS_COMPRESSION_ZLIB is not set
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index ac181dc2fb34..4c1d40846056 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-3535341c60838c5a3a5b02da35648d4a
+3bfd0a3556e630878dfbff7b733b494e
 # CONFIG_ARCH_BCM283X is not set
 CONFIG_ARCH_HAS_FEC_IMX=y
 CONFIG_ARCH_HAS_IMX_GPT=y
@@ -113,6 +113,7 @@ CONFIG_MACH_EMBEST_RIOTBOARD=y
 # CONFIG_MACH_KONTRON_SAMX6I is not set
 CONFIG_MACH_NITROGEN6=y
 # CONFIG_MACH_NXP_IMX6ULL_EVK is not set
+# CONFIG_MACH_NXP_IMX8MM_EVK is not set
 # CONFIG_MACH_NXP_IMX8MQ_EVK is not set
 # CONFIG_MACH_PCA100 is not set
 # CONFIG_MACH_PCM038 is not set
@@ -182,7 +183,6 @@ CONFIG_NAND_ECC_HW_NONE=y
 CONFIG_NAND_ECC_HW_SYNDROME=y
 CONFIG_NAND_ECC_SOFT=y
 CONFIG_NAND_IMX=y
-CONFIG_NAND_IMX_BBM=y
 CONFIG_NAND_INFO=y
 CONFIG_NAND_MXS=y
 CONFIG_NAND_READ_OOB=y
@@ -191,6 +191,7 @@ CONFIG_NVMEM=y
 CONFIG_PARTITION_DISK_EFI=y
 CONFIG_PARTITION_DISK_EFI_GPT_COMPARE=y
 CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE=y
+# CONFIG_PBL_OPTEE is undefined
 # CONFIG_PCI is not set
 # CONFIG_PCI_IMX6 is not set
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
@@ -217,6 +218,7 @@ 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_PHY=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 39592eeadbe5..f40288ab5820 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.02.0-20200302-1 Configuration
+# Barebox/arm 2020.04.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -94,7 +94,6 @@ CONFIG_BINFMT=y
 CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
-CONFIG_BAREBOX_UPDATE=y
 CONFIG_MENUTREE=y
 CONFIG_BOOT=y
 
@@ -163,9 +162,9 @@ CONFIG_BOOTM_OFTREE=y
 # CONFIG_BOOTM_OFTREE_UIMAGE is not set
 # CONFIG_BOOTM_AIMAGE is not set
 # CONFIG_BOOTM_FITIMAGE is not set
-# CONFIG_BOOTM_OPTEE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_BAREBOX_UPDATE=y
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -201,6 +200,12 @@ CONFIG_STATE=y
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
 # CONFIG_MACHINE_ID is not set
+
+#
+# OP-TEE loading
+#
+# CONFIG_BOOTM_OPTEE is not set
+# end of OP-TEE loading
 # end of General Settings
 
 #
@@ -212,7 +217,6 @@ CONFIG_DEFAULT_LOGLEVEL=6
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_PBL_BREAK is not set
 # CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
 # end of Debugging
 
 CONFIG_HAS_DEBUG_LL=y
@@ -571,18 +575,18 @@ CONFIG_COMMON_CLK=y
 #
 CONFIG_CLOCKSOURCE_BCM283X=y
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
+CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 # end of Clocksource
 
 #
-# MFD
+# Multifunction device drivers
 #
 # 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 MFD
+# end of Multifunction device drivers
 
 #
 # Misc devices
@@ -719,6 +723,7 @@ CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
+# CONFIG_FS_JFFS2 is not set
 # CONFIG_FS_BPKFS is not set
 # CONFIG_FS_UIMAGEFS is not set
 # CONFIG_FS_PSTORE is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index ca89c225f63d..64ecde1aa007 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-3535341c60838c5a3a5b02da35648d4a
+3bfd0a3556e630878dfbff7b733b494e
 CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_BOOTM_INITRD=y
 # CONFIG_CMD_I2C is undefined
@@ -43,6 +43,7 @@ CONFIG_NET_NETCONSOLE=y
 # CONFIG_NET_NFS is not set
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_SNVS_LPGPR is not set
+# CONFIG_PBL_OPTEE is undefined
 CONFIG_PINCTRL_BCM283X=y
 CONFIG_PROMPT="R-Pi> "
 CONFIG_SERIAL_AMBA_PL011=y
@@ -54,7 +55,6 @@ 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_FASTBOOT_SPARSE is undefined
 # CONFIG_USB_GADGET_SERIAL is undefined
 # CONFIG_USB_HUB_USB251XB is undefined
 CONFIG_WATCHDOG_BCM2835=y
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 5b532804ffb7..4dce15bf13c5 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.02.0-20200302-1 Configuration
+# Barebox/arm 2020.04.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -87,7 +87,6 @@ CONFIG_BINFMT=y
 CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
-CONFIG_BAREBOX_UPDATE=y
 CONFIG_MENUTREE=y
 CONFIG_BOOT=y
 
@@ -156,9 +155,9 @@ CONFIG_BOOTM_OFTREE=y
 CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_AIMAGE is not set
 # CONFIG_BOOTM_FITIMAGE is not set
-# CONFIG_BOOTM_OPTEE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_BAREBOX_UPDATE=y
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -191,6 +190,12 @@ CONFIG_POLLER=y
 # CONFIG_STATE is not set
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
+
+#
+# OP-TEE loading
+#
+# CONFIG_BOOTM_OPTEE is not set
+# end of OP-TEE loading
 # end of General Settings
 
 #
@@ -202,7 +207,6 @@ CONFIG_DEFAULT_LOGLEVEL=7
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_PBL_BREAK is not set
 # CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
 # end of Debugging
 
 CONFIG_HAS_DEBUG_LL=y
@@ -527,12 +531,12 @@ CONFIG_COMMON_CLK_OF_PROVIDER=y
 # Clocksource
 #
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
+CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 # end of Clocksource
 
 #
-# MFD
+# Multifunction device drivers
 #
 # CONFIG_MFD_ACT8846 is not set
 # CONFIG_MFD_DA9053 is not set
@@ -548,7 +552,7 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_STPMIC1=y
 # CONFIG_FINTEK_SUPERIO is not set
 # CONFIG_SMSC_SUPERIO is not set
-# end of MFD
+# end of Multifunction device drivers
 
 #
 # Misc devices
@@ -628,6 +632,7 @@ CONFIG_STM32_BSEC=y
 
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED=y
+# CONFIG_REGULATOR_STM32_PWR is not set
 CONFIG_REGULATOR_STPMIC1=y
 # CONFIG_REGULATOR_ANATOP is not set
 
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index ae685bc0303f..e68585038825 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-3535341c60838c5a3a5b02da35648d4a
+3bfd0a3556e630878dfbff7b733b494e
 # CONFIG_ARCH_BCM283X is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_ARCH_NR_GPIO=416
@@ -50,6 +50,7 @@ CONFIG_DRIVER_SERIAL_STM32=y
 # CONFIG_EEPROM_AT25 is undefined
 # CONFIG_FILE_LIST is undefined
 # CONFIG_FIRMWARE_ALTERA_SERIAL is undefined
+# CONFIG_FS_JFFS2 is undefined
 # CONFIG_GPIO_74164 is undefined
 # CONFIG_GPIO_RASPBERRYPI_EXP is undefined
 # CONFIG_HWRNG is not set
@@ -98,6 +99,7 @@ CONFIG_PARTITION_DISK_EFI=y
 # CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
 # CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set
 CONFIG_PBL_CONSOLE=y
+# CONFIG_PBL_OPTEE is undefined
 # CONFIG_PINCTRL_BCM283X is undefined
 CONFIG_PINCTRL_STM32=y
 CONFIG_PRINTF_UUID=y
@@ -105,6 +107,7 @@ CONFIG_PROMPT="barebox:"
 # CONFIG_REGULATOR_ANATOP is not set
 # CONFIG_REGULATOR_BCM283X is undefined
 CONFIG_REGULATOR_FIXED=y
+# CONFIG_REGULATOR_STM32_PWR is not set
 CONFIG_REGULATOR_STPMIC1=y
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_IMX7 is not set
@@ -129,7 +132,6 @@ 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_FASTBOOT_SPARSE 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 ce701a6c5000..2a8bf5fa4516 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.02.0-20200302-1 Configuration
+# Barebox/arm 2020.04.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -80,7 +80,6 @@ CONFIG_BINFMT=y
 CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
-CONFIG_BAREBOX_UPDATE=y
 CONFIG_MENUTREE=y
 CONFIG_FILE_LIST=y
 CONFIG_USBGADGET_START=y
@@ -151,9 +150,9 @@ CONFIG_BOOTM_OFTREE=y
 # CONFIG_BOOTM_OFTREE_UIMAGE is not set
 # CONFIG_BOOTM_AIMAGE is not set
 # CONFIG_BOOTM_FITIMAGE is not set
-# CONFIG_BOOTM_OPTEE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_BAREBOX_UPDATE=y
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -189,6 +188,13 @@ CONFIG_STATE=y
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
 # CONFIG_MACHINE_ID is not set
+
+#
+# OP-TEE loading
+#
+# CONFIG_BOOTM_OPTEE is not set
+# CONFIG_PBL_OPTEE is not set
+# end of OP-TEE loading
 # end of General Settings
 
 #
@@ -200,7 +206,6 @@ CONFIG_DEFAULT_LOGLEVEL=6
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_PBL_BREAK is not set
 # CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
 # end of Debugging
 
 CONFIG_HAS_DEBUG_LL=y
@@ -551,7 +556,6 @@ 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_FASTBOOT_SPARSE is not set
 # CONFIG_USB_MUSB is not set
 # CONFIG_VIDEO is not set
 CONFIG_MCI=y
@@ -581,12 +585,12 @@ CONFIG_COMMON_CLK_OF_PROVIDER=y
 #
 CONFIG_AMBA_SP804=y
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
+CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 # end of Clocksource
 
 #
-# MFD
+# Multifunction device drivers
 #
 # CONFIG_MFD_ACT8846 is not set
 # CONFIG_MFD_DA9053 is not set
@@ -602,7 +606,7 @@ CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_FINTEK_SUPERIO is not set
 # CONFIG_SMSC_SUPERIO is not set
-# end of MFD
+# end of Multifunction device drivers
 
 #
 # Misc devices
@@ -716,6 +720,7 @@ CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
+# CONFIG_FS_JFFS2 is not set
 # CONFIG_FS_BPKFS is not set
 # CONFIG_FS_UIMAGEFS is not set
 # CONFIG_FS_PSTORE is not set
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 867fa47b9321..39405a7d525e 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-3535341c60838c5a3a5b02da35648d4a
+3bfd0a3556e630878dfbff7b733b494e
 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 c0fc25066c11..50a7c1aa3bcc 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.02.0-20200302-1 Configuration
+# Barebox/arm 2020.04.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -93,7 +93,6 @@ CONFIG_BINFMT=y
 CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
-CONFIG_BAREBOX_UPDATE=y
 CONFIG_MENUTREE=y
 CONFIG_FILE_LIST=y
 CONFIG_USBGADGET_START=y
@@ -164,9 +163,9 @@ CONFIG_BOOTM_OFTREE=y
 # CONFIG_BOOTM_OFTREE_UIMAGE is not set
 # CONFIG_BOOTM_AIMAGE is not set
 # CONFIG_BOOTM_FITIMAGE is not set
-# CONFIG_BOOTM_OPTEE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_BAREBOX_UPDATE=y
 CONFIG_IMD=y
 # CONFIG_IMD_TARGET is not set
 # CONFIG_KERNEL_INSTALL_TARGET is not set
@@ -202,6 +201,13 @@ CONFIG_STATE=y
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
 # CONFIG_MACHINE_ID is not set
+
+#
+# OP-TEE loading
+#
+# CONFIG_BOOTM_OPTEE is not set
+# CONFIG_PBL_OPTEE is not set
+# end of OP-TEE loading
 # end of General Settings
 
 #
@@ -213,7 +219,6 @@ CONFIG_DEFAULT_LOGLEVEL=6
 # CONFIG_DEBUG_INITCALLS is not set
 # CONFIG_PBL_BREAK is not set
 # CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
 # end of Debugging
 
 CONFIG_HAS_DEBUG_LL=y
@@ -564,7 +569,6 @@ 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_FASTBOOT_SPARSE is not set
 # CONFIG_USB_MUSB is not set
 # CONFIG_VIDEO is not set
 CONFIG_MCI=y
@@ -595,12 +599,12 @@ CONFIG_COMMON_CLK=y
 #
 CONFIG_CLOCKSOURCE_BCM283X=y
 CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
-CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
+CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
 # end of Clocksource
 
 #
-# MFD
+# Multifunction device drivers
 #
 # CONFIG_MFD_ACT8846 is not set
 # CONFIG_MFD_DA9053 is not set
@@ -616,7 +620,7 @@ CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_FINTEK_SUPERIO is not set
 # CONFIG_SMSC_SUPERIO is not set
-# end of MFD
+# end of Multifunction device drivers
 
 #
 # Misc devices
@@ -757,6 +761,7 @@ CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
+# CONFIG_FS_JFFS2 is not set
 # CONFIG_FS_BPKFS is not set
 # CONFIG_FS_UIMAGEFS is not set
 # CONFIG_FS_PSTORE is not set
diff --git a/configs/platform-v7a/patches/barebox-2020.02.0/0001-USB-MUSB-PHY-scrap-singleton-am335x_get_usb_phy.patch b/configs/platform-v7a/patches/barebox-2020.02.0/0001-USB-MUSB-PHY-scrap-singleton-am335x_get_usb_phy.patch
deleted file mode 100644
index 2250399200d1..000000000000
--- a/configs/platform-v7a/patches/barebox-2020.02.0/0001-USB-MUSB-PHY-scrap-singleton-am335x_get_usb_phy.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Tue, 25 Feb 2020 17:57:30 +0100
-Subject: [PATCH] USB: MUSB: PHY: scrap singleton am335x_get_usb_phy()
-
-am335x_get_usb_phy() retrieves the last probed USB phy. On the BeagleBone
-with both PHYs enabled, this means that dependent on probe order, both
-MUSB instances could end up with the same PHY.
-
-Remove the global variable and have the MUSB driver parse the "phys"
-property instead.
-
-The cleaner way to achieve this would be to migrate phy-am335x.c
-and phy-am335x-control.c to the generic phy framework and have MUSB use
-of_phy_get, alas, even Linux hasn't done this so far and we need
-a short patch for master anyway, thus just do it the easy way.
-
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
-Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
----
- drivers/usb/musb/musb_dsps.c  | 16 +++++++++++-----
- drivers/usb/musb/phy-am335x.c | 11 ++---------
- drivers/usb/musb/phy-am335x.h |  6 ------
- 3 files changed, 13 insertions(+), 20 deletions(-)
- delete mode 100644 drivers/usb/musb/phy-am335x.h
-
-diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
-index 3b76b6cc610d..f30672914830 100644
---- a/drivers/usb/musb/musb_dsps.c
-+++ b/drivers/usb/musb/musb_dsps.c
-@@ -39,7 +39,6 @@
- #include <linux/barebox-wrapper.h>
- 
- #include "musb_core.h"
--#include "phy-am335x.h"
- 
- static __maybe_unused struct of_device_id musb_dsps_dt_ids[];
- 
-@@ -217,10 +216,6 @@ static int dsps_musb_init(struct musb *musb)
- 	const struct dsps_musb_wrapper *wrp = glue->wrp;
- 	u32 rev, val, mode;
- 
--	musb->xceiv = am335x_get_usb_phy();
--	if (IS_ERR(musb->xceiv))
--		return PTR_ERR(musb->xceiv);
--
- 	/* Returns zero if e.g. not clocked */
- 	rev = dsps_readl(musb->ctrl_base, wrp->revision);
- 	if (!rev)
-@@ -324,6 +319,8 @@ static int dsps_probe(struct device_d *dev)
- 	struct musb_hdrc_config	*config;
- 	struct device_node *dn = dev->device_node;
- 	const struct dsps_musb_wrapper *wrp;
-+	struct device_node *phy_node;
-+	struct device_d *phy_dev;
- 	struct dsps_glue *glue;
- 	int ret;
- 
-@@ -337,6 +334,14 @@ static int dsps_probe(struct device_d *dev)
- 		return -ENODEV;
- 	}
- 
-+	phy_node = of_parse_phandle(dn, "phys", 0);
-+	if (!phy_node)
-+		return -ENODEV;
-+
-+	phy_dev = of_find_device_by_node(phy_node);
-+	if (!phy_dev || !phy_dev->priv)
-+		return -EPROBE_DEFER;
-+
- 	/* allocate glue */
- 	glue = kzalloc(sizeof(*glue), GFP_KERNEL);
- 	if (!glue) {
-@@ -360,6 +365,7 @@ static int dsps_probe(struct device_d *dev)
- 	glue->musb.ctrl_base = IOMEM(iores->start);
- 
- 	glue->musb.controller = dev;
-+	glue->musb.xceiv = phy_dev->priv;
- 
- 	config = &glue->config;
- 
-diff --git a/drivers/usb/musb/phy-am335x.c b/drivers/usb/musb/phy-am335x.c
-index df31255d891c..6991f4402d3f 100644
---- a/drivers/usb/musb/phy-am335x.c
-+++ b/drivers/usb/musb/phy-am335x.c
-@@ -5,7 +5,6 @@
- #include <linux/err.h>
- #include "am35x-phy-control.h"
- #include "musb_core.h"
--#include "phy-am335x.h"
- 
- struct am335x_usbphy {
- 	void __iomem *base;
-@@ -14,13 +13,6 @@ struct am335x_usbphy {
- 	struct usb_phy phy;
- };
- 
--static struct am335x_usbphy *am_usbphy;
--
--struct usb_phy *am335x_get_usb_phy(void)
--{
--	return &am_usbphy->phy;
--}
--
- static int am335x_init(struct usb_phy *phy)
- {
- 	struct am335x_usbphy *am_usbphy = container_of(phy, struct am335x_usbphy, phy);
-@@ -31,6 +23,7 @@ static int am335x_init(struct usb_phy *phy)
- 
- static int am335x_phy_probe(struct device_d *dev)
- {
-+	struct am335x_usbphy *am_usbphy;
- 	struct resource *iores;
- 	int ret;
- 
-@@ -54,7 +47,7 @@ static int am335x_phy_probe(struct device_d *dev)
- 	}
- 
- 	am_usbphy->phy.init = am335x_init;
--	dev->priv = am_usbphy;
-+	dev->priv = &am_usbphy->phy;
- 
- 	dev_info(dev, "am_usbphy %p enabled\n", &am_usbphy->phy);
- 
-diff --git a/drivers/usb/musb/phy-am335x.h b/drivers/usb/musb/phy-am335x.h
-deleted file mode 100644
-index 27da2e3b1057..000000000000
---- a/drivers/usb/musb/phy-am335x.h
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#ifndef _PHY_AM335x_H_
--#define _PHY_AM335x_H_
--
--struct usb_phy *am335x_get_usb_phy(void);
--
--#endif
diff --git a/configs/platform-v7a/patches/barebox-2020.02.0/0002-USB-MUSB-defer-driver-probes-where-necessary.patch b/configs/platform-v7a/patches/barebox-2020.02.0/0002-USB-MUSB-defer-driver-probes-where-necessary.patch
deleted file mode 100644
index 504e4d29bb94..000000000000
--- a/configs/platform-v7a/patches/barebox-2020.02.0/0002-USB-MUSB-defer-driver-probes-where-necessary.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Tue, 25 Feb 2020 17:57:31 +0100
-Subject: [PATCH] USB: MUSB: defer driver probes where necessary
-
-Kernel commit 0782e8572c ("ARM: dts: Probe am335x musb with ti-sysc")
-which we pulled in during the v2020.02.0 dts/ sync moved the USB nodes
-to be under a ti-sysc bus instead of ti,am33xx-usb.
-
-This new probe order broke am335x USB under barebox, because the MUSB
-drivers couldn't cope with the now different device probe order.
-
-Pepper some -EPROBE_DEFER around to make USB work again.
-
-Fixes: 574eed3f6f ("dts: update to v5.5-rc1")
-Reported-by: Yegor Yefremov <yegorslists@googlemail.com>
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
-Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
----
- drivers/usb/musb/musb_core.c          |  5 +++--
- drivers/usb/musb/musb_dsps.c          | 39 +++++++++++++++++++++++++----------
- drivers/usb/musb/phy-am335x-control.c | 25 +++++++++++++++-------
- drivers/usb/musb/phy-am335x.c         | 11 +++++++---
- 4 files changed, 57 insertions(+), 23 deletions(-)
-
-diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
-index 4c11e6580c0f..b84da5516c4a 100644
---- a/drivers/usb/musb/musb_core.c
-+++ b/drivers/usb/musb/musb_core.c
-@@ -1136,8 +1136,9 @@ fail2:
- 	musb_platform_exit(musb);
- 
- fail1:
--	dev_err(musb->controller,
--		"musb_init_controller failed with status %d\n", status);
-+	if (status != -EPROBE_DEFER)
-+		dev_err(musb->controller,
-+			"musb_init_controller failed with status %d\n", status);
- 
- 	musb_free(musb);
- 
-diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
-index f30672914830..d54a663e9d8b 100644
---- a/drivers/usb/musb/musb_dsps.c
-+++ b/drivers/usb/musb/musb_dsps.c
-@@ -314,7 +314,7 @@ static int dsps_set_mode(void *ctx, enum usb_dr_mode mode)
- 
- static int dsps_probe(struct device_d *dev)
- {
--	struct resource *iores;
-+	struct resource *iores[2];
- 	struct musb_hdrc_platform_data *pdata;
- 	struct musb_hdrc_config	*config;
- 	struct device_node *dn = dev->device_node;
-@@ -354,15 +354,19 @@ static int dsps_probe(struct device_d *dev)
- 
- 	pdata = &glue->pdata;
- 
--	iores = dev_request_mem_resource(dev, 0);
--	if (IS_ERR(iores))
--		return PTR_ERR(iores);
--	glue->musb.mregs = IOMEM(iores->start);
-+	iores[0] = dev_request_mem_resource(dev, 0);
-+	if (IS_ERR(iores[0])) {
-+		ret = PTR_ERR(iores[0]);
-+		goto free_glue;
-+	}
-+	glue->musb.mregs = IOMEM(iores[0]->start);
- 
--	iores = dev_request_mem_resource(dev, 1);
--	if (IS_ERR(iores))
--		return PTR_ERR(iores);
--	glue->musb.ctrl_base = IOMEM(iores->start);
-+	iores[1] = dev_request_mem_resource(dev, 1);
-+	if (IS_ERR(iores[1])) {
-+		ret = PTR_ERR(iores[1]);
-+		goto release_iores0;
-+	}
-+	glue->musb.ctrl_base = IOMEM(iores[1]->start);
- 
- 	glue->musb.controller = dev;
- 	glue->musb.xceiv = phy_dev->priv;
-@@ -383,11 +387,24 @@ static int dsps_probe(struct device_d *dev)
- 	if (pdata->mode == MUSB_PORT_MODE_DUAL_ROLE) {
- 		ret = usb_register_otg_device(dev, dsps_set_mode, glue);
- 		if (ret)
--			return ret;
-+			goto release_iores1;
- 		return 0;
- 	}
- 
--	return musb_init_controller(&glue->musb, pdata);
-+	ret = musb_init_controller(&glue->musb, pdata);
-+	if (ret)
-+		goto release_iores1;
-+
-+	return 0;
-+
-+release_iores1:
-+	release_region(iores[1]);
-+release_iores0:
-+	release_region(iores[0]);
-+free_glue:
-+	free(glue);
-+
-+	return ret;
- }
- 
- static const struct dsps_musb_wrapper am33xx_driver_data = {
-diff --git a/drivers/usb/musb/phy-am335x-control.c b/drivers/usb/musb/phy-am335x-control.c
-index c84525ec7eb4..41a3689ed3f9 100644
---- a/drivers/usb/musb/phy-am335x-control.c
-+++ b/drivers/usb/musb/phy-am335x-control.c
-@@ -109,15 +109,15 @@ struct phy_control *am335x_get_phy_control(struct device_d *dev)
- 
- 	node = of_parse_phandle(dev->device_node, "ti,ctrl_mod", 0);
- 	if (!node)
--		return NULL;
-+		return ERR_PTR(-ENOENT);
- 
- 	dev = of_find_device_by_node(node);
- 	if (!dev)
--		return NULL;
-+		return ERR_PTR(-EPROBE_DEFER);
- 
- 	ctrl_usb = dev->priv;
- 	if (!ctrl_usb)
--		return NULL;
-+		return ERR_PTR(-EPROBE_DEFER);
- 
- 	return &ctrl_usb->phy_ctrl;
- }
-@@ -141,13 +141,17 @@ static int am335x_control_usb_probe(struct device_d *dev)
- 	ctrl_usb->dev = dev;
- 
- 	iores = dev_request_mem_resource(dev, 0);
--	if (IS_ERR(iores))
--		return PTR_ERR(iores);
-+	if (IS_ERR(iores)) {
-+		ret = PTR_ERR(iores);
-+		goto free_ctrl;
-+	}
- 	ctrl_usb->phy_reg = IOMEM(iores->start);
- 
- 	iores = dev_request_mem_resource(dev, 1);
--	if (IS_ERR(iores))
--		return PTR_ERR(iores);
-+	if (IS_ERR(iores)) {
-+		ret = PTR_ERR(iores);
-+		goto release_resource;
-+	}
- 	ctrl_usb->wkup = IOMEM(iores->start);
- 
- 	spin_lock_init(&ctrl_usb->lock);
-@@ -155,6 +159,13 @@ static int am335x_control_usb_probe(struct device_d *dev)
- 
- 	dev->priv = ctrl_usb;
- 	return 0;
-+
-+release_resource:
-+	release_region(iores);
-+free_ctrl:
-+	free(ctrl_usb);
-+
-+	return 0;
- };
- 
- static struct driver_d am335x_control_driver = {
-diff --git a/drivers/usb/musb/phy-am335x.c b/drivers/usb/musb/phy-am335x.c
-index 6991f4402d3f..f2e870d7ee61 100644
---- a/drivers/usb/musb/phy-am335x.c
-+++ b/drivers/usb/musb/phy-am335x.c
-@@ -37,13 +37,16 @@ static int am335x_phy_probe(struct device_d *dev)
- 	am_usbphy->base = IOMEM(iores->start);
- 
- 	am_usbphy->phy_ctrl = am335x_get_phy_control(dev);
--	if (!am_usbphy->phy_ctrl)
--		return -ENODEV;
-+	if (IS_ERR(am_usbphy->phy_ctrl)) {
-+		ret = PTR_ERR(am_usbphy->phy_ctrl);
-+		goto err_release;
-+	}
- 
- 	am_usbphy->id = of_alias_get_id(dev->device_node, "phy");
- 	if (am_usbphy->id < 0) {
- 		dev_err(dev, "Missing PHY id: %d\n", am_usbphy->id);
--		return am_usbphy->id;
-+		ret = am_usbphy->id;
-+		goto err_release;
- 	}
- 
- 	am_usbphy->phy.init = am335x_init;
-@@ -53,6 +56,8 @@ static int am335x_phy_probe(struct device_d *dev)
- 
- 	return 0;
- 
-+err_release:
-+	release_region(iores);
- err_free:
- 	free(am_usbphy);
- 
diff --git a/configs/platform-v7a/patches/barebox-2020.02.0/0101-Release-2020.02.0-customers-pengutronix-distrokit-v7.patch b/configs/platform-v7a/patches/barebox-2020.02.0/0101-Release-2020.02.0-customers-pengutronix-distrokit-v7.patch
deleted file mode 100644
index f6d964c983fc..000000000000
--- a/configs/platform-v7a/patches/barebox-2020.02.0/0101-Release-2020.02.0-customers-pengutronix-distrokit-v7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Mon, 2 Mar 2020 10:29:27 +0100
-Subject: [PATCH] Release
- 2020.02.0/customers/pengutronix/distrokit-v7a/20200302-1
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ef98910c0bcd..dbc7d3fe5610 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2020
- PATCHLEVEL = 02
- SUBLEVEL = 0
--EXTRAVERSION =
-+EXTRAVERSION =-20200302-1
- NAME = None
- 
- # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2020.02.0/series b/configs/platform-v7a/patches/barebox-2020.02.0/series
deleted file mode 100644
index e9ae25888a11..000000000000
--- a/configs/platform-v7a/patches/barebox-2020.02.0/series
+++ /dev/null
@@ -1,12 +0,0 @@
-# umpf-base: v2020.02.0
-# umpf-name: 2020.02.0/customers/pengutronix/distrokit-v7a
-# umpf-version: 2020.02.0/customers/pengutronix/distrokit-v7a/20200302-1
-# umpf-topic: v2020.02.0/topic/am335x-usb-fix
-# umpf-hashinfo: b7314bc58ef983ea308f10710fdc3330e03fbacd
-# umpf-topic-range: 849b2f8b958a19d28715c187a0d6dca23ccba6b5..668810be409187d7ea1dfb43aae151792aabaa25
-0001-USB-MUSB-PHY-scrap-singleton-am335x_get_usb_phy.patch
-0002-USB-MUSB-defer-driver-probes-where-necessary.patch
-# umpf-release: 2020.02.0/customers/pengutronix/distrokit-v7a/20200302-1
-# umpf-topic-range: 668810be409187d7ea1dfb43aae151792aabaa25..1ddfaff751466a5673322f551ff80acab5cb36ae
-0101-Release-2020.02.0-customers-pengutronix-distrokit-v7.patch
-# umpf-end
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index c090b3563834..7904ea58315e 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -166,8 +166,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.02.0"
-PTXCONF_BAREBOX_COMMON_MD5="4e971834db38f84ce8093fdf7fecd1a7"
+PTXCONF_BAREBOX_COMMON_VERSION="2020.04.0"
+PTXCONF_BAREBOX_COMMON_MD5="58b6d6182c7c9fe10ce9714fbbacb138"
 PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
 PTXCONF_BAREBOX_AM335X_MLO=y
 PTXCONF_BAREBOX_AM335X=y
-- 
2.26.0.rc2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de