diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-04-09 09:40:19 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-09 14:47:28 -0700 |
| commit | 861d7d667d90783fbe8958ec91feec43dbaa2928 (patch) | |
| tree | f017704a77709df7c4abfaee35c78ca0642520f9 | |
| parent | 95250857ad9575ea6391d6987cd368ef92e12e7e (diff) | |
| download | chrome-ec-861d7d667d90783fbe8958ec91feec43dbaa2928.tar.gz | |
Rename usb_charging.c to extpower_usb.c and move to common/
This more clearly indicates what it does - it manages external power
supplied by USB. This code will be common to multiple boards which
take power via USB, so it might as well move now.
No code changes, just moving the file.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build spring
Change-Id: Iae74122db38666bc346104a5096fa82df8cb0c19
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47656
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
| -rw-r--r-- | board/spring/board.h | 1 | ||||
| -rw-r--r-- | board/spring/build.mk | 4 | ||||
| -rw-r--r-- | common/build.mk | 1 | ||||
| -rw-r--r-- | common/extpower_usb.c (renamed from board/spring/usb_charging.c) | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/board/spring/board.h b/board/spring/board.h index 0fef5d2adc..27a1c3cc19 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -27,6 +27,7 @@ #define CONFIG_BOARD_PRE_INIT #define CONFIG_CHIPSET_GAIA #define CONFIG_CMD_PMU +#define CONFIG_EXTPOWER_USB #define CONFIG_HOST_COMMAND_STATUS #define CONFIG_I2C #define CONFIG_I2C_PASSTHROUGH diff --git a/board/spring/build.mk b/board/spring/build.mk index bb6f4ae234..8c1bc9c0a6 100644 --- a/board/spring/build.mk +++ b/board/spring/build.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # @@ -8,4 +8,4 @@ CHIP:=stm32 CHIP_VARIANT:=stm32f100 -board-y=board.o usb_charging.o +board-y=board.o diff --git a/common/build.mk b/common/build.mk index a7e10a8375..dbf863eeb4 100644 --- a/common/build.mk +++ b/common/build.mk @@ -18,6 +18,7 @@ common-$(CONFIG_PMU_TPS65090)+=pmu_tps65090.o pmu_tps65090_charger.o common-$(CONFIG_EOPTION)+=eoption.o common-$(CONFIG_EXTPOWER_GPIO)+=extpower_gpio.o common-$(CONFIG_EXTPOWER_SNOW)+=extpower_snow.o +common-$(CONFIG_EXTPOWER_USB)+=extpower_usb.o common-$(CONFIG_FLASH)+=flash_common.o fmap.o common-$(CONFIG_I2C)+=i2c_commands.o common-$(CONFIG_I2C_ARBITRATION)+=i2c_arbitration.o diff --git a/board/spring/usb_charging.c b/common/extpower_usb.c index e46153fa32..e46153fa32 100644 --- a/board/spring/usb_charging.c +++ b/common/extpower_usb.c |