Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50905 )
Change subject: mb/intel/harcuvar: Drop build guards for ENABLE_FSP_MEMORY_DOWN ......................................................................
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 th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/50905 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de --- M src/mainboard/intel/harcuvar/Makefile.inc M src/mainboard/intel/harcuvar/romstage.c 2 files changed, 4 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/src/mainboard/intel/harcuvar/Makefile.inc b/src/mainboard/intel/harcuvar/Makefile.inc index aa1d779..9091682 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 0373c01..027c56e 100644 --- a/src/mainboard/intel/harcuvar/romstage.c +++ b/src/mainboard/intel/harcuvar/romstage.c @@ -7,8 +7,6 @@ #include <fsp/api.h> #include <fsp/soc_binding.h>
-#if CONFIG(ENABLE_FSP_MEMORY_DOWN) - /* * Define platform specific Memory Down Configure structure. * @@ -63,8 +61,6 @@ } };
-#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_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 @@ mupd->FspmConfig.PcdMemoryDown = 0; mupd->FspmConfig.PcdMemoryDownConfigPtr = 0; } -#endif /* CONFIG_ENABLE_FSP_MEMORY_DOWN */ }