fix: modified as required by issues

CodeChenL · May 21, 2024 · 22b19dd · 22b19dd
1 parent 5b485ed
commit 22b19dd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git 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
@@ -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
diff --git 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