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

vboot: remove remnants of VBOOT_STUB 

For vboot1 there was an rmodule that was loaded and ran to
do the firmware verification. That's no longer used so remove
the last vestiges of VBOOT_STUB.

BUG=chrome-os-partner:44827
BRANCH=None
TEST=Built glados.

Change-Id: I6b41544874bef4d84d0f548640114285cad3474e
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11817
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Aaron Durbin 2015-10-07 10:00:58 -05:00 committed by Aaron Durbin
parent e6af4be158
commit e957832b2a
6 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc
View File

@ -615,7 +615,7 @@ $(REFCODE_BLOB): $(RMODTOOL)
$(RMODTOOL) -i $(CONFIG_REFCODE_BLOB_FILE) -o $@ $(RMODTOOL) -i $(CONFIG_REFCODE_BLOB_FILE) -o $@
endif endif
$(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/ramstage.elf $(CBFSTOOL) $$(call strip_quotes,$$(COREBOOT_ROM_DEPENDENCIES)) $$(INTERMEDIATE) $$(VBOOT_STUB) $(REFCODE_BLOB) $(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/ramstage.elf $(CBFSTOOL) $$(call strip_quotes,$$(COREBOOT_ROM_DEPENDENCIES)) $$(INTERMEDIATE) $(REFCODE_BLOB)
@printf " CBFS $(subst $(obj)/,,$(@))\n" @printf " CBFS $(subst $(obj)/,,$(@))\n"
# The full ROM may be larger than the CBFS part, so create an empty # The full ROM may be larger than the CBFS part, so create an empty
# file (filled with \377 = 0xff) and copy the CBFS image over it. # file (filled with \377 = 0xff) and copy the CBFS image over it.

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

@ -106,8 +106,6 @@ rmodules_arm-y += memcpy.S
rmodules_arm-y += memmove.S rmodules_arm-y += memmove.S
rmodules_arm-y += eabi_compat.c rmodules_arm-y += eabi_compat.c
VBOOT_STUB_DEPS += $(obj)/arch/arm/eabi_compat.rmodules_arm.o
$(objcbfs)/romstage.debug: $$(romstage-objs) $(objcbfs)/romstage.debug: $$(romstage-objs)
@printf " LINK $(subst $(obj)/,,$(@))\n" @printf " LINK $(subst $(obj)/,,$(@))\n"
$(LD_romstage) $(LDFLAGS_romstage) -o $@ -L$(obj) -T $(obj)/mainboard/$(MAINBOARDDIR)/memlayout.romstage.ld --whole-archive --start-group $(filter-out %.ld,$(romstage-objs)) --end-group $(LD_romstage) $(LDFLAGS_romstage) -o $@ -L$(obj) -T $(obj)/mainboard/$(MAINBOARDDIR)/memlayout.romstage.ld --whole-archive --start-group $(filter-out %.ld,$(romstage-objs)) --end-group

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

@ -120,9 +120,6 @@ rmodules_arm64-y += memcpy.S
rmodules_arm64-y += memmove.S rmodules_arm64-y += memmove.S
rmodules_arm64-y += eabi_compat.c rmodules_arm64-y += eabi_compat.c
# Build the romstage
VBOOT_STUB_DEPS += $(obj)/arch/arm/eabi_compat.rmodules_arm64.o
$(objcbfs)/romstage.debug: $$(romstage-objs) $(objcbfs)/romstage.debug: $$(romstage-objs)
@printf " LINK $(subst $(obj)/,,$(@))\n" @printf " LINK $(subst $(obj)/,,$(@))\n"
$(LD_romstage) $(LDFLAGS_romstage) -o $@ -L$(obj) --whole-archive --start-group $(filter-out %.ld,$(romstage-objs)) --end-group -T $(obj)/mainboard/$(MAINBOARDDIR)/memlayout.romstage.ld $(LD_romstage) $(LDFLAGS_romstage) -o $@ -L$(obj) --whole-archive --start-group $(filter-out %.ld,$(romstage-objs)) --end-group -T $(obj)/mainboard/$(MAINBOARDDIR)/memlayout.romstage.ld

1
src/soc/nvidia/tegra124/Makefile.inc
View File

@ -68,7 +68,6 @@ ramstage-y += ../tegra/usb.c
ramstage-$(CONFIG_DRIVERS_UART) += uart.c ramstage-$(CONFIG_DRIVERS_UART) += uart.c
rmodules_$(ARCH-romstage-y)-y += monotonic_timer.c rmodules_$(ARCH-romstage-y)-y += monotonic_timer.c
VBOOT_STUB_DEPS += $(obj)/soc/nvidia/tegra124/monotonic_timer.rmodules_$(ARCH-romstage-y).o
CPPFLAGS_common += -Isrc/soc/nvidia/tegra124/include/ CPPFLAGS_common += -Isrc/soc/nvidia/tegra124/include/

1
src/soc/nvidia/tegra132/Makefile.inc
View File

@ -103,7 +103,6 @@ secmon-y += uart.c
secmon-y += gic.c secmon-y += gic.c
modules_arm-y += monotonic_timer.c modules_arm-y += monotonic_timer.c
VBOOT_STUB_DEPS += $(obj)/soc/nvidia/tegra132/monotonic_timer.rmodules_arm.o
CPPFLAGS_common += -Isrc/soc/nvidia/tegra132/include/ CPPFLAGS_common += -Isrc/soc/nvidia/tegra132/include/
CBOOTIMAGE_OPTS = --soc tegra132 CBOOTIMAGE_OPTS = --soc tegra132

1
src/soc/nvidia/tegra210/Makefile.inc
View File

@ -112,7 +112,6 @@ secmon-y += uart.c
secmon-y += gic.c secmon-y += gic.c
rmodules_arm-y += monotonic_timer.c rmodules_arm-y += monotonic_timer.c
VBOOT_STUB_DEPS += $(obj)/soc/nvidia/tegra210/monotonic_timer.rmodules_arm.o
CPPFLAGS_common += -Isrc/soc/nvidia/tegra210/include/ CPPFLAGS_common += -Isrc/soc/nvidia/tegra210/include/