Clean up more config options

No functional changes, just renaming config options.

BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms

Change-Id: I65b310b670e61bcb3531c581dfc57625df064df2
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63248

21 files changed, 29 insertions, 55 deletions

diff --git a/board/bds/board.h b/board/bds/board.h
index ed25fac20c..61c7c5a7f9 100644
--- a/board/bds/board.h
+++ b/board/bds/board.h
@@ -16,7 +16,10 @@
 #define CONFIG_EOPTION
 #define CONFIG_PSTORE
 
-/* LM4 modules we want to exclude */
+/* Modules we want to exclude */
+#undef CONFIG_LID_SWITCH
+#undef CONFIG_LPC
+#undef CONFIG_PECI
 #undef CONFIG_SWITCH
 
 /* Write protect is active high */
diff --git a/board/bolt/board.c b/board/bolt/board.c
index bd7ec971e9..6d5f35172b 100644
--- a/board/bolt/board.c
+++ b/board/bolt/board.c
@@ -170,9 +170,7 @@ const struct i2c_port_t i2c_ports[I2C_PORTS_USED] = {
 const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = {
 /* HEY: Need correct I2C addresses and read function for external sensor */
 	{"ECInternal", TEMP_SENSOR_TYPE_BOARD, chip_temp_sensor_get_val, 0, 4},
-#ifdef CONFIG_PECI
 	{"PECI", TEMP_SENSOR_TYPE_CPU, peci_temp_sensor_get_val, 0, 2},
-#endif
 };
 
 struct keyboard_scan_config keyscan_config = {
diff --git a/board/bolt/board.h b/board/bolt/board.h
index 0d9d6782bc..b207e45133 100644
--- a/board/bolt/board.h
+++ b/board/bolt/board.h
@@ -24,13 +24,10 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
-#define CONFIG_LID_SWITCH
-#define CONFIG_LPC
 #define CONFIG_ONEWIRE
 #define  ONEWIRE_BANK LM4_GPIO_F
 #define  ONEWIRE_PIN (1 << 7)
 #define CONFIG_ONEWIRE_LED
-#define CONFIG_PECI
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_BUTTON_X86
 #define CONFIG_WP_ACTIVE_HIGH
@@ -186,7 +183,7 @@ enum adc_channel {
 };
 
 enum temp_sensor_id {
-	/* HEY - need two I2C sensor values */
+	/* HEY - need two I2C sensor values, and put PECI first */
 
 	/* EC internal temperature sensor */
 	TEMP_SENSOR_EC_INTERNAL,
diff --git a/board/daisy/board.h b/board/daisy/board.h
index a0fb0bd168..a76735a4f2 100644
--- a/board/daisy/board.h
+++ b/board/daisy/board.h
@@ -22,7 +22,6 @@
 #define CONFIG_I2C_HOST_AUTO
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
 #define CONFIG_KEYBOARD_SUPPRESS_NOISE
-#define CONFIG_LID_SWITCH
 #define CONFIG_PMU_TPS65090
 #undef  CONFIG_WATCHDOG_HELP
 
diff --git a/board/falco/board.c b/board/falco/board.c
index 745c4e6d57..8b1980d9e6 100644
--- a/board/falco/board.c
+++ b/board/falco/board.c
@@ -170,9 +170,7 @@ const struct i2c_port_t i2c_ports[I2C_PORTS_USED] = {
 
 /* Temperature sensors data; must be in same order as enum temp_sensor_id. */
 const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = {
-#ifdef CONFIG_PECI
 	{"PECI", TEMP_SENSOR_TYPE_CPU, peci_temp_sensor_get_val, 0, 2},
-#endif
 	{"ECInternal", TEMP_SENSOR_TYPE_BOARD, chip_temp_sensor_get_val, 0, 4},
 	{"G781Internal", TEMP_SENSOR_TYPE_BOARD, g781_get_val, 0, 4},
 	{"G781External", TEMP_SENSOR_TYPE_BOARD, g781_get_val, 1, 4},
diff --git a/board/falco/board.h b/board/falco/board.h
index 2b8874a91f..04bdc86d8c 100644
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -24,9 +24,6 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
-#define CONFIG_LID_SWITCH
-#define CONFIG_LPC
-#define CONFIG_PECI
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_BUTTON_X86
 #define CONFIG_PWM_FAN
@@ -174,15 +171,10 @@ enum adc_channel {
 };
 
 enum temp_sensor_id {
-#ifdef CONFIG_PECI
 	/* CPU die temperature via PECI */
 	TEMP_SENSOR_CPU_PECI = 0,
 	/* EC internal temperature sensor */
 	TEMP_SENSOR_EC_INTERNAL,
-#else
-	/* EC internal temperature sensor */
-	TEMP_SENSOR_EC_INTERNAL = 0,
-#endif
 	/* G781 internal and external sensors */
 	TEMP_SENSOR_I2C_G781_INTERNAL,
 	TEMP_SENSOR_I2C_G781_EXTERNAL,
diff --git a/board/host/board.h b/board/host/board.h
index a0d0d35cd7..64cda75f01 100644
--- a/board/host/board.h
+++ b/board/host/board.h
@@ -10,9 +10,7 @@
 
 /* Optional features */
 #define CONFIG_EXTPOWER_GPIO
-#define CONFIG_HOSTCMD
 #define CONFIG_HOST_EMU
-#define CONFIG_LID_SWITCH
 #define CONFIG_POWER_BUTTON
 #define CONFIG_TEMP_SENSOR
 #undef CONFIG_WATCHDOG
diff --git a/board/link/board.h b/board/link/board.h
index 30c8389213..2cf1c0e7b2 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -24,13 +24,10 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
-#define CONFIG_LID_SWITCH
-#define CONFIG_LPC
 #define CONFIG_ONEWIRE
 #define  ONEWIRE_BANK LM4_GPIO_H
 #define  ONEWIRE_PIN (1 << 2)
 #define CONFIG_ONEWIRE_LED
-#define CONFIG_PECI
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_BUTTON_X86
 #define CONFIG_PWM_FAN
diff --git a/board/mccroskey/board.h b/board/mccroskey/board.h
index bc3578ae97..0501c06ad6 100644
--- a/board/mccroskey/board.h
+++ b/board/mccroskey/board.h
@@ -15,6 +15,9 @@
 #define CONFIG_I2C_DEBUG	/* FIXME(dhendrix): remove this eventually */
 #undef  CONFIG_TASK_PROFILING
 
+/* Features not present on this reference board */
+#undef CONFIG_LID_SWITCH
+
 /* Optional features */
 #define CONFIG_BOARD_PRE_INIT
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
diff --git a/board/peppy/board.c b/board/peppy/board.c
index 61bf94d7b1..5ef8a56998 100644
--- a/board/peppy/board.c
+++ b/board/peppy/board.c
@@ -163,9 +163,7 @@ const struct i2c_port_t i2c_ports[I2C_PORTS_USED] = {
 
 /* Temperature sensors data; must be in same order as enum temp_sensor_id. */
 const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = {
-#ifdef CONFIG_PECI
 	{"PECI", TEMP_SENSOR_TYPE_CPU, peci_temp_sensor_get_val, 0, 2},
-#endif
 	{"ECInternal", TEMP_SENSOR_TYPE_BOARD, chip_temp_sensor_get_val, 0, 4},
 	{"G781Internal", TEMP_SENSOR_TYPE_BOARD, g781_get_val, 0, 4},
 	{"G781External", TEMP_SENSOR_TYPE_BOARD, g781_get_val, 1, 4},
diff --git a/board/peppy/board.h b/board/peppy/board.h
index cf5ad95563..f8988e507a 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -25,9 +25,6 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
-#define CONFIG_LID_SWITCH
-#define CONFIG_LPC
-#define CONFIG_PECI
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_BUTTON_X86
 #define CONFIG_PWM_FAN
@@ -178,15 +175,10 @@ enum adc_channel {
 };
 
 enum temp_sensor_id {
-#ifdef CONFIG_PECI
 	/* CPU die temperature via PECI */
 	TEMP_SENSOR_CPU_PECI = 0,
 	/* EC internal temperature sensor */
 	TEMP_SENSOR_EC_INTERNAL,
-#else
-	/* EC internal temperature sensor */
-	TEMP_SENSOR_EC_INTERNAL = 0,
-#endif
 	/* G781 internal and external sensors */
 	TEMP_SENSOR_I2C_G781_INTERNAL,
 	TEMP_SENSOR_I2C_G781_EXTERNAL,
diff --git a/board/pit/board.h b/board/pit/board.h
index 1c510b2565..b4ded92d60 100644
--- a/board/pit/board.h
+++ b/board/pit/board.h
@@ -23,7 +23,6 @@
 #define CONFIG_HOST_COMMAND_STATUS
 #define CONFIG_I2C
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
-#define CONFIG_LID_SWITCH
 #define CONFIG_PMU_HARD_RESET
 #define CONFIG_PMU_TPS65090
 #define CONFIG_SPI
diff --git a/board/puppy/board.h b/board/puppy/board.h
index 9a1be1d9ac..024d3ec6d4 100644
--- a/board/puppy/board.h
+++ b/board/puppy/board.h
@@ -23,7 +23,6 @@
 #define CONFIG_HOST_COMMAND_STATUS
 #define CONFIG_I2C
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
-#define CONFIG_LID_SWITCH
 #define CONFIG_PMU_HARD_RESET
 #define CONFIG_PMU_TPS65090
 #define CONFIG_SPI
diff --git a/board/slippy/board.c b/board/slippy/board.c
index e19cb4aeef..0422e434e0 100644
--- a/board/slippy/board.c
+++ b/board/slippy/board.c
@@ -163,9 +163,7 @@ const struct i2c_port_t i2c_ports[I2C_PORTS_USED] = {
 
 /* Temperature sensors data; must be in same order as enum temp_sensor_id. */
 const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = {
-#ifdef CONFIG_PECI
 	{"PECI", TEMP_SENSOR_TYPE_CPU, peci_temp_sensor_get_val, 0, 2},
-#endif
 	{"ECInternal", TEMP_SENSOR_TYPE_BOARD, chip_temp_sensor_get_val, 0, 4},
 	{"G781Internal", TEMP_SENSOR_TYPE_BOARD, g781_get_val, 0, 4},
 	{"G781External", TEMP_SENSOR_TYPE_BOARD, g781_get_val, 1, 4},
diff --git a/board/slippy/board.h b/board/slippy/board.h
index 3d7e7753bd..c8f3d8a38f 100644
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -26,9 +26,6 @@
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
 #define CONFIG_LED_SLIPPY
-#define CONFIG_LID_SWITCH
-#define CONFIG_LPC
-#define CONFIG_PECI
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_BUTTON_X86
 #define CONFIG_PWM_FAN
@@ -173,15 +170,10 @@ enum adc_channel {
 };
 
 enum temp_sensor_id {
-#ifdef CONFIG_PECI
 	/* CPU die temperature via PECI */
 	TEMP_SENSOR_CPU_PECI = 0,
 	/* EC internal temperature sensor */
 	TEMP_SENSOR_EC_INTERNAL,
-#else
-	/* EC internal temperature sensor */
-	TEMP_SENSOR_EC_INTERNAL = 0,
-#endif
 	/* G781 internal and external sensors */
 	TEMP_SENSOR_I2C_G781_INTERNAL,
 	TEMP_SENSOR_I2C_G781_EXTERNAL,
diff --git a/board/snow/board.h b/board/snow/board.h
index 5a5b3be161..66fd26dd74 100644
--- a/board/snow/board.h
+++ b/board/snow/board.h
@@ -29,7 +29,6 @@
 #define CONFIG_I2C_ARBITRATION
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
 #define CONFIG_KEYBOARD_SUPPRESS_NOISE
-#define CONFIG_LID_SWITCH
 #define CONFIG_PMU_HARD_RESET
 #define CONFIG_PMU_TPS65090
 
diff --git a/board/spring/board.h b/board/spring/board.h
index c74275ea07..2990a316a4 100644
--- a/board/spring/board.h
+++ b/board/spring/board.h
@@ -30,7 +30,6 @@
 #define CONFIG_I2C
 #define CONFIG_I2C_PASSTHROUGH
 #define CONFIG_KEYBOARD_PROTOCOL_MKBP
-#define CONFIG_LID_SWITCH
 #define CONFIG_LOW_POWER_IDLE	/* Use STOP mode when we have nothing to do */
 #define CONFIG_LED_DRIVER_LP5562
 #define CONFIG_PMU_FORCE_FET	/* Always enable 3G modem power rail */
diff --git a/board/wolf/board.c b/board/wolf/board.c
index ddeb3e6ea5..757bdd0ae2 100644
--- a/board/wolf/board.c
+++ b/board/wolf/board.c
@@ -163,9 +163,7 @@ const struct i2c_port_t i2c_ports[I2C_PORTS_USED] = {
 const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = {
 /* HEY: Need correct I2C addresses and read function for external sensor */
 	{"ECInternal", TEMP_SENSOR_TYPE_BOARD, chip_temp_sensor_get_val, 0, 4},
-#ifdef CONFIG_PECI
 	{"PECI", TEMP_SENSOR_TYPE_CPU, peci_temp_sensor_get_val, 0, 2},
-#endif
 };
 
 struct keyboard_scan_config keyscan_config = {
diff --git a/board/wolf/board.h b/board/wolf/board.h
index 7ee3554b5b..22da17b654 100644
--- a/board/wolf/board.h
+++ b/board/wolf/board.h
@@ -19,9 +19,6 @@
 #ifdef HAS_TASK_KEYPROTO
 #define CONFIG_KEYBOARD_PROTOCOL_8042
 #endif
-#define CONFIG_LID_SWITCH
-#define CONFIG_LPC
-#define CONFIG_PECI
 #define CONFIG_POWER_BUTTON
 #define CONFIG_POWER_BUTTON_X86
 #define CONFIG_PWM_FAN
@@ -162,7 +159,7 @@ enum adc_channel {
 };
 
 enum temp_sensor_id {
-	/* HEY - need two I2C sensor values */
+	/* HEY - need two I2C sensor values, and PECI should really be first */
 
 	/* EC internal temperature sensor */
 	TEMP_SENSOR_EC_INTERNAL,
diff --git a/chip/lm4/config_chip.h b/chip/lm4/config_chip.h
index 6dd030a5d1..1b44abb770 100644
--- a/chip/lm4/config_chip.h
+++ b/chip/lm4/config_chip.h
@@ -105,6 +105,8 @@
 #define CONFIG_FMAP
 #define CONFIG_FPU
 #define CONFIG_I2C
+#define CONFIG_LPC
+#define CONFIG_PECI
 #define CONFIG_SWITCH
 
 /* Compile for running from RAM instead of flash */
diff --git a/include/config.h b/include/config.h
index e6a2166add..ac52fa60be 100644
--- a/include/config.h
+++ b/include/config.h
@@ -221,7 +221,6 @@
 #undef CONFIG_FW_WP_RO_OFF
 #undef CONFIG_FW_WP_RO_SIZE
 
-#undef CONFIG_HOSTCMD
 #undef CONFIG_HOST_COMMAND_STATUS
 #undef CONFIG_HOST_EMU
 
@@ -275,12 +274,24 @@
 
 #undef CONFIG_LED_DRIVER_LP5562
 
-#undef CONFIG_LID_SWITCH
+/*
+ * Compile lid switch support.
+ *
+ * This is enabled by default because all boards other than reference boards
+ * are for laptops with lid switchs.  Reference boards #undef it.
+ */
+#define CONFIG_LID_SWITCH
+
 #undef CONFIG_LOW_POWER_IDLE
+
+/* Compile support for LPC interface */
 #undef CONFIG_LPC
+
 #undef CONFIG_ONEWIRE
 #undef CONFIG_ONEWIRE_LED
 #undef CONFIG_OVERFLOW_DETECT
+
+/* Compile support for PECI interface to x86 processor */
 #undef CONFIG_PECI
 
 /*****************************************************************************/
@@ -418,6 +429,11 @@
 /*****************************************************************************/
 
 #undef CONFIG_WIRELESS
+
+/*
+ * Write protect signal is active-high.  If this is defined, there must be a
+ * GPIO named GPIO_WP; if not defined, there must be a GPIO names GPIO_WP_L.
+ */
 #undef CONFIG_WP_ACTIVE_HIGH
 
 /*