diff options
| author | Furquan Shaikh <furquan@google.com> | 2016-02-24 09:42:16 -0800 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2016-02-25 07:16:10 +0100 |
| commit | 01554574492a4965668e0d9423d3ae4da079cfde (patch) | |
| tree | 51a7339e8ca0f517bc03e729cd97970a14ceded8 /src | |
| parent | 116485a6343c24452f491fc67a342ddfe0f3a167 (diff) | |
| download | coreboot-01554574492a4965668e0d9423d3ae4da079cfde.tar.xz | |
x86/Makefile.inc: Fix redundant addition of memlayout.ld in bootblock
For C_ENVIRONMENT_BOOTBLOCK, memlayout.ld is added by call to
early_x86_stage. Remove redundant addition of memlayout.ld in this
case.
Change-Id: Ibb5ce690ac4e63f7ff5063d5bd04daeeb731e4d7
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/13777
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/Makefile.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 56e2ad0d59..01fa81e747 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -113,7 +113,6 @@ $(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h ifeq ($(CONFIG_C_ENVIRONMENT_BOOTBLOCK),y) bootblock-y += bootblock_crt0.S -bootblock-y += memlayout.ld ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32),y) $(eval $(call early_x86_stage,bootblock,elf32-i386)) |