Make all Icicle Kit files generic. This supports the addition of
upcoming support for other MPFS boards.
Signed-off-by: Jamie Gibbons <jamie.gibb...@microchip.com>
---
arch/riscv/Kconfig | 6 +++---
board/microchip/{mpfs_icicle => mpfs_generic}/Kconfig | 6 +++---
board/microchip/mpfs_generic/MAINTAINERS | 7 +++++++
board/microchip/{mpfs_icicle => mpfs_generic}/Makefile | 2 +-
.../mpfs_icicle.c => mpfs_generic/mpfs_generic.c} | 0
board/microchip/mpfs_icicle/MAINTAINERS | 7 -------
...s_icicle_defconfig => microchip_mpfs_generic_defconfig} | 2 +-
.../{microchip_mpfs_icicle.h => microchip_mpfs_generic.h} | 0
8 files changed, 15 insertions(+), 15 deletions(-)
rename board/microchip/{mpfs_icicle => mpfs_generic}/Kconfig (92%)
create mode 100644 board/microchip/mpfs_generic/MAINTAINERS
rename board/microchip/{mpfs_icicle => mpfs_generic}/Makefile (85%)
rename board/microchip/{mpfs_icicle/mpfs_icicle.c =>
mpfs_generic/mpfs_generic.c} (100%)
delete mode 100644 board/microchip/mpfs_icicle/MAINTAINERS
rename configs/{microchip_mpfs_icicle_defconfig =>
microchip_mpfs_generic_defconfig} (95%)
rename include/configs/{microchip_mpfs_icicle.h => microchip_mpfs_generic.h}
(100%)
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 04eb0e6f23c..6e6e0dfd4b5 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -23,8 +23,8 @@ config TARGET_K230_CANMV
config TARGET_LICHEERV_NANO
bool "Support LicheeRV Nano Board"
-config TARGET_MICROCHIP_ICICLE
- bool "Support Microchip PolarFire-SoC Icicle Board"
+config TARGET_MICROCHIP_GENERIC
+ bool "Support Microchip PolarFire-SoC Boards"
config TARGET_MILKV_DUO
bool "Support Milk-v Duo Board"
@@ -108,7 +108,7 @@ source "board/andestech/voyager/Kconfig"
source "board/aspeed/ibex_ast2700/Kconfig"
source "board/canaan/k230_canmv/Kconfig"
source "board/emulation/qemu-riscv/Kconfig"
-source "board/microchip/mpfs_icicle/Kconfig"
+source "board/microchip/mpfs_generic/Kconfig"
source "board/openpiton/riscv64/Kconfig"
source "board/sifive/unleashed/Kconfig"
source "board/sifive/unmatched/Kconfig"
diff --git a/board/microchip/mpfs_icicle/Kconfig
b/board/microchip/mpfs_generic/Kconfig
similarity index 92%
rename from board/microchip/mpfs_icicle/Kconfig
rename to 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 <conor.doo...@microchip.com>
+M: Jamie Gibbons <jamie.gibb...@microchip.com>
+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
similarity index 85%
rename from board/microchip/mpfs_icicle/Makefile
rename to 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 <padmarao.beg...@microchip.com>
#
-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
similarity index 100%
rename from board/microchip/mpfs_icicle/mpfs_icicle.c
rename to board/microchip/mpfs_generic/mpfs_generic.c
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 <conor.doo...@microchip.com>
-M: Cyril Jean <cyril.j...@microchip.com>
-S: Maintained
-F: board/microchip/mpfs_icicle/
-F: include/configs/microchip_mpfs_icicle.h
-F: configs/microchip_mpfs_icicle_defconfig
diff --git a/configs/microchip_mpfs_icicle_defconfig
b/configs/microchip_mpfs_generic_defconfig
similarity index 95%
rename from configs/microchip_mpfs_icicle_defconfig
rename to configs/microchip_mpfs_generic_defconfig
index 9f933592c9d..0ed0cae93eb 100644
--- a/configs/microchip_mpfs_icicle_defconfig
+++ b/configs/microchip_mpfs_generic_defconfig
@@ -9,7 +9,7 @@ CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_LOAD_ADDR=0x80200000
CONFIG_SYS_MEM_TOP_HIDE=0x400000
# CONFIG_DEBUG_UART is not set
-CONFIG_TARGET_MICROCHIP_ICICLE=y
+CONFIG_TARGET_MICROCHIP_GENERIC=y
CONFIG_ARCH_RV64I=y
CONFIG_RISCV_SMODE=y
CONFIG_FIT=y
diff --git a/include/configs/microchip_mpfs_icicle.h
b/include/configs/microchip_mpfs_generic.h
similarity index 100%
rename from include/configs/microchip_mpfs_icicle.h
rename to include/configs/microchip_mpfs_generic.h
--
2.43.0
