diff --git a/arch/arm64/boot/dts/rockchip/overlays/Makefile b/arch/arm64/boot/dts/rockchip/overlays/Makefile index 3a6a0221..dedc62ae 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/Makefile +++ b/arch/arm64/boot/dts/rockchip/overlays/Makefile @@ -18,8 +18,7 @@ ifeq ($(strip $(CONFIG_CPU_RK3588)), y) CONFIG_CLK_RK3588 ?= y endif -src ?= arch/arm64/boot/dts/rockchip/overlays -include $(src)/rk3588-can.mak +-include arch/arm64/boot/dts/rockchip/overlays/Makefile.rk3588-can dtb-$(CONFIG_CLK_RK3308) += \ radxa-s0-ext-antenna.dtbo \ diff --git a/arch/arm64/boot/dts/rockchip/overlays/Makefile.rk3588-can b/arch/arm64/boot/dts/rockchip/overlays/Makefile.rk3588-can new file mode 100644 index 00000000..151a8a63 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/overlays/Makefile.rk3588-can @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 + +dtb-$(CONFIG_CPU_RK3588) += \ + rk3588-can1-m0.dtbo \ + rk3588-can1-m1.dtbo \ + rk3588-can2-m1.dtbo diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-can.mak b/arch/arm64/boot/dts/rockchip/overlays/rk3588-can.mak deleted file mode 100644 index c0b2583b..00000000 --- a/arch/arm64/boot/dts/rockchip/overlays/rk3588-can.mak +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - - -# Can-related overlays are not compiled when kernel version is bsp 6.1. -ifeq ($(shell echo $(KERNELRELEASE) | grep -q '6\.1\..*-rk2312' && echo 1 || echo 0),0) - dtb-$(CONFIG_CPU_RK3588) += \ - rk3588-can1-m0.dtbo \ - rk3588-can1-m1.dtbo \ - rk3588-can2-m1.dtbo -endif \ No newline at end of file diff --git a/debian/rules b/debian/rules index d8578efe..e93f1952 100755 --- a/debian/rules +++ b/debian/rules @@ -13,4 +13,7 @@ override_dh_builddeb: dh_builddeb -- -Zxz override_dh_install: - DEB_VERSION=$(DEB_VERSION) dh_install + DEB_VERSION=$(DEB_VERSION) dh_install -X arch/arm64/boot/dts/rockchip/overlays/Makefile.rk3588-can \ + -X arch/arm64/boot/dts/rockchip/overlays/rk3588-can1-m0.dts \ + -X arch/arm64/boot/dts/rockchip/overlays/rk3588-can1-m1.dts \ + -X arch/arm64/boot/dts/rockchip/overlays/rk3588-can2-m1.dts