CHROMIUM: config: renormalize splitconfig after exynos merge

This just goes with defaults everywhere, exynos config will be brought in
separately.

BUG=chrome-os-partner:10937
TEST=none

Change-Id: I63699942b626cc81e6c34ca6f904b21313123cb4
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/26286
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>

diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 9a2f1a3..1d6ad8b 100644 (file)
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -127,6 +127,15 @@ CONFIG_CHARGER_GPIO=y
 CONFIG_CHROMEOS_RAMOOPS_RAM_START=0x02000000
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_CMA=y
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=16
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMDLINE="mem=448M@0M console=ttyS0,115200n8 earlyprintk init=/bin/ash"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
@@ -196,6 +205,7 @@ CONFIG_HAVE_ARM_SCU=y
 CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_SMP=y
@@ -249,6 +259,7 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_TPS6586X=y
 # CONFIG_MG_DISK is not set
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_MIGRATION=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MMC_DW is not set

diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index f7970b9..4d6e053 100644 (file)
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -213,10 +213,12 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
 # CONFIG_CPUSETS is not set
 CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -225,6 +227,7 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_CPU_RMAP=y
+# CONFIG_CPU_THERMAL is not set
 # CONFIG_CRAMFS is not set
 CONFIG_CRC16=y
 CONFIG_CRC32=y
@@ -450,6 +453,7 @@ CONFIG_FB=y
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_S3C is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_SVGALIB is not set
@@ -528,6 +532,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -837,6 +842,7 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MKBP is not set
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
@@ -953,8 +959,10 @@ CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MEMSTICK is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_CHROMEOS_EC is not set
 # CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
@@ -1873,6 +1881,7 @@ CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRT_TO_BUS=y
 # CONFIG_VITESSE_PHY is not set
+# CONFIG_VITHAR is not set
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VT=y

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index e0161b5..12b8d0b 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -132,6 +132,7 @@ CONFIG_CLKBLD_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_CLKSRC_I8253=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
+# CONFIG_CMA is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CNIC is not set
 # CONFIG_COMEDI is not set
@@ -295,7 +296,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 98f6ab6..69fe850 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -318,7 +318,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_BPF_JIT=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y