board: microchip: icicle: rename all icicle files to generic

Make all Icicle Kit files generic. This supports the addition of
upcoming support for other MPFS boards.

Signed-off-by: Jamie Gibbons <jamie.gibbons@microchip.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index f0d2c90434955c87326e76c30239c0d67ff32d8e..265b53207779aa724326f05a0fa6a2930442d8d8 100644 (file)
--- 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 760dffc488b618b86acd6ba33b5ef69cb1c5218c..8dcf55a0311d11aad42b89e83a111bc1b7925d36 100644 (file)
--- 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 (file)
index 0000000..3de9914
--- /dev/null
+++ b/board/microchip/mpfs_generic/MAINTAINERS
@@ -0,0 +1,7 @@
+Microchip MPFS Generic
+M:     Conor Dooley <conor.dooley@microchip.com>
+M:     Jamie Gibbons <jamie.gibbons@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 72b0410dda89d6386d749210ebcebc4382316198..dfe4b2634e6d4aa92e887c228fddf1c31ca72d9e 100644 (file)
--- a/board/microchip/mpfs_icicle/Makefile
+++ b/board/microchip/mpfs_generic/Makefile
@@ -4,4 +4,4 @@
 # Padmarao Begari <padmarao.begari@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 (file)
index d092b5a..0000000
--- a/board/microchip/mpfs_icicle/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-Microchip MPFS icicle
-M:     Conor Dooley <conor.dooley@microchip.com>
-M:     Cyril Jean <cyril.jean@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 9f933592c9d189ba6fb88adc04492aff8587147c..0ed0cae93eb3c52a2fde3ed85d2fe692126b5427 100644 (file)
--- 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