From 13030ef80c19571b552c1aacd01b3b4d1f4075bf Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 11 Apr 2019 16:26:56 +0200
Subject: dashboard/config: update usb config

---
 dashboard/config/upstream-usb.config | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'dashboard')

diff --git a/dashboard/config/upstream-usb.config b/dashboard/config/upstream-usb.config
index 29a236d70..7d520c2d3 100644
--- a/dashboard/config/upstream-usb.config
+++ b/dashboard/config/upstream-usb.config
@@ -3,11 +3,21 @@
 # Linux/x86 5.1.0-rc4 Kernel Configuration
 #
 
+# The following configs are added manually, preserve them.
+# CONFIG_DEBUG_MEMORY was once added to mm tree and cause disabling of KASAN,
+# which in turn caused storm of assorted crashes after silent memory
+# corruptions. The config was reverted, but we keep it here for the case
+# it is reintroduced to kernel again.
+CONFIG_DEBUG_MEMORY=y
+# This config can be used to enable any additional temporal debugging
+# features in linux-next tree.
+CONFIG_DEBUG_AID_FOR_SYZBOT=y
+
 #
-# Compiler: gcc (Debian 7.3.0-5) 7.3.0
+# Compiler: gcc (GCC) 9.0.0 20190115 (experimental)
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=70300
+CONFIG_GCC_VERSION=90000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
@@ -776,8 +786,9 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC=""
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -5211,8 +5222,6 @@ CONFIG_DRM_AMD_ACP=y
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
-CONFIG_DRM_AMD_DC_DCN1_0=y
-CONFIG_DRM_AMD_DC_DCN1_01=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 # CONFIG_HSA_AMD is not set
 
@@ -8384,6 +8393,7 @@ CONFIG_KASAN_STACK=1
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_KCOV=y
+CONFIG_KCOV_ENABLE_COMPARISONS=y
 CONFIG_KCOV_INSTRUMENT_ALL=y
 # CONFIG_DEBUG_SHIRQ is not set
 
-- 
cgit mrf-deployment