From 37fedadeba0000b7e1413f7fe3b18585794f71df Mon Sep 17 00:00:00 2001
From: Breno Leitao <breno.leitao@gmail.com>
Date: Fri, 7 Apr 2017 16:11:47 -0300
Subject: [PATCH] UBUNTU: [Config] Disable CONFIG_HVC_UDBG on ppc64el

BugLink: https://bugs.launchpad.net/bugs/1680888

Disabling CONFIG_HVC_UDBG on ppc64el config because it is not
required on production environment (fake hypervisor console debug), and
it is causing some issues that are still being investigated.

Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 debian.master/config/annotations          | 4 +++-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f511ec13a71e..22c169853f78 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -630,7 +630,7 @@ CONFIG_HVC_RTAS                                 policy<{'ppc64el': 'y'}>
 CONFIG_HVC_IUCV                                 policy<{'s390x': 'y'}>
 CONFIG_HVC_XEN                                  policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}>
 CONFIG_HVC_XEN_FRONTEND                         policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}>
-CONFIG_HVC_UDBG                                 policy<{'ppc64el': 'y'}>
+CONFIG_HVC_UDBG                                 policy<{'ppc64el': 'n'}>
 CONFIG_HVC_DCC                                  policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_HVCS                                     policy<{'ppc64el': 'm'}>
 CONFIG_VIRTIO_CONSOLE                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -11117,3 +11117,5 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065		policy<{'arm64': 'y'}>
 CONFIG_ARM64_ERRATUM_843419			mark<ENFORCED> note<LP#1647793>
 CONFIG_ARM64_ERRATUM_858921			mark<ENFORCED> note<LP#1675509>
 CONFIG_QCOM_QDF2400_ERRATUM_0065		mark<ENFORCED> note<LP#1672486>
+#
+CONFIG_HVC_UDBG				mark<ENFORCED> note<LP#1680888>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 46503caa4e86..0c1c3a32e279 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3418,7 +3418,7 @@ CONFIG_HVC_IUCV=y
 CONFIG_HVC_OLD_HVSI=y
 CONFIG_HVC_OPAL=y
 CONFIG_HVC_RTAS=y
-CONFIG_HVC_UDBG=y
+# CONFIG_HVC_UDBG is not set
 CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_HV_PERF_CTRS=y
-- 
2.39.5