Clean up and document more config options

No functional changes, just renaming config options.

Remove README, now that all options described in it have been moved to
config.h, and the remaining information is out of date.  (Yes, we
should have a README which describes the organization of the EC
repository, but that's a matter for another CL; this one's about
cleaning up config options.)

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

Change-Id: Iafefbe94369f1217c698f11d358bc0ecac2bdfde
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63145
Reviewed-by: Vic Yang <victoryang@chromium.org>

11 files changed, 6 insertions, 16 deletions

diff --git a/board/daisy/board.h b/board/daisy/board.h
index 681d09a345..2161650def 100644
--- a/board/daisy/board.h
+++ b/board/daisy/board.h
@@ -28,6 +28,7 @@
 #define CONFIG_KEYBOARD_SUPPRESS_NOISE
 #define CONFIG_LID_SWITCH
 #define CONFIG_PMU_TPS65090
+#undef  CONFIG_WATCHDOG_HELP
 
 /*
  * Allow dangerous commands all the time, since we don't have a write protect
diff --git a/board/falco/board.h b/board/falco/board.h
index 5e8633b1d6..259ad966ec 100644
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -16,10 +16,10 @@
 #define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24738
+#define CONFIG_CHARGER_DISCHARGE_ON_AC
 #ifdef HAS_TASK_CHIPSET
 #define CONFIG_CHIPSET_HASWELL
 #endif
-#define CONFIG_CMD_DISCHARGE_ON_AC
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_KEYBOARD_BOARD_CONFIG
 #ifdef HAS_TASK_KEYPROTO
diff --git a/board/host/board.h b/board/host/board.h
index e9d0e3adbe..d962f3f285 100644
--- a/board/host/board.h
+++ b/board/host/board.h
@@ -15,6 +15,7 @@
 #define CONFIG_LID_SWITCH
 #define CONFIG_POWER_BUTTON
 #define CONFIG_TEMP_SENSOR
+#undef CONFIG_WATCHDOG
 
 /* Keyboard protocol */
 #ifdef KB_8042
diff --git a/board/mccroskey/board.h b/board/mccroskey/board.h
index 99cfaf6509..e5fa6c79e3 100644
--- a/board/mccroskey/board.h
+++ b/board/mccroskey/board.h
@@ -17,7 +17,6 @@
 /* Debug features */
 #define CONFIG_I2C_DEBUG	/* FIXME(dhendrix): remove this eventually */
 #undef  CONFIG_TASK_PROFILING
-#define CONFIG_WATCHDOG_HELP
 
 /* Optional features */
 #define CONFIG_BOARD_PRE_INIT
diff --git a/board/peppy/board.h b/board/peppy/board.h
index 22de835d20..fe780f771a 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -16,10 +16,10 @@
 #define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24707A
+#define CONFIG_CHARGER_DISCHARGE_ON_AC
 #ifdef HAS_TASK_CHIPSET
 #define CONFIG_CHIPSET_HASWELL
 #endif
-#define CONFIG_CMD_DISCHARGE_ON_AC
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_KEYBOARD_BOARD_CONFIG
 #ifdef HAS_TASK_KEYPROTO
diff --git a/board/pit/board.h b/board/pit/board.h
index 7b1cd08eda..036184c5ea 100644
--- a/board/pit/board.h
+++ b/board/pit/board.h
@@ -11,9 +11,6 @@
 /* Use USART1 as console serial port */
 #define CONFIG_CONSOLE_UART 1
 
-/* Debug features */
-#define CONFIG_WATCHDOG_HELP
-
 /* Optional features */
 #define CONFIG_BATTERY_BQ20Z453
 #define CONFIG_BATTERY_SMART
diff --git a/board/puppy/board.h b/board/puppy/board.h
index 1618ce7158..39789080e4 100644
--- a/board/puppy/board.h
+++ b/board/puppy/board.h
@@ -11,9 +11,6 @@
 /* Use USART1 as console serial port */
 #define CONFIG_CONSOLE_UART 1
 
-/* Debug features */
-#define CONFIG_WATCHDOG_HELP
-
 /* Optional features */
 #define CONFIG_BATTERY_BQ20Z453
 #define CONFIG_BATTERY_SMART
diff --git a/board/slippy/board.h b/board/slippy/board.h
index cd4562f2f7..33f7caedfa 100644
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -16,10 +16,10 @@
 #define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24707A
+#define CONFIG_CHARGER_DISCHARGE_ON_AC
 #ifdef HAS_TASK_CHIPSET
 #define CONFIG_CHIPSET_HASWELL
 #endif
-#define CONFIG_CMD_DISCHARGE_ON_AC
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_KEYBOARD_BOARD_CONFIG
 #ifdef HAS_TASK_KEYPROTO
diff --git a/board/snow/board.c b/board/snow/board.c
index ef5f8488c8..90bdba1847 100644
--- a/board/snow/board.c
+++ b/board/snow/board.c
@@ -167,9 +167,6 @@ void board_i2c_post_init(int port)
 
 void board_config_post_gpio_init(void)
 {
-#ifdef CONFIG_AC_POWER_STATUS
-	gpio_set_flags(GPIO_AC_STATUS, GPIO_OUT_HIGH);
-#endif
 #ifdef CONFIG_SPI
 	gpio_set_flags(GPIO_SPI1_NSS, GPIO_INT_BOTH);
 #endif
diff --git a/board/snow/board.h b/board/snow/board.h
index 73b67e3610..a9fed8f528 100644
--- a/board/snow/board.h
+++ b/board/snow/board.h
@@ -15,8 +15,7 @@
 #define CONFIG_CONSOLE_UART 1
 
 /* Debug features */
-#undef  CONFIG_TASK_PROFILING
-#define CONFIG_WATCHDOG_HELP
+#undef CONFIG_TASK_PROFILING
 
 /* Optional features */
 #define CONFIG_BATTERY_BQ20Z453
diff --git a/board/spring/board.h b/board/spring/board.h
index f919c99987..412e13284c 100644
--- a/board/spring/board.h
+++ b/board/spring/board.h
@@ -17,7 +17,6 @@
 
 /* Debug features */
 #undef  CONFIG_TASK_PROFILING
-#define CONFIG_WATCHDOG_HELP
 
 /* Optional features */
 #define CONFIG_ADC