x86 & tegra: add CONFIG_POWER_COMMON.

For the better naming for power/common.h, we rename CONFIG_CHIPSET_X86
to CONFIG_POWER_COMMON (no one is actually using it). But keep
CONFIG_CHIPSER_TEGRA for power/build.mk.

BUG=chrome-os-partner:25068
BRANCH=nyan,falco,link,peppy,rambi,samus,squawks
TEST=build only

Change-Id: Ibf1a4c24088dfddac39b38a95b3b887c195152d5
Signed-off-by: Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/182732

10 files changed, 17 insertions, 16 deletions

diff --git a/board/falco/board.h b/board/falco/board.h
index 2900dc9b73..d86a9793f2 100644
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -17,7 +17,7 @@
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHIPSET_CAN_THROTTLE
 #define CONFIG_CHIPSET_HASWELL
-#define CONFIG_CHIPSET_X86
+#define CONFIG_POWER_COMMON
 #define CONFIG_CMD_GSV
 #define CONFIG_EXTPOWER_FALCO
 #define CONFIG_EXTPOWER_GPIO
diff --git a/board/link/board.h b/board/link/board.h
index def2af9146..3816279b91 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -20,7 +20,7 @@
 #define CONFIG_CHARGER_BQ24725
 #define CONFIG_CHIPSET_CAN_THROTTLE
 #define CONFIG_CHIPSET_IVYBRIDGE
-#define CONFIG_CHIPSET_X86
+#define CONFIG_POWER_COMMON
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_FANS 1
 #define CONFIG_I2C_PASSTHRU_RESTRICTED
diff --git a/board/nyan/board.h b/board/nyan/board.h
index 60df3ee303..6ed1ab8efd 100644
--- a/board/nyan/board.h
+++ b/board/nyan/board.h
@@ -14,6 +14,7 @@
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24725
 #define CONFIG_CHIPSET_TEGRA
+#define CONFIG_POWER_COMMON
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_HOST_COMMAND_STATUS
 #define CONFIG_I2C
diff --git a/board/peppy/board.h b/board/peppy/board.h
index 8749e60f89..b635ff256b 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -19,7 +19,7 @@
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHIPSET_CAN_THROTTLE
 #define CONFIG_CHIPSET_HASWELL
-#define CONFIG_CHIPSET_X86
+#define CONFIG_POWER_COMMON
 #define CONFIG_CMD_GSV
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_FANS 1
diff --git a/board/rambi/board.h b/board/rambi/board.h
index 656e716236..c1fd34d119 100644
--- a/board/rambi/board.h
+++ b/board/rambi/board.h
@@ -21,7 +21,7 @@
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input senso resistor, mOhm */
 #define CONFIG_CHIPSET_BAYTRAIL
 #define CONFIG_CHIPSET_CAN_THROTTLE
-#define CONFIG_CHIPSET_X86
+#define CONFIG_POWER_COMMON
 #define CONFIG_CMD_GSV
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_KEYBOARD_COL2_INVERTED
diff --git a/board/samus/board.h b/board/samus/board.h
index 6eb42c1d84..a0abf8757a 100644
--- a/board/samus/board.h
+++ b/board/samus/board.h
@@ -18,7 +18,7 @@
 #define CONFIG_ALS
 #define CONFIG_ALS_ISL29035
 #define CONFIG_BOARD_VERSION
-#define CONFIG_CHIPSET_X86
+#define CONFIG_POWER_COMMON
 #define CONFIG_CHIPSET_CAN_THROTTLE
 #define CONFIG_KEYBOARD_BOARD_CONFIG
 #define CONFIG_KEYBOARD_PROTOCOL_8042
diff --git a/board/squawks/board.h b/board/squawks/board.h
index 05393040f4..91748c0b18 100644
--- a/board/squawks/board.h
+++ b/board/squawks/board.h
@@ -21,7 +21,7 @@
 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input senso resistor, mOhm */
 #define CONFIG_CHIPSET_BAYTRAIL
 #define CONFIG_CHIPSET_CAN_THROTTLE
-#define CONFIG_CHIPSET_X86
+#define CONFIG_POWER_COMMON
 #define CONFIG_CMD_GSV
 #define CONFIG_EXTPOWER_GPIO
 #define CONFIG_KEYBOARD_COL2_INVERTED
diff --git a/include/config.h b/include/config.h
index 5775ad8d58..abf183151c 100644
--- a/include/config.h
+++ b/include/config.h
@@ -189,13 +189,10 @@
 
 /* AP chipset support; pick at most one */
 #undef CONFIG_CHIPSET_BAYTRAIL  /* Intel Bay Trail (x86) */
-#undef CONFIG_CHIPSET_GAIA	/* Gaia and Ares (ARM) */
+#undef CONFIG_CHIPSET_GAIA      /* Gaia and Ares (ARM) */
 #undef CONFIG_CHIPSET_HASWELL   /* Intel Haswell (x86) */
 #undef CONFIG_CHIPSET_IVYBRIDGE /* Intel Ivy Bridge (x86) */
-#undef CONFIG_CHIPSET_TEGRA	/* Tegra */
-
-/* Compile common x86 chipset infrastructure.  Required for x86 chips. */
-#undef CONFIG_CHIPSET_X86
+#undef CONFIG_CHIPSET_TEGRA     /* nVidia Tegra 5 */
 
 /* Support power rail control */
 #define CONFIG_CHIPSET_HAS_PP1350
@@ -574,6 +571,9 @@
 /* Support sending the power button signal to x86 chipsets */
 #undef CONFIG_POWER_BUTTON_X86
 
+/* Compile common code for AP power state machine */
+#undef CONFIG_POWER_COMMON
+
 /*
  * The EC stores persistent state information for flash write protect in a
  * block of flash.  If this option is defined, the information is in the last
@@ -819,8 +819,8 @@
 #undef CONFIG_CHIPSET_GAIA
 #undef CONFIG_CHIPSET_HASWELL
 #undef CONFIG_CHIPSET_IVYBRIDGE
-#undef CONFIG_CHIPSET_X86
 #undef CONFIG_CHIPSET_TEGRA
+#undef CONFIG_POWER_COMMON
 #endif
 
 #ifndef HAS_TASK_KEYPROTO
diff --git a/include/power.h b/include/power.h
index 80b977a81b..5469ffad3f 100644
--- a/include/power.h
+++ b/include/power.h
@@ -88,9 +88,9 @@ enum power_state power_chipset_init(void);
 enum power_state power_handle_state(enum power_state state);
 
 /**
- * Interrupt handler for chipset GPIOs.
+ * Interrupt handler for power signal GPIOs.
  */
-#if defined(CONFIG_CHIPSET_X86) || defined(CONFIG_CHIPSET_TEGRA)
+#ifdef HAS_TASK_CHIPSET
 void power_signal_interrupt(enum gpio_signal signal);
 #else
 #define power_signal_interrupt NULL
diff --git a/power/build.mk b/power/build.mk
index 7afcc38233..5819b623c1 100644
--- a/power/build.mk
+++ b/power/build.mk
@@ -10,5 +10,5 @@ power-$(CONFIG_CHIPSET_BAYTRAIL)+=baytrail.o
 power-$(CONFIG_CHIPSET_GAIA)+=gaia.o
 power-$(CONFIG_CHIPSET_HASWELL)+=haswell.o
 power-$(CONFIG_CHIPSET_IVYBRIDGE)+=ivybridge.o
-power-$(CONFIG_CHIPSET_TEGRA)+=tegra.o common.o
-power-$(CONFIG_CHIPSET_X86)+=common.o
+power-$(CONFIG_CHIPSET_TEGRA)+=tegra.o
+power-$(CONFIG_POWER_COMMON)+=common.o