[PATCH] UBUNTU: [Config]: set CONFIG_EDAC_DEBUG=y for ARM64

[Manoj Iyer]

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

Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>
---
 debian.master/config/amd64/config.common.amd64       | 1 +
 debian.master/config/annotations                     | 2 +-
 debian.master/config/arm64/config.flavour.generic    | 1 +
 debian.master/config/arm64/config.flavour.snapdragon | 1 +
 debian.master/config/armhf/config.common.armhf       | 1 +
 debian.master/config/config.common.ubuntu            | 1 -
 debian.master/config/i386/config.common.i386         | 1 +
 debian.master/config/ppc64el/config.common.ppc64el   | 1 +
 8 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 74bdfcef30cc..0471f42adbe2 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -96,6 +96,7 @@ CONFIG_DRM_KMS_HELPER=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_EFI_DEV_PATH_PARSER=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 5d8144bfba41..2968225d3cd3 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1258,7 +1258,7 @@ CONFIG_OF_UNITTEST                              flag<DEBUG>
 # Menu: Device Drivers >> EDAC (Error Detection And Correction) reporting
 CONFIG_EDAC                                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_EDAC_LEGACY_SYSFS                        policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
-CONFIG_EDAC_DEBUG                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
+CONFIG_EDAC_DEBUG                               policy<{'amd64': 'n', 'arm64': 'y', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_EDAC_DECODE_MCE                          policy<{'amd64': 'm', 'i386': 'm'}>
 CONFIG_EDAC_GHES                                policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}>
 CONFIG_EDAC_AMD64                               policy<{'amd64': 'm', 'i386': 'm'}>
diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index d57a37e00066..a82a2ae66412 100644
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -9,6 +9,7 @@ CONFIG_DRM=m
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_MSM=m
+CONFIG_EDAC_DEBUG=y
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m
diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index cef01ad27861..00b4a96feaef 100644
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -9,6 +9,7 @@ CONFIG_DRM=y
 CONFIG_DRM_I2C_ADV7511=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_MSM=y
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 6ae8ae5bf84d..ce78b0c20b01 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -97,6 +97,7 @@ CONFIG_DRM_MSM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_EFS_FS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 89cec7ee6ff4..9afd68ae48ed 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2630,7 +2630,6 @@ CONFIG_EDAC_AMD64=m
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_CPC925=m
-# CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_E7XXX=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 3d4f6adf0b33..aab8c6713ac5 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -92,6 +92,7 @@ CONFIG_DRM_KMS_HELPER=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI_CAPSULE_LOADER=y
 CONFIG_EFI_DEV_PATH_PARSER=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 02bb780f57a8..c3dd02dc25e7 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -93,6 +93,7 @@ CONFIG_DRM_KMS_HELPER=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFS_FS=m
 # CONFIG_EM_TIMER_STI is not set
-- 
2.17.1