chromeos: config: tegra11x: disable CACHE_L2X0

Turns out T114 doesn't support CACHE_L2X0, so we shouldn't be
enabling it. It causes a build break if we do currently, so
disabling it (and by extension PL310 configs).

Renormalize configs after updating.

Change-Id: I060b8335705f3b1c069451b361261a5d192f6d4b
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-on: http://git-master/r/189232
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Riham Haidar <rhaidar@nvidia.com>
Tested-by: Riham Haidar <rhaidar@nvidia.com>

9 files changed, 44 insertions, 13 deletions

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index b58d99be69fd..11b11d16e310 100644
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -27,6 +27,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 # CONFIG_ARM_ERRATA_752520 is not set
 # CONFIG_ARM_ERRATA_754322 is not set
 # CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_761320 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
 CONFIG_ARM_EXYNOS5250_CPUFREQ=y
 CONFIG_ARM_EXYNOS_CPUFREQ=y
@@ -64,7 +65,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BT=m
 # CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BLUESLEEP is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIBTSDIO=m
diff --git a/chromeos/config/armel/chromeos-tegra11.flavour.config b/chromeos/config/armel/chromeos-tegra11.flavour.config
index 7b506d891b62..dd8a7fca4a5c 100644
--- a/chromeos/config/armel/chromeos-tegra11.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra11.flavour.config
@@ -19,6 +19,7 @@ CONFIG_ARCH_PROVIDES_UDELAY=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_11x_SOC=y
+# CONFIG_ARCH_TEGRA_14x_SOC is not set
 CONFIG_ARCH_TEGRA_4GB_MEMORY=y
 CONFIG_ARCH_TEGRA_HAS_CL_DVFS=y
 CONFIG_ARCH_TEGRA_HAS_DUAL_CPU_CLUSTERS=y
@@ -34,6 +35,7 @@ CONFIG_ARM_ERRATA_742230=y
 CONFIG_ARM_ERRATA_752520=y
 # CONFIG_ARM_ERRATA_754322 is not set
 # CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_761320 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
 # CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
 CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
@@ -105,8 +107,7 @@ CONFIG_BT_HIDP=y
 # CONFIG_BT_MRVL is not set
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_CACHE_L2X0=y
-CONFIG_CACHE_PL310=y
+# CONFIG_CACHE_L2X0 is not set
 CONFIG_CAIF=y
 # CONFIG_CAIF_DEBUG is not set
 # CONFIG_CAIF_HSI is not set
@@ -151,6 +152,7 @@ CONFIG_CPUQUIET_FRAMEWORK=y
 CONFIG_CPUQUIET_GOVERNOR_BALANCED=y
 CONFIG_CPUQUIET_GOVERNOR_RUNNABLE=y
 CONFIG_CPUQUIET_GOVERNOR_USERSPACE=y
+# CONFIG_CPUQUIET_STATS is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
@@ -480,11 +482,14 @@ CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_MAC80211_LEDS is not set
 CONFIG_MAC80211_SCAN_ABORT=y
+# CONFIG_MACH_CERES is not set
 # CONFIG_MACH_CURACAO is not set
 CONFIG_MACH_DALMORE=y
 CONFIG_MACH_HAS_SND_SOC_TEGRA_CS42L73=y
 CONFIG_MACH_HAS_SND_SOC_TEGRA_RT5639=y
 CONFIG_MACH_HAS_SND_SOC_TEGRA_RT5640=y
+CONFIG_MACH_HAS_SND_SOC_TEGRA_TLV320AIC326X=y
+# CONFIG_MACH_PISMO is not set
 # CONFIG_MACH_ROTH is not set
 CONFIG_MACH_TEGRA_PLUTO=y
 # CONFIG_MAX77665_FLASH is not set
@@ -726,6 +731,7 @@ CONFIG_NVMAP_CACHE_MAINT_BY_SET_WAYS=y
 CONFIG_NVMAP_CARVEOUT_COMPACTOR=y
 # CONFIG_NVMAP_CARVEOUT_KILLER is not set
 CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM=y
+CONFIG_NVMAP_DEFERRED_CACHE_MAINT=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
@@ -738,8 +744,6 @@ CONFIG_NVMAP_RECLAIM_UNPINNED_VM=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 CONFIG_OPROFILE=y
-CONFIG_OUTER_CACHE=y
-CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCH_GBE is not set
@@ -765,10 +769,6 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCNET32 is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_PHYLIB is not set
-# CONFIG_PL310_ERRATA_588369 is not set
-# CONFIG_PL310_ERRATA_727915 is not set
-# CONFIG_PL310_ERRATA_753970 is not set
-# CONFIG_PL310_ERRATA_769419 is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_WAKELOCKS=y
@@ -1027,6 +1027,7 @@ CONFIG_SND_SOC_TEGRA30_SPDIF=y
 CONFIG_SND_SOC_TEGRA_CS42L73=y
 CONFIG_SND_SOC_TEGRA_RT5639=y
 CONFIG_SND_SOC_TEGRA_RT5640=y
+# CONFIG_SND_SOC_TEGRA_TLV320AIC326X is not set
 # CONFIG_SND_SONICVIBES is not set
 CONFIG_SND_SPI=y
 # CONFIG_SND_TRIDENT is not set
@@ -1069,6 +1070,8 @@ CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TEGRA_AUTO_HOTPLUG=y
 # CONFIG_TEGRA_AVP is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_SMMU=y
+# CONFIG_TEGRA_BASEBAND is not set
+# CONFIG_TEGRA_BASEBAND_SIMU is not set
 # CONFIG_TEGRA_BB_SUPPORT is not set
 CONFIG_TEGRA_BB_XMM_POWER=y
 CONFIG_TEGRA_BB_XMM_POWER2=m
@@ -1128,8 +1131,10 @@ CONFIG_TEGRA_NVAVP_AUDIO=y
 CONFIG_TEGRA_NVHDCP=y
 CONFIG_TEGRA_NVMAP=y
 CONFIG_TEGRA_PLLM_RESTRICTED=y
+# CONFIG_TEGRA_PLLM_SCALED is not set
 # CONFIG_TEGRA_PREINIT_CLOCKS is not set
 # CONFIG_TEGRA_PREPOWER_WIFI is not set
+# CONFIG_TEGRA_PRE_SILICON_SUPPORT is not set
 CONFIG_TEGRA_PWM=y
 CONFIG_TEGRA_RPC=y
 CONFIG_TEGRA_SD_GEN2=y
@@ -1145,6 +1150,7 @@ CONFIG_TEGRA_TIMER_HZ=1000
 CONFIG_TEGRA_USB_MODEM_POWER=y
 CONFIG_TEGRA_USE_DFLL_RANGE=1
 # CONFIG_TEGRA_VIRTUAL_CPUID is not set
+# CONFIG_TEGRA_WAKEUP_MONITOR is not set
 # CONFIG_TEGRA_WDT_RECOVERY is not set
 # CONFIG_TEHUTI is not set
 CONFIG_TEXTSEARCH=y
diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index 28ae9f6ff4d1..e6f19456ced0 100644
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -19,6 +19,7 @@ CONFIG_ARCH_PROVIDES_UDELAY=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_TEGRA=y
 # CONFIG_ARCH_TEGRA_11x_SOC is not set
+# CONFIG_ARCH_TEGRA_14x_SOC is not set
 CONFIG_ARCH_TEGRA_2x_SOC=y
 # CONFIG_ARCH_TEGRA_3x_SOC is not set
 # CONFIG_ARCH_TEGRA_4GB_MEMORY is not set
@@ -35,6 +36,7 @@ CONFIG_ARM_ERRATA_751472=y
 # CONFIG_ARM_ERRATA_752520 is not set
 # CONFIG_ARM_ERRATA_754322 is not set
 CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_761320=y
 CONFIG_ARM_ERRATA_764369=y
 # CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
 # CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
@@ -91,7 +93,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BT=m
 # CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BLUESLEEP is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIBTSDIO=m
@@ -605,6 +606,7 @@ CONFIG_NR_CPUS=2
 CONFIG_NVMAP_CACHE_MAINT_BY_SET_WAYS=y
 CONFIG_NVMAP_CARVEOUT_COMPACTOR=y
 # CONFIG_NVMAP_CARVEOUT_KILLER is not set
+CONFIG_NVMAP_DEFERRED_CACHE_MAINT=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=y
@@ -938,6 +940,8 @@ CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TEGRA_ARBITRATION_EMEM_INTR is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_MMU=y
+# CONFIG_TEGRA_BASEBAND is not set
+# CONFIG_TEGRA_BASEBAND_SIMU is not set
 # CONFIG_TEGRA_BB_SUPPORT is not set
 # CONFIG_TEGRA_BB_XMM_POWER is not set
 # CONFIG_TEGRA_BB_XMM_POWER2 is not set
@@ -985,6 +989,7 @@ CONFIG_TEGRA_NVMAP=y
 # CONFIG_TEGRA_PCI is not set
 # CONFIG_TEGRA_PREINIT_CLOCKS is not set
 # CONFIG_TEGRA_PREPOWER_WIFI is not set
+# CONFIG_TEGRA_PRE_SILICON_SUPPORT is not set
 # CONFIG_TEGRA_PWM is not set
 # CONFIG_TEGRA_SD_GEN2 is not set
 CONFIG_TEGRA_SE_ON_CBUS=y
@@ -996,6 +1001,7 @@ CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
 CONFIG_TEGRA_TIMER_HZ=1000
 # CONFIG_TEGRA_USB_MODEM_POWER is not set
+# CONFIG_TEGRA_WAKEUP_MONITOR is not set
 # CONFIG_TEGRA_WDT_RECOVERY is not set
 # CONFIG_TEHUTI is not set
 # CONFIG_TIFM_CORE is not set
diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config
index 46c0ea1fcd29..ff2a987eefb2 100644
--- a/chromeos/config/armel/chromeos-tegra3.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra3.flavour.config
@@ -19,6 +19,7 @@ CONFIG_ARCH_PROVIDES_UDELAY=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_TEGRA=y
 # CONFIG_ARCH_TEGRA_11x_SOC is not set
+# CONFIG_ARCH_TEGRA_14x_SOC is not set
 CONFIG_ARCH_TEGRA_3x_SOC=y
 # CONFIG_ARCH_TEGRA_4GB_MEMORY is not set
 CONFIG_ARCH_TEGRA_HAS_ARM_SCU=y
@@ -37,6 +38,7 @@ CONFIG_ARM_ERRATA_751472=y
 CONFIG_ARM_ERRATA_752520=y
 CONFIG_ARM_ERRATA_754322=y
 # CONFIG_ARM_ERRATA_754327 is not set
+CONFIG_ARM_ERRATA_761320=y
 CONFIG_ARM_ERRATA_764369=y
 # CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
 CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
@@ -156,6 +158,7 @@ CONFIG_CPUQUIET_FRAMEWORK=y
 CONFIG_CPUQUIET_GOVERNOR_BALANCED=y
 CONFIG_CPUQUIET_GOVERNOR_RUNNABLE=y
 CONFIG_CPUQUIET_GOVERNOR_USERSPACE=y
+# CONFIG_CPUQUIET_STATS is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
@@ -506,6 +509,7 @@ CONFIG_MACH_HAS_SND_SOC_TEGRA_MAX98095=y
 CONFIG_MACH_HAS_SND_SOC_TEGRA_TLV320AIC326X=y
 CONFIG_MACH_HAS_SND_SOC_TEGRA_WM8903=y
 # CONFIG_MACH_KAI is not set
+# CONFIG_MACH_M2601 is not set
 # CONFIG_MACH_P1852 is not set
 # CONFIG_MACH_TAI is not set
 CONFIG_MACH_TEGRA_ENTERPRISE=y
@@ -777,6 +781,7 @@ CONFIG_NVMAP_CACHE_MAINT_BY_SET_WAYS=y
 CONFIG_NVMAP_CARVEOUT_COMPACTOR=y
 # CONFIG_NVMAP_CARVEOUT_KILLER is not set
 CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM=y
+CONFIG_NVMAP_DEFERRED_CACHE_MAINT=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=y
@@ -1142,6 +1147,8 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TEGRA_AUTO_HOTPLUG=y
 # CONFIG_TEGRA_AVP is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_SMMU=y
+# CONFIG_TEGRA_BASEBAND is not set
+# CONFIG_TEGRA_BASEBAND_SIMU is not set
 # CONFIG_TEGRA_BB_OEM1 is not set
 # CONFIG_TEGRA_BB_OEM2 is not set
 CONFIG_TEGRA_BB_POWER=y
@@ -1209,6 +1216,7 @@ CONFIG_TEGRA_PCI=y
 CONFIG_TEGRA_PLLM_RESTRICTED=y
 CONFIG_TEGRA_PREINIT_CLOCKS=y
 CONFIG_TEGRA_PREPOWER_WIFI=y
+# CONFIG_TEGRA_PRE_SILICON_SUPPORT is not set
 CONFIG_TEGRA_PWM=y
 CONFIG_TEGRA_RPC=y
 # CONFIG_TEGRA_SD_GEN2 is not set
@@ -1221,6 +1229,7 @@ CONFIG_TEGRA_THERMAL_THROTTLE=y
 CONFIG_TEGRA_THROUGHPUT=y
 CONFIG_TEGRA_TIMER_HZ=1000
 CONFIG_TEGRA_USB_MODEM_POWER=y
+# CONFIG_TEGRA_WAKEUP_MONITOR is not set
 # CONFIG_TEGRA_WDT_RECOVERY is not set
 # CONFIG_TEHUTI is not set
 CONFIG_TEXTSEARCH=y
diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index bd45235dfa64..ee76e4c5080b 100644
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -19,6 +19,7 @@ CONFIG_ARCH_PROVIDES_UDELAY=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_TEGRA=y
 # CONFIG_ARCH_TEGRA_11x_SOC is not set
+# CONFIG_ARCH_TEGRA_14x_SOC is not set
 CONFIG_ARCH_TEGRA_2x_SOC=y
 # CONFIG_ARCH_TEGRA_3x_SOC is not set
 # CONFIG_ARCH_TEGRA_4GB_MEMORY is not set
@@ -35,6 +36,7 @@ CONFIG_ARM_ERRATA_751472=y
 # CONFIG_ARM_ERRATA_752520 is not set
 # CONFIG_ARM_ERRATA_754322 is not set
 CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_761320=y
 CONFIG_ARM_ERRATA_764369=y
 # CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
 # CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
@@ -91,7 +93,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BT=m
 # CONFIG_BT_ATH3K is not set
-# CONFIG_BT_BLUESLEEP is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIBTSDIO=m
@@ -605,6 +606,7 @@ CONFIG_NR_CPUS=2
 CONFIG_NVMAP_CACHE_MAINT_BY_SET_WAYS=y
 CONFIG_NVMAP_CARVEOUT_COMPACTOR=y
 # CONFIG_NVMAP_CARVEOUT_KILLER is not set
+CONFIG_NVMAP_DEFERRED_CACHE_MAINT=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=y
@@ -938,6 +940,8 @@ CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TEGRA_ARBITRATION_EMEM_INTR is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_MMU=y
+# CONFIG_TEGRA_BASEBAND is not set
+# CONFIG_TEGRA_BASEBAND_SIMU is not set
 # CONFIG_TEGRA_BB_SUPPORT is not set
 # CONFIG_TEGRA_BB_XMM_POWER is not set
 # CONFIG_TEGRA_BB_XMM_POWER2 is not set
@@ -985,6 +989,7 @@ CONFIG_TEGRA_NVMAP=y
 # CONFIG_TEGRA_PCI is not set
 # CONFIG_TEGRA_PREINIT_CLOCKS is not set
 # CONFIG_TEGRA_PREPOWER_WIFI is not set
+# CONFIG_TEGRA_PRE_SILICON_SUPPORT is not set
 # CONFIG_TEGRA_PWM is not set
 # CONFIG_TEGRA_SD_GEN2 is not set
 CONFIG_TEGRA_SE_ON_CBUS=y
@@ -996,6 +1001,7 @@ CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
 CONFIG_TEGRA_TIMER_HZ=1000
 # CONFIG_TEGRA_USB_MODEM_POWER is not set
+# CONFIG_TEGRA_WAKEUP_MONITOR is not set
 # CONFIG_TEGRA_WDT_RECOVERY is not set
 # CONFIG_TEHUTI is not set
 # CONFIG_TIFM_CORE is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 8687bbdc84f5..c301be33fd4f 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -203,6 +203,7 @@ CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_I2C=y
+CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
 # CONFIG_OF_SELFTEST is not set
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 888db25dc555..b25d693feece 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -308,6 +308,7 @@ CONFIG_DM_CRYPT=y
 # CONFIG_DNOTIFY is not set
 CONFIG_DQL=y
 # CONFIG_DS1682 is not set
+# CONFIG_DS90UH925Q_SER is not set
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_DVB_CORE is not set
 CONFIG_DYNAMIC_FTRACE=y
@@ -352,6 +353,7 @@ CONFIG_EXT4_FS_XATTR=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_FAIR_SHARE is not set
 # CONFIG_FANOTIFY is not set
+# CONFIG_FAN_THERM_EST is not set
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_FB=y
@@ -720,9 +722,11 @@ CONFIG_MD=y
 # CONFIG_MEMSTICK is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_AS3720 is not set
 # CONFIG_MFD_BQ2419X is not set
 # CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_MAX77660 is not set
 # CONFIG_MFD_MAX77665 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
@@ -909,6 +913,7 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 CONFIG_PROFILING=y
 # CONFIG_PROVE_LOCKING is not set
+# CONFIG_PWM_FAN is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_QUOTA is not set
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index a00375f58ea7..7a70b100b6a0 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -142,7 +142,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
 CONFIG_BT=m
 CONFIG_BT_ATH3K=m
-# CONFIG_BT_BLUESLEEP is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBFUSB=m
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index e5a094a22f1e..2cab2d9aacb1 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -150,7 +150,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BT=m
 CONFIG_BT_ATH3K=m
-# CONFIG_BT_BLUESLEEP is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBFUSB=m