summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch')
-rw-r--r--meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch82
1 files changed, 82 insertions, 0 deletions
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
new file mode 100644
index 0000000..c102691
--- /dev/null
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
@@ -0,0 +1,82 @@
1From fd1b50c5ff9c288040abf5e78815151327d32e0e Mon Sep 17 00:00:00 2001
2From: Ilya Yanok <yanok@emcraft.com>
3Date: Mon, 20 Jun 2011 12:45:37 +0000
4Subject: config.mk: move LDSCRIPT processing to the top-level Makefile
5
6Upstream-Status: Applied
7
8LDSCRIPT is used only from the top-level Makefile and only when the
9system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT
10related logic into the top level Makefile and under configured condition
11to avoid errors when building tools from unconfigured tree.
12
13Signed-off-by: Ilya Yanok <yanok@emcraft.com>
14Acked-by: Mike Frysinger <vapier@gentoo.org>
15---
16 Makefile | 30 ++++++++++++++++++++++++++++++
17 config.mk | 8 --------
18 2 files changed, 30 insertions(+), 8 deletions(-)
19
20diff --git a/Makefile b/Makefile
21index ece91ab..358c410 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -163,6 +163,36 @@ endif
25 # load other configuration
26 include $(TOPDIR)/config.mk
27
28+# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
29+# that (or fail if absent). Otherwise, search for a linker script in a
30+# standard location.
31+
32+ifndef LDSCRIPT
33+ #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
34+ ifdef CONFIG_SYS_LDSCRIPT
35+ # need to strip off double quotes
36+ LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
37+ endif
38+endif
39+
40+ifndef LDSCRIPT
41+ ifeq ($(CONFIG_NAND_U_BOOT),y)
42+ LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
43+ ifeq ($(wildcard $(LDSCRIPT)),)
44+ LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
45+ endif
46+ endif
47+ ifeq ($(wildcard $(LDSCRIPT)),)
48+ LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
49+ endif
50+ ifeq ($(wildcard $(LDSCRIPT)),)
51+ LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds
52+ endif
53+ ifeq ($(wildcard $(LDSCRIPT)),)
54+$(error could not find linker script)
55+ endif
56+endif
57+
58 #########################################################################
59 # U-Boot objects....order is important (i.e. start must be first)
60
61diff --git a/config.mk b/config.mk
62index fa46ff1..59c4c93 100644
63--- a/config.mk
64+++ b/config.mk
65@@ -153,14 +153,6 @@ endif
66 RELFLAGS= $(PLATFORM_RELFLAGS)
67 DBGFLAGS= -g # -DDEBUG
68 OPTFLAGS= -Os #-fomit-frame-pointer
69-ifndef LDSCRIPT
70-#LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
71-ifeq ($(CONFIG_NAND_U_BOOT),y)
72-LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
73-else
74-LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
75-endif
76-endif
77 OBJCFLAGS += --gap-fill=0xff
78
79 gccincdir := $(shell $(CC) -print-file-name=include)
80--
811.7.5.4
82