diff options
| author | Simon Glass <sjg@chromium.org> | 2011-11-21 10:49:37 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-03-30 07:43:28 +0200 |
| commit | ee60197e64f4daa8869a88ccc20bf6896a218657 (patch) | |
| tree | b8c64618b17a94be373110116022556faf189c87 /spl | |
| parent | 76e2c169a525159d48dd005a371fb05e1943c64b (diff) | |
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>
Diffstat (limited to 'spl')
| -rw-r--r-- | spl/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spl/Makefile b/spl/Makefile index 3262e226ae..680f6dd1f6 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -81,6 +81,9 @@ ifeq ($(wildcard $(LDSCRIPT)),) 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 |