From 2a58e187af790dab8a9c1dbeebe4b57a9c259a3c Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 19 Feb 2021 11:11:34 +0100 Subject: mb/intel/harcuvar: Drop build guards for ENABLE_FSP_MEMORY_DOWN Ensure the code gets build-tested for CONFIG_ENABLE_FSP_MEMORY_DOWN=n. Change-Id: I6213e3e0ea3b2acfc97017739ac069ee3811d742 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/50905 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/intel/harcuvar/Makefile.inc | 2 +- src/mainboard/intel/harcuvar/romstage.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mainboard/intel/harcuvar/Makefile.inc b/src/mainboard/intel/harcuvar/Makefile.inc index aa1d779b43..90916824da 100644 --- a/src/mainboard/intel/harcuvar/Makefile.inc +++ b/src/mainboard/intel/harcuvar/Makefile.inc @@ -1,6 +1,6 @@ ## SPDX-License-Identifier: GPL-2.0-only -subdirs-$(CONFIG_ENABLE_FSP_MEMORY_DOWN) += spd +subdirs-y += spd romstage-y += boardid.c romstage-y += hsio.c diff --git a/src/mainboard/intel/harcuvar/romstage.c b/src/mainboard/intel/harcuvar/romstage.c index 0373c01c60..027c56ef52 100644 --- a/src/mainboard/intel/harcuvar/romstage.c +++ b/src/mainboard/intel/harcuvar/romstage.c @@ -7,8 +7,6 @@ #include #include -#if CONFIG(ENABLE_FSP_MEMORY_DOWN) - /* * Define platform specific Memory Down Configure structure. * @@ -63,8 +61,6 @@ const MEMORY_DOWN_CONFIG mMemoryDownConfig = { } }; -#endif /* CONFIG_ENABLE_FSP_MEMORY_DOWN */ - void mainboard_config_gpios(void); void mainboard_memory_init_params(FSPM_UPD *mupd); @@ -103,7 +99,9 @@ void mainboard_config_gpios(void) void mainboard_memory_init_params(FSPM_UPD *mupd) { -#if CONFIG(ENABLE_FSP_MEMORY_DOWN) + if (!CONFIG(ENABLE_FSP_MEMORY_DOWN)) + return; + uint8_t *spd_data_ptr = NULL; /* Get SPD data pointer */ @@ -125,5 +123,4 @@ void mainboard_memory_init_params(FSPM_UPD *mupd) mupd->FspmConfig.PcdMemoryDown = 0; mupd->FspmConfig.PcdMemoryDownConfigPtr = 0; } -#endif /* CONFIG_ENABLE_FSP_MEMORY_DOWN */ } -- cgit v1.2.3