diff mbox

[10/10] UBUNTU: [Config] Updateconfigs for new configs

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

Commit Message

Ike Panhc June 8, 2012, 7:36 a.m. UTC 
BugLink: http://launchpad.net/bugs/1008345

Enable new configs for highbank

 CONFIG_OF_CLOCK=y
 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 these configs are not enabled

 # CONFIG_EDAC_DEBUG is not set
 # CONFIG_COMMON_CLK_DISABLE_UNUSED is not set
 # CONFIG_COMMON_CLK_DEBUG is not set

Commit 4d2f704e also introduce CONFIG_EDAC for ARM, Since it is not
necessary for omap so let it disabled

 # CONFIG_EDAC is not set

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          |    9 +++++++--
 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, 19 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 7cfba45..d1328db 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -48,6 +48,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 41e0ac8..06b1e87 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -49,6 +49,7 @@  CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DVB_FE_CUSTOMISE=y
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_DW_DMAC=m
+# 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 63bb328..7694827 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -19,6 +19,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_FAT_FS=y
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 6ca2812..8553f19 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -31,6 +31,7 @@  CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DW_DMAC 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 2b73fda..800ba65 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -31,6 +31,7 @@  CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_DW_DMAC=m
+# 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 ea1b5f9..a548a8f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1019,6 +1019,9 @@  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_COMMON_CLK_DISABLE_UNUSED is not set
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_COMPAT=y
 CONFIG_COMPAT_BINFMT_ELF=y
@@ -1566,7 +1569,6 @@  CONFIG_ECONET=m
 CONFIG_ECONET_AUNUDP=y
 CONFIG_ECONET_NATIVE=y
 CONFIG_ECRYPT_FS=y
-CONFIG_EDAC=y
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_AMD76X=m
@@ -1577,6 +1579,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
@@ -1588,7 +1592,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
@@ -1968,6 +1971,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
@@ -3788,6 +3792,7 @@  CONFIG_OCFS2_FS_STATS=y
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
+CONFIG_OF_CLOCK=y
 CONFIG_OF_DEVICE=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e65267c..94c68b1 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -47,6 +47,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 0fed2bd..6445705 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -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
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 1e477dc..6b4d04b 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -46,6 +46,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