summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-02-14 04:18:53 +0000
committerSimon Glass <sjg@chromium.org>2013-02-14 20:18:58 -0800
commita32e626f92415290b7924930a7e3b80df6884090 (patch)
tree8ddf60fe1cfd4a63bebb21161c82a9f236b6e61e
parent1f3a581495df6272047840437a206a9fafde7d29 (diff)
downloadtalos-obmc-uboot-a32e626f92415290b7924930a7e3b80df6884090.tar.gz
talos-obmc-uboot-a32e626f92415290b7924930a7e3b80df6884090.zip
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 <sjg@chromium.org> Acked-by: Gabe Black <gabeblack@chromium.org>
-rw-r--r--Makefile6
1 files changed, 1 insertions, 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)
OpenPOWER on IntegriCloud