[PATCH v1] RISC-V: fix incorrect type of ARCH_CANAAN_K210_DTB_SOURCE

Conor Dooley conor.dooley at microchip.com
Wed Jan 11 02:48:49 PST 2023


When adding the ARCH_ symbol for the builtin K210 dtb, I erroneously
used the bool type for something that is quite obviously a string.
Unfortunately, there is no such thing as "def_string", but in this case
we can use "default" to propagate the value of
SOC_CANAAN_K210_DTB_SOURCE to ARCH_CANAAN_K210_DTB_SOURCE.
ARCH_CANAAN_K210_DTB_SOURCE is not user selectable, so using
olddefconfig etc will update ARCH_CANAAN_K210_DTB_SOURCE to reflect any
changes made to SOC_CANAAN_K210_DTB_SOURCE.

Fixes: fc43211939bb ("RISC-V: kconfig.socs: convert usage of SOC_CANAAN to ARCH_CANAAN")
Reported-by: Geert Uytterhoeven <geert+renesas at glider.be>
Signed-off-by: Conor Dooley <conor.dooley at microchip.com>
---
Palmer, this one's for you btw

CC: Geert Uytterhoeven <geert+renesas at glider.be>
CC: Palmer Dabbelt <palmer at dabbelt.com>
CC: Damien Le Moal <damien.lemoal at opensource.wdc.com>
CC: linux-riscv at lists.infradead.org
---
 arch/riscv/Kconfig.socs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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"
-- 
2.39.0




More information about the linux-riscv mailing list