Messages in this thread | | | Date | Thu, 06 Jan 2022 10:01:55 -0800 (PST) | Subject | Re: [PATCH 12/12] RISC-V: defconfigs: Remove redundant K210 DT source | From | Palmer Dabbelt <> |
| |
On Sun, 21 Nov 2021 15:41:18 PST (-0800), Damien.LeMoal@wdc.com wrote: >> On 2021/11/20 1:45, Palmer Dabbelt wrote: >> From: Palmer Dabbelt <palmer@rivosinc.com> >> >> The "k210_generic" DT has been the default in Kconfig since 7d96729a9e7 >> ("riscv: Update Canaan Kendryte K210 device tree"), so drop it from the >> defconfigs to avoid diff with savedefconfig. >> >> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> >> --- >> arch/riscv/configs/nommu_k210_defconfig | 1 - >> arch/riscv/configs/nommu_k210_sdcard_defconfig | 1 - >> 2 files changed, 2 deletions(-) >> >> diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig >> index 89ab76349ea8..e8ceab678e8b 100644 >> --- a/arch/riscv/configs/nommu_k210_defconfig >> +++ b/arch/riscv/configs/nommu_k210_defconfig >> @@ -29,7 +29,6 @@ CONFIG_EMBEDDED=y >> CONFIG_SLOB=y >> # CONFIG_MMU is not set >> CONFIG_SOC_CANAAN=y >> -CONFIG_SOC_CANAAN_K210_DTB_SOURCE="k210_generic" >> CONFIG_MAXPHYSMEM_2GB=y >> CONFIG_SMP=y >> CONFIG_NR_CPUS=2 >> diff --git a/arch/riscv/configs/nommu_k210_sdcard_defconfig b/arch/riscv/configs/nommu_k210_sdcard_defconfig >> index 84b87f8bfc8f..46aa3879f19c 100644 >> --- a/arch/riscv/configs/nommu_k210_sdcard_defconfig >> +++ b/arch/riscv/configs/nommu_k210_sdcard_defconfig >> @@ -21,7 +21,6 @@ CONFIG_EMBEDDED=y >> CONFIG_SLOB=y >> # CONFIG_MMU is not set >> CONFIG_SOC_CANAAN=y >> -CONFIG_SOC_CANAAN_K210_DTB_SOURCE="k210_generic" >> CONFIG_MAXPHYSMEM_2GB=y >> CONFIG_SMP=y >> CONFIG_NR_CPUS=2 >> > > Then maybe also delete the arch/riscv/boot/dts/canaan/k210_generic.dts file too > ? It is redundant now that it is not being referenced...
IIUC that's the opposite of what's going on here. Looks like I somehow managed to get the commit wrong, which I've fixed, it's 67d96729a9e7 ("riscv: Update Canaan Kendryte K210 device tree") That contains
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 6402746c68f3..7efcece8896c 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -51,7 +51,7 @@ config SOC_CANAAN_K210_DTB_SOURCE string "Source file for the Canaan Kendryte K210 builtin DTB" depends on SOC_CANAAN depends on SOC_CANAAN_K210_DTB_BUILTIN - default "k210" + default "k210_generic" help Base name (without suffix, relative to arch/riscv/boot/dts/canaan) for the DTS file that will be used to produce the DTB linked into the
which makes the defconfig entry redundant but still references the DT file.
| |