From bca04036ffc9fd6f891eafb7996510dce9af0fbc Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 4 Jun 2023 19:55:11 +0100 Subject: [PATCH] mediatek: use updated device tree overlay mechanism for BPi-R64 Use new device tree overlay mechanism for the BananaPi BPi-R64 board. Signed-off-by: Daniel Golle (cherry picked from commit 34bb33094a5e49c727b76b20394d252f3e2ba70d) --- target/linux/mediatek/image/mt7622.mk | 2 ++ .../base-files/etc/board.d/05_compat-version | 15 +++++++++++++++ ...dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch | 4 ++-- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 target/linux/mediatek/mt7622/base-files/etc/board.d/05_compat-version diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index 92824ff24a..c02390100b 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -96,6 +96,8 @@ define Device/bananapi_bpi-r64 KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb with-initrd | pad-to 128k IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb external-static-with-rootfs | append-metadata + DEVICE_COMPAT_VERSION := 1.1 + DEVICE_COMPAT_MESSAGE := Device tree overlay mechanism needs bootloader update endef TARGET_DEVICES += bananapi_bpi-r64 diff --git a/target/linux/mediatek/mt7622/base-files/etc/board.d/05_compat-version b/target/linux/mediatek/mt7622/base-files/etc/board.d/05_compat-version new file mode 100644 index 0000000000..c8fb2c08f6 --- /dev/null +++ b/target/linux/mediatek/mt7622/base-files/etc/board.d/05_compat-version @@ -0,0 +1,15 @@ + +. /lib/functions.sh +. /lib/functions/uci-defaults.sh + +board_config_update + +case "$(board_name)" in + bananapi,bpi-r64) + ucidef_set_compat_version "1.1" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/mediatek/patches-5.15/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch b/target/linux/mediatek/patches-5.15/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch index b15d04f8bb..f779c1e047 100644 --- a/target/linux/mediatek/patches-5.15/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch +++ b/target/linux/mediatek/patches-5.15/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch @@ -10,7 +10,7 @@ gpios = <90 GPIO_ACTIVE_HIGH>; output-high; --- /dev/null -+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64-sata.dts ++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64-sata.dtso @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ + @@ -44,7 +44,7 @@ + }; +}; --- /dev/null -+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64-pcie1.dts ++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64-pcie1.dtso @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ + -- 2.30.2