summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin K Wong <kevin.k.wong@intel.com>2014-11-21 18:38:22 -0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-04-13 21:31:58 +0000
commit8580227b4064dff3437a7b81eaabeb0e999c7492 (patch)
treee8827a1aeda97b5f8dd37bab457ed6364f2517ca
parentaf27fe89838f55cd14be98d0691326627e87b39f (diff)
downloadchrome-ec-8580227b4064dff3437a7b81eaabeb0e999c7492.tar.gz
mec1322: Added CONFIG_SWITCH support.
This allows switch status to be updated to EC MemMap. BUG=none TEST=Verified mmapinfo console command is reporting the correct info. BRANCH=none Change-Id: I3b6683be8b92b59dffb3227e0a72a122dcda56a2 Signed-off-by: Kevin K Wong <kevin.k.wong@intel.com> Reviewed-on: https://chromium-review.googlesource.com/265493 Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r--board/cyan/board.h1
-rw-r--r--board/strago/board.h1
-rw-r--r--chip/mec1322/config_chip.h2
3 files changed, 1 insertions, 3 deletions
diff --git a/board/cyan/board.h b/board/cyan/board.h
index 9fde193e02..527ab7af34 100644
--- a/board/cyan/board.h
+++ b/board/cyan/board.h
@@ -22,7 +22,6 @@
#define CONFIG_POWER_BUTTON
#define CONFIG_POWER_BUTTON_X86
#define CONFIG_LID_SWITCH
-#define CONFIG_SWITCH
#define CONFIG_LED_COMMON
#define CONFIG_POWER_COMMON
#define CONFIG_EXTPOWER_GPIO
diff --git a/board/strago/board.h b/board/strago/board.h
index 5143bdbcb7..edfca0a6dd 100644
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -47,7 +47,6 @@
#undef CONFIG_EOPTION
#undef CONFIG_PSTORE
#undef CONFIG_PECI
-#undef CONFIG_SWITCH
#undef CONFIG_PWM
#undef CONFIG_FANS
#undef CONFIG_ADC
diff --git a/chip/mec1322/config_chip.h b/chip/mec1322/config_chip.h
index 797a895c3e..43f9974222 100644
--- a/chip/mec1322/config_chip.h
+++ b/chip/mec1322/config_chip.h
@@ -103,7 +103,6 @@
#if 0
#define CONFIG_ADC
#define CONFIG_PECI
-#define CONFIG_SWITCH
#define CONFIG_MPU
#endif
#define CONFIG_DMA
@@ -111,5 +110,6 @@
#define CONFIG_I2C
#define CONFIG_LPC
#define CONFIG_SPI
+#define CONFIG_SWITCH
#endif /* __CROS_EC_CONFIG_CHIP_H */