From 999a5c8c96519ad993f6226a3744af1719d8adb9 Mon Sep 17 00:00:00 2001
From: CodeChenL <2540735020@qq.com>
Date: Mon, 20 May 2024 19:21:56 +0800
Subject: [PATCH] fix: can overlays aren't compiled when kernel is bsp 6.1

* closes https://github.com/radxa-pkg/radxa-overlays/issues/316
---
 .github/workflows/build.yml                               | 2 +-
 arch/arm64/boot/dts/rockchip/overlays/Makefile            | 5 ++---
 arch/arm64/boot/dts/rockchip/overlays/Makefile.rk3588-can | 6 ++++++
 debian/rules                                              | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/overlays/Makefile.rk3588-can

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 083dd1fa..7cbe4ade 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
             do
               OVERLAY_NAME="$(basename "$i")"
               OVERLAY_NAME="${OVERLAY_NAME/.dts}.dtbo"
-              if ! grep "$OVERLAY_NAME" "${OVERLAY_PATH}/Makefile" >/dev/null 2>/dev/null
+              if ! grep "$OVERLAY_NAME" "${OVERLAY_PATH}/Makefile"* >/dev/null 2>/dev/null
               then
                 echo "$OVERLAY_NAME is not included in $VENDOR Makefile!"
                 MISSING=1
diff --git a/arch/arm64/boot/dts/rockchip/overlays/Makefile b/arch/arm64/boot/dts/rockchip/overlays/Makefile
index 75bd222a..6b312fe8 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/Makefile
+++ b/arch/arm64/boot/dts/rockchip/overlays/Makefile
@@ -18,6 +18,8 @@ ifeq ($(strip $(CONFIG_CPU_RK3588)), y)
 	CONFIG_CLK_RK3588 ?= y
 endif
 
+-include $(src)/Makefile.rk3588-can
+
 dtb-$(CONFIG_CLK_RK3308) += \
 	radxa-s0-ext-antenna.dtbo \
 	rk3308-bs-opp-1008.dtbo \
@@ -431,9 +433,6 @@ dtb-$(CONFIG_CLK_RK3588) += \
 	rock-5b-sata.dtbo
 
 dtb-$(CONFIG_CPU_RK3588) += \
-	rk3588-can1-m0.dtbo \
-	rk3588-can1-m1.dtbo \
-	rk3588-can2-m1.dtbo \
 	radxa-cm5-io-okdo-5mp.dtbo \
 	radxa-cm5-io-radxa-display-8hd.dtbo \
 	radxa-cm5-io-radxa-camera-4k.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/debian/rules b/debian/rules
index d8578efe..b442f882 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,4 +13,4 @@ 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