Merge patch "RISC-V: fix incorrect type of ARCH_CANAAN_K210_DTB_SOURCE"

This fixes an issue with the K210 Kconfig cleanups, I'm just merging it
from that to avoid crossing the streams.

* b4-shazam-merge:
  RISC-V: fix incorrect type of ARCH_CANAAN_K210_DTB_SOURCE

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Palmer Dabbelt <[email protected]>

diff --combined arch/riscv/Kconfig.socs
index 34a54e5310a115f5e9f7f637da59bc61c2759189,fb34ae19d454def1940f9bd7c016750b6e91b7fd..d36a5f39f13a6f8ac7a75f06841bfc68723ab345
--- 1/arch/riscv/Kconfig.socs
--- 2/arch/riscv/Kconfig.socs
+++ b/arch/riscv/Kconfig.socs
@@@ -5,6 -5,7 +5,6 @@@ config ARCH_MICROCHIP_POLARFIR
  
  config SOC_MICROCHIP_POLARFIRE
        bool "Microchip PolarFire SoCs"
 -      select MCHP_CLK_MPFS
        help
          This enables support for Microchip PolarFire SoC platforms.
  
@@@ -18,6 -19,10 +18,6 @@@ config ARCH_SIFIV
  
  config SOC_SIFIVE
        bool "SiFive SoCs"
 -      select SERIAL_SIFIVE if TTY
 -      select SERIAL_SIFIVE_CONSOLE if TTY
 -      select CLK_SIFIVE
 -      select CLK_SIFIVE_PRCI
        select ERRATA_SIFIVE if !XIP_KERNEL
        help
          This enables support for SiFive SoC platform hardware.
@@@ -56,9 -61,12 +56,9 @@@ config SOC_CANAA
        bool "Canaan Kendryte K210 SoC"
        depends on !MMU
        select CLINT_TIMER if RISCV_M_MODE
 -      select SERIAL_SIFIVE if TTY
 -      select SERIAL_SIFIVE_CONSOLE if TTY
        select ARCH_HAS_RESET_CONTROLLER
        select PINCTRL
        select COMMON_CLK
 -      select COMMON_CLK_K210
        help
          This enables support for Canaan Kendryte K210 SoC platform hardware.
  
@@@ -79,7 -87,8 +79,8 @@@ config SOC_CANAAN_K210_DTB_BUILTI
          If unsure, say Y.
  
  config ARCH_CANAAN_K210_DTB_SOURCE
-       def_bool SOC_CANAAN_K210_DTB_SOURCE
+       string
+       default SOC_CANAAN_K210_DTB_SOURCE
  
  config SOC_CANAAN_K210_DTB_SOURCE
        string "Source file for the Canaan Kendryte K210 builtin DTB"