summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2016-07-25 17:07:53 -0700
committerLee Leahy <leroy.p.leahy@intel.com>2016-07-26 16:14:53 +0200
commite82b5057e3f3e6d1bd67b38002e49eae0248c839 (patch)
treeecc1a5762777119c73404f0210d4a1ce646eb337
parenta7491502dc5c5cdb0c6b456be007157984f6b6d3 (diff)
downloadcoreboot-e82b5057e3f3e6d1bd67b38002e49eae0248c839.tar.xz
arch/x86: Move romstage files into romstage section
Move the romstage files into the romstage section of the file. Eliminate duplicate conditional statements. TEST=None Change-Id: Ie2d65cef3797a2c091c0cd76b147b30a765332ad Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com> Reviewed-on: https://review.coreboot.org/15891 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins)
-rw-r--r--src/arch/x86/Makefile.inc30
1 files changed, 12 insertions, 18 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 3c00d3c7ff..ce6a92bb2b 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -203,6 +203,18 @@ endif # CONFIG_ARCH_VERSTAGE_X86_32 / CONFIG_ARCH_VERSTAGE_X86_64
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
+romstage-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
+romstage-y += boot.c
+romstage-y += cbmem.c
+romstage-y += cbfs_and_run.c
+romstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += cpu_common.c
+romstage-y += memcpy.c
+romstage-y += memmove.c
+romstage-y += memset.c
+romstage-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c
+romstage-$(CONFIG_POSTCAR_STAGE) += postcar_loader.c
+romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
+
ifneq ($(CONFIG_ROMCC),y)
romstage-srcs += $(src)/mainboard/$(MAINBOARDDIR)/romstage.c
@@ -356,24 +368,6 @@ endif
endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64
-ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
-
-romstage-$(CONFIG_POSTCAR_STAGE) += postcar_loader.c
-romstage-y += cbmem.c
-romstage-y += boot.c
-romstage-$(CONFIG_HAVE_ACPI_RESUME) += acpi_s3.c
-
-romstage-y += cbfs_and_run.c
-romstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += cpu_common.c
-romstage-y += memset.c
-romstage-y += memcpy.c
-romstage-y += memmove.c
-romstage-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c
-
-romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
-
-endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64
-
ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y)
ramstage-y += boot.c