Unverified Commit 08734e05 authored by Damien Le Moal's avatar Damien Le Moal Committed by Palmer Dabbelt
Browse files

riscv: Use vendor name for K210 SoC support 



Rename configuration options and directories related to the Kendryte
K210 SoC to use the SoC vendor name (canaan) instead of the "kendryte"
branding name.

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent d5805af9

arch/riscv/Kconfig.socs

+12 −12
Original line number Diff line number Diff line
@@ -22,21 +22,21 @@ config SOC_VIRT 
	help

	  This enables support for QEMU Virt Machine.



config SOC_KENDRYTE

	bool "Kendryte K210 SoC"

config SOC_CANAAN

	bool "Canaan Kendryte K210 SoC"

	depends on !MMU

	select CLINT_TIMER if RISCV_M_MODE

	select SERIAL_SIFIVE if TTY

	select SERIAL_SIFIVE_CONSOLE if TTY

	select SIFIVE_PLIC

	help

	  This enables support for Kendryte K210 SoC platform hardware.

	  This enables support for Canaan Kendryte K210 SoC platform hardware.



if SOC_KENDRYTE

if SOC_CANAAN



config SOC_KENDRYTE_K210_DTB_BUILTIN

	bool "Builtin device tree for the Kendryte K210"

	depends on SOC_KENDRYTE

config SOC_CANAAN_K210_DTB_BUILTIN

	bool "Builtin device tree for the Canaan Kendryte K210"

	depends on SOC_CANAAN

	default y

	select OF

	select BUILTIN_DTB
@@ -45,13 +45,13 @@ config SOC_KENDRYTE_K210_DTB_BUILTIN 
	  This option should be selected if no bootloader is being used.

	  If unsure, say Y.



config SOC_KENDRYTE_K210_DTB_SOURCE

	string "Source file for the Kendryte K210 builtin DTB"

	depends on SOC_KENDRYTE

	depends on SOC_KENDRYTE_K210_DTB_BUILTIN

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"

	help

	  Base name (without suffix, relative to arch/riscv/boot/dts/kendryte)

	  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

	  kernel.

arch/riscv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ PHONY += vdso_install 
vdso_install:

	$(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@



ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_KENDRYTE),yy)

ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy)

KBUILD_IMAGE := $(boot)/loader.bin

else

KBUILD_IMAGE := $(boot)/Image.gz

arch/riscv/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

subdir-y += sifive

subdir-$(CONFIG_SOC_KENDRYTE) += kendryte

subdir-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) += canaan



obj-$(CONFIG_BUILTIN_DTB) := $(addsuffix /, $(subdir-y))

arch/riscv/boot/dts/canaan/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

ifneq ($(CONFIG_SOC_CANAAN_K210_DTB_SOURCE),"")

dtb-y += $(strip $(shell echo $(CONFIG_SOC_CANAAN_K210_DTB_SOURCE))).dtb

obj-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) += $(addsuffix .o, $(dtb-y))

endif