summaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake/chip.c
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2019-01-23 12:04:43 +0100
committerNico Huber <nico.h@gmx.de>2019-01-27 11:14:26 +0000
commitb58e99dfa56e1cf02e5bc0720872836bf8bded93 (patch)
tree8e2825eb2b33ca9a32b53613254ca85a0af51c8e /src/soc/intel/skylake/chip.c
parentd3fa7fa5d810688cdcdb7c34b7f13ae1350a0f84 (diff)
downloadcoreboot-b58e99dfa56e1cf02e5bc0720872836bf8bded93.tar.xz
src: Fix the warning "type 'hex' are always defined"
This is spotted using "./util/lint/kconfig_lint" While at it, do the check in C and not the preprocessor. Change-Id: Icfda267936a23d9d14832116d67571f42f685906 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/31050 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/soc/intel/skylake/chip.c')
-rw-r--r--src/soc/intel/skylake/chip.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 07ac4e8fa3..cbbfaaaf06 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -170,12 +170,12 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params)
params->LockDownConfigSpiEiss = 0;
}
/* 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
+ if (CONFIG_SUBSYSTEM_VENDOR_ID != 0)
+ params->PchConfigSubSystemVendorId = CONFIG_SUBSYSTEM_VENDOR_ID;
+
+ if (CONFIG_SUBSYSTEM_DEVICE_ID != 0)
+ params->PchConfigSubSystemId = CONFIG_SUBSYSTEM_DEVICE_ID;
+
params->WakeConfigWolEnableOverride =
config->WakeConfigWolEnableOverride;
params->WakeConfigPcieWakeFromDeepSx =