From e751a101c08d540c59fc39def9681a0ee227d825 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 23 Nov 2020 13:28:57 +0100 Subject: [PATCH] soc/intel/broadwell: Move romstage.c to Haswell Broadwell no longer has CPU code. Change-Id: I9c9717439a702dddaa613a30e6f3da29887ec4bd Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/46951 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/cpu/intel/haswell/Makefile.inc | 2 ++ src/{soc/intel/broadwell/cpu => cpu/intel/haswell}/romstage.c | 0 src/soc/intel/broadwell/Makefile.inc | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{soc/intel/broadwell/cpu => cpu/intel/haswell}/romstage.c (100%) diff --git a/src/cpu/intel/haswell/Makefile.inc b/src/cpu/intel/haswell/Makefile.inc index 3c4db4f1c8..bfb501133c 100644 --- a/src/cpu/intel/haswell/Makefile.inc +++ b/src/cpu/intel/haswell/Makefile.inc @@ -1,4 +1,6 @@ ramstage-y += haswell_init.c + +romstage-y += romstage.c romstage-y += ../car/romstage.c ramstage-y += acpi.c diff --git a/src/soc/intel/broadwell/cpu/romstage.c b/src/cpu/intel/haswell/romstage.c similarity index 100% rename from src/soc/intel/broadwell/cpu/romstage.c rename to src/cpu/intel/haswell/romstage.c diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc index dc16ae4bb9..5e0ce649bf 100644 --- a/src/soc/intel/broadwell/Makefile.inc +++ b/src/soc/intel/broadwell/Makefile.inc @@ -1,7 +1,5 @@ ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y) -romstage-y += cpu/romstage.c - subdirs-y += pch bootblock-y += bootblock.c