From: Steve Sakoman <steve@sakoman.com>
Date: Sat, 27 Jun 2020 02:39:53 +0000 (-1000)
Subject: u-boot: move redundant-yyloc-global patch to u-boot-common.inc
X-Git-Tag: 2020-04.2-dunfell~62
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2e128a775a3d51dc1856a35e2f5135d3c156d10e;p=openembedded-core.git

u-boot: move redundant-yyloc-global patch to u-boot-common.inc

gcc10 build issue occurs in both u-boot and u-boot-tools

Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch b/meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools/remove-redundant-yyloc-global.patch
rename to meta/recipes-bsp/u-boot/files/remove-redundant-yyloc-global.patch
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index edd0004792..4a17894c49 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -15,6 +15,7 @@ PE = "1"
 SRCREV = "303f8fed261020c1cb7da32dad63b610bf6873dd"
 
 SRC_URI = "git://git.denx.de/u-boot.git \
+           file://remove-redundant-yyloc-global.patch \
           "
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb
index ca8876ff98..7eaf721ca8 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb
@@ -1,4 +1,2 @@
 require u-boot-common.inc
 require u-boot-tools.inc
-
-SRC_URI += "file://remove-redundant-yyloc-global.patch"