summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-08-22 19:50:22 -0400
committerWolfgang Denk <wd@denx.de>2009-08-23 22:25:05 +0200
commit2ed0869d30602eb660569eababb8fedff36bd23a (patch)
tree2c21c6a65f8818d72b4d1fa5e049f6e31a4114dc
parent4d3758c835c7e96da2a291e7fb5acfc19bc06e8e (diff)
downloadu-boot-imx-2ed0869d30602eb660569eababb8fedff36bd23a.zip
u-boot-imx-2ed0869d30602eb660569eababb8fedff36bd23a.tar.gz
u-boot-imx-2ed0869d30602eb660569eababb8fedff36bd23a.tar.bz2
Blackfin: use common code to preprocess linker script
Now that the common code preprocesses the linker script, the Blackfin code no longer needs to do it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--lib_blackfin/Makefile5
-rw-r--r--lib_blackfin/config.mk2
2 files changed, 2 insertions, 5 deletions
diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile
index 4bdf6d3..cbf47f0 100644
--- a/lib_blackfin/Makefile
+++ b/lib_blackfin/Makefile
@@ -48,12 +48,9 @@ COBJS-y += string.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
-$(LIB): $(obj).depend $(OBJS) $(obj)u-boot.lds
+$(LIB): $(obj).depend $(OBJS)
$(AR) $(ARFLAGS) $@ $(OBJS)
-$(obj)u-boot.lds: u-boot.lds.S
- $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ > $@
-
#########################################################################
# defines $(obj).depend target
diff --git a/lib_blackfin/config.mk b/lib_blackfin/config.mk
index 0dd2ac6..a7e3658 100644
--- a/lib_blackfin/config.mk
+++ b/lib_blackfin/config.mk
@@ -62,5 +62,5 @@ endif
LDR_FLAGS += $(LDR_FLAGS-y)
ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),)
-LDSCRIPT = $(obj)lib_$(ARCH)/u-boot.lds
+LDSCRIPT = $(obj)lib_$(ARCH)/u-boot.lds.S
endif