1 files changed, 195 insertions, 126 deletions

diff --git a/include/config.h b/include/config.h
index 77177c6452..8d6088312b 100644
--- a/include/config.h
+++ b/include/config.h
@@ -19,134 +19,203 @@
 #define __CROS_EC_CONFIG_H
 
 /*
- * TODO(rspangler): set defaults and describe ALL config variables.
+ * All config options are listed alphabetically and described here.
  *
- * Here is the current list:
-
-CONFIG_ADC
-CONFIG_ASSERT_HELP
-CONFIG_BACKLIGHT_X86
-CONFIG_BATTERY_BQ20Z453
-CONFIG_BATTERY_FALCO
-CONFIG_BATTERY_LINK
-CONFIG_BATTERY_PEPPY
-CONFIG_BATTERY_SLIPPY
-CONFIG_BATTERY_SPRING
-CONFIG_BOARD_POST_GPIO_INIT
-CONFIG_BOARD_PRE_INIT
-CONFIG_BOARD_VERSION
-CONFIG_BQ24707A_R_AC
-CONFIG_BQ24707A_R_SNS
-CONFIG_BQ24725_R_AC
-CONFIG_BQ24725_R_SNS
-CONFIG_BQ24738_R_AC
-CONFIG_BQ24738_R_SNS
-CONFIG_CHARGER
-CONFIG_CHARGER_BQ24707A
-CONFIG_CHARGER_BQ24725
-CONFIG_CHARGER_BQ24738
-CONFIG_CHARGER_INPUT_CURRENT
-CONFIG_CHARGER_TPS65090
-CONFIG_CHARGING_CURRENT_LIMIT
-CONFIG_CHIPSET_GAIA
-CONFIG_CHIPSET_HASWELL
-CONFIG_CHIPSET_IVYBRIDGE
-CONFIG_CMD_PMU
-CONFIG_CONSOLE_CMDHELP
-CONFIG_CONSOLE_RESTRICTED_INPUT
-CONFIG_CONSOLE_UART
-CONFIG_CUSTOM_KEYSCAN
-CONFIG_DEBUG
-CONFIG_DEBUG_I2C
-CONFIG_EEPROM
-CONFIG_EOPTION
-CONFIG_EXTPOWER_FALCO
-CONFIG_EXTPOWER_GPIO
-CONFIG_EXTPOWER_SNOW
-CONFIG_EXTPOWER_USB
-CONFIG_FLASH
-CONFIG_FLASH_BANK_SIZE
-CONFIG_FLASH_BASE
-CONFIG_FLASH_ERASED_VALUE32
-CONFIG_FLASH_ERASE_SIZE
-CONFIG_FLASH_PHYSICAL_SIZE
-CONFIG_FLASH_PROTECT_NEXT_BOOT
-CONFIG_FLASH_SIZE
-CONFIG_FLASH_WRITE_SIZE
-CONFIG_FMAP
-CONFIG_FORCE_CONSOLE_RESUME
-CONFIG_FPU
-CONFIG_FW_IMAGE_SIZE
-CONFIG_FW_PSTATE_OFF
-CONFIG_FW_PSTATE_SIZE
-CONFIG_FW_RO_OFF
-CONFIG_FW_RO_SIZE
-CONFIG_FW_RW_OFF
-CONFIG_FW_RW_SIZE
-CONFIG_FW_WP_RO_OFF
-CONFIG_FW_WP_RO_SIZE
-CONFIG_HOSTCMD
-CONFIG_HOST_COMMAND_STATUS
-CONFIG_HOST_EMU
-CONFIG_HOST_UART
-CONFIG_HOST_UART1_GPIOS_PB0_1
-CONFIG_HOST_UART1_GPIOS_PC4_5
-CONFIG_HOST_UART2_GPIOS_PG4_5
-CONFIG_HOST_UART_IRQ
-CONFIG_I2C
-CONFIG_I2C_ARBITRATION
-CONFIG_I2C_HOST_AUTO
-CONFIG_I2C_PASSTHROUGH
-CONFIG_I2C_PASSTHRU_RESTRICTED
-CONFIG_IRQ_COUNT
-CONFIG_KEYBOARD_PROTOCOL_8042
-CONFIG_KEYBOARD_PROTOCOL_MKBP
-CONFIG_KEYBOARD_SUPPRESS_NOISE
-CONFIG_LED_DRIVER_LP5562
-CONFIG_LED_FALCO
-CONFIG_LED_PEPPY
-CONFIG_LED_SLIPPY
-CONFIG_LID_SWITCH
-CONFIG_LOW_POWER_IDLE
-CONFIG_LPC
-CONFIG_ONEWIRE
-CONFIG_ONEWIRE_LED
-CONFIG_PANIC_HELP
-CONFIG_PECI
-CONFIG_PMU_BOARD_INIT
-CONFIG_PMU_FORCE_FET
-CONFIG_PMU_HARD_RESET
-CONFIG_PMU_TPS65090
-CONFIG_POWER_BUTTON
-CONFIG_PSTORE
-CONFIG_PWM_FAN
-CONFIG_PWM_KBLIGHT
-CONFIG_RAM_BASE
-CONFIG_RAM_SIZE
-CONFIG_SMART_BATTERY
-CONFIG_SPI
-CONFIG_STACK_SIZE
-CONFIG_SYSTEM_UNLOCKED
-CONFIG_TASK_LIST
-CONFIG_TASK_PROFILING
-CONFIG_TEMP_SENSOR
-CONFIG_TEMP_SENSOR_G781
-CONFIG_TEMP_SENSOR_TMP006
-CONFIG_TEST_TASK_LIST
-CONFIG_UART_BAUD_RATE
-CONFIG_UART_RX_BUF_SIZE
-CONFIG_UART_TX_BUF_SIZE
-CONFIG_USB_PORT_POWER_DUMB
-CONFIG_USB_PORT_POWER_SMART
-CONFIG_USB_SWITCH_TSU6721
-CONFIG_WATCHDOG
-CONFIG_WATCHDOG_HELP
-CONFIG_WIRELESS
-CONFIG_WP_ACTIVE_HIGH
-
- * Also describe the HAS_TASK_* macro and how/when it should be used vs. a
- * config define.
+ * If you add a new config option somewhere in the code, you must add a
+ * default value here and describe what it does.
+ *
+ * To get a list current list, run this command:
+ *    git grep " CONFIG_" | grep -o "CONFIG_[A-Za-z0-9_]\+" | sort | uniq
+ *
+ * TODO(rspangler): describe all of these.  Also describe the HAS_TASK_* macro
+ * and how/when it should be used vs. a config define.
+ */
+
+#undef CONFIG_AC_POWER_STATUS
+#undef CONFIG_ADC
+#undef CONFIG_ASSERT_HELP
+#undef CONFIG_BACKLIGHT_X86
+
+#undef CONFIG_BATTERY_BQ20Z453
+#undef CONFIG_BATTERY_FALCO
+#undef CONFIG_BATTERY_LINK
+#undef CONFIG_BATTERY_PEPPY
+#undef CONFIG_BATTERY_SLIPPY
+#undef CONFIG_BATTERY_SPRING
+
+#undef CONFIG_BOARD_PMU_INIT
+#undef CONFIG_BOARD_POST_GPIO_INIT
+#undef CONFIG_BOARD_PRE_INIT
+#undef CONFIG_BOARD_VERSION
+
+/*****************************************************************************/
+/* Charger config */
+
+/* Compile common charge state code */
+#undef CONFIG_CHARGER
+
+/* Compile charger-specific code for these chargers (pick at most one) */
+#undef CONFIG_CHARGER_BQ24707A
+#undef CONFIG_CHARGER_BQ24715
+#undef CONFIG_CHARGER_BQ24725
+#undef CONFIG_CHARGER_BQ24738
+#undef CONFIG_CHARGER_TPS65090
+
+/*
+ * Board specific charging current limit, in mA.  If defined, the charge state
+ * machine will not allow the battery to request more current than this.
+ */
+#undef CONFIG_CHARGER_CURRENT_LIMIT
+
+/*
+ * Maximum amount of input current the charger can receive, in mA.
+ *
+ * This value should depend on external power adapter, designed charging
+ * voltage, and the maximum power of the running system.
  */
+#undef CONFIG_CHARGER_INPUT_CURRENT
+
+/* Value of the charge sense resistor, in mOhms */
+#undef CONFIG_CHARGER_SENSE_RESISTOR
+
+/* Value of the input current sense resistor, in mOhms */
+#undef CONFIG_CHARGER_SENSE_RESISTOR_AC
+
+/*****************************************************************************/
+
+#undef CONFIG_CHIPSET_GAIA
+#undef CONFIG_CHIPSET_HASWELL
+#undef CONFIG_CHIPSET_IVYBRIDGE
+
+#undef CONFIG_CMD_COMXTEST
+#undef CONFIG_CMD_ECTEMP
+#undef CONFIG_CMD_PLL
+#undef CONFIG_CMD_PMU
+#undef CONFIG_CMD_POWERLED
+#undef CONFIG_CMD_SCRATCHPAD
+#undef CONFIG_CMD_SLEEP
+
+#undef CONFIG_CONSOLE_CMDHELP
+#undef CONFIG_CONSOLE_RESTRICTED_INPUT
+#undef CONFIG_CONSOLE_UART
+
+#undef CONFIG_CUSTOM_KEYSCAN
+#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_I2C
+#undef CONFIG_DMA_HELP
+#undef CONFIG_EEPROM
+#undef CONFIG_EOPTION
+
+#undef CONFIG_EXTPOWER_FALCO
+#undef CONFIG_EXTPOWER_GPIO
+#undef CONFIG_EXTPOWER_SNOW
+#undef CONFIG_EXTPOWER_USB
+
+#undef CONFIG_FLASH
+#undef CONFIG_FLASH_BANK_SIZE
+#undef CONFIG_FLASH_BASE
+#undef CONFIG_FLASH_ERASED_VALUE32
+#undef CONFIG_FLASH_ERASE_SIZE
+#undef CONFIG_FLASH_PHYSICAL_SIZE
+#undef CONFIG_FLASH_PROTECT_NEXT_BOOT
+#undef CONFIG_FLASH_SIZE
+#undef CONFIG_FLASH_WRITE_IDEAL_SIZE
+#undef CONFIG_FLASH_WRITE_SIZE
+
+#undef CONFIG_FMAP
+#undef CONFIG_FORCE_CONSOLE_RESUME
+#undef CONFIG_FPU
+
+#undef CONFIG_FW_IMAGE_SIZE
+#undef CONFIG_FW_PSTATE_OFF
+#undef CONFIG_FW_PSTATE_SIZE
+#undef CONFIG_FW_RO_OFF
+#undef CONFIG_FW_RO_SIZE
+#undef CONFIG_FW_RW_OFF
+#undef CONFIG_FW_RW_SIZE
+#undef CONFIG_FW_WP_RO_OFF
+#undef CONFIG_FW_WP_RO_SIZE
+
+#undef CONFIG_HOSTCMD
+#undef CONFIG_HOST_COMMAND_STATUS
+#undef CONFIG_HOST_EMU
+#undef CONFIG_HOST_UART
+#undef CONFIG_HOST_UART1_GPIOS_PB0_1
+#undef CONFIG_HOST_UART1_GPIOS_PC4_5
+#undef CONFIG_HOST_UART2_GPIOS_PG4_5
+#undef CONFIG_HOST_UART_IRQ
+
+#undef CONFIG_I2C
+#undef CONFIG_I2C_ARBITRATION
+#undef CONFIG_I2C_DEBUG_PASSTHRU
+#undef CONFIG_I2C_HOST_AUTO
+#undef CONFIG_I2C_PASSTHROUGH
+#undef CONFIG_I2C_PASSTHRU_RESTRICTED
+
+#undef CONFIG_IRQ_COUNT
+
+#undef CONFIG_KEYBOARD_DEBUG_MORE
+#undef CONFIG_KEYBOARD_PROTOCOL_8042
+#undef CONFIG_KEYBOARD_PROTOCOL_MKBP
+#undef CONFIG_KEYBOARD_SUPPRESS_NOISE
+#undef CONFIG_KEYBOARD_TEST
+
+#undef CONFIG_LED_DRIVER_LP5562
+#undef CONFIG_LED_FALCO
+#undef CONFIG_LED_PEPPY
+
+#undef CONFIG_LID_SWITCH
+#undef CONFIG_LOW_POWER_IDLE
+#undef CONFIG_LPC
+#undef CONFIG_ONEWIRE
+#undef CONFIG_ONEWIRE_LED
+#undef CONFIG_OVERFLOW_DETECT
+#undef CONFIG_PANIC_HELP
+#undef CONFIG_PECI
+
+#undef CONFIG_PMU_BOARD_INIT
+#undef CONFIG_PMU_FORCE_FET
+#undef CONFIG_PMU_HARD_RESET
+#undef CONFIG_PMU_TPS65090
+
+#undef CONFIG_POWER_BUTTON
+#undef CONFIG_POWER_BUTTON_X86
+#undef CONFIG_PSTATE_AT_END
+#undef CONFIG_PSTORE
+#undef CONFIG_PWM_FAN
+#undef CONFIG_PWM_KBLIGHT
+#undef CONFIG_RAM_BASE
+#undef CONFIG_RAM_SIZE
+#undef CONFIG_SAVE_VBOOT_HASH
+#undef CONFIG_SMART_BATTERY
+#undef CONFIG_SOMETHING
+#undef CONFIG_SPI
+#undef CONFIG_STACK_SIZE
+#undef CONFIG_SWITCH
+#undef CONFIG_SYSTEM_UNLOCKED
+#undef CONFIG_TASK_LIST
+#undef CONFIG_TASK_PROFILING
+
+#undef CONFIG_TEMP_SENSOR
+#undef CONFIG_TEMP_SENSOR_G781
+#undef CONFIG_TEMP_SENSOR_TMP006
+
+#undef CONFIG_TEST_TASK_LIST
+
+#undef CONFIG_UART_BAUD_RATE
+#undef CONFIG_UART_RX_BUF_SIZE
+#undef CONFIG_UART_TX_BUF_SIZE
+
+#undef CONFIG_USB_PORT_POWER_DUMB
+#undef CONFIG_USB_PORT_POWER_SMART
+#undef CONFIG_USB_SWITCH_TSU6721
+
+#undef CONFIG_USE_CPCIDVI
+#undef CONFIG_USE_PLL
+#undef CONFIG_WATCHDOG
+#undef CONFIG_WATCHDOG_HELP
+#undef CONFIG_WIRELESS
+#undef CONFIG_WP_ACTIVE_HIGH
 
 /*
  * Include board and core configs, since those hold the CONFIG_ constants for a