diff options
| author | Tom Rini <[email protected]> | 2025-10-06 13:20:24 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-10-06 13:20:24 -0600 |
| commit | 0eaa4b337336dbbe93395d1f2ccc18937eaafea2 (patch) | |
| tree | c01e661d69181dceca68f56a4849a9bd04608521 /board/microchip | |
| parent | e50b1e8715011def8aff1588081a2649a2c6cd47 (diff) | |
| parent | 4e4a9de31de2a5f395ee25c59e4026422fbcb27e (diff) | |
Merge branch 'next'
Merge the outstanding changes from the 'next' branch to master.
Diffstat (limited to 'board/microchip')
| -rw-r--r-- | board/microchip/mpfs_generic/Kconfig (renamed from board/microchip/mpfs_icicle/Kconfig) | 6 | ||||
| -rw-r--r-- | board/microchip/mpfs_generic/MAINTAINERS | 7 | ||||
| -rw-r--r-- | board/microchip/mpfs_generic/Makefile (renamed from board/microchip/mpfs_icicle/Makefile) | 2 | ||||
| -rw-r--r-- | board/microchip/mpfs_generic/mpfs_generic.c (renamed from board/microchip/mpfs_icicle/mpfs_icicle.c) | 2 | ||||
| -rw-r--r-- | board/microchip/mpfs_icicle/MAINTAINERS | 7 |
5 files changed, 13 insertions, 11 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 c99207bc89b..f57f5f4046b 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 |