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();
 }