From b3a7bb132f4dbaf60cf98eaa5cab677eb7801e0f Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
Date: Mon, 12 Oct 2020 21:35:58 +0200
Subject: v7a: barebox: version bump v2020.08.1 → v2020.09.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous upgrade to v2020.08.1 gave us first stage boot support on
the sama5d2, but had slight multi-image breakage because the fresh
giantboard support on the sama5d27 messed up the EK1 environment
support: it set nv.boot.default=mmc1 in the built-in environment when
none should've been set. This is fixed in v2020.09.0, which is imported
here.

The config changes are those of olddefconfig.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/barebox-am335x-mlo.config    | 3 ++-
 configs/platform-v7a/barebox-am335x.config        | 6 ++++--
 configs/platform-v7a/barebox-am335x.config.diff   | 2 +-
 configs/platform-v7a/barebox-mx6.config           | 7 +++++--
 configs/platform-v7a/barebox-mx6.config.diff      | 3 ++-
 configs/platform-v7a/barebox-rpi2.config          | 7 +++++--
 configs/platform-v7a/barebox-rpi2.config.diff     | 5 ++++-
 configs/platform-v7a/barebox-stm32mp.config       | 4 +++-
 configs/platform-v7a/barebox-stm32mp.config.diff  | 4 +++-
 configs/platform-v7a/barebox-vexpress.config      | 6 ++++--
 configs/platform-v7a/barebox-vexpress.config.diff | 2 +-
 configs/platform-v7a/barebox.config               | 6 ++++--
 configs/platform-v7a/platformconfig               | 4 ++--
 13 files changed, 40 insertions(+), 19 deletions(-)

(limited to 'configs')

diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index cc96039..022d53c 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.08.1 Configuration
+# Barebox/arm 2020.09.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -313,6 +313,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y
 #
 # CONFIG_MFD_MC13XXX is not set
 # CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_ATMEL_FLEXCOM 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 ee8f8e8..a430710 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.08.1 Configuration
+# Barebox/arm 2020.09.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -592,9 +592,10 @@ CONFIG_DISK_WRITE=y
 # CONFIG_DISK_INTF_PLATFORM_IDE is not set
 CONFIG_USB=y
 CONFIG_USB_HOST=y
+# CONFIG_USB_DWC2_HOST is not set
+# CONFIG_USB_DWC2_GADGET is not set
 # CONFIG_USB_DWC3 is not set
 CONFIG_USB_EHCI=y
-# CONFIG_USB_DWC2_HOST is not set
 # CONFIG_USB_XHCI is not set
 # CONFIG_USB_ULPI is not set
 CONFIG_USB_OTGDEV=y
@@ -662,6 +663,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y
 # CONFIG_MFD_TWL4030 is not set
 # CONFIG_MFD_TWL6030 is not set
 # CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_ATMEL_FLEXCOM 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 c632609..e944803 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-13a81bc35e62247636060ddc6df36f77
+e6072dae533833bfa758a60d8e3b92b6
 # CONFIG_AM33XX_NET_BOOT is not set
 CONFIG_ARCH_AM33XX=y
 # CONFIG_ARCH_BCM283X is not set
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 9dfab1e..1340090 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.08.1 Configuration
+# Barebox/arm 2020.09.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -102,6 +102,7 @@ CONFIG_MACH_UDOO_NEO=y
 # CONFIG_MACH_CM_FX6 is not set
 # CONFIG_MACH_ADVANTECH_ROM_742X is not set
 # CONFIG_MACH_WARP7 is not set
+# CONFIG_MACH_AC_SXB is not set
 # CONFIG_MACH_VF610_TWR is not set
 # CONFIG_MACH_ZII_RDU1 is not set
 # CONFIG_MACH_ZII_RDU2 is not set
@@ -681,9 +682,10 @@ CONFIG_USB_HOST=y
 CONFIG_USB_IMX_CHIPIDEA=y
 CONFIG_USB_IMX_CHIPIDEA_USBMISC=y
 CONFIG_USB_IMX_PHY=y
+# CONFIG_USB_DWC2_HOST is not set
+# CONFIG_USB_DWC2_GADGET is not set
 # CONFIG_USB_DWC3 is not set
 CONFIG_USB_EHCI=y
-# CONFIG_USB_DWC2_HOST is not set
 # CONFIG_USB_XHCI is not set
 CONFIG_USB_ULPI=y
 CONFIG_USB_OTGDEV=y
@@ -771,6 +773,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TWL4030 is not set
 # CONFIG_MFD_TWL6030 is not set
 # CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_ATMEL_FLEXCOM 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 e27ba96..3c04319 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-13a81bc35e62247636060ddc6df36f77
+e6072dae533833bfa758a60d8e3b92b6
 # CONFIG_ARCH_BCM283X is not set
 CONFIG_ARCH_HAS_FEC_IMX=y
 CONFIG_ARCH_HAS_IMX_GPT=y
@@ -91,6 +91,7 @@ CONFIG_KEYBOARD_GPIO=y
 CONFIG_LIBSCAN=y
 CONFIG_LIBUBIGEN=y
 CONFIG_LODEPNG=y
+# CONFIG_MACH_AC_SXB is not set
 # CONFIG_MACH_ADVANTECH_ROM_742X is not set
 # CONFIG_MACH_CCMX51 is not set
 # CONFIG_MACH_CCMX53 is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 9569d74..9e73e9e 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.08.1 Configuration
+# Barebox/arm 2020.09.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -537,11 +537,13 @@ CONFIG_DISK_WRITE=y
 # CONFIG_DISK_INTF_PLATFORM_IDE is not set
 CONFIG_USB=y
 CONFIG_USB_HOST=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_EHCI is not set
-CONFIG_USB_DWC2_HOST=y
 # CONFIG_USB_XHCI is not set
 # CONFIG_USB_ULPI is not set
+CONFIG_USB_OTGDEV=y
 CONFIG_USB_STORAGE=y
 
 #
@@ -588,6 +590,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 #
 # CONFIG_MFD_MC13XXX is not set
 # CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_ATMEL_FLEXCOM 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 0e8ff24..4ca4bd2 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-13a81bc35e62247636060ddc6df36f77
+e6072dae533833bfa758a60d8e3b92b6
 CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_BOOTM_INITRD=y
 # CONFIG_CMD_I2C is undefined
@@ -48,6 +48,8 @@ CONFIG_PROMPT="R-Pi> "
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_THUMB2_BAREBOX=y
 # CONFIG_USBGADGET_START is undefined
+CONFIG_USB_DWC2=y
+# CONFIG_USB_DWC2_GADGET is undefined
 CONFIG_USB_DWC2_HOST=y
 # CONFIG_USB_EHCI is not set
 # CONFIG_USB_GADGET is not set
@@ -56,4 +58,5 @@ CONFIG_USB_DWC2_HOST=y
 # CONFIG_USB_GADGET_FASTBOOT is undefined
 # CONFIG_USB_GADGET_SERIAL is undefined
 # CONFIG_USB_HUB_USB251XB is undefined
+CONFIG_USB_OTGDEV=y
 CONFIG_WATCHDOG_BCM2835=y
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 992f6f1..5e1faed 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.08.1 Configuration
+# Barebox/arm 2020.09.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -54,6 +54,7 @@ CONFIG_ARCH_NR_GPIO=416
 CONFIG_ARCH_STM32MP157=y
 CONFIG_MACH_STM32MP157C_DK2=y
 CONFIG_MACH_LXA_MC1=y
+# CONFIG_MACH_SEEED_ODYSSEY is not set
 # CONFIG_BOARD_ARM_GENERIC_DT is not set
 CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_AEABI=y
@@ -560,6 +561,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TWL6030 is not set
 CONFIG_MFD_STPMIC1=y
 CONFIG_MFD_STM32_TIMERS=y
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
 # end of Multifunction device drivers
 
 #
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 9fd5d54..0d61820 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-13a81bc35e62247636060ddc6df36f77
+e6072dae533833bfa758a60d8e3b92b6
 # CONFIG_ARCH_BCM283X is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_ARCH_NR_GPIO=416
@@ -67,6 +67,7 @@ CONFIG_MACH_LXA_MC1=y
 # CONFIG_MACH_RPI is undefined
 # CONFIG_MACH_RPI_CM3 is undefined
 # CONFIG_MACH_RPI_COMMON is undefined
+# CONFIG_MACH_SEEED_ODYSSEY is not set
 CONFIG_MACH_STM32MP157C_DK2=y
 # CONFIG_MCI_BCM283X is undefined
 # CONFIG_MCI_BCM283X_SDHOST is undefined
@@ -127,6 +128,7 @@ CONFIG_STM32_REMOTEPROC=y
 CONFIG_THUMB2_BAREBOX=y
 # CONFIG_USB is undefined
 # CONFIG_USBGADGET_START is undefined
+# CONFIG_USB_DWC2_GADGET is undefined
 # CONFIG_USB_DWC2_HOST is undefined
 # CONFIG_USB_DWC3 is undefined
 # CONFIG_USB_EHCI is undefined
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 1fed629..d507898 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.08.1 Configuration
+# Barebox/arm 2020.09.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -539,9 +539,10 @@ CONFIG_DISK_WRITE=y
 # CONFIG_DISK_INTF_PLATFORM_IDE is not set
 CONFIG_USB=y
 CONFIG_USB_HOST=y
+# CONFIG_USB_DWC2_HOST is not set
+# CONFIG_USB_DWC2_GADGET is not set
 # CONFIG_USB_DWC3 is not set
 CONFIG_USB_EHCI=y
-# CONFIG_USB_DWC2_HOST is not set
 # CONFIG_USB_XHCI is not set
 # CONFIG_USB_ULPI is not set
 CONFIG_USB_STORAGE=y
@@ -607,6 +608,7 @@ 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_MFD_ATMEL_FLEXCOM 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 f685c75..ac5b99a 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-13a81bc35e62247636060ddc6df36f77
+e6072dae533833bfa758a60d8e3b92b6
 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 266c6e2..bbe7f3e 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.08.1 Configuration
+# Barebox/arm 2020.09.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -552,9 +552,10 @@ CONFIG_DISK_WRITE=y
 # CONFIG_DISK_INTF_PLATFORM_IDE is not set
 CONFIG_USB=y
 CONFIG_USB_HOST=y
+# CONFIG_USB_DWC2_HOST is not set
+# CONFIG_USB_DWC2_GADGET is not set
 # CONFIG_USB_DWC3 is not set
 CONFIG_USB_EHCI=y
-# CONFIG_USB_DWC2_HOST is not set
 # CONFIG_USB_XHCI is not set
 # CONFIG_USB_ULPI is not set
 CONFIG_USB_STORAGE=y
@@ -621,6 +622,7 @@ 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_MFD_ATMEL_FLEXCOM is not set
 # end of Multifunction device drivers
 
 #
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index e0a50cb..a94a765 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.08.1"
-PTXCONF_BAREBOX_COMMON_MD5="d57031878390cb267f6641aedffcda9f"
+PTXCONF_BAREBOX_COMMON_VERSION="2020.09.0"
+PTXCONF_BAREBOX_COMMON_MD5="907dc813298fcded06fa9c788d3fb6c8"
 PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
 PTXCONF_BAREBOX_AM335X_MLO=y
 PTXCONF_BAREBOX_AM335X=y
-- 
cgit v1.2.3