From a32e626f92415290b7924930a7e3b80df6884090 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Feb 2013 04:18:53 +0000 Subject: [PATCH] x86: Remove unneeded cruft from main Makefile These lines are dealt with in the x86 Makefile and link script, so punt them. Signed-off-by: Simon Glass Acked-by: Gabe Black --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 35eee704dd..fc18dd4cc0 100644 --- a/Makefile +++ b/Makefile @@ -230,10 +230,6 @@ endif # U-Boot objects....order is important (i.e. start must be first) OBJS = $(CPUDIR)/start.o -ifeq ($(CPU),x86) -RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += $(CPUDIR)/start16.o -RESET_OBJS-$(CONFIG_X86_NO_RESET_VECTOR) += $(CPUDIR)/resetvec.o -endif ifeq ($(CPU),ppc4xx) OBJS += $(CPUDIR)/resetvec.o endif @@ -241,7 +237,7 @@ ifeq ($(CPU),mpc85xx) OBJS += $(CPUDIR)/resetvec.o endif -OBJS := $(addprefix $(obj),$(OBJS) $(RESET_OBJS-)) +OBJS := $(addprefix $(obj),$(OBJS)) HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n) -- 2.25.1