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>
This commit is contained in:
		
				
					committed by
					
						
						Patrick Georgi
					
				
			
			
				
	
			
			
			
						parent
						
							cacc5a3eb0
						
					
				
				
					commit
					7b1b246411
				
			@@ -42,12 +42,12 @@ config CHROMEOS
 | 
				
			|||||||
	bool
 | 
						bool
 | 
				
			||||||
	default y
 | 
						default y
 | 
				
			||||||
	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
 | 
						select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
 | 
				
			||||||
	select VBOOT_LID_SWITCH
 | 
						select VBOOT_LID_SWITCH if GLK_CHROME_EC
 | 
				
			||||||
 | 
					
 | 
				
			||||||
config VBOOT
 | 
					config VBOOT
 | 
				
			||||||
	select HAS_RECOVERY_MRC_CACHE
 | 
						select HAS_RECOVERY_MRC_CACHE
 | 
				
			||||||
	select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
 | 
						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
 | 
					config MAINBOARD_DIR
 | 
				
			||||||
	string
 | 
						string
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -54,3 +54,8 @@ void mainboard_chromeos_acpi_generate(void)
 | 
				
			|||||||
	gpios = variant_cros_gpios(&num);
 | 
						gpios = variant_cros_gpios(&num);
 | 
				
			||||||
	chromeos_acpi_gpio_generate(gpios, num);
 | 
						chromeos_acpi_gpio_generate(gpios, num);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int __attribute__((weak)) get_lid_switch(void)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						return -1;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,5 +53,6 @@ int mainboard_smi_apmc(u8 apmc)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void mainboard_smi_espi_handler(void)
 | 
					void mainboard_smi_espi_handler(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	chromeec_smi_process_events();
 | 
						if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))
 | 
				
			||||||
 | 
							chromeec_smi_process_events();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user