[coreboot-gerrit] New patch to review for coreboot: arch/x86: Move romstage files into romstage section

[Lee Leahy]

Lee Leahy ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15891

-gerrit

commit e4a4e8df651e9e7d79c57f1852f77b0b0ce0125e
Author: Lee Leahy 
Date:   Mon Jul 25 17:07:53 2016 -0700

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 
---
 src/arch/x86/Makefile.inc | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index c1af995..c07a7cb 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
@@ -268,12 +280,12 @@ postcar-generic-ccopts += -D__POSTCAR__
 postcar-y += boot.c
 postcar-y += cbfs_and_run.c
 postcar-y += exit_car.S
-postcar-y += memset.c
 postcar-y += memcpy.c
-postcar-y += memmove.c
 postcar-y += memlayout.ld
-postcar-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
+postcar-y += memmove.c
+postcar-y += memset.c
 postcar-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c
+postcar-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c

$(objcbfs)/postcar.debug: $$(postcar-objs)
    @printf "    LINK       $(subst $(obj)/,,$(@))\n"
@@ -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