New patch to review for coreboot: 2ae15ba rmodules: Make rmodules inclusion for vboot dependent on romstage_arch

[Marc Jones]

Marc Jones ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8673

-gerrit

commit 2ae15ba1edf28ef36c27d9f4fb8af478078a3de3
Author: Furquan Shaikh 
Date:   Wed Jul 23 11:41:59 2014 -0700

rmodules: Make rmodules inclusion for vboot dependent on romstage_arch

Currently, the rmodules inclusion for vboot is dependent on ramstage_arch.
    This change adds dependency on romstage_arch, since vboot is associated with
    romstage. Inclusion based on ramstage_arch is left as is in case someone needs
    it in ramstage.

BUG=chrome-os-partner:30784
    BRANCH=None
    TEST=Compiles successfully for link, rush and nyan

Original-Change-Id: Ib62415671c26a4a18c7133d98e8c683414def32b
    Original-Signed-off-by: Furquan Shaikh 
    Original-Reviewed-on: https://chromium-review.googlesource.com/209568
    Original-Reviewed-by: Aaron Durbin 
    Original-Tested-by: Furquan Shaikh 
    Original-Commit-Queue: Aaron Durbin 
    (cherry picked from commit 00da67cc02c81d7a6160f7336b33bf53b00e1875)
    Signed-off-by: Marc Jones

Change-Id: I9df02134af4e396c7257a2db2e2c371cfd1a02bc
---
 src/arch/arm/Makefile.inc         | 4 ++++
 src/arch/arm/armv4/Makefile.inc   | 3 +++
 src/arch/arm/armv7/Makefile.inc   | 3 +++
 src/arch/arm64/Makefile.inc       | 5 +++++
 src/arch/arm64/armv8/Makefile.inc | 3 +++
 5 files changed, 18 insertions(+)

diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc
index f357a91..e339be1 100644
--- a/src/arch/arm/Makefile.inc
+++ b/src/arch/arm/Makefile.inc
@@ -93,6 +93,10 @@ romstage-y += memset.S
 romstage-y += memcpy.S
 romstage-y += memmove.S
 romstage-y += clock.c
+rmodules_arm-y += memset.S
+rmodules_arm-y += memcpy.S
+rmodules_arm-y += memmove.S
+rmodules_arm-y += eabi_compat.c

VBOOT_STUB_DEPS += $(obj)/arch/arm/eabi_compat.rmodules_arm.o

diff --git a/src/arch/arm/armv4/Makefile.inc b/src/arch/arm/armv4/Makefile.inc
index eab7f0f..b234fff 100644
--- a/src/arch/arm/armv4/Makefile.inc
+++ b/src/arch/arm/armv4/Makefile.inc
@@ -51,6 +51,9 @@ romstage-c-ccopts += $(armv4_flags)
 romstage-S-ccopts += $(armv4_flags)
 romstage-y += cache.c

+rmodules_arm-c-ccopts += $(armv4_flags)
+rmodules_arm-S-ccopts += $(armv4_flags)
+
 endif # CONFIG_ARCH_ROMSTAGE_ARMV4

###############################################################################
diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc
index ea7a880..c22c8c6 100644
--- a/src/arch/arm/armv7/Makefile.inc
+++ b/src/arch/arm/armv7/Makefile.inc
@@ -74,6 +74,9 @@ romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 romstage-c-ccopts += $(armv7_flags)
 romstage-S-ccopts += $(armv7_asm_flags)

+rmodules_arm-c-ccopts += $(armv7_flags)
+rmodules_arm-S-ccopts += $(armv7_asm_flags)
+
 endif # CONFIG_ARCH_ROMSTAGE_ARMV7

###############################################################################
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 6b199b5..b50499e 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -89,6 +89,11 @@ romstage-y += ../../lib/memcpy.c
 romstage-y += ../../lib/memmove.c
 romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c

+rmodules_arm64-y += ../../lib/memset.c
+rmodules_arm64-y += ../../lib/memcpy.c
+rmodules_arm64-y += ../../lib/memmove.c
+rmodules_arm64-y += eabi_compat.c
+
 # Build the romstage
 VBOOT_STUB_DEPS += $(obj)/arch/arm/eabi_compat.rmodules_arm64.o

diff --git a/src/arch/arm64/armv8/Makefile.inc b/src/arch/arm64/armv8/Makefile.inc
index 4cbb6e9..61e37e6 100644
--- a/src/arch/arm64/armv8/Makefile.inc
+++ b/src/arch/arm64/armv8/Makefile.inc
@@ -58,6 +58,9 @@ romstage-y += exception_asm.S
 romstage-c-ccopts += $(armv8_flags)
 romstage-S-ccopts += $(armv8_asm_flags)

+rmodules_arm64-c-ccopts += $(armv8_flags)
+rmodules_arm64-S-ccopts += $(armv8_asm_flags)
+
 endif

################################################################################