diff options
| author | Victor Prupis <vprupis@google.com> | 2016-08-12 14:15:01 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-08-19 14:21:17 -0700 |
| commit | a56aabfc650ebd562d768a9b2fb528ac46f4e540 (patch) | |
| tree | bf5387a40bb2486123988a7934b0307b88769416 | |
| parent | 1fd2427b3c9e6914a3a1764f69b6bdff7e5559f1 (diff) | |
| download | chrome-ec-a56aabfc650ebd562d768a9b2fb528ac46f4e540.tar.gz | |
Standard locations for board specific battery code
Moved battery code for samus and ryu from driver tree to board tree.
BUG=chrome-os-partner:42486
BRANCH=master
TEST=none
Change-Id: Iaad1456323f85e5852d8aa8e3e2d453b26e2d452
Signed-off-by: Victor Prupis <vprupis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/371402
Reviewed-by: Stefan Reinauer <reinauer@google.com>
| -rw-r--r-- | board/ryu/battery.c (renamed from driver/battery/ryu.c) | 0 | ||||
| -rw-r--r-- | board/ryu/build.mk | 2 | ||||
| -rw-r--r-- | board/samus/battery.c (renamed from driver/battery/samus.c) | 0 | ||||
| -rw-r--r-- | board/samus/build.mk | 2 | ||||
| -rw-r--r-- | driver/build.mk | 2 |
5 files changed, 2 insertions, 4 deletions
diff --git a/driver/battery/ryu.c b/board/ryu/battery.c index a7ecd3ea07..a7ecd3ea07 100644 --- a/driver/battery/ryu.c +++ b/board/ryu/battery.c diff --git a/board/ryu/build.mk b/board/ryu/build.mk index 7d6e69851d..a4b97412b0 100644 --- a/board/ryu/build.mk +++ b/board/ryu/build.mk @@ -9,5 +9,5 @@ CHIP:=stm32 CHIP_FAMILY:=stm32f3 CHIP_VARIANT:=stm32f373 -board-y=board.o +board-y=battery.o board.o board-$(CONFIG_USB_POWER_DELIVERY)+=usb_mux.o usb_pd_policy.o diff --git a/driver/battery/samus.c b/board/samus/battery.c index bd334d08c8..bd334d08c8 100644 --- a/driver/battery/samus.c +++ b/board/samus/battery.c diff --git a/board/samus/build.mk b/board/samus/build.mk index 153a280b76..2ff7e66d94 100644 --- a/board/samus/build.mk +++ b/board/samus/build.mk @@ -9,4 +9,4 @@ # the IC is TI Stellaris LM4 CHIP:=lm4 -board-y=board.o power_sequence.o panel.o extpower.o +board-y=battery.o board.o power_sequence.o panel.o extpower.o diff --git a/driver/build.mk b/driver/build.mk index cfa8781fc4..1458874864 100644 --- a/driver/build.mk +++ b/driver/build.mk @@ -26,8 +26,6 @@ driver-$(CONFIG_ALS_SI114X)+=als_si114x.o driver-$(CONFIG_BATTERY_BQ20Z453)+=battery/bq20z453.o driver-$(CONFIG_BATTERY_BQ27541)+=battery/bq27541.o driver-$(CONFIG_BATTERY_BQ27621)+=battery/bq27621_g1.o -driver-$(CONFIG_BATTERY_RYU)+=battery/ryu.o -driver-$(CONFIG_BATTERY_SAMUS)+=battery/samus.o driver-$(CONFIG_BATTERY_SMART)+=battery/smart.o # Battery charger ICs |