diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2015-07-30 18:03:18 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-11-24 14:48:22 +0100 |
| commit | 593f5c8a48043153963c04060ed8de7d60604bc1 (patch) | |
| tree | 6381f410d5cf6ff9805f32ee0f2af1e214cf3175 /src/arch/x86 | |
| parent | 62477931c88c701617445a3a23769583e7b830b5 (diff) | |
Unify OBJCOPY arguments throughout various x86 stages
Instead of having to have an ifeq() all across the code base,
use $(target-objcopy). And correct target-objcopy to a value
that objcopy actually understands.
Change-Id: Id5dea6420bee02a044dc488b5086d109e806d605
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/11090
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/Makefile.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 03dba344bf..5829983165 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -251,16 +251,16 @@ endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64 ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y) -ifeq ($(CONFIG_COMPILE_IN_DSDT),y) -ramstage-srcs += $(obj)/dsdt.aml - ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y) target-objcopy=-O elf32-i386 -B i386 endif ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_64),y) -target-objcopy=-O elf64-x86_64 -B x86_64 +target-objcopy=-O elf64-x86-64 -B i386:x86-64 endif +ifeq ($(CONFIG_COMPILE_IN_DSDT),y) +ramstage-srcs += $(obj)/dsdt.aml + define ramstage-objs_aml_template $(call src-to-obj,ramstage,$(1).aml): $(1).aml @printf " OBJCOPY $$(subst $$(obj)/,,$$(@))\n" |