Milk-V Duo now uses the upstream devicetree, so the local board dts and CV1800B dtsi are no longer used. Remove them and drop the local dtb target from arch/riscv/dts/Makefile.
Keep cv18xx.dtsi since it is still used by the SG2002 local devicetree. Signed-off-by: Zhuxu Ran <[email protected]> --- arch/riscv/dts/Makefile | 1 - arch/riscv/dts/cv1800b-milkv-duo.dts | 64 ------------------------------------ arch/riscv/dts/cv1800b.dtsi | 22 ------------- 3 files changed, 87 deletions(-) diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile index 8e591cb7aa9..498aa6c7f5d 100644 --- a/arch/riscv/dts/Makefile +++ b/arch/riscv/dts/Makefile @@ -5,7 +5,6 @@ dtb-$(CONFIG_TARGET_ANDES_VOYAGER) += qilai-voyager.dtb dtb-$(CONFIG_TARGET_BANANAPI_F3) += k1-bananapi-f3.dtb dtb-$(CONFIG_TARGET_K230_CANMV) += k230-canmv.dtb dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += mpfs-icicle-kit.dtb -dtb-$(CONFIG_TARGET_MILKV_DUO) += cv1800b-milkv-duo.dtb dtb-$(CONFIG_TARGET_LICHEERV_NANO) += sg2002-licheerv-nano-b.dtb dtb-$(CONFIG_TARGET_QEMU_VIRT) += qemu-virt32.dtb qemu-virt64.dtb dtb-$(CONFIG_TARGET_OPENPITON_RISCV64) += openpiton-riscv64.dtb diff --git a/arch/riscv/dts/cv1800b-milkv-duo.dts b/arch/riscv/dts/cv1800b-milkv-duo.dts deleted file mode 100644 index e7cc0e8bd14..00000000000 --- a/arch/riscv/dts/cv1800b-milkv-duo.dts +++ /dev/null @@ -1,64 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright (C) 2023 Jisheng Zhang <[email protected]> - */ - -/dts-v1/; - -#include "cv1800b.dtsi" - -/ { - model = "Milk-V Duo"; - compatible = "milkv,duo", "sophgo,cv1800b"; - - aliases { - serial0 = &uart0; - serial1 = &uart1; - serial2 = &uart2; - serial3 = &uart3; - serial4 = &uart4; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - memory@80000000 { - device_type = "memory"; - reg = <0x80000000 0x3f40000>; - }; -}; - -ðernet0 { - status = "okay"; - phy-mode = "rmii"; -}; - -&osc { - clock-frequency = <25000000>; -}; - -&sdhci0 { - status = "okay"; - bus-width = <4>; - no-1-8-v; - no-mmc; - no-sdio; -}; - -&spif { - status = "okay"; - - spiflash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <75000000>; - spi-tx-bus-width = <4>; - spi-rx-bus-width = <4>; - m25p,fast-read; - }; -}; - -&uart0 { - status = "okay"; -}; diff --git a/arch/riscv/dts/cv1800b.dtsi b/arch/riscv/dts/cv1800b.dtsi deleted file mode 100644 index baf641829e7..00000000000 --- a/arch/riscv/dts/cv1800b.dtsi +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright (C) 2023 Jisheng Zhang <[email protected]> - */ - -#include "cv18xx.dtsi" - -/ { - compatible = "sophgo,cv1800b"; -}; - -&plic { - compatible = "sophgo,cv1800b-plic", "thead,c900-plic"; -}; - -&clint { - compatible = "sophgo,cv1800b-clint", "thead,c900-clint"; -}; - -&clk { - compatible = "sophgo,cv1800-clk"; -}; -- 2.55.0

