From 7ffe07bf98f37fddc066eca6109bd41543d51d28 Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
Date: Wed, 15 Apr 2020 14:54:07 +0200
Subject: v7a: barebox: version bump 2020.02.0 -> 2020.04.0

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>
---
 configs/platform-v7a/barebox-am335x-mlo.config | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'configs/platform-v7a/barebox-am335x-mlo.config')

diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index 909b518..a680c87 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
-- 
cgit v1.2.3