odroidgoA: Fix invalid DTS includes (cherry-pick from upstream)#66
Open
glebm wants to merge 2 commits intohardkernel:odroidgoA-v2017.09from
Open
odroidgoA: Fix invalid DTS includes (cherry-pick from upstream)#66glebm wants to merge 2 commits intohardkernel:odroidgoA-v2017.09from
glebm wants to merge 2 commits intohardkernel:odroidgoA-v2017.09from
Conversation
glebm
force-pushed
the
odroidgoA-v2017.09-fix-dts
branch
from
852d52b to
f97fee7
Compare
glebm
force-pushed
the
odroidgoA-v2017.09-fix-dts
branch
from
f97fee7 to
894218c
Compare
glebm
force-pushed
the
odroidgoA-v2017.09-fix-dts
branch
from
894218c to
4520c31
Compare
[ commit 9564a8cf422d7b58f6e857e3546d346fa970191e in Linux ]
I tried building using a freshly built Make (4.2.1-69-g8a731d1), but
already the objtool build broke with
orc_dump.c: In function ‘orc_dump’:
orc_dump.c:106:2: error: ‘elf_getshnum’ is deprecated [-Werror=deprecated-declarations]
if (elf_getshdrnum(elf, &nr_sections)) {
Turns out that with that new Make, the backslash was not removed, so cpp
didn't see a #include directive, grep found nothing, and
-DLIBELF_USE_DEPRECATED was wrongly put in CFLAGS.
Now, that new Make behaviour is documented in their NEWS file:
* WARNING: Backward-incompatibility!
Number signs (#) appearing inside a macro reference or function invocation
no longer introduce comments and should not be escaped with backslashes:
thus a call such as:
foo := $(shell echo '#')
is legal. Previously the number sign needed to be escaped, for example:
foo := $(shell echo '\#')
Now this latter will resolve to "\#". If you want to write makefiles
portable to both versions, assign the number sign to a variable:
C := \#
foo := $(shell echo '$C')
This was claimed to be fixed in 3.81, but wasn't, for some reason.
To detect this change search for 'nocomment' in the .FEATURES variable.
This also fixes up the two make-cmd instances to replace # with $(pound)
rather than with \#. There might very well be other places that need
similar fixup in preparation for whatever future Make release contains
the above change, but at least this builds an x86_64 defconfig with the
new make.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=197847
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
The escape sequence '\#' does not work for the latest GNU Make from the git tree. Replace it with $(pound) as Linux did. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
glebm
force-pushed
the
odroidgoA-v2017.09-fix-dts
branch
from
3004e4b to
3b8101c
Compare
glebm
added a commit
to glebm/batocera.linux
that referenced
this pull request
Nov 22, 2020
Also sent upstream: * hardkernel/u-boot#66 * hardkernel/u-boot#65
glebm
changed the title
glebm
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picks these 2 commits:
Fixes the following build errors:
The generated DTS had
\#includeinstead of#include