diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2013-07-24 10:43:36 -0500 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-07-24 12:09:49 -0700 |
| commit | 18f0bd28e2fe2e5a40e36293630e7466bb7b5d6d (patch) | |
| tree | e0650ba8ec4189ba09df5339f4bc9cf51adb7a7e | |
| parent | 8cd69cfe53b1243e76d2054f7682b32b675bae9c (diff) | |
| download | chrome-ec-18f0bd28e2fe2e5a40e36293630e7466bb7b5d6d.tar.gz | |
x86: build chipset_x86_common.o conditionally
Add a CONFIG_CHIPSET_X86 option that determines if
chipset_x86_common.o is built.
BUG=chrome-os-partner:20372
BRANCH=None
TEST=built bolt and link. All other boards should be covered.
Change-Id: I980a8fc68a31162b920429e695631909c5f6a4db
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63208
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | board/falco/board.h | 1 | ||||
| -rw-r--r-- | board/link/board.h | 1 | ||||
| -rw-r--r-- | board/peppy/board.h | 1 | ||||
| -rw-r--r-- | board/slippy/board.h | 1 | ||||
| -rw-r--r-- | board/wolf/board.h | 1 | ||||
| -rw-r--r-- | common/build.mk | 5 | ||||
| -rw-r--r-- | include/config.h | 2 |
7 files changed, 10 insertions, 2 deletions
diff --git a/board/falco/board.h b/board/falco/board.h index 259ad966ec..c146cf4ad0 100644 --- a/board/falco/board.h +++ b/board/falco/board.h @@ -19,6 +19,7 @@ #define CONFIG_CHARGER_DISCHARGE_ON_AC #ifdef HAS_TASK_CHIPSET #define CONFIG_CHIPSET_HASWELL +#define CONFIG_CHIPSET_X86 #endif #define CONFIG_EXTPOWER_GPIO #define CONFIG_KEYBOARD_BOARD_CONFIG diff --git a/board/link/board.h b/board/link/board.h index 50a8049836..25184019d6 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -17,6 +17,7 @@ #define CONFIG_CHARGER_BQ24725 #ifdef HAS_TASK_CHIPSET #define CONFIG_CHIPSET_IVYBRIDGE +#define CONFIG_CHIPSET_X86 #endif #define CONFIG_EXTPOWER_GPIO #define CONFIG_I2C_PASSTHRU_RESTRICTED diff --git a/board/peppy/board.h b/board/peppy/board.h index fe780f771a..16f9e93b14 100644 --- a/board/peppy/board.h +++ b/board/peppy/board.h @@ -19,6 +19,7 @@ #define CONFIG_CHARGER_DISCHARGE_ON_AC #ifdef HAS_TASK_CHIPSET #define CONFIG_CHIPSET_HASWELL +#define CONFIG_CHIPSET_X86 #endif #define CONFIG_EXTPOWER_GPIO #define CONFIG_KEYBOARD_BOARD_CONFIG diff --git a/board/slippy/board.h b/board/slippy/board.h index 33f7caedfa..858afebfe7 100644 --- a/board/slippy/board.h +++ b/board/slippy/board.h @@ -19,6 +19,7 @@ #define CONFIG_CHARGER_DISCHARGE_ON_AC #ifdef HAS_TASK_CHIPSET #define CONFIG_CHIPSET_HASWELL +#define CONFIG_CHIPSET_X86 #endif #define CONFIG_EXTPOWER_GPIO #define CONFIG_KEYBOARD_BOARD_CONFIG diff --git a/board/wolf/board.h b/board/wolf/board.h index 8198ed0ddb..7cbbd9c003 100644 --- a/board/wolf/board.h +++ b/board/wolf/board.h @@ -12,6 +12,7 @@ #define CONFIG_BACKLIGHT_X86 #ifdef HAS_TASK_CHIPSET #define CONFIG_CHIPSET_HASWELL +#define CONFIG_CHIPSET_X86 #endif #define CONFIG_EXTPOWER_GPIO #define CONFIG_KEYBOARD_BOARD_CONFIG diff --git a/common/build.mk b/common/build.mk index b88e4dda00..6f8a0213e0 100644 --- a/common/build.mk +++ b/common/build.mk @@ -24,8 +24,9 @@ common-$(CONFIG_CHARGER_BQ24707A)+=charger_bq24707a.o common-$(CONFIG_CHARGER_BQ24738)+=charger_bq24738.o common-$(CONFIG_CHARGER_TPS65090)+=pmu_tps65090_charger.o common-$(CONFIG_CHIPSET_GAIA)+=chipset_gaia.o -common-$(CONFIG_CHIPSET_HASWELL)+=chipset_haswell.o chipset_x86_common.o -common-$(CONFIG_CHIPSET_IVYBRIDGE)+=chipset_ivybridge.o chipset_x86_common.o +common-$(CONFIG_CHIPSET_HASWELL)+=chipset_haswell.o +common-$(CONFIG_CHIPSET_IVYBRIDGE)+=chipset_ivybridge.o +common-$(CONFIG_CHIPSET_X86)+=chipset_x86_common.o common-$(CONFIG_PMU_TPS65090)+=pmu_tps65090.o common-$(CONFIG_EOPTION)+=eoption.o common-$(CONFIG_EXTPOWER_FALCO)+=extpower_falco.o diff --git a/include/config.h b/include/config.h index 222b9d5b63..5ca03cb467 100644 --- a/include/config.h +++ b/include/config.h @@ -113,6 +113,8 @@ #undef CONFIG_CHIPSET_GAIA #undef CONFIG_CHIPSET_HASWELL #undef CONFIG_CHIPSET_IVYBRIDGE +/* Common x86 chipset infrastructure. */ +#undef CONFIG_CHIPSET_X86 #undef CONFIG_CMD_COMXTEST #undef CONFIG_CMD_ECTEMP |