From e957832b2a4c880fae15c74b998630d5c5125890 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 7 Oct 2015 10:00:58 -0500 Subject: 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 Reviewed-on: http://review.coreboot.org/11817 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- Makefile.inc | 2 +- src/arch/arm/Makefile.inc | 2 -- src/arch/arm64/Makefile.inc | 3 --- src/soc/nvidia/tegra124/Makefile.inc | 1 - src/soc/nvidia/tegra132/Makefile.inc | 1 - src/soc/nvidia/tegra210/Makefile.inc | 1 - 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 017addc60e..d84bf19271 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -615,7 +615,7 @@ $(REFCODE_BLOB): $(RMODTOOL) $(RMODTOOL) -i $(CONFIG_REFCODE_BLOB_FILE) -o $@ 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" # 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. diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc index 82ce8b3c99..34c447d5a4 100644 --- a/src/arch/arm/Makefile.inc +++ b/src/arch/arm/Makefile.inc @@ -106,8 +106,6 @@ 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 - $(objcbfs)/romstage.debug: $$(romstage-objs) @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 diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index e1c84a902e..694d49df88 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -120,9 +120,6 @@ rmodules_arm64-y += memcpy.S rmodules_arm64-y += memmove.S 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) @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 diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc index 38ba4f6270..2f0f470f8f 100644 --- a/src/soc/nvidia/tegra124/Makefile.inc +++ b/src/soc/nvidia/tegra124/Makefile.inc @@ -68,7 +68,6 @@ ramstage-y += ../tegra/usb.c ramstage-$(CONFIG_DRIVERS_UART) += uart.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/ diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc index 54530b1611..491b18b5e6 100644 --- a/src/soc/nvidia/tegra132/Makefile.inc +++ b/src/soc/nvidia/tegra132/Makefile.inc @@ -103,7 +103,6 @@ secmon-y += uart.c secmon-y += gic.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/ CBOOTIMAGE_OPTS = --soc tegra132 diff --git a/src/soc/nvidia/tegra210/Makefile.inc b/src/soc/nvidia/tegra210/Makefile.inc index 90b60b5e62..66df6b457d 100644 --- a/src/soc/nvidia/tegra210/Makefile.inc +++ b/src/soc/nvidia/tegra210/Makefile.inc @@ -112,7 +112,6 @@ secmon-y += uart.c secmon-y += gic.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/ -- cgit v1.2.3