| Message ID | 20230111104848.2088516-1-conor.dooley@microchip.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f1b3dc80f0bb3ad659df726a0ee5e477b2a4f223 |
| Delegated to: | Palmer Dabbelt |
| Headers | show |
| Series | [v1] RISC-V: fix incorrect type of ARCH_CANAAN_K210_DTB_SOURCE | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/patch_count | success | Link |
| conchuod/cover_letter | success | Single patches do not need cover letters |
| conchuod/tree_selection | success | Guessed tree name to be for-next |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 13 and now 13 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/alphanumeric_selects | success | Out of order selects before the patch: 57 and now 57 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/build_warn_rv64 | success | Errors and warnings before: 2054 this patch: 2054 |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 4 this patch: 4 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 9 lines checked |
| conchuod/source_inline | success | Was 0 now: 0 |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | Fixes tag looks correct |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
On Wed, Jan 11, 2023 at 11:50 AM Conor Dooley <conor.dooley@microchip.com> wrote: > 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@glider.be> > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hello: This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <palmer@rivosinc.com>: On Wed, 11 Jan 2023 10:48:49 +0000 you wrote: > 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. > > [...] Here is the summary with links: - [v1] RISC-V: fix incorrect type of ARCH_CANAAN_K210_DTB_SOURCE https://git.kernel.org/riscv/c/f1b3dc80f0bb You are awesome, thank you!
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"
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@glider.be> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> --- Palmer, this one's for you btw CC: Geert Uytterhoeven <geert+renesas@glider.be> CC: Palmer Dabbelt <palmer@dabbelt.com> CC: Damien Le Moal <damien.lemoal@opensource.wdc.com> CC: linux-riscv@lists.infradead.org --- arch/riscv/Kconfig.socs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)