commit c3ff94ef00424e35574e3c020d6b4c6593094852
author David Hendricks <dhendrix@chromium.org> Fri Dec 13 22:31:32 2013
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Dec 17 03:15:47 2013
tree fb9643659ffe46ba23126289ee9e88f5459c4749
parent ae7f9cffd83e31fca1f6121f8e3e7fe7087e4a6c

Tidy up defconfig files

There were some stale options set in the defconfigs, this replaces
them after running "make menuconfig". Most of this is benign since
the correct values should be forcibly set via "default" and "select".

x86:
- CrOS EC variables were stale

arm:
- Obsolete platforms removed
- Several devices (such as LPC ECs and Intel chipsets) were selected
  that are only present on x86 platforms, so unset those.

BUG=none
BRANCH=none
TEST=built and run on mario, alex, zgb, sumpy, lumpy, parrot,
stout, butterfly, spring, pit

Change-Id: I4d4b23577dd82084a2c27c405a138cd6583d16c8
Reviewed-on: https://chromium-review.googlesource.com/180090
Reviewed-by: Doug Anderson <dianders@chromium.org>
Commit-Queue: David Hendricks <dhendrix@chromium.org>
Tested-by: David Hendricks <dhendrix@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>

configs/arm_defconfig

diff --git a/configs/arm_defconfig b/configs/arm_defconfig
index 0f67b10..ef9fde0 100644
--- a/configs/arm_defconfig
+++ b/configs/arm_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Mosys version: 1.2.03
-# Thu May 16 13:48:29 2013
+# Fri Dec 13 14:34:32 2013
 #
 
 #
@@ -45,32 +45,29 @@
 # Experimental Platform Support
 #
 CONFIG_PLATFORM_EXPERIMENTAL=y
-CONFIG_EXPERIMENTAL_AEBL=y
-CONFIG_EXPERIMENTAL_ASYMPTOTE=y
-CONFIG_EXPERIMENTAL_KAEN=y
-CONFIG_EXPERIMENTAL_SEABOARD=y
 CONFIG_PLATFORM_PEACH=y
-CONFIG_PLATFORM_SPRING=y
 CONFIG_EXPERIMENTAL_NYAN=y
+CONFIG_PLATFORM_SPRING=y
 
 #
 # Device Drivers
 #
 CONFIG_TRACKPAD_CYPRESS_APA=y
-CONFIG_GOOGLE_EC=y
-CONFIG_GOOGLE_EC_I2C=y
-CONFIG_GOOGLE_EC_LPC=y
-CONFIG_CHIPSET_INTEL=y
-CONFIG_CHIPSET_INTEL_NM10=y
-CONFIG_CHIPSET_INTEL_SERIES6=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_I2C=y
+# CONFIG_CROS_EC_LPC is not set
+# CONFIG_CHIPSET_INTEL is not set
+# CONFIG_CHIPSET_INTEL_NM10 is not set
+# CONFIG_CHIPSET_INTEL_SERIES6 is not set
 # CONFIG_CHIPSET_INTEL_LYNXPOINT_LP is not set
-CONFIG_EC_ITE_IT8500=y
-CONFIG_SUPERIO_ITE_IT8772=y
-CONFIG_EC_NUVOTON_NPCE781=y
+# CONFIG_EC_ITE_IT8500 is not set
+# CONFIG_SUPERIO_ITE_IT8772 is not set
+# CONFIG_EC_NUVOTON_NPCE781 is not set
 CONFIG_SOC_SAMSUNG=y
-CONFIG_SOC_SAMSUNG_EXYNOS5=y
-CONFIG_EC_SMSC_MEC1308=y
-CONFIG_EC_ENE_KB932=y
+CONFIG_SOC_SAMSUNG_EXYNOS5250=y
+CONFIG_SOC_SAMSUNG_EXYNOS5420=y
+# CONFIG_EC_SMSC_MEC1308 is not set
+# CONFIG_EC_ENE_KB932 is not set
 # CONFIG_STORAGE_SANDISK_U100 is not set
 
 #

configs/x86_defconfig

diff --git a/configs/x86_defconfig b/configs/x86_defconfig
index 1d30af2..a021885 100644
--- a/configs/x86_defconfig
+++ b/configs/x86_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Mosys version: 1.2.03
-# Thu Sep  5 16:46:56 2013
+# Fri Dec 13 14:29:47 2013
 #
 
 #
@@ -63,9 +63,9 @@
 # Device Drivers
 #
 # CONFIG_TRACKPAD_CYPRESS_APA is not set
-CONFIG_GOOGLE_EC=y
-# CONFIG_GOOGLE_EC_I2C is not set
-CONFIG_GOOGLE_EC_LPC=y
+CONFIG_CROS_EC=y
+# CONFIG_CROS_EC_I2C is not set
+CONFIG_CROS_EC_LPC=y
 CONFIG_CHIPSET_INTEL=y
 CONFIG_CHIPSET_INTEL_NM10=y
 CONFIG_CHIPSET_INTEL_SERIES6=y