Message ID | 20180521213023.7883-2-manoj.iyer@canonical.com |
---|---|
State | New |
Headers | show |
Series | UBUNTU: [Config]: set CONFIG_EDAC_DEBUG=y for ARM64 | expand |
On Mon, May 21, 2018 at 04:30:23PM -0500, Manoj Iyer wrote: > BugLink: https://launchpad.net/bugs/1772516 > > Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Applied to unstable/master, thanks!
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index b5a1e219d552..1d1ccd4cf77d 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -95,6 +95,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 80f7e244ca1a..d00fa9eab0a0 100644 --- a/debian.master/config/arm64/config.flavour.generic +++ b/debian.master/config/arm64/config.flavour.generic @@ -7,6 +7,7 @@ CONFIG_COMMON_CLK_QCOM=m CONFIG_DRM=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 40a6c62f92e6..6e9008fb318b 100644 --- a/debian.master/config/arm64/config.flavour.snapdragon +++ b/debian.master/config/arm64/config.flavour.snapdragon @@ -7,6 +7,7 @@ CONFIG_COMMON_CLK_QCOM=y CONFIG_DRM=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 b1a84534a018..dfa0f4261f4e 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -95,6 +95,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 5ff32cb997e9..f8d5487b58d3 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2631,7 +2631,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 34d5ed297fce..e1fc0eea6989 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -91,6 +91,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 6c55c7dfa9f6..8d09b2f156ea 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -91,6 +91,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
BugLink: https://launchpad.net/bugs/1772516 Signed-off-by: Manoj Iyer <manoj.iyer@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(-)