sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge issues in src/soc/intel

Browse Source
This commit is contained in:
Jeremy Soller
2020-05-09 13:09:05 -06:00
parent f208e51e57
commit d164dd2f24
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/soc/intel/cannonlake/fsp_params.c
View File

@@ -429,9 +429,6 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
&params->SerialIoSpiCsPolarity[0], NULL, NULL); &params->SerialIoSpiCsPolarity[0], NULL, NULL);
#endif #endif
/* Set correct Sirq mode based on config */
params->PchSirqMode = config->SerialIrqConfigSirqMode;
/* Chipset Lockdown */ /* Chipset Lockdown */
if (get_lockdown_config() == CHIPSET_LOCKDOWN_COREBOOT) { if (get_lockdown_config() == CHIPSET_LOCKDOWN_COREBOOT) {
tconfig->PchLockDownGlobalSmi = 0; tconfig->PchLockDownGlobalSmi = 0;

4
src/soc/intel/cannonlake/graphics.c
View File

@@ -93,8 +93,8 @@ uintptr_t graphics_soc_write_acpi_opregion(const struct device *device,
} }
const struct i915_gpu_controller_info * const struct i915_gpu_controller_info *
intel_igd_get_controller_info(struct device *device) intel_igd_get_controller_info(const struct device *device)
{ {
struct soc_intel_apollolake_config *chip = device->chip_info; struct soc_intel_cannonlake_config *chip = device->chip_info;
return &chip->gfx; return &chip->gfx;
} }