]> git.itanic.dy.fi Git - linux-stable/commit
MIPS: generic: Update node names to avoid unit addresses
authorNathan Chancellor <nathan@kernel.org>
Fri, 9 Apr 2021 19:21:28 +0000 (12:21 -0700)
committerSasha Levin <sashal@kernel.org>
Wed, 30 Jun 2021 12:48:29 +0000 (08:48 -0400)
commit822564cd3aa1a6a092cc227e394f31f902864b88
treeb6920617fa74617f380d30d223c70161511be4e6
parent6edee499192828dc5e885241de12185f5b6df594
MIPS: generic: Update node names to avoid unit addresses

commit e607ff630c6053ecc67502677c0e50053d7892d4 upstream.

With the latest mkimage from U-Boot 2021.04, the generic defconfigs no
longer build, failing with:

/usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1

This is expected after the linked U-Boot commits because '@' is
forbidden in the node names due to the way that libfdt treats nodes with
the same prefix but different unit addresses.

Switch the '@' in the node name to '-'. Drop the unit addresses from the
hash and kernel child nodes because there is only one node so they do
not need to have a number to differentiate them.

Cc: stable@vger.kernel.org
Link: https://source.denx.de/u-boot/u-boot/-/commit/79af75f7776fc20b0d7eb6afe1e27c00fdb4b9b4
Link: https://source.denx.de/u-boot/u-boot/-/commit/3f04db891a353f4b127ed57279279f851c6b4917
Suggested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
[nathan: Backport to 4.19, only apply to .its.S files that exist]
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/generic/board-boston.its.S
arch/mips/generic/board-ni169445.its.S
arch/mips/generic/board-xilfpga.its.S
arch/mips/generic/vmlinux.its.S