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>
This commit is contained in:
Aaron Durbin
2013-07-24 10:43:36 -05:00
committed by ChromeBot
parent 8cd69cfe53
commit 18f0bd28e2
7 changed files with 10 additions and 2 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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