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>

diff --git a/lib_blackfin/Makefile b/lib_blackfin/Makefile
index 4bdf6d34ce87e3d4dba96d178c7df607a3cc6f5b..cbf47f01296904dfabbf5671f60b8570e43c2b68 100644 (file)
--- 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 0dd2ac63e15fe683b1d97f7ea44c12e091ee0f93..a7e3658c3efebf1a2c73624c7a87a31746615e01 100644 (file)
--- 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