CHROMIUM: config: renormalize split configs

Renormalize the split configs to adapt to changes since the last
renormalization. Also fix the DEFAULT_HOSTNAME change which was
accidentally reverted in the last round of normalization.

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

9 files changed, 47 insertions, 15 deletions

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index dc69f34a1476..b58d99be69fd 100644
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -144,7 +144,6 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=5
@@ -362,6 +361,7 @@ CONFIG_MAC80211_HWSIM=m
 # CONFIG_MAC80211_IBSS_DEBUG is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_NOINLINE is not set
+# CONFIG_MAC80211_SCAN_ABORT is not set
 # CONFIG_MAC80211_TKIP_DEBUG is not set
 CONFIG_MAC80211_VERBOSE_DEBUG=y
 # CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set
@@ -422,7 +422,6 @@ CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_NAMESPACES=y
 # CONFIG_NATIONAL_PHY is not set
-CONFIG_NEED_MACH_MEMORY_H=y
 CONFIG_NEON=y
 # CONFIG_NETFILTER_ADVANCED is not set
 CONFIG_NETFILTER_XT_MARK=m
diff --git a/chromeos/config/armel/chromeos-tegra11.flavour.config b/chromeos/config/armel/chromeos-tegra11.flavour.config
index 3d5b6809bade..840522c1ee0d 100644
--- a/chromeos/config/armel/chromeos-tegra11.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra11.flavour.config
@@ -189,7 +189,6 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_VM=y
-CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_DEFAULT_IOSCHED="noop"
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -480,11 +479,13 @@ CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_MAC80211_LEDS is not set
+CONFIG_MAC80211_SCAN_ABORT=y
 # 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_ROTH is not set
 CONFIG_MACH_TEGRA_PLUTO=y
 # CONFIG_MAX77665_FLASH is not set
 # CONFIG_MEDIA_CONTROLLER is not set
@@ -721,7 +722,7 @@ CONFIG_NR_CPUS=4
 CONFIG_NTFS_FS=y
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVMAP_ALLOW_SYSMEM is not set
-# CONFIG_NVMAP_CACHE_MAINT_BY_SET_WAYS is not set
+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
@@ -1064,6 +1065,7 @@ CONFIG_TASK_SIZE_3G_LESS_16M=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_MD5SIG is not set
+# CONFIG_TEGRA_ARBITRATION_EMEM_INTR is not set
 CONFIG_TEGRA_AUTO_HOTPLUG=y
 # CONFIG_TEGRA_AVP is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_SMMU=y
@@ -1076,6 +1078,7 @@ CONFIG_TEGRA_CBUS_CLOCK_DIVIDER=2
 # CONFIG_TEGRA_CEC_SUPPORT is not set
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
 CONFIG_TEGRA_CLUSTER_CONTROL=y
+# CONFIG_TEGRA_CORE_EDP_LIMITS is not set
 CONFIG_TEGRA_CPUQUIET=y
 # CONFIG_TEGRA_CPU_DVFS is not set
 # CONFIG_TEGRA_CRYPTO_DEV is not set
@@ -1093,6 +1096,7 @@ CONFIG_TEGRA_DYNAMIC_PWRDET=y
 # CONFIG_TEGRA_EDP_LIMITS is not set
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 CONFIG_TEGRA_EMC_TO_DDR_CLOCK=1
+CONFIG_TEGRA_ERRATA_1157520=y
 # CONFIG_TEGRA_FIQ_DEBUGGER is not set
 # CONFIG_TEGRA_FPGA_PLATFORM is not set
 CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ=0
@@ -1112,6 +1116,7 @@ CONFIG_TEGRA_ISOMGR_SYSFS=y
 CONFIG_TEGRA_LATENCY_ALLOWANCE=y
 # CONFIG_TEGRA_LATENCY_ALLOWANCE_SCALING is not set
 CONFIG_TEGRA_LP2_CPU_TIMER=y
+CONFIG_TEGRA_MC_EARLY_ACK=y
 CONFIG_TEGRA_MC_PROFILE=y
 CONFIG_TEGRA_MC_PTSA=y
 # CONFIG_TEGRA_MEDIASERVER is not set
@@ -1119,6 +1124,7 @@ CONFIG_TEGRA_MC_PTSA=y
 CONFIG_TEGRA_MIPI_CAL=y
 CONFIG_TEGRA_NVAVP=y
 CONFIG_TEGRA_NVAVP_AUDIO=y
+# CONFIG_TEGRA_NVDUMPER is not set
 CONFIG_TEGRA_NVHDCP=y
 CONFIG_TEGRA_NVMAP=y
 CONFIG_TEGRA_PLLM_RESTRICTED=y
@@ -1135,8 +1141,9 @@ CONFIG_TEGRA_SILICON_PLATFORM=y
 CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
 CONFIG_TEGRA_THROUGHPUT=y
+CONFIG_TEGRA_TIMER_HZ=1000
 CONFIG_TEGRA_USB_MODEM_POWER=y
-CONFIG_TEGRA_USE_DFLL=y
+CONFIG_TEGRA_USE_DFLL_RANGE=1
 # CONFIG_TEGRA_VIRTUAL_CPUID is not set
 # CONFIG_TEGRA_WDT_RECOVERY is not set
 # CONFIG_TEHUTI is not set
diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index bac9a4d58538..28ae9f6ff4d1 100644
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -176,7 +176,6 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=5
@@ -449,6 +448,7 @@ CONFIG_MAC80211_HWSIM=m
 # CONFIG_MAC80211_IBSS_DEBUG is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_NOINLINE is not set
+# CONFIG_MAC80211_SCAN_ABORT is not set
 # CONFIG_MAC80211_TKIP_DEBUG is not set
 CONFIG_MAC80211_VERBOSE_DEBUG=y
 # CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set
@@ -936,6 +936,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_YEAH is not set
 CONFIG_TCP_MD5SIG=y
+# CONFIG_TEGRA_ARBITRATION_EMEM_INTR is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_MMU=y
 # CONFIG_TEGRA_BB_SUPPORT is not set
 # CONFIG_TEGRA_BB_XMM_POWER is not set
@@ -945,6 +946,7 @@ CONFIG_TEGRA_CBUS_CLOCK_DIVIDER=2
 # CONFIG_TEGRA_CEC_SUPPORT is not set
 # CONFIG_TEGRA_CLOCK_DEBUG_WRITE is not set
 CONFIG_TEGRA_CORE_DVFS=y
+# CONFIG_TEGRA_CORE_EDP_LIMITS is not set
 CONFIG_TEGRA_CPU_DVFS=y
 # CONFIG_TEGRA_CRYPTO_DEV is not set
 # CONFIG_TEGRA_DC_CMU is not set
@@ -977,6 +979,7 @@ CONFIG_TEGRA_ISOMGR_POOL_KB_PER_SEC=0
 # CONFIG_TEGRA_LATENCY_ALLOWANCE is not set
 CONFIG_TEGRA_MC_PROFILE=y
 # CONFIG_TEGRA_MIPI_CAL is not set
+# CONFIG_TEGRA_NVDUMPER is not set
 # CONFIG_TEGRA_NVHDCP is not set
 CONFIG_TEGRA_NVMAP=y
 # CONFIG_TEGRA_PCI is not set
@@ -988,10 +991,10 @@ CONFIG_TEGRA_SE_ON_CBUS=y
 CONFIG_TEGRA_SILICON_PLATFORM=y
 # CONFIG_TEGRA_SIMULATION_PLATFORM is not set
 # CONFIG_TEGRA_SLOW_CSITE is not set
-# CONFIG_TEGRA_SOCTHERM is not set
 # CONFIG_TEGRA_STAT_MON is not set
 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_WDT_RECOVERY is not set
 # CONFIG_TEHUTI is not set
diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config
index 5aa800bcb328..46c0ea1fcd29 100644
--- a/chromeos/config/armel/chromeos-tegra3.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra3.flavour.config
@@ -196,7 +196,6 @@ CONFIG_DEBUG_SLAB=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_VM=y
 CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_IOSCHED="noop"
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
@@ -1139,10 +1138,12 @@ CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_WESTWOOD=m
 # CONFIG_TCP_CONG_YEAH is not set
 # CONFIG_TCP_MD5SIG is not set
+# CONFIG_TEGRA_ARBITRATION_EMEM_INTR is not set
 CONFIG_TEGRA_AUTO_HOTPLUG=y
 # CONFIG_TEGRA_AVP is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_SMMU=y
-CONFIG_TEGRA_BB_M7400=y
+# CONFIG_TEGRA_BB_OEM1 is not set
+# CONFIG_TEGRA_BB_OEM2 is not set
 CONFIG_TEGRA_BB_POWER=y
 CONFIG_TEGRA_BB_SUPPORT=y
 CONFIG_TEGRA_BB_XMM_POWER=y
@@ -1155,6 +1156,7 @@ CONFIG_TEGRA_CBUS_CLOCK_DIVIDER=2
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
 CONFIG_TEGRA_CLUSTER_CONTROL=y
 CONFIG_TEGRA_CORE_DVFS=y
+# CONFIG_TEGRA_CORE_EDP_LIMITS is not set
 CONFIG_TEGRA_CPUQUIET=y
 CONFIG_TEGRA_CPU_DVFS=y
 CONFIG_TEGRA_CRYPTO_DEV=y
@@ -1200,6 +1202,7 @@ CONFIG_TEGRA_MC_PROFILE=y
 # CONFIG_TEGRA_MIPI_CAL is not set
 CONFIG_TEGRA_NVAVP=y
 # CONFIG_TEGRA_NVAVP_AUDIO is not set
+# CONFIG_TEGRA_NVDUMPER is not set
 CONFIG_TEGRA_NVHDCP=y
 CONFIG_TEGRA_NVMAP=y
 CONFIG_TEGRA_PCI=y
@@ -1213,10 +1216,10 @@ CONFIG_TEGRA_SE_ON_CBUS=y
 CONFIG_TEGRA_SILICON_PLATFORM=y
 # CONFIG_TEGRA_SIMULATION_PLATFORM is not set
 CONFIG_TEGRA_SLOW_CSITE=y
-# CONFIG_TEGRA_SOCTHERM is not set
 CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
 CONFIG_TEGRA_THROUGHPUT=y
+CONFIG_TEGRA_TIMER_HZ=1000
 CONFIG_TEGRA_USB_MODEM_POWER=y
 # CONFIG_TEGRA_WDT_RECOVERY is not set
 # CONFIG_TEHUTI is not set
diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index d20695f284ff..bd45235dfa64 100644
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -176,7 +176,6 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=5
@@ -449,6 +448,7 @@ CONFIG_MAC80211_HWSIM=m
 # CONFIG_MAC80211_IBSS_DEBUG is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_NOINLINE is not set
+# CONFIG_MAC80211_SCAN_ABORT is not set
 # CONFIG_MAC80211_TKIP_DEBUG is not set
 CONFIG_MAC80211_VERBOSE_DEBUG=y
 # CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set
@@ -936,6 +936,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_YEAH is not set
 CONFIG_TCP_MD5SIG=y
+# CONFIG_TEGRA_ARBITRATION_EMEM_INTR is not set
 CONFIG_TEGRA_AVP_KERNEL_ON_MMU=y
 # CONFIG_TEGRA_BB_SUPPORT is not set
 # CONFIG_TEGRA_BB_XMM_POWER is not set
@@ -945,6 +946,7 @@ CONFIG_TEGRA_CBUS_CLOCK_DIVIDER=2
 # CONFIG_TEGRA_CEC_SUPPORT is not set
 # CONFIG_TEGRA_CLOCK_DEBUG_WRITE is not set
 CONFIG_TEGRA_CORE_DVFS=y
+# CONFIG_TEGRA_CORE_EDP_LIMITS is not set
 CONFIG_TEGRA_CPU_DVFS=y
 # CONFIG_TEGRA_CRYPTO_DEV is not set
 # CONFIG_TEGRA_DC_CMU is not set
@@ -977,6 +979,7 @@ CONFIG_TEGRA_ISOMGR_POOL_KB_PER_SEC=0
 # CONFIG_TEGRA_LATENCY_ALLOWANCE is not set
 CONFIG_TEGRA_MC_PROFILE=y
 # CONFIG_TEGRA_MIPI_CAL is not set
+# CONFIG_TEGRA_NVDUMPER is not set
 # CONFIG_TEGRA_NVHDCP is not set
 CONFIG_TEGRA_NVMAP=y
 # CONFIG_TEGRA_PCI is not set
@@ -988,10 +991,10 @@ CONFIG_TEGRA_SE_ON_CBUS=y
 CONFIG_TEGRA_SILICON_PLATFORM=y
 # CONFIG_TEGRA_SIMULATION_PLATFORM is not set
 # CONFIG_TEGRA_SLOW_CSITE is not set
-# CONFIG_TEGRA_SOCTHERM is not set
 # CONFIG_TEGRA_STAT_MON is not set
 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_WDT_RECOVERY is not set
 # CONFIG_TEHUTI is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 78345cfbce64..8687bbdc84f5 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -182,6 +182,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_MACH_MEMORY_H=y
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CIRRUS=y
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 4b01a5cd3059..888db25dc555 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -63,7 +63,7 @@
 # CONFIG_ADXRS450 is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_AIC3262_CODEC is not set
+# CONFIG_AIC3XXX_CORE is not set
 CONFIG_AIO=y
 # CONFIG_ALTERA_STAPL is not set
 # CONFIG_AMIGA_PARTITION is not set
@@ -128,6 +128,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_SD=y
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLOCK=y
+# CONFIG_BLUEDROID_PM is not set
 # CONFIG_BMP085 is not set
 # CONFIG_BONDING is not set
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
@@ -182,6 +183,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
@@ -281,6 +283,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DECNET is not set
+CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -347,6 +350,7 @@ CONFIG_EXT4_FS_XATTR=y
 # CONFIG_EXTCON is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_FAIR_SHARE is not set
 # CONFIG_FANOTIFY is not set
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -390,6 +394,7 @@ CONFIG_FUTEX=y
 CONFIG_FW_LOADER=y
 # CONFIG_GAMEPORT is not set
 # CONFIG_GCOV_KERNEL is not set
+# CONFIG_GCOV_TOOLCHAIN_IS_ANDROID is not set
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -715,6 +720,7 @@ CONFIG_MD=y
 # CONFIG_MEMSTICK is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE 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_MAX77665 is not set
@@ -736,6 +742,8 @@ CONFIG_MD=y
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8400 is not set
+# CONFIG_MHI is not set
+# CONFIG_MHI_NETDEV is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MII=y
 # CONFIG_MINIX_FS is not set
@@ -1041,6 +1049,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_GPIO_FAN is not set
 # CONFIG_SENSORS_HMC5843 is not set
 # CONFIG_SENSORS_INA230 is not set
+# CONFIG_SENSORS_INA3221 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
@@ -1165,6 +1174,7 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STAGING=y
 # CONFIG_STAGING_MEDIA is not set
 CONFIG_STANDALONE=y
+CONFIG_STEP_WISE=y
 CONFIG_STOP_MACHINE=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_ST_GPS is not set
@@ -1188,6 +1198,9 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_POWER is not set
 CONFIG_THERMAL=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
 CONFIG_THERMAL_HWMON=y
 # CONFIG_THERM_EST is not set
 CONFIG_TICK_ONESHOT=y
@@ -1297,6 +1310,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1362_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KPI is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_LED is not set
@@ -1320,6 +1334,7 @@ CONFIG_USB_LIBUSUAL=y
 # CONFIG_USB_PRINTER is not set
 # CONFIG_USB_PWC is not set
 # CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RENESAS_MODEM is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_S2255 is not set
 CONFIG_USB_SERIAL=y
@@ -1404,6 +1419,7 @@ CONFIG_USB_SUSPEND=y
 # CONFIG_USB_YUREX is not set
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_ZR364XX is not set
+# CONFIG_USER_SPACE is not set
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VGASTATE is not set
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 7641c1f92692..a00375f58ea7 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -247,7 +247,6 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_IO_DELAY_TYPE=1
@@ -691,6 +690,7 @@ CONFIG_MAC80211_HWSIM=m
 # CONFIG_MAC80211_IBSS_DEBUG is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_NOINLINE is not set
+# CONFIG_MAC80211_SCAN_ABORT is not set
 # CONFIG_MAC80211_TKIP_DEBUG is not set
 CONFIG_MAC80211_VERBOSE_DEBUG=y
 # CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index e57933684011..e5a094a22f1e 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -262,7 +262,6 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_IO_DELAY_TYPE=1
@@ -727,6 +726,7 @@ CONFIG_MAC80211_HWSIM=m
 # CONFIG_MAC80211_IBSS_DEBUG is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_NOINLINE is not set
+# CONFIG_MAC80211_SCAN_ABORT is not set
 # CONFIG_MAC80211_TKIP_DEBUG is not set
 CONFIG_MAC80211_VERBOSE_DEBUG=y
 # CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set