From 3790e1340d0cb2c76d1a99906d95b09e4361efb9 Mon Sep 17 00:00:00 2001 From: Paul Burton Date: Fri, 18 Jul 2014 11:19:59 +0100 Subject: [PATCH] Makefile.inc: Remove duplication of ROMSTAGE_ELF assignment The ROMSTAGE_ELF variable is assigned based upon the architecture the romstage is being built for. x86 uses a unique value but arm & arm64 both use the same value which MIPS will also share. Remove the duplication of the assignment by special casing x86 only. Change-Id: Id4307c30d91fde8dc48f89b2eb6f5b16b45e0c67 Suggested-by: Vadim Bendebury Signed-off-by: Paul Burton Reviewed-on: https://chromium-review.googlesource.com/208932 Reviewed-by: David Hendricks --- Makefile.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index f98a61b25e..3eae768a55 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -516,14 +516,10 @@ endif @printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n" $(CBFSTOOL) $@ print -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_X86_32),y) ROMSTAGE_ELF := romstage_xip.elf +else +ROMSTAGE_ELF := romstage.elf endif $(obj)/coreboot.pre: $(objcbfs)/$(ROMSTAGE_ELF) $(obj)/coreboot.pre1 $(CBFSTOOL)