From: Nathan Chancellor <nathan@kernel.org>
To: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org
Subject: Re: [PATCH 4.19] MIPS: fix allmodconfig build with latest mkimage
Date: Sat, 14 May 2022 14:03:40 -0700 [thread overview]
Message-ID: <YoAZLPxTYsqEypGP@dev-arch.thelio-3990X> (raw)
In-Reply-To: <20220514153414.6190-1-sudip.mukherjee@sifive.com>
On Sat, May 14, 2022 at 04:34:14PM +0100, Sudip Mukherjee wrote:
> From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
>
> With the latest mkimage from U-Boot 2021.04+ the allmodconfig build
> fails. 822564cd3aa1 ("MIPS: generic: Update node names to avoid unit
> addresses") was applied for similar build failure, but it was not
> applied to 'arch/mips/generic/board-ocelot_pcb123.its.S' as that was
> removed from upstream when the patch was applied.
>
> Fixes: 822564cd3aa1 ("MIPS: generic: Update node names to avoid unit addresses")
Ah, fair enough. I missed this because the board file was renamed and
updated as part of commit 39249d776ca7 ("MIPS: mscc: add PCB120 to the
ocelot fitImage"), which was a part of 4.20... :) the upstream change
has this properly fixed and this diff matches so:
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> Cc: Nathan Chancellor <nathan@kernel.org>
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> ---
> arch/mips/generic/board-ocelot_pcb123.its.S | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/mips/generic/board-ocelot_pcb123.its.S b/arch/mips/generic/board-ocelot_pcb123.its.S
> index 5a7d5e1c878af..6dd54b7c2f076 100644
> --- a/arch/mips/generic/board-ocelot_pcb123.its.S
> +++ b/arch/mips/generic/board-ocelot_pcb123.its.S
> @@ -1,23 +1,23 @@
> /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
> / {
> images {
> - fdt@ocelot_pcb123 {
> + fdt-ocelot_pcb123 {
> description = "MSCC Ocelot PCB123 Device Tree";
> data = /incbin/("boot/dts/mscc/ocelot_pcb123.dtb");
> type = "flat_dt";
> arch = "mips";
> compression = "none";
> - hash@0 {
> + hash {
> algo = "sha1";
> };
> };
> };
>
> configurations {
> - conf@ocelot_pcb123 {
> + conf-ocelot_pcb123 {
> description = "Ocelot Linux kernel";
> - kernel = "kernel@0";
> - fdt = "fdt@ocelot_pcb123";
> + kernel = "kernel";
> + fdt = "fdt-ocelot_pcb123";
> };
> };
> };
> --
> 2.30.2
>
next prev parent reply other threads:[~2022-05-14 21:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-14 15:34 [PATCH 4.19] MIPS: fix allmodconfig build with latest mkimage Sudip Mukherjee
2022-05-14 21:03 ` Nathan Chancellor [this message]
2022-05-16 12:31 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YoAZLPxTYsqEypGP@dev-arch.thelio-3990X \
--to=nathan@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=stable@vger.kernel.org \
--cc=sudipm.mukherjee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).