GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <furquan@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/209568
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Tested-by: Furquan Shaikh <furquan@chromium.org>
Original-Commit-Queue: Aaron Durbin <adurbin@chromium.org>
(cherry picked from commit 00da67cc02c81d7a6160f7336b33bf53b00e1875)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>

Change-Id: I9df02134af4e396c7257a2db2e2c371cfd1a02bc
Reviewed-on: http://review.coreboot.org/8673
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Furquan Shaikh 2014-07-23 11:41:59 -07:00 committed by Marc Jones
parent fbff908a74
commit a742ef1a48
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/arm/Makefile.inc
View File

@ -93,6 +93,10 @@ romstage-y += memset.S
romstage-y += memcpy.S romstage-y += memcpy.S
romstage-y += memmove.S romstage-y += memmove.S
romstage-y += clock.c 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 VBOOT_STUB_DEPS += $(obj)/arch/arm/eabi_compat.rmodules_arm.o

3
src/arch/arm/armv4/Makefile.inc
View File

@ -51,6 +51,9 @@ romstage-c-ccopts += $(armv4_flags)
romstage-S-ccopts += $(armv4_flags) romstage-S-ccopts += $(armv4_flags)
romstage-y += cache.c romstage-y += cache.c
rmodules_arm-c-ccopts += $(armv4_flags)
rmodules_arm-S-ccopts += $(armv4_flags)
endif # CONFIG_ARCH_ROMSTAGE_ARMV4 endif # CONFIG_ARCH_ROMSTAGE_ARMV4
############################################################################### ###############################################################################

3
src/arch/arm/armv7/Makefile.inc
View File

@ -74,6 +74,9 @@ romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
romstage-c-ccopts += $(armv7_flags) romstage-c-ccopts += $(armv7_flags)
romstage-S-ccopts += $(armv7_asm_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 endif # CONFIG_ARCH_ROMSTAGE_ARMV7
############################################################################### ###############################################################################

5
src/arch/arm64/Makefile.inc
View File

@ -89,6 +89,11 @@ romstage-y += ../../lib/memcpy.c
romstage-y += ../../lib/memmove.c romstage-y += ../../lib/memmove.c
romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.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 # Build the romstage
VBOOT_STUB_DEPS += $(obj)/arch/arm/eabi_compat.rmodules_arm64.o VBOOT_STUB_DEPS += $(obj)/arch/arm/eabi_compat.rmodules_arm64.o

3
src/arch/arm64/armv8/Makefile.inc
View File

@ -58,6 +58,9 @@ romstage-y += exception_asm.S
romstage-c-ccopts += $(armv8_flags) romstage-c-ccopts += $(armv8_flags)
romstage-S-ccopts += $(armv8_asm_flags) romstage-S-ccopts += $(armv8_asm_flags)
rmodules_arm64-c-ccopts += $(armv8_flags)
rmodules_arm64-S-ccopts += $(armv8_asm_flags)
endif endif
################################################################################ ################################################################################