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