diff options
| author | Naresh G Solanki <naresh.solanki@intel.com> | 2018-04-02 21:38:57 +0530 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-04-06 07:04:36 +0000 |
| commit | 7b1b246411d40da0172e783f8943e337fbcb494c (patch) | |
| tree | ed321cd4199e2e573bf4aa8e9cbdce445416accb | |
| parent | cacc5a3eb035eed278a2d1eec76f14c55b0b7211 (diff) | |
mb/intel/glkrvp: Unselect Chrome EC specific config when using Intel EC
When building with Intel EC selected, unselect Chrome EC specific
options i.e., LID switch to prevent build error.
BUG=None
BRANCH=None
TEST=Build with Intel EC selected, Build should be successful.
Change-Id: I39d6d65bbfd08d684af43972b89ca78fcbd58567
Signed-off-by: Naresh G Solanki <naresh.solanki@intel.com>
Reviewed-on: https://review.coreboot.org/25479
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/intel/glkrvp/Kconfig | 4 | ||||
| -rw-r--r-- | src/mainboard/intel/glkrvp/chromeos.c | 5 | ||||
| -rw-r--r-- | src/mainboard/intel/glkrvp/smihandler.c | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig index 94887d56b0..3451640d27 100644 --- a/src/mainboard/intel/glkrvp/Kconfig +++ b/src/mainboard/intel/glkrvp/Kconfig @@ -42,12 +42,12 @@ config CHROMEOS bool default y select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC - select VBOOT_LID_SWITCH + select VBOOT_LID_SWITCH if GLK_CHROME_EC config VBOOT select HAS_RECOVERY_MRC_CACHE select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN - select EC_GOOGLE_CHROMEEC_SWITCHES + select EC_GOOGLE_CHROMEEC_SWITCHES if GLK_CHROME_EC config MAINBOARD_DIR string diff --git a/src/mainboard/intel/glkrvp/chromeos.c b/src/mainboard/intel/glkrvp/chromeos.c index a87ce4aa0d..05e8c6017a 100644 --- a/src/mainboard/intel/glkrvp/chromeos.c +++ b/src/mainboard/intel/glkrvp/chromeos.c @@ -54,3 +54,8 @@ void mainboard_chromeos_acpi_generate(void) gpios = variant_cros_gpios(&num); chromeos_acpi_gpio_generate(gpios, num); } + +int __attribute__((weak)) get_lid_switch(void) +{ + return -1; +} diff --git a/src/mainboard/intel/glkrvp/smihandler.c b/src/mainboard/intel/glkrvp/smihandler.c index c08fef9e32..f6d98e5f20 100644 --- a/src/mainboard/intel/glkrvp/smihandler.c +++ b/src/mainboard/intel/glkrvp/smihandler.c @@ -53,5 +53,6 @@ int mainboard_smi_apmc(u8 apmc) void mainboard_smi_espi_handler(void) { - chromeec_smi_process_events(); + if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) + chromeec_smi_process_events(); } |