diff options
author | Randall Spangler <rspangler@chromium.org> | 2013-07-19 09:46:48 -0700 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-07-23 11:14:15 -0700 |
commit | 4288e45815d8677147d582a46eb625a185f49162 (patch) | |
tree | 7c51c459a453f5447fc19873fd31fce1427c6a91 | |
parent | 345c22be083b9d5929f69714f346709d86e987e4 (diff) | |
download | chrome-ec-4288e45815d8677147d582a46eb625a185f49162.tar.gz |
Clean up and document battery config options
No functional changes, just documenting and renaming.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms
Change-Id: I0b0d3cdce535d90ce437e82e96346fc3ca9be7b0
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/62673
-rw-r--r-- | board/daisy/board.h | 2 | ||||
-rw-r--r-- | board/falco/board.h | 2 | ||||
-rw-r--r-- | board/link/board.h | 2 | ||||
-rw-r--r-- | board/peppy/board.h | 2 | ||||
-rw-r--r-- | board/pit/board.h | 2 | ||||
-rw-r--r-- | board/puppy/board.h | 2 | ||||
-rw-r--r-- | board/slippy/board.h | 2 | ||||
-rw-r--r-- | board/snow/board.h | 2 | ||||
-rw-r--r-- | board/spring/board.h | 2 | ||||
-rw-r--r-- | common/build.mk | 2 | ||||
-rw-r--r-- | include/config.h | 21 |
11 files changed, 30 insertions, 11 deletions
diff --git a/board/daisy/board.h b/board/daisy/board.h index 5f15cc4ef4..2c8d0db1e3 100644 --- a/board/daisy/board.h +++ b/board/daisy/board.h @@ -19,6 +19,7 @@ #define CONFIG_ASSERT_HELP /* Optional features */ +#define CONFIG_BATTERY_SMART #define CONFIG_BOARD_POST_GPIO_INIT #define CONFIG_CHARGER_TPS65090 #ifdef HAS_TASK_CHIPSET @@ -31,7 +32,6 @@ #define CONFIG_KEYBOARD_SUPPRESS_NOISE #define CONFIG_LID_SWITCH #define CONFIG_PMU_TPS65090 -#define CONFIG_SMART_BATTERY /* * 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 f8cb1406ce..37a923e43e 100644 --- a/board/falco/board.h +++ b/board/falco/board.h @@ -15,9 +15,9 @@ #define CONFIG_TASK_PROFILING /* Optional features */ -#define CONFIG_SMART_BATTERY #define CONFIG_BACKLIGHT_X86 #define CONFIG_BATTERY_FALCO +#define CONFIG_BATTERY_SMART #define CONFIG_EXTPOWER_FALCO #define CONFIG_BOARD_VERSION #define CONFIG_CHARGER diff --git a/board/link/board.h b/board/link/board.h index e40dee3191..485979153f 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -15,9 +15,9 @@ #define CONFIG_TASK_PROFILING /* Optional features */ -#define CONFIG_SMART_BATTERY #define CONFIG_BACKLIGHT_X86 #define CONFIG_BATTERY_LINK +#define CONFIG_BATTERY_SMART #define CONFIG_BOARD_VERSION #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24725 diff --git a/board/peppy/board.h b/board/peppy/board.h index 34b0155233..b47ba2a7ef 100644 --- a/board/peppy/board.h +++ b/board/peppy/board.h @@ -15,10 +15,10 @@ #define CONFIG_TASK_PROFILING /* Optional features */ -#define CONFIG_SMART_BATTERY #define CONFIG_BACKLIGHT_X86 #define CONFIG_BATTERY_CHECK_CONNECTED #define CONFIG_BATTERY_PEPPY +#define CONFIG_BATTERY_SMART #define CONFIG_BOARD_VERSION #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24707A diff --git a/board/pit/board.h b/board/pit/board.h index 1dabe252a2..2877c030c7 100644 --- a/board/pit/board.h +++ b/board/pit/board.h @@ -20,6 +20,7 @@ /* Optional features */ #define CONFIG_BATTERY_BQ20Z453 +#define CONFIG_BATTERY_SMART #define CONFIG_BOARD_POST_GPIO_INIT #ifdef HAS_TASK_CHARGER #define CONFIG_CHARGER_TPS65090 @@ -36,7 +37,6 @@ #define CONFIG_PMU_BOARD_INIT #define CONFIG_PMU_HARD_RESET #define CONFIG_PMU_TPS65090 -#define CONFIG_SMART_BATTERY #define CONFIG_SPI #ifndef __ASSEMBLER__ diff --git a/board/puppy/board.h b/board/puppy/board.h index 2c29f5b5f9..9059447155 100644 --- a/board/puppy/board.h +++ b/board/puppy/board.h @@ -20,6 +20,7 @@ /* Optional features */ #define CONFIG_BATTERY_BQ20Z453 +#define CONFIG_BATTERY_SMART #define CONFIG_BOARD_POST_GPIO_INIT #ifdef HAS_TASK_CHARGER #define CONFIG_CHARGER_TPS65090 @@ -36,7 +37,6 @@ #define CONFIG_PMU_BOARD_INIT #define CONFIG_PMU_HARD_RESET #define CONFIG_PMU_TPS65090 -#define CONFIG_SMART_BATTERY #define CONFIG_SPI #ifndef __ASSEMBLER__ diff --git a/board/slippy/board.h b/board/slippy/board.h index e82e570be5..febea388a7 100644 --- a/board/slippy/board.h +++ b/board/slippy/board.h @@ -15,10 +15,10 @@ #define CONFIG_TASK_PROFILING /* Optional features */ -#define CONFIG_SMART_BATTERY #define CONFIG_BACKLIGHT_X86 #define CONFIG_BATTERY_CHECK_CONNECTED #define CONFIG_BATTERY_SLIPPY +#define CONFIG_BATTERY_SMART #define CONFIG_BOARD_VERSION #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24707A diff --git a/board/snow/board.h b/board/snow/board.h index 1987b19045..d80fd28892 100644 --- a/board/snow/board.h +++ b/board/snow/board.h @@ -23,6 +23,7 @@ /* Optional features */ #define CONFIG_BATTERY_BQ20Z453 +#define CONFIG_BATTERY_SMART #define CONFIG_BOARD_PRE_INIT #define CONFIG_BOARD_POST_GPIO_INIT #define CONFIG_CHARGER_TPS65090 @@ -40,7 +41,6 @@ #define CONFIG_PMU_BOARD_INIT #define CONFIG_PMU_HARD_RESET #define CONFIG_PMU_TPS65090 -#define CONFIG_SMART_BATTERY /* use STOP mode when we have nothing to do */ #define CONFIG_LOW_POWER_IDLE diff --git a/board/spring/board.h b/board/spring/board.h index 7c2693adf2..be759987fe 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -25,6 +25,7 @@ /* Optional features */ #define CONFIG_ADC #define CONFIG_BATTERY_SPRING +#define CONFIG_BATTERY_SMART #define CONFIG_BOARD_PRE_INIT #define CONFIG_CHARGER_TPS65090 #ifdef HAS_TASK_CHIPSET @@ -43,7 +44,6 @@ #define CONFIG_PMU_FORCE_FET /* Always enable 3G modem power rail */ #define CONFIG_PMU_HARD_RESET #define CONFIG_PMU_TPS65090 -#define CONFIG_SMART_BATTERY #define CONFIG_USB_SWITCH_TSU6721 #ifndef __ASSEMBLER__ diff --git a/common/build.mk b/common/build.mk index 88d598ee7a..b88e4dda00 100644 --- a/common/build.mk +++ b/common/build.mk @@ -16,6 +16,7 @@ common-$(CONFIG_BATTERY_SLIPPY)+=battery_slippy.o common-$(CONFIG_BATTERY_PEPPY)+=battery_peppy.o common-$(CONFIG_BATTERY_FALCO)+=battery_falco.o common-$(CONFIG_BATTERY_SPRING)+=battery_spring.o +common-$(CONFIG_BATTERY_SMART)+=smart_battery.o smart_battery_stub.o common-$(CONFIG_CHARGER)+=charge_state.o charger_common.o common-$(CONFIG_CHARGER_BQ24715)+=charger_bq24715.o common-$(CONFIG_CHARGER_BQ24725)+=charger_bq24725.o @@ -49,7 +50,6 @@ common-$(CONFIG_POWER_BUTTON)+=power_button.o common-$(CONFIG_POWER_BUTTON_X86)+=power_button_x86.o common-$(CONFIG_PSTORE)+=pstore_commands.o common-$(CONFIG_REGULATOR_IR357X)+=regulator_ir357x.o -common-$(CONFIG_SMART_BATTERY)+=smart_battery.o smart_battery_stub.o common-$(CONFIG_SWITCH)+=switch.o common-$(CONFIG_WIRELESS)+=wireless.o common-$(CONFIG_TEMP_SENSOR)+=temp_sensor.o diff --git a/include/config.h b/include/config.h index 8d6088312b..3e7e6ad1a2 100644 --- a/include/config.h +++ b/include/config.h @@ -36,6 +36,10 @@ #undef CONFIG_ASSERT_HELP #undef CONFIG_BACKLIGHT_X86 +/*****************************************************************************/ +/* Battery config */ + +/* Compile battery-specific code for these batteries (pick at most one) */ #undef CONFIG_BATTERY_BQ20Z453 #undef CONFIG_BATTERY_FALCO #undef CONFIG_BATTERY_LINK @@ -43,6 +47,22 @@ #undef CONFIG_BATTERY_SLIPPY #undef CONFIG_BATTERY_SPRING +/* + * Battery can check if it's connected. If defined, charger will check for + * battery presence before attempting to communicate with it. + */ +#undef CONFIG_BATTERY_CHECK_CONNECTED + +/* + * Compile smart battery support + * + * For batteries which support this specification: + * http://sbs-forum.org/specs/sbdat110.pdf) + */ +#undef CONFIG_BATTERY_SMART + +/*****************************************************************************/ + #undef CONFIG_BOARD_PMU_INIT #undef CONFIG_BOARD_POST_GPIO_INIT #undef CONFIG_BOARD_PRE_INIT @@ -187,7 +207,6 @@ #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 |