diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 12 | ||||
| -rw-r--r-- | include/power.h | 4 |
2 files changed, 8 insertions, 8 deletions
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 |