riscv: mpfs: move SoC level options to the CPU Kconfig

There are multiple boards that use the PolarFire SoC, so extract
the Kconfig sections that are determined at a CPU level from the board
Kconfigs now that we have a CPU Kconfig.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/arch/riscv/cpu/mpfs/Kconfig b/arch/riscv/cpu/mpfs/Kconfig
index 3e99c1aae3829f65581ecedf94a46d38a9358f57..bcf1ede818b3106a8d87abd37078710c8e157346 100644 (file)
--- a/arch/riscv/cpu/mpfs/Kconfig
+++ b/arch/riscv/cpu/mpfs/Kconfig
@@ -14,3 +14,20 @@ config MICROCHIP_MPFS
        imply SPL_LOAD_FIT
        imply REGMAP
        imply SYSCON
+       imply CLK_CCF
+       imply CLK_MPFS
+       imply SYS_NS16550
+       imply MACB
+       imply MII
+       imply CMD_I2C
+       imply DM_I2C
+       imply SYS_I2C_MICROCHIP
+       imply MMC
+       imply MMC_WRITE
+       imply MMC_SDHCI
+       imply MMC_SDHCI_CADENCE
+       imply MMC_SDHCI_ADMA
+       imply MMC_HS200_SUPPORT
+       imply SPI
+       imply DM_SPI
+       imply MICROCHIP_QSPI

diff --git a/board/microchip/mpfs_generic/Kconfig b/board/microchip/mpfs_generic/Kconfig
index 49663a4c5625eed8bbb3bb643c9c0da7819e99e2..d38e56c742d4f9ba71f0688cd32f0838d2cc1c1a 100644 (file)
--- a/board/microchip/mpfs_generic/Kconfig
+++ b/board/microchip/mpfs_generic/Kconfig
@@ -22,11 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
        imply SMP
-       imply CLK_CCF
-       imply CLK_MPFS
-       imply REGMAP
-       imply SYSCON
-       imply SYS_NS16550
        imply CMD_DHCP
        imply CMD_EXT2
        imply CMD_EXT4
@@ -39,23 +34,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        imply EFI_PARTITION
        imply IP_DYN
        imply ISO_PARTITION
-       imply MACB
-       imply MII
        imply PHY_LIB
        imply PHY_VITESSE
-       imply MMC
-       imply MMC_WRITE
-       imply MMC_SDHCI
-       imply MMC_SDHCI_CADENCE
-       imply MMC_SDHCI_ADMA
-       imply MMC_HS200_SUPPORT
-       imply CMD_I2C
-       imply DM_I2C
-       imply SYS_I2C_MICROCHIP
-       imply MTD
-       imply SPI
-       imply DM_SPI
-       imply MICROCHIP_COREQSPI
        imply MTD_SPI_NAND
        imply CMD_MTD
        imply CMD_MTDPARTS