[U-Boot,1/7] Blackfin: use common LDSCRIPT logic

Message ID 1306207860-5124-2-git-send-email-vapier@gentoo.org
State Accepted
Delegated to: Mike Frysinger
Headers show

Commit Message

Mike Frysinger May 24, 2011, 3:30 a.m.
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>
 arch/blackfin/config.mk                            |    4 ----
 arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} |    0
 2 files changed, 0 insertions(+), 4 deletions(-)
 rename arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} (100%)

diff --git a/arch/blackfin/lib/u-boot.lds.S b/arch/blackfin/cpu/u-boot.lds
similarity index 100%
rename from arch/blackfin/lib/u-boot.lds.S
rename to arch/blackfin/cpu/u-boot.lds


diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index f0909e9..71fd53f 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.
-ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),)
-LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S
 $(error do not set CONFIG_SYS_TEXT_BASE for Blackfin boards)