Re: [U-Boot] [PATCH 1/3] config.mk: move LDSCRIPT processing to the top-level Makefile

[Wolfgang Denk]

Dear Ilya Yanok,

In message <1308609939-23337-1-git-send-email-ya...@emcraft.com> you wrote:
> LDSCRIPT is used only from the top-level Makefile and only when the
> system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT
> related logic into the top level Makefile and under configured condition
> to avoid errors when building tools from unconfigured tree.
> 
> Signed-off-by: Ilya Yanok 
> ---
>  Makefile  |   30 ++
>  config.mk |   30 --
>  2 files changed, 30 insertions(+), 30 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
Don't panic.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 1/3] config.mk: move LDSCRIPT processing to the top-level Makefile

[Mike Frysinger]

Acked-by: Mike Frysinger 
-mike


signature.asc
Description: This is a digitally signed message part.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 1/3] config.mk: move LDSCRIPT processing to the top-level Makefile

[Ilya Yanok]

LDSCRIPT is used only from the top-level Makefile and only when the
system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT
related logic into the top level Makefile and under configured condition
to avoid errors when building tools from unconfigured tree.

Signed-off-by: Ilya Yanok 
---
 Makefile  |   30 ++
 config.mk |   30 --
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index dcf5d93..e73cfc7 100644
--- a/Makefile
+++ b/Makefile
@@ -163,6 +163,36 @@ endif
 # load other configuration
 include $(TOPDIR)/config.mk
 
+# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
+# that (or fail if absent).  Otherwise, search for a linker script in a
+# standard location.
+
+ifndef LDSCRIPT
+   #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
+   ifdef CONFIG_SYS_LDSCRIPT
+   # need to strip off double quotes
+   LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
+   endif
+endif
+
+ifndef LDSCRIPT
+   ifeq ($(CONFIG_NAND_U_BOOT),y)
+   LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
+   ifeq ($(wildcard $(LDSCRIPT)),)
+   LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
+   endif
+   endif
+   ifeq ($(wildcard $(LDSCRIPT)),)
+   LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
+   endif
+   ifeq ($(wildcard $(LDSCRIPT)),)
+   LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds
+   endif
+   ifeq ($(wildcard $(LDSCRIPT)),)
+$(error could not find linker script)
+   endif
+endif
+
 #
 # U-Boot objectsorder is important (i.e. start must be first)
 
diff --git a/config.mk b/config.mk
index 7ce554e..2eb7fa2 100644
--- a/config.mk
+++ b/config.mk
@@ -154,36 +154,6 @@ RELFLAGS= $(PLATFORM_RELFLAGS)
 DBGFLAGS= -g # -DDEBUG
 OPTFLAGS= -Os #-fomit-frame-pointer
 
-# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
-# that (or fail if absent).  Otherwise, search for a linker script in a
-# standard location.
-
-ifndef LDSCRIPT
-   #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
-   ifdef CONFIG_SYS_LDSCRIPT
-   # need to strip off double quotes
-   LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
-   endif
-endif
-
-ifndef LDSCRIPT
-   ifeq ($(CONFIG_NAND_U_BOOT),y)
-   LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-   ifeq ($(wildcard $(LDSCRIPT)),)
-   LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-   endif
-   endif
-   ifeq ($(wildcard $(LDSCRIPT)),)
-   LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
-   endif
-   ifeq ($(wildcard $(LDSCRIPT)),)
-   LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds
-   endif
-   ifeq ($(wildcard $(LDSCRIPT)),)
-$(error could not find linker script)
-   endif
-endif
-
 OBJCFLAGS += --gap-fill=0xff
 
 gccincdir := $(shell $(CC) -print-file-name=include)
-- 
1.7.5.4

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot