Skip to content

Commit

Permalink
fix: can overlays aren't compiled when kernel is bsp 6.1
Browse files Browse the repository at this point in the history
* closes radxa-pkg#316
  • Loading branch information
CodeChenL committed May 22, 2024
1 parent 1651015 commit 999a5c8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions arch/arm64/boot/dts/rockchip/overlays/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
6 changes: 6 additions & 0 deletions arch/arm64/boot/dts/rockchip/overlays/Makefile.rk3588-can
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 999a5c8

Please sign in to comment.