From 166e34091b28ab591122d39cbf6565265ce67bd7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 28 Dec 2022 11:19:32 +0100
Subject: rockpi4-plus: switch to correct dtb, enable bluetooth support

---
 target/aarch64/Makefile                   | 2 +-
 target/aarch64/kernel/rockpi4-plus        | 3 +++
 target/aarch64/rockpi4-plus/extlinux.conf | 2 +-
 target/aarch64/rockpi4-plus/genimage.cfg  | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'target/aarch64')

diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile
index ec5e984cc..a6741fe8d 100644
--- a/target/aarch64/Makefile
+++ b/target/aarch64/Makefile
@@ -85,7 +85,7 @@ ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
 	done
 endif
 ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y)
-	${KERNEL_MAKE} rockchip/rk3399-rock-pi-4b.dtb $(MAKE_TRACE)
+	${KERNEL_MAKE} rockchip/rk3399-rock-pi-4b-plus.dtb $(MAKE_TRACE)
 endif
 	for x in $(LINUX_DIR)/arch/arm64/boot/dts/*/*.dtb; do \
 		[[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm64/boot/dts/*/*.dtb $(FW_DIR); \
diff --git a/target/aarch64/kernel/rockpi4-plus b/target/aarch64/kernel/rockpi4-plus
index c5c1446d8..237d7ba54 100644
--- a/target/aarch64/kernel/rockpi4-plus
+++ b/target/aarch64/kernel/rockpi4-plus
@@ -1173,3 +1173,6 @@ CONFIG_DAX=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_ROCKCHIP_EFUSE=y
+
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
diff --git a/target/aarch64/rockpi4-plus/extlinux.conf b/target/aarch64/rockpi4-plus/extlinux.conf
index 6bcaf3c8e..d754675c4 100644
--- a/target/aarch64/rockpi4-plus/extlinux.conf
+++ b/target/aarch64/rockpi4-plus/extlinux.conf
@@ -1,4 +1,4 @@
 label rockpi4-plus-openadk
   kernel /kernel
-  devicetree /rk3399-rock-pi-4b.dtb
+  devicetree /rk3399-rock-pi-4b-plus.dtb
   append console=ttyS2,115200n8 root=/dev/mmcblk0p2 rootwait
diff --git a/target/aarch64/rockpi4-plus/genimage.cfg b/target/aarch64/rockpi4-plus/genimage.cfg
index 9ea22a6d3..4cb5f3593 100644
--- a/target/aarch64/rockpi4-plus/genimage.cfg
+++ b/target/aarch64/rockpi4-plus/genimage.cfg
@@ -2,7 +2,7 @@ image boot.vfat {
 	vfat {
 		files = {
 			"kernel",
-			"rk3399-rock-pi-4b.dtb",
+			"rk3399-rock-pi-4b-plus.dtb",
 			"extlinux"
 		}
 	}
-- 
cgit v1.2.3