summaryrefslogtreecommitdiff
path: root/Makefile.inc
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2014-11-29 11:51:25 +0100
committerPatrick Georgi <pgeorgi@google.com>2014-12-02 10:24:57 +0100
commit24cca75b47f516e2ad226c37da1e71aef5036fce (patch)
tree2c5777b6a9badf28db31e8b603d122ec4d4d9b8b /Makefile.inc
parentfffd772e35f1efb528fa485ebfbbbe3f405d7ec9 (diff)
downloadcoreboot-24cca75b47f516e2ad226c37da1e71aef5036fce.tar.xz
build system: remove ROMSTAGE_ELF variable
No need to keep that just because x86 has one extra linking step. Change-Id: Iffdbf64e0613f89070ed0dfb009379f5ca0bd3c1 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: http://review.coreboot.org/7611 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'Makefile.inc')
-rw-r--r--Makefile.inc17
1 files changed, 2 insertions, 15 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 59d11bdc2c..11989d3f41 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -602,24 +602,11 @@ cbfs-files-$(CONFIG_BOOTSPLASH) += bootsplash.jpg
bootsplash.jpg-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE))
bootsplash.jpg-type := bootsplash
-ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM),y)
-ROMSTAGE_ELF := romstage.elf
-endif
-ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM64),y)
-ROMSTAGE_ELF := romstage.elf
-endif
-ifeq ($(CONFIG_ARCH_ROMSTAGE_RISCV),y)
-ROMSTAGE_ELF := romstage.elf
-endif
-ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y)
-ROMSTAGE_ELF := romstage_xip.elf
-endif
-
-$(obj)/coreboot.pre: $(objcbfs)/$(ROMSTAGE_ELF) $(obj)/coreboot.pre1 $(CBFSTOOL)
+$(obj)/coreboot.pre: $(objcbfs)/romstage.elf $(obj)/coreboot.pre1 $(CBFSTOOL)
@printf " CBFS $(subst $(obj)/,,$(@))\n"
cp $(obj)/coreboot.pre1 $@.tmp
$(CBFSTOOL) $@.tmp add-stage \
- -f $(objcbfs)/$(ROMSTAGE_ELF) \
+ -f $(objcbfs)/romstage.elf \
-n $(CONFIG_CBFS_PREFIX)/romstage -c none \
$(CBFSTOOL_PRE_OPTS)
mv $@.tmp $@