* [PATCH 4.19] MIPS: fix allmodconfig build with latest mkimage
@ 2022-05-14 15:34 Sudip Mukherjee
2022-05-14 21:03 ` Nathan Chancellor
0 siblings, 1 reply; 3+ messages in thread
From: Sudip Mukherjee @ 2022-05-14 15:34 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, Sudip Mukherjee, Nathan Chancellor
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")
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 4.19] MIPS: fix allmodconfig build with latest mkimage
2022-05-14 15:34 [PATCH 4.19] MIPS: fix allmodconfig build with latest mkimage Sudip Mukherjee
@ 2022-05-14 21:03 ` Nathan Chancellor
2022-05-16 12:31 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Chancellor @ 2022-05-14 21:03 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: Greg Kroah-Hartman, stable
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 4.19] MIPS: fix allmodconfig build with latest mkimage
2022-05-14 21:03 ` Nathan Chancellor
@ 2022-05-16 12:31 ` Greg Kroah-Hartman
0 siblings, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2022-05-16 12:31 UTC (permalink / raw)
To: Nathan Chancellor; +Cc: Sudip Mukherjee, stable
On Sat, May 14, 2022 at 02:03:40PM -0700, Nathan Chancellor wrote:
> 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>
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-16 12:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-14 15:34 [PATCH 4.19] MIPS: fix allmodconfig build with latest mkimage Sudip Mukherjee
2022-05-14 21:03 ` Nathan Chancellor
2022-05-16 12:31 ` Greg Kroah-Hartman
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).