commit 9b30937d1d724aa35f9df92fb1d70f299ecd63fa
author Simon Glass <sjg@chromium.org> Mon Nov 21 10:49:37 2011 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Fri Mar 30 07:43:28 2012 +0200
tree b8c64618b17a94be373110116022556faf189c87
parent bce82d323c11a4b22022b58b5a4745f845fb2c9b

Allow arch directory to contain .lds without requiring Makefile

The Makefile for a CPU is in arch/($ARCH)/cpu/$(CPU). We want to support
having an .lds file in arch/$(ARCH)/cpu without requiring an additional
Makefile there. This change makes it clear that we expect a Makefile in
the same directory as the link script except in this case.

Signed-off-by: Simon Glass <sjg@chromium.org>

spl/Makefile

diff --git a/spl/Makefile b/spl/Makefile
index 3262e22..680f6dd 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -81,6 +81,9 @@
 	LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-spl.lds
 endif
 ifeq ($(wildcard $(LDSCRIPT)),)
+	LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds
+endif
+ifeq ($(wildcard $(LDSCRIPT)),)
 $(error could not find linker script)
 endif