[U-Boot] [PATCH] Blackfin: use common code to preprocess linker script

Mike Frysinger
2009-08-22T23:50:22Z

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>
---
lib_blackfin/Makefile | 5 +----
lib_blackfin/config.mk | 2 +-
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
--
1.6.4