mxs: fix warning in SPL with console support

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 7b7c25a1b293186b4146136f8e33781e268ae693..64e829623982898a6d683e4292257fdb1bb62db5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -495,7 +495,7 @@ ifndef LDSCRIPT
        #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
        ifdef CONFIG_SYS_LDSCRIPT
                # need to strip off double quotes
-               LDSCRIPT := $(CONFIG_SYS_LDSCRIPT:"%"=%)
+               LDSCRIPT := $(srctree)/$(CONFIG_SYS_LDSCRIPT:"%"=%)
        endif
 endif
 
@@ -518,9 +518,6 @@ ifndef LDSCRIPT
                # We don't expect a Makefile here
                LDSCRIPT_MAKEFILE_DIR =
        endif
-       ifeq ($(wildcard $(LDSCRIPT)),)
-$(error could not find linker script)
-       endif
 endif
 
 else
@@ -859,6 +856,8 @@ OBJCOPYFLAGS_u-boot.ais = -I binary -O binary --pad-to=$(CONFIG_SPL_MAX_SIZE)
 u-boot.ais: spl/u-boot-spl.ais u-boot.img FORCE
        $(call if_changed,pad_cat)
 
+u-boot-signed.sb: u-boot.bin spl/u-boot-spl.bin
+       $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot-signed.sb
 u-boot.sb: u-boot.bin spl/u-boot-spl.bin
        $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs $(objtree)/u-boot.sb
 
@@ -996,6 +995,10 @@ ifeq ($(CONFIG_SYS_GENERIC_BOARD),y)
        @/bin/false
 endif
 endif
+ifeq ($(wildcard $(LDSCRIPT)),)
+       @echo >&2 "  Could not find linker script."
+       @/bin/false
+endif
 
 archprepare: prepare1 scripts_basic