From 2ed0869d30602eb660569eababb8fedff36bd23a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 22 Aug 2009 19:50:22 -0400 Subject: [PATCH] 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 --- 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 4bdf6d34ce..cbf47f0129 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 0dd2ac63e1..a7e3658c3e 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 -- 2.30.2