diff mbox

[14/14] UBUNTU: [Config] Enable EDAC/CLK for highbank

Message ID 1343957207-5738-1-git-send-email-ike.pan@canonical.com
State New
Headers show

Commit Message

Ike Panhc Aug. 3, 2012, 1:26 a.m. UTC 
BugLink: http://launchpad.net/bugs/1008345

These are new configs for highbank

CONFIG_EDAC=y
CONFIG_EDAC_MM_EDAC=y
CONFIG_EDAC_HIGHBANK_MC=y
CONFIG_EDAC_HIGHBANK_L2=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y

and other flavours are not affected.

Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    2 ++
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/armhf/config.common.armhf     |    1 +
 debian.master/config/armhf/config.flavour.highbank |    1 +
 debian.master/config/armhf/config.flavour.omap     |    1 +
 debian.master/config/config.common.ubuntu          |    7 +++++--
 debian.master/config/i386/config.common.i386       |    2 ++
 debian.master/config/powerpc/config.common.powerpc |    2 ++
 debian.master/config/ppc64/config.common.ppc64     |    2 ++
 9 files changed, 17 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ff5ca94..6f68201 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -43,6 +43,8 @@  CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM_RAID45=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EVM=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index c598027..ee2ed97 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -42,6 +42,7 @@  CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM_RAID45 is not set
 CONFIG_DVB_FE_CUSTOMISE=y
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+# CONFIG_EDAC is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EVM=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 2f8cc06..b708376 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -18,6 +18,7 @@  CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_DM_RAID45 is not set
 CONFIG_DVB_FE_CUSTOMISE=y
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_EDAC_MM_EDAC=y
 # CONFIG_EZX_PCAP is not set
 CONFIG_FAT_FS=y
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 041e029..2f7f91d 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -25,6 +25,7 @@  CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_EDAC=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_EVM is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index f3fc1b5..16eb583 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -25,6 +25,7 @@  CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_EDAC is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EVM=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a3f452f..7748509 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1039,6 +1039,8 @@  CONFIG_COMEDI_USBDUXFAST=m
 CONFIG_COMEDI_USBDUXSIGMA=m
 CONFIG_COMEDI_USB_DRIVERS=m
 CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMMON_CLK=y
+# CONFIG_COMMON_CLK_DEBUG is not set
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_COMPAT=y
 CONFIG_COMPAT_BINFMT_ELF=y
@@ -1598,7 +1600,6 @@  CONFIG_EASYCAP=m
 # CONFIG_EASYCAP_DEBUG is not set
 CONFIG_ECHO=m
 CONFIG_ECRYPT_FS=y
-CONFIG_EDAC=y
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_AMD76X=m
@@ -1609,6 +1610,8 @@  CONFIG_EDAC_CPC925=m
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_HIGHBANK_L2=y
+CONFIG_EDAC_HIGHBANK_MC=y
 CONFIG_EDAC_I3000=m
 CONFIG_EDAC_I3200=m
 CONFIG_EDAC_I5000=m
@@ -1620,7 +1623,6 @@  CONFIG_EDAC_I82860=m
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_PASEMI=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_SBRIDGE=m
@@ -2013,6 +2015,7 @@  CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index aaef715..ba536de 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -42,6 +42,8 @@  CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DM_RAID45=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EVM=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 9c8663c..4053815 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -36,6 +36,8 @@  CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM_RAID45 is not set
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EVM=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 3de1cf0..c06ccfa 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -41,6 +41,8 @@  CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_DM_RAID45 is not set
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EVM=y