diff options
Diffstat (limited to 'src/soc/intel/skylake/chip.c')
-rw-r--r-- | src/soc/intel/skylake/chip.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index 92c3addf8a..9d9ca01d6d 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -159,8 +159,13 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params) params->LockDownConfigBiosLock = 0; params->LockDownConfigSpiEiss = 0; } - params->PchConfigSubSystemVendorId = config->PchConfigSubSystemVendorId; - params->PchConfigSubSystemId = config->PchConfigSubSystemId; + /* only replacing preexisting subsys ID defaults when non-zero */ +#if defined(CONFIG_SUBSYSTEM_VENDOR_ID) && CONFIG_SUBSYSTEM_VENDOR_ID + params->PchConfigSubSystemVendorId = CONFIG_SUBSYSTEM_VENDOR_ID; +#endif +#if defined(CONFIG_SUBSYSTEM_DEVICE_ID) && CONFIG_SUBSYSTEM_DEVICE_ID + params->PchConfigSubSystemId = CONFIG_SUBSYSTEM_DEVICE_ID; +#endif params->WakeConfigWolEnableOverride = config->WakeConfigWolEnableOverride; params->WakeConfigPcieWakeFromDeepSx = |