aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-04-08 00:52:06 -0400
committerMike Frysinger <vapier@gentoo.org>2011-06-03 13:26:45 -0400
commit867f54cc35aafd3179fd3b6efbeacf5978ce53b9 (patch)
treeb18eca244a32043ea689dd9de6eb1c855ce5375a
parent6f4dd40cddbd69c56fec1285fee02cbd5a3833d8 (diff)
Blackfin: use common LDSCRIPT logic
Now that common code is a bit smarter when it comes to default LDSCRIPT values, rename the default Blackfin file and drop the Blackfin-specific config.mk logic. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/config.mk4
-rw-r--r--arch/blackfin/cpu/u-boot.lds (renamed from arch/blackfin/lib/u-boot.lds.S)0
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index f0909e95d..71fd53fba 100644
--- a/arch/blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -76,10 +76,6 @@ LDR_FLAGS += $(LDR_FLAGS-y)
# Set some default LDR flags based on boot mode.
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
-ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),)
-LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S
-endif
-
ifneq ($(CONFIG_SYS_TEXT_BASE),)
$(error do not set CONFIG_SYS_TEXT_BASE for Blackfin boards)
endif
diff --git a/arch/blackfin/lib/u-boot.lds.S b/arch/blackfin/cpu/u-boot.lds
index 2b8d285e1..2b8d285e1 100644
--- a/arch/blackfin/lib/u-boot.lds.S
+++ b/arch/blackfin/cpu/u-boot.lds