Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-riscv into next

CI: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/27673

- Switch to upstream devicetree for TH1520 platform
- Remove fdt_high env variable
- Support SMP on RISC-V cores with Zalrsc only
- Make MPFS Generic
- riscv: dts: starfive: prune redundant jh7110-common

6 files changed, 15 insertions, 12 deletions

diff --git a/board/microchip/mpfs_icicle/Kconfig b/board/microchip/mpfs_generic/Kconfig
index 760dffc488b..8dcf55a0311 100644
--- a/board/microchip/mpfs_icicle/Kconfig
+++ b/board/microchip/mpfs_generic/Kconfig
@@ -1,7 +1,7 @@
-if TARGET_MICROCHIP_ICICLE
+if TARGET_MICROCHIP_GENERIC
 
 config SYS_BOARD
-	default "mpfs_icicle"
+	default "mpfs_generic"
 
 config SYS_VENDOR
 	default "microchip"
@@ -10,7 +10,7 @@ config SYS_CPU
 	default "generic"
 
 config SYS_CONFIG_NAME
-	default "microchip_mpfs_icicle"
+	default "microchip_mpfs_generic"
 
 config TEXT_BASE
 	default 0x80000000 if !RISCV_SMODE
diff --git a/board/microchip/mpfs_generic/MAINTAINERS b/board/microchip/mpfs_generic/MAINTAINERS
new file mode 100644
index 00000000000..3de99144c41
--- /dev/null
+++ b/board/microchip/mpfs_generic/MAINTAINERS
@@ -0,0 +1,7 @@
+Microchip MPFS Generic
+M:	Conor Dooley <[email protected]>
+M:	Jamie Gibbons <[email protected]>
+S:	Maintained
+F:	board/microchip/mpfs_generic/
+F:	include/configs/microchip_mpfs_generic.h
+F:	configs/microchip_mpfs_generic_defconfig
diff --git a/board/microchip/mpfs_icicle/Makefile b/board/microchip/mpfs_generic/Makefile
index 72b0410dda8..dfe4b2634e6 100644
--- a/board/microchip/mpfs_icicle/Makefile
+++ b/board/microchip/mpfs_generic/Makefile
@@ -4,4 +4,4 @@
 # Padmarao Begari <[email protected]>
 #
 
-obj-y	+= mpfs_icicle.o
+obj-y	+= mpfs_generic.o
diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_generic/mpfs_generic.c
index 739a9b6cd76..fac4b6aecba 100644
--- a/board/microchip/mpfs_icicle/mpfs_icicle.c
+++ b/board/microchip/mpfs_generic/mpfs_generic.c
@@ -172,6 +172,8 @@ int board_late_init(void)
 		}
 	}
 
+	mpfs_syscontroller_process_dtbo(sys_serv_priv);
+
 	return 0;
 }
 
diff --git a/board/microchip/mpfs_icicle/MAINTAINERS b/board/microchip/mpfs_icicle/MAINTAINERS
deleted file mode 100644
index d092b5a8111..00000000000
--- a/board/microchip/mpfs_icicle/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-Microchip MPFS icicle
-M:	Conor Dooley <[email protected]>
-M:	Cyril Jean <[email protected]>
-S:	Maintained
-F:	board/microchip/mpfs_icicle/
-F:	include/configs/microchip_mpfs_icicle.h
-F:	configs/microchip_mpfs_icicle_defconfig
diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c
index 3dfa931b655..fe14b44ce28 100644
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -23,7 +23,8 @@ DECLARE_GLOBAL_DATA_PTR;
 void spl_perform_fixups(struct spl_image_info *spl_image)
 {
 	/* Update the memory size which read from eeprom or DT */
-	fdt_fixup_memory(spl_image->fdt_addr, 0x40000000, gd->ram_size);
+	if (spl_image->fdt_addr)
+		fdt_fixup_memory(spl_image->fdt_addr, 0x40000000, gd->ram_size);
 }
 
 static void jh7110_jtag_init(void)