ChromeOS: config: renormalize splitconfig

Update splitconfigs with new kconfig options

Change-Id: I9aa83fcabc886932447fe241b34c809374a35cc5
Signed-off-by: Christopher Freeman <cfreeman@nvidia.com>
Reviewed-on: http://git-master/r/144170
Reviewed-by: Rhyland Klein <rklein@nvidia.com>
Tested-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Andrew Chew <achew@nvidia.com>
Reviewed-by: Allen Martin <amartin@nvidia.com>
GVS: Gerrit_Virtual_Submit

Rebase-Id: R28855f24692a8a2636be057004fd15205cba462d

8 files changed, 28 insertions, 124 deletions

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index 2292d092fa9e..2f8e1dbb3167 100644
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -143,7 +143,6 @@ CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ENGINE=y
-CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DM_BUFIO=y
 # CONFIG_DM_UEVENT is not set
 CONFIG_DM_VERITY=y
@@ -239,10 +238,6 @@ CONFIG_INPUT_JOYDEV=m
 # CONFIG_INPUT_KEYRESET is not set
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_UINPUT=m
-CONFIG_INV_SENSORS=y
-CONFIG_INV_SENSORS_ACCELEROMETERS=y
-CONFIG_INV_SENSORS_COMPASS=y
-CONFIG_INV_SENSORS_PRESSURE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IP6_NF_FILTER=m
@@ -363,24 +358,6 @@ CONFIG_MMC_SDHCI_S3C=y
 # CONFIG_MMC_SDHCI_S3C_DMA is not set
 # CONFIG_MMC_TEST is not set
 # CONFIG_MOUSE_PS2 is not set
-# CONFIG_MPU_SENSORS_AK8963 is not set
-# CONFIG_MPU_SENSORS_AK8972 is not set
-# CONFIG_MPU_SENSORS_AK8975 is not set
-# CONFIG_MPU_SENSORS_AMI306 is not set
-# CONFIG_MPU_SENSORS_AMI30X is not set
-# CONFIG_MPU_SENSORS_BMA085 is not set
-# CONFIG_MPU_SENSORS_HMC5883 is not set
-# CONFIG_MPU_SENSORS_HSCDTD002B is not set
-# CONFIG_MPU_SENSORS_HSCDTD004A is not set
-# CONFIG_MPU_SENSORS_LSM303DLX_M is not set
-# CONFIG_MPU_SENSORS_MMC314X is not set
-# CONFIG_MPU_SENSORS_MMC314XMS is not set
-# CONFIG_MPU_SENSORS_MPU3050 is not set
-# CONFIG_MPU_SENSORS_MPU6050A2 is not set
-# CONFIG_MPU_SENSORS_MPU6050B1 is not set
-# CONFIG_MPU_SENSORS_TIMERIRQ is not set
-# CONFIG_MPU_SENSORS_YAS530 is not set
-# CONFIG_MPU_USERSPACE_DEBUG is not set
 # CONFIG_MSDOS_FS is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_MWIFIEX=m
diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index a807f3eaa759..0573464b9d68 100644
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -174,7 +174,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEVPORT=y
 # CONFIG_DL2K is not set
 # CONFIG_DMADEVICES is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_DM_BUFIO=y
 # CONFIG_DM_UEVENT is not set
 CONFIG_DM_VERITY=y
@@ -325,10 +324,6 @@ CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_OF_MATRIX_KEYMAP=y
 CONFIG_INPUT_UINPUT=m
 # CONFIG_INTEL_MID_PTI is not set
-CONFIG_INV_SENSORS=y
-CONFIG_INV_SENSORS_ACCELEROMETERS=y
-CONFIG_INV_SENSORS_COMPASS=y
-CONFIG_INV_SENSORS_PRESSURE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_IOSCHED_DEADLINE=y
 # CONFIG_IP1000 is not set
@@ -471,24 +466,6 @@ CONFIG_MMC_SDHCI_TEGRA=y
 # CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_VIA_SDMMC is not set
 # CONFIG_MOUSE_PS2 is not set
-# CONFIG_MPU_SENSORS_AK8963 is not set
-# CONFIG_MPU_SENSORS_AK8972 is not set
-# CONFIG_MPU_SENSORS_AK8975 is not set
-# CONFIG_MPU_SENSORS_AMI306 is not set
-# CONFIG_MPU_SENSORS_AMI30X is not set
-# CONFIG_MPU_SENSORS_BMA085 is not set
-# CONFIG_MPU_SENSORS_HMC5883 is not set
-# CONFIG_MPU_SENSORS_HSCDTD002B is not set
-# CONFIG_MPU_SENSORS_HSCDTD004A is not set
-# CONFIG_MPU_SENSORS_LSM303DLX_M is not set
-# CONFIG_MPU_SENSORS_MMC314X is not set
-# CONFIG_MPU_SENSORS_MMC314XMS is not set
-# CONFIG_MPU_SENSORS_MPU3050 is not set
-# CONFIG_MPU_SENSORS_MPU6050A2 is not set
-# CONFIG_MPU_SENSORS_MPU6050B1 is not set
-# CONFIG_MPU_SENSORS_TIMERIRQ is not set
-# CONFIG_MPU_SENSORS_YAS530 is not set
-# CONFIG_MPU_USERSPACE_DEBUG is not set
 # CONFIG_MSDOS_FS is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_MWIFIEX=m
@@ -570,7 +547,7 @@ CONFIG_NVMAP_CARVEOUT_COMPACTOR=y
 # CONFIG_NVMAP_CARVEOUT_KILLER is not set
 # CONFIG_NVMAP_FORCE_ZEROED_USER_PAGES is not set
 # CONFIG_NVMAP_HIGHMEM_ONLY is not set
-# CONFIG_NVMAP_OUTER_CACHE_MAINT_BY_SET_WAYS is not set
+CONFIG_NVMAP_OUTER_CACHE_MAINT_BY_SET_WAYS=y
 CONFIG_NVMAP_PAGE_POOLS=y
 CONFIG_NVMAP_PAGE_POOLS_INIT_FILLUP=y
 CONFIG_NVMAP_PAGE_POOL_SIZE=0x0
@@ -845,6 +822,7 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_VIRTUOSO is not set
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
+CONFIG_SOC_BUS=y
 CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_SLAVE_TEGRA is not set
 CONFIG_SPI_SPIDEV=m
@@ -909,11 +887,14 @@ CONFIG_TEGRA_EMC_TO_DDR_CLOCK=2
 # CONFIG_TEGRA_FPGA_PLATFORM is not set
 CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ=0
 # CONFIG_TEGRA_GRHOST is not set
+CONFIG_TEGRA_GRHOST_USE_DMABUF=y
 CONFIG_TEGRA_GRHOST_USE_NVMAP=y
 # CONFIG_TEGRA_HDMI_74MHZ_LIMIT is not set
 # CONFIG_TEGRA_IOMMU_GART is not set
 CONFIG_TEGRA_IOVMM=y
 CONFIG_TEGRA_IOVMM_GART=y
+# CONFIG_TEGRA_ISOMGR is not set
+CONFIG_TEGRA_ISOMGR_POOL_KB_PER_SEC=0
 # CONFIG_TEGRA_LATENCY_ALLOWANCE is not set
 CONFIG_TEGRA_MC_PROFILE=y
 # CONFIG_TEGRA_NVHDCP is not set
diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config
index 6ad7a835fc0c..9ac293248a64 100644
--- a/chromeos/config/armel/chromeos-tegra3.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra3.flavour.config
@@ -154,8 +154,12 @@ CONFIG_COMPAT_BRK=y
 # CONFIG_CONNECTOR is not set
 CONFIG_CPA=y
 # CONFIG_CPUQUIET_DEFAULT_GOV_BALANCED is not set
+# CONFIG_CPUQUIET_DEFAULT_GOV_RUNNABLE is not set
 CONFIG_CPUQUIET_DEFAULT_GOV_USERSPACE=y
 CONFIG_CPUQUIET_FRAMEWORK=y
+CONFIG_CPUQUIET_GOVERNOR_BALANCED=y
+CONFIG_CPUQUIET_GOVERNOR_RUNNABLE=y
+CONFIG_CPUQUIET_GOVERNOR_USERSPACE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
@@ -207,7 +211,6 @@ CONFIG_DEVPORT=y
 # CONFIG_DHD_USE_STATIC_BUF is not set
 # CONFIG_DL2K is not set
 # CONFIG_DMADEVICES is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_VERITY is not set
 CONFIG_DNS_RESOLVER=y
@@ -358,7 +361,6 @@ CONFIG_INPUT_OF_MATRIX_KEYMAP=y
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INTEL_MID_PTI is not set
-# CONFIG_INV_SENSORS is not set
 # CONFIG_IOSCHED_CFQ is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IP1000 is not set
@@ -467,6 +469,7 @@ CONFIG_LOG_BUF_SHIFT=17
 CONFIG_MACH_CARDHU=y
 CONFIG_MACH_DALMORE=y
 # CONFIG_MACH_E1853 is not set
+CONFIG_MACH_HAS_SND_SOC_TEGRA_CS42L73=y
 CONFIG_MACH_HAS_SND_SOC_TEGRA_MAX98088=y
 CONFIG_MACH_HAS_SND_SOC_TEGRA_MAX98095=y
 CONFIG_MACH_HAS_SND_SOC_TEGRA_RT5639=y
@@ -543,7 +546,6 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MPU_SENSORS_TIMERIRQ=y
 CONFIG_MSDOS_FS=m
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_MWIFIEX is not set
@@ -736,7 +738,7 @@ CONFIG_NVMAP_CARVEOUT_COMPACTOR=y
 CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM=y
 # CONFIG_NVMAP_FORCE_ZEROED_USER_PAGES is not set
 # CONFIG_NVMAP_HIGHMEM_ONLY is not set
-# CONFIG_NVMAP_OUTER_CACHE_MAINT_BY_SET_WAYS is not set
+CONFIG_NVMAP_OUTER_CACHE_MAINT_BY_SET_WAYS=y
 CONFIG_NVMAP_PAGE_POOLS=y
 CONFIG_NVMAP_PAGE_POOLS_INIT_FILLUP=y
 CONFIG_NVMAP_PAGE_POOL_SIZE=0x0
@@ -842,6 +844,7 @@ CONFIG_RTC_DRV_MAX77663=y
 CONFIG_RTC_DRV_RC5T583=y
 # CONFIG_RTC_DRV_TEGRA is not set
 CONFIG_RTC_DRV_TPS6586X=y
+# CONFIG_RTC_DRV_TPS65910 is not set
 CONFIG_RTC_DRV_TPS6591x=y
 CONFIG_RTC_DRV_TPS80031=y
 # CONFIG_RTL8180 is not set
@@ -1028,6 +1031,7 @@ CONFIG_SND_SOC_TEGRA30_DAM=y
 CONFIG_SND_SOC_TEGRA30_I2S=y
 CONFIG_SND_SOC_TEGRA30_SPDIF=y
 # CONFIG_SND_SOC_TEGRA_ALC5632 is not set
+# CONFIG_SND_SOC_TEGRA_CS42L73 is not set
 CONFIG_SND_SOC_TEGRA_MAX98088=y
 CONFIG_SND_SOC_TEGRA_MAX98095=y
 # CONFIG_SND_SOC_TEGRA_RT5640 is not set
@@ -1044,6 +1048,7 @@ CONFIG_SND_SPI=y
 CONFIG_SND_VMASTER=y
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
+CONFIG_SOC_BUS=y
 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SPI_BITBANG is not set
 CONFIG_SPI_SLAVE_TEGRA=y
@@ -1120,6 +1125,7 @@ CONFIG_TEGRA_EMC_TO_DDR_CLOCK=1
 CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ=0
 CONFIG_TEGRA_GRHOST=y
 CONFIG_TEGRA_GRHOST_DEFAULT_TIMEOUT=30000
+CONFIG_TEGRA_GRHOST_USE_DMABUF=y
 CONFIG_TEGRA_GRHOST_USE_NVMAP=y
 # CONFIG_TEGRA_HDMI_74MHZ_LIMIT is not set
 # CONFIG_TEGRA_IOMMU_SMMU is not set
@@ -1127,6 +1133,8 @@ CONFIG_TEGRA_IOVMM=y
 CONFIG_TEGRA_IOVMM_SMMU=y
 # CONFIG_TEGRA_IOVMM_SMMU_SYSFS is not set
 CONFIG_TEGRA_IRDA=y
+# CONFIG_TEGRA_ISOMGR is not set
+CONFIG_TEGRA_ISOMGR_POOL_KB_PER_SEC=0
 CONFIG_TEGRA_LATENCY_ALLOWANCE=y
 CONFIG_TEGRA_LATENCY_ALLOWANCE_SCALING=y
 # CONFIG_TEGRA_LP1_950 is not set
@@ -1345,6 +1353,7 @@ CONFIG_VIDEO_OV2710=m
 # CONFIG_VIDEO_OV5640 is not set
 CONFIG_VIDEO_OV5650=m
 # CONFIG_VIDEO_OV9726 is not set
+# CONFIG_VIDEO_OV9772 is not set
 # CONFIG_VIDEO_SAA7134 is not set
 CONFIG_VIDEO_SH532U=m
 # CONFIG_VIDEO_SOC380 is not set
diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index 365602e5f272..53878ead5786 100644
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -174,7 +174,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEVPORT=y
 # CONFIG_DL2K is not set
 # CONFIG_DMADEVICES is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
 CONFIG_DM_BUFIO=y
 # CONFIG_DM_UEVENT is not set
 CONFIG_DM_VERITY=y
@@ -325,10 +324,6 @@ CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_OF_MATRIX_KEYMAP=y
 CONFIG_INPUT_UINPUT=m
 # CONFIG_INTEL_MID_PTI is not set
-CONFIG_INV_SENSORS=y
-CONFIG_INV_SENSORS_ACCELEROMETERS=y
-CONFIG_INV_SENSORS_COMPASS=y
-CONFIG_INV_SENSORS_PRESSURE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_IOSCHED_DEADLINE=y
 # CONFIG_IP1000 is not set
@@ -471,24 +466,6 @@ CONFIG_MMC_SDHCI_TEGRA=y
 # CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_VIA_SDMMC is not set
 # CONFIG_MOUSE_PS2 is not set
-# CONFIG_MPU_SENSORS_AK8963 is not set
-# CONFIG_MPU_SENSORS_AK8972 is not set
-# CONFIG_MPU_SENSORS_AK8975 is not set
-# CONFIG_MPU_SENSORS_AMI306 is not set
-# CONFIG_MPU_SENSORS_AMI30X is not set
-# CONFIG_MPU_SENSORS_BMA085 is not set
-# CONFIG_MPU_SENSORS_HMC5883 is not set
-# CONFIG_MPU_SENSORS_HSCDTD002B is not set
-# CONFIG_MPU_SENSORS_HSCDTD004A is not set
-# CONFIG_MPU_SENSORS_LSM303DLX_M is not set
-# CONFIG_MPU_SENSORS_MMC314X is not set
-# CONFIG_MPU_SENSORS_MMC314XMS is not set
-# CONFIG_MPU_SENSORS_MPU3050 is not set
-# CONFIG_MPU_SENSORS_MPU6050A2 is not set
-# CONFIG_MPU_SENSORS_MPU6050B1 is not set
-# CONFIG_MPU_SENSORS_TIMERIRQ is not set
-# CONFIG_MPU_SENSORS_YAS530 is not set
-# CONFIG_MPU_USERSPACE_DEBUG is not set
 # CONFIG_MSDOS_FS is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_MWIFIEX=m
@@ -570,7 +547,7 @@ CONFIG_NVMAP_CARVEOUT_COMPACTOR=y
 # CONFIG_NVMAP_CARVEOUT_KILLER is not set
 # CONFIG_NVMAP_FORCE_ZEROED_USER_PAGES is not set
 # CONFIG_NVMAP_HIGHMEM_ONLY is not set
-# CONFIG_NVMAP_OUTER_CACHE_MAINT_BY_SET_WAYS is not set
+CONFIG_NVMAP_OUTER_CACHE_MAINT_BY_SET_WAYS=y
 CONFIG_NVMAP_PAGE_POOLS=y
 CONFIG_NVMAP_PAGE_POOLS_INIT_FILLUP=y
 CONFIG_NVMAP_PAGE_POOL_SIZE=0x0
@@ -845,6 +822,7 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_VIRTUOSO is not set
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
+CONFIG_SOC_BUS=y
 CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_SLAVE_TEGRA is not set
 CONFIG_SPI_SPIDEV=m
@@ -909,11 +887,14 @@ CONFIG_TEGRA_EMC_TO_DDR_CLOCK=2
 # CONFIG_TEGRA_FPGA_PLATFORM is not set
 CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ=0
 # CONFIG_TEGRA_GRHOST is not set
+CONFIG_TEGRA_GRHOST_USE_DMABUF=y
 CONFIG_TEGRA_GRHOST_USE_NVMAP=y
 # CONFIG_TEGRA_HDMI_74MHZ_LIMIT is not set
 # CONFIG_TEGRA_IOMMU_GART is not set
 CONFIG_TEGRA_IOVMM=y
 CONFIG_TEGRA_IOVMM_GART=y
+# CONFIG_TEGRA_ISOMGR is not set
+CONFIG_TEGRA_ISOMGR_POOL_KB_PER_SEC=0
 # CONFIG_TEGRA_LATENCY_ALLOWANCE is not set
 CONFIG_TEGRA_MC_PROFILE=y
 # CONFIG_TEGRA_NVHDCP is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 3effdca2fb85..952959225f02 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -156,7 +156,6 @@ CONFIG_HIGHMEM=y
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HVC_DCC is not set
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_HZ=100
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_INPUT_SPARSEKMAP is not set
 CONFIG_IRQ_DOMAIN=y
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 3f24236a3f5e..290345c6a590 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -300,6 +300,7 @@ CONFIG_DEVMEM=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DM_CRYPT=y
 # CONFIG_DM_DEBUG is not set
 # CONFIG_DM_DELAY is not set
@@ -516,6 +517,7 @@ CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_HWMON_VID is not set
 CONFIG_HW_CONSOLE=y
+CONFIG_HZ=1000
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -609,6 +611,8 @@ CONFIG_INPUT_MOUSE=y
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_INPUT_YEALINK is not set
+# CONFIG_INV_AK8975 is not set
+# CONFIG_INV_MPU is not set
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_ION is not set
 CONFIG_IOSCHED_NOOP=y
@@ -1312,6 +1316,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TWL6040_CORE is not set
 CONFIG_UEVENT_HELPER_PATH=""
 # CONFIG_UFS_FS is not set
+# CONFIG_UHID is not set
 CONFIG_UID16=y
 # CONFIG_UIO is not set
 # CONFIG_ULTRIX_PARTITION is not set
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 3f0f116a2bbe..371e48f07d19 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -253,7 +253,6 @@ CONFIG_DELL_WMI=m
 # CONFIG_DELL_WMI_AIO is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMADEVICES is not set
-CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
@@ -460,7 +459,6 @@ CONFIG_HW_RANDOM_INTEL=y
 # CONFIG_HW_RANDOM_VIA is not set
 # CONFIG_HW_RANDOM_VIRTIO is not set
 # CONFIG_HYPERV is not set
-CONFIG_HZ=1000
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_1000=y
 # CONFIG_HZ_250 is not set
@@ -530,10 +528,6 @@ CONFIG_INSTRUCTION_DECODER=y
 CONFIG_INTEL_MENLOW=m
 # CONFIG_INTEL_MID_PTI is not set
 # CONFIG_INTEL_OAKTRAIL is not set
-CONFIG_INV_SENSORS=y
-CONFIG_INV_SENSORS_ACCELEROMETERS=y
-CONFIG_INV_SENSORS_COMPASS=y
-CONFIG_INV_SENSORS_PRESSURE=y
 # CONFIG_IOMMU_HELPER is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IOSCHED_CFQ=y
@@ -743,24 +737,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
-# CONFIG_MPU_SENSORS_AK8963 is not set
-# CONFIG_MPU_SENSORS_AK8972 is not set
-# CONFIG_MPU_SENSORS_AK8975 is not set
-# CONFIG_MPU_SENSORS_AMI306 is not set
-# CONFIG_MPU_SENSORS_AMI30X is not set
-# CONFIG_MPU_SENSORS_BMA085 is not set
-# CONFIG_MPU_SENSORS_HMC5883 is not set
-# CONFIG_MPU_SENSORS_HSCDTD002B is not set
-# CONFIG_MPU_SENSORS_HSCDTD004A is not set
-# CONFIG_MPU_SENSORS_LSM303DLX_M is not set
-# CONFIG_MPU_SENSORS_MMC314X is not set
-# CONFIG_MPU_SENSORS_MMC314XMS is not set
-# CONFIG_MPU_SENSORS_MPU3050 is not set
-# CONFIG_MPU_SENSORS_MPU6050A2 is not set
-# CONFIG_MPU_SENSORS_MPU6050B1 is not set
-# CONFIG_MPU_SENSORS_TIMERIRQ is not set
-# CONFIG_MPU_SENSORS_YAS530 is not set
-# CONFIG_MPU_USERSPACE_DEBUG is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_MSI_LAPTOP is not set
 # CONFIG_MSI_WMI is not set
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index c2f84a544cdb..8ac80e74f58f 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -269,7 +269,6 @@ CONFIG_DELL_WMI=m
 CONFIG_DEVPORT=y
 CONFIG_DIRECT_GBPAGES=y
 # CONFIG_DMADEVICES is not set
-CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
@@ -477,7 +476,6 @@ CONFIG_HW_RANDOM_INTEL=y
 # CONFIG_HW_RANDOM_VIA is not set
 # CONFIG_HW_RANDOM_VIRTIO is not set
 # CONFIG_HYPERV is not set
-CONFIG_HZ=1000
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_1000=y
 # CONFIG_HZ_250 is not set
@@ -554,10 +552,6 @@ CONFIG_INSTRUCTION_DECODER=y
 CONFIG_INTEL_MENLOW=m
 # CONFIG_INTEL_MID_PTI is not set
 # CONFIG_INTEL_OAKTRAIL is not set
-CONFIG_INV_SENSORS=y
-CONFIG_INV_SENSORS_ACCELEROMETERS=y
-CONFIG_INV_SENSORS_COMPASS=y
-CONFIG_INV_SENSORS_PRESSURE=y
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_STRESS is not set
@@ -770,24 +764,6 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MPSC is not set
-# CONFIG_MPU_SENSORS_AK8963 is not set
-# CONFIG_MPU_SENSORS_AK8972 is not set
-# CONFIG_MPU_SENSORS_AK8975 is not set
-# CONFIG_MPU_SENSORS_AMI306 is not set
-# CONFIG_MPU_SENSORS_AMI30X is not set
-# CONFIG_MPU_SENSORS_BMA085 is not set
-# CONFIG_MPU_SENSORS_HMC5883 is not set
-# CONFIG_MPU_SENSORS_HSCDTD002B is not set
-# CONFIG_MPU_SENSORS_HSCDTD004A is not set
-# CONFIG_MPU_SENSORS_LSM303DLX_M is not set
-# CONFIG_MPU_SENSORS_MMC314X is not set
-# CONFIG_MPU_SENSORS_MMC314XMS is not set
-# CONFIG_MPU_SENSORS_MPU3050 is not set
-# CONFIG_MPU_SENSORS_MPU6050A2 is not set
-# CONFIG_MPU_SENSORS_MPU6050B1 is not set
-# CONFIG_MPU_SENSORS_TIMERIRQ is not set
-# CONFIG_MPU_SENSORS_YAS530 is not set
-# CONFIG_MPU_USERSPACE_DEBUG is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_MSI_LAPTOP is not set
 # CONFIG_MSI_WMI is not set