From 01554574492a4965668e0d9423d3ae4da079cfde Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Wed, 24 Feb 2016 09:42:16 -0800 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/13777 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/arch/x86/Makefile.inc | 1 - 1 file changed, 1 deletion(-) 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))