]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/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)
committerKelsey Skunberg <kelsey.skunberg@canonical.com>
Mon, 24 May 2021 23:46:13 +0000 (17:46 -0600)
commit3ad8a030cd23818e4857f0f9528ff11a91a4f7c0
treed1d2a9379b243a9ade87dadb71b899b696dc650c
parent2a49bc120e1bffe9f26d8e1494acaa066bf80da9
MIPS: generic: Update node names to avoid unit addresses

BugLink: https://bugs.launchpad.net/bugs/1929455
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
arch/mips/generic/board-boston.its.S
arch/mips/generic/board-jaguar2.its.S
arch/mips/generic/board-luton.its.S
arch/mips/generic/board-ni169445.its.S
arch/mips/generic/board-ocelot.its.S
arch/mips/generic/board-serval.its.S
arch/mips/generic/board-xilfpga.its.S
arch/mips/generic/vmlinux.its.S