diff options
| author | Palmer Dabbelt <palmer@rivosinc.com> | 2023-01-17 19:22:27 -0800 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2023-01-17 20:14:59 -0800 |
| commit | ae4d39f753080aff01830a607c22e5abc6012f41 (patch) | |
| tree | 865db95cb72902ea23526ddc3978209b8f6587fc /arch/riscv/Kconfig.socs | |
| parent | b07de94d4501c61a3015cb0035227e449c51d87e (diff) | |
| parent | 6fb4c593982a01c8a356d1ba3b54dc1852ba1404 (diff) | |
| download | linux-stable-ae4d39f753080aff01830a607c22e5abc6012f41.tar.gz linux-stable-ae4d39f753080aff01830a607c22e5abc6012f41.tar.bz2 linux-stable-ae4d39f753080aff01830a607c22e5abc6012f41.zip | |
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/20230111104848.2088516-1-conor.dooley@microchip.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'arch/riscv/Kconfig.socs')
| -rw-r--r-- | arch/riscv/Kconfig.socs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 34a54e5310a1..d36a5f39f13a 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -79,7 +79,8 @@ config SOC_CANAAN_K210_DTB_BUILTIN 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" |