From f2fc4972282bfa92be417bc6f3df3197c47ceb01 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 3 Oct 2017 15:39:22 -0500 Subject: google/cyan: fix variant memory/silicon init params override The mainboard_memory_init_params() and mainboard_silicon_init_params() methods already have weak definitions in drivers/intel/fsp1_1, so having them declared as weak in the cyan baseboard has the effect of them not being called at all unless overridden at the variant level. Therefore, remove the weak declarations in the baseboard and ensure that each variant has its own init functions if needed. TEST: build/boot google/cyan Change-Id: I1c76cb5838ef1e65e72c7341d951f9baf2ddd41b Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/21704 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/google/cyan/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainboard/google/cyan/Makefile.inc') diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.inc index 0b11aa3b1d..92b0422279 100644 --- a/src/mainboard/google/cyan/Makefile.inc +++ b/src/mainboard/google/cyan/Makefile.inc @@ -21,10 +21,10 @@ romstage-y += spd/spd.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += ec.c ramstage-y += irqroute.c -ramstage-y += ramstage.c ramstage-y += w25q64.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include -- cgit v1.2.3