diff options
| -rw-r--r-- | board/glkrvp/board.h | 2 | ||||
| -rw-r--r-- | board/yorp/board.h | 3 | ||||
| -rw-r--r-- | include/config.h | 31 | ||||
| -rw-r--r-- | power/build.mk | 2 | ||||
| -rw-r--r-- | power/intel_x86.c | 5 |
5 files changed, 28 insertions, 15 deletions
diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h index 7025e92672..2236285087 100644 --- a/board/glkrvp/board.h +++ b/board/glkrvp/board.h @@ -77,7 +77,7 @@ /* SoC / PCH */ #define CONFIG_ESPI #define CONFIG_LPC -#define CONFIG_CHIPSET_APOLLOLAKE +#define CONFIG_CHIPSET_GEMINILAKE #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_X86 diff --git a/board/yorp/board.h b/board/yorp/board.h index e7d7ef9bbf..3061b7b75a 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -96,8 +96,7 @@ #define I2C_PORT_SENSOR NPCX_I2C_PORT7_0 /* SoC / PCH */ -/* GEMINILAKE reuses apollo lake power seq */ -#define CONFIG_CHIPSET_APOLLOLAKE +#define CONFIG_CHIPSET_GEMINILAKE #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_ESPI /* TODO(b/74123961): Enable Virtual Wires after bringup */ diff --git a/include/config.h b/include/config.h index 4b9913ef6e..160ea65127 100644 --- a/include/config.h +++ b/include/config.h @@ -699,16 +699,20 @@ /* Chipset config */ /* AP chipset support; pick at most one */ -#undef CONFIG_CHIPSET_APOLLOLAKE/* Intel Apollolake (x86) */ -#undef CONFIG_CHIPSET_BRASWELL /* Intel Braswell (x86) */ -#undef CONFIG_CHIPSET_CANNONLAKE /* Intel Cannonlake (x86) */ -#undef CONFIG_CHIPSET_ECDRIVEN /* Dummy power module */ -#undef CONFIG_CHIPSET_MEDIATEK /* MediaTek MT81xx */ -#undef CONFIG_CHIPSET_RK3399 /* Rockchip rk3399 */ +#undef CONFIG_CHIPSET_APOLLOLAKE /* Intel Apollolake (x86) */ +#undef CONFIG_CHIPSET_BRASWELL /* Intel Braswell (x86) */ +#undef CONFIG_CHIPSET_CANNONLAKE /* Intel Cannonlake (x86) */ +#undef CONFIG_CHIPSET_ECDRIVEN /* Dummy power module */ +#undef CONFIG_CHIPSET_GEMINILAKE /* Intel Geminilake (x86) */ +#undef CONFIG_CHIPSET_MEDIATEK /* MediaTek MT81xx */ +#undef CONFIG_CHIPSET_RK3399 /* Rockchip rk3399 */ /* TODO: Rename below config to CONFIG_CHIPSET_RK32XX */ -#undef CONFIG_CHIPSET_ROCKCHIP /* Rockchip rk32xx */ -#undef CONFIG_CHIPSET_SKYLAKE /* Intel Skylake (x86) */ -#undef CONFIG_CHIPSET_STONEY /* AMD Stoney (x86)*/ +#undef CONFIG_CHIPSET_ROCKCHIP /* Rockchip rk32xx */ +#undef CONFIG_CHIPSET_SKYLAKE /* Intel Skylake (x86) */ +#undef CONFIG_CHIPSET_STONEY /* AMD Stoney (x86)*/ + +/* Shared chipset support; automatically gets defined below. */ +#undef CONFIG_CHIPSET_APL_GLK /* Apollolake & Geminilake */ /* Support chipset throttling */ #undef CONFIG_CHIPSET_CAN_THROTTLE @@ -3408,6 +3412,7 @@ #undef CONFIG_CHIPSET_APOLLOLAKE #undef CONFIG_CHIPSET_BRASWELL #undef CONFIG_CHIPSET_CANNONLAKE +#undef CONFIG_CHIPSET_GEMINILAKE #undef CONFIG_CHIPSET_MEDIATEK #undef CONFIG_CHIPSET_RK3399 #undef CONFIG_CHIPSET_ROCKCHIP @@ -3439,6 +3444,14 @@ #endif /*****************************************************************************/ +/* Define derived Chipset configs */ +#if defined(CONFIG_CHIPSET_APOLLOLAKE) || \ + defined(CONFIG_CHIPSET_GEMINILAKE) +#define CONFIG_CHIPSET_APL_GLK +#endif + + +/*****************************************************************************/ /* * Apply test config overrides last, since tests need to override some of the * config flags in non-standard ways to mock only parts of the system. diff --git a/power/build.mk b/power/build.mk index 5d6db5f065..e24ea80cee 100644 --- a/power/build.mk +++ b/power/build.mk @@ -6,7 +6,7 @@ # Power management for application processor and peripherals # -power-$(CONFIG_CHIPSET_APOLLOLAKE)+=apollolake.o intel_x86.o +power-$(CONFIG_CHIPSET_APL_GLK)+=apollolake.o intel_x86.o power-$(CONFIG_CHIPSET_BRASWELL)+=braswell.o power-$(CONFIG_CHIPSET_CANNONLAKE)+=cannonlake.o intel_x86.o power-$(CONFIG_CHIPSET_ECDRIVEN)+=ec_driven.o diff --git a/power/intel_x86.c b/power/intel_x86.c index a1626d9b5c..2e983c514c 100644 --- a/power/intel_x86.c +++ b/power/intel_x86.c @@ -24,7 +24,8 @@ #include "wireless.h" /* Chipset specific header files */ -#ifdef CONFIG_CHIPSET_APOLLOLAKE +/* Geminilake and apollolake use same power sequencing. */ +#ifdef CONFIG_CHIPSET_APL_GLK #include "apollolake.h" #elif defined(CONFIG_CHIPSET_CANNONLAKE) #include "cannonlake.h" @@ -451,7 +452,7 @@ void common_intel_x86_handle_rsmrst(enum power_state state) board_before_rsmrst(rsmrst_in); #endif -#ifdef CONFIG_CHIPSET_APOLLOLAKE +#ifdef CONFIG_CHIPSET_APL_GLK /* Only passthrough RSMRST_L de-assertion on power up */ if (rsmrst_in && !power_s5_up) return; |