summaryrefslogtreecommitdiffstats
path: root/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-01-25 09:37:59 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-02-01 06:58:36 +0000
commit12f3a11c1930152c17c70e34dc01c80feca20333 (patch)
treedad2d9ad2dfb5e2f36461872dd612d4fae216c08 /meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
parent334546f57a18032f146bab09fe3f097db254b1b2 (diff)
downloadmeta-boot2qt-12f3a11c1930152c17c70e34dc01c80feca20333.tar.gz
nitrogen6x: update u-boot-boundary patches
Update meta-boundary to master branch where thud layer compatibility is set & update patches for yocto thud Task-number: QTBUG-72413 Change-Id: Ie654dbb1d82799e3170e947cf80baf64aa725ab6 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch')
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
index c5fa923..49af5e5 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
@@ -1,4 +1,4 @@
1From 22c5a278b98cf6ea4e4a402bca19d1354ab3c431 Mon Sep 17 00:00:00 2001 1From baed831959ba41b8d1cebfb5d960ddfa847ae915 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 25 Sep 2018 16:05:17 +0300 3Date: Tue, 25 Sep 2018 16:05:17 +0300
4Subject: [PATCH] Disable build for tools and use mkimage from sysroot 4Subject: [PATCH] Disable build for tools and use mkimage from sysroot
@@ -11,10 +11,10 @@ fails when trying to compile with host gcc: unable to execute
11 2 files changed, 2 insertions(+), 2 deletions(-) 11 2 files changed, 2 insertions(+), 2 deletions(-)
12 12
13diff --git a/Makefile b/Makefile 13diff --git a/Makefile b/Makefile
14index 119ad49eec..022690e26e 100644 14index 7d5f801eea..d5d44c5def 100644
15--- a/Makefile 15--- a/Makefile
16+++ b/Makefile 16+++ b/Makefile
17@@ -698,7 +698,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/) 17@@ -730,7 +730,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
18 18
19 libs-y := $(sort $(libs-y)) 19 libs-y := $(sort $(libs-y))
20 20
@@ -24,13 +24,15 @@ index 119ad49eec..022690e26e 100644
24 u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-)))) 24 u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-))))
25 25
26diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib 26diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
27index 80ddb08474..e86c949f08 100644 27index f8c3fff1d1..f24ea9cc25 100644
28--- a/scripts/Makefile.lib 28--- a/scripts/Makefile.lib
29+++ b/scripts/Makefile.lib 29+++ b/scripts/Makefile.lib
30@@ -493,5 +493,5 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ 30@@ -508,7 +508,7 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
31 # --------------------------------------------------------------------------- 31 # ---------------------------------------------------------------------------
32 MKIMAGEOUTPUT ?= /dev/null 32 MKIMAGEOUTPUT ?= /dev/null
33 quiet_cmd_mkimage = MKIMAGE $@ 33 quiet_cmd_mkimage = MKIMAGE $@
34-cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ 34-cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
35+cmd_mkimage = mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ 35+cmd_mkimage = mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
36 $(if $(KBUILD_VERBOSE:1=), >$(MKIMAGEOUTPUT)) 36 >$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT))
37
38 # fdtgrep