arch:riscv:modify Kconfig.socs

Kconfig.socs: remove the definitions like 'STARFIVE_BOARD_FPGA'.
drivers:watchdog: change the definition.

Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>

diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
index cb87acd..31428dc 100755 (executable)
--- a/arch/riscv/Kconfig.socs
+++ b/arch/riscv/Kconfig.socs
@@ -95,29 +95,6 @@ config USB_CDNS3_HOST_FLUSH_DMA
 
 endmenu
 
-choice
-       prompt "StarFive JH SOCs board type"
-       depends on SOC_STARFIVE
-       default STARFIVE_BOARD_FPGA
-       help
-               choice StarFive JH7110 SOC board type
-
-       config STARFIVE_BOARD_FPGA
-               bool "FPGA"
-               help
-                       This enables support for StarFive SoC FPGA board type Hardware.
-
-       config STARFIVE_BOARD_EVB
-               bool "EVB"
-               help
-                       This enables support for StarFive SoC EVB board type Hardware.
-
-       config STARFIVE_BOARD_VISIONFIVE
-               bool "Visionfive"
-               help
-                       This enables support for StarFive SoC Visionfive board type Hardware.
-endchoice
-
 config SOC_VIRT
        bool "QEMU Virt Machine"
        select CLINT_TIMER if RISCV_M_MODE

diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
index d05a668..6965409 100755 (executable)
--- a/drivers/watchdog/starfive-wdt.c
+++ b/drivers/watchdog/starfive-wdt.c
@@ -200,7 +200,7 @@ MODULE_DEVICE_TABLE(platform, si5wdt_ids);
 
 static int si5wdt_get_clock_rate(struct stf_si5_wdt *wdt)
 {
-#ifdef CONFIG_STARFIVE_BOARD_FPGA
+#ifdef HWBOARD_FPGA
        int ret;
        u32 freq;