lkml.org 
[lkml]   [2021]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH 12/12] RISC-V: defconfigs: Remove redundant K210 DT source
Date
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...

--
Damien Le Moal
Western Digital Research

\
 
 \ /
  Last update: 2021-11-22 00:42    [W:0.176 / U:0.848 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site