diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-11-13 07:13:08 +0000 |
---|---|---|
committer | Dan Murphy <dmurphy@ti.com> | 2020-11-19 10:33:45 -0600 |
commit | efabc3ccceec3d6e65f7fae5e15bec763c1078ea (patch) | |
tree | 750f04d38cbcd517cb09f355df58f911836c5baf /recipes-bsp | |
parent | 07209f738f14c98e84874573c98a948ba894ecf3 (diff) | |
download | meta-ti-efabc3ccceec3d6e65f7fae5e15bec763c1078ea.tar.gz |
u-boot-ti-staging_2020.01: Fix build on hosts with gcc10 on them
Backport a patch from upstream to fix build on distros with gcc10+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch | 28 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb | 4 |
2 files changed, 31 insertions, 1 deletions
diff --git a/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch new file mode 100644 index 00000000..4973ea9d --- /dev/null +++ b/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From b436a29de12d3f1da579edf3e3d4d42a60b9e58a Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Robinson <pbrobinson@gmail.com> | ||
3 | Date: Thu, 30 Jan 2020 09:37:15 +0000 | ||
4 | Subject: [PATCH] Remove redundant YYLOC global declaration | ||
5 | |||
6 | Same as the upstream fix for building dtc with gcc 10. | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/018921ee79d3f30893614b3b2b63b588d8544f73] | ||
9 | Signed-off-by: Peter Robinson <pbrobinson@gmail.com> | ||
10 | --- | ||
11 | scripts/dtc/dtc-lexer.l | 1 - | ||
12 | 1 file changed, 1 deletion(-) | ||
13 | |||
14 | diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l | ||
15 | index fd825ebba6..24af549977 100644 | ||
16 | --- a/scripts/dtc/dtc-lexer.l | ||
17 | +++ b/scripts/dtc/dtc-lexer.l | ||
18 | @@ -38,7 +38,6 @@ LINECOMMENT "//".*\n | ||
19 | #include "srcpos.h" | ||
20 | #include "dtc-parser.tab.h" | ||
21 | |||
22 | -YYLTYPE yylloc; | ||
23 | extern bool treesource_error; | ||
24 | |||
25 | /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ | ||
26 | -- | ||
27 | 2.29.2 | ||
28 | |||
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb index 991ba0ca..29fa6ee6 100644 --- a/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +++ b/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb | |||
@@ -1,7 +1,9 @@ | |||
1 | require u-boot-ti.inc | 1 | require u-boot-ti.inc |
2 | 2 | ||
3 | PR = "r22" | 3 | PR = "r23" |
4 | 4 | ||
5 | BRANCH = "ti-u-boot-2020.01" | 5 | BRANCH = "ti-u-boot-2020.01" |
6 | 6 | ||
7 | SRCREV = "3c9ebdb87d65aacc4ec302be8bef3df15364bacd" | 7 | SRCREV = "3c9ebdb87d65aacc4ec302be8bef3df15364bacd" |
8 | |||
9 | SRC_URI += "file://0001-Remove-redundant-YYLOC-global-declaration.patch" | ||