[U-Boot] [PATCH 2/2] kbuild: Move linker sciript check to prepare1

Masahiro Yamada yamada.m at jp.panasonic.com
Mon Feb 24 14:11:46 CET 2014


Same as the previous commit.
Move sanity check to prepare1 target to avoid nasty troubles.

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---

 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index fffeb7e..b034a36 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -996,6 +993,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
 
-- 
1.8.3.2



More information about the U-Boot mailing list