diff options
| -rw-r--r-- | package/brcm-bluetooth/files/hci | 3 | ||||
| -rw-r--r-- | package/u-boot/files/boot.script.rockpi4 | 2 | ||||
| -rw-r--r-- | target/aarch64/Makefile | 2 | ||||
| -rw-r--r-- | target/aarch64/kernel/rockpi4-plus | 3 | ||||
| -rw-r--r-- | target/aarch64/rockpi4-plus/extlinux.conf | 2 | ||||
| -rw-r--r-- | target/aarch64/rockpi4-plus/genimage.cfg | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.bluetooth | 12 |
7 files changed, 17 insertions, 9 deletions
diff --git a/package/brcm-bluetooth/files/hci b/package/brcm-bluetooth/files/hci index 69716e147..ecc86a210 100644 --- a/package/brcm-bluetooth/files/hci +++ b/package/brcm-bluetooth/files/hci @@ -11,10 +11,9 @@ start) target=$(cat /etc/.adktarget) case $target in raspberry-pi3 | raspberry-pi3p) - hciattach /dev/ttyAMA0 bcm43xx 921600 noflow - + btattach -B /dev/ttyAMA0 -P bcm ;; *) - echo "No supported target found" ;; esac ;; diff --git a/package/u-boot/files/boot.script.rockpi4 b/package/u-boot/files/boot.script.rockpi4 index 1aca0bddb..73836ac94 100644 --- a/package/u-boot/files/boot.script.rockpi4 +++ b/package/u-boot/files/boot.script.rockpi4 @@ -1,4 +1,4 @@ setenv bootargs console=ttyS2,115200 root=/dev/mmcblk0p1 rootwait ext4load mmc 1:1 $kernel_addr_r boot/kernel -ext4load mmc 1:1 $fdt_addr_r boot/rk3399-rock-pi-4b.dtb +ext4load mmc 1:1 $fdt_addr_r boot/rk3399-rock-pi-4b-plus.dtb booti $kernel_addr_r - $fdt_addr_r 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" } } diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index 9c549620e..44df845af 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -132,12 +132,18 @@ config ADK_LINUX_KERNEL_BT_HCIUART_3WIRE depends on ADK_LINUX_KERNEL_BT_HCIUART default n +config ADK_LINUX_KERNEL_BT_HCIUART_SERDEV + bool + depends on ADK_LINUX_KERNEL_BT_HCIUART + default n + config ADK_LINUX_KERNEL_BT_HCIUART_BCM - tristate "Broadcom protocol support" - select ADK_LINUX_KERNEL_BT_HCIUART + bool "Broadcom protocol support" + select ADK_LINUX_KERNEL_BT_HCIUART_SERDEV select ADK_LINUX_KERNEL_BT_HCIUART_3WIRE select ADK_LINUX_KERNEL_BT_BCM - depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3 + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3 || \ + ADK_TARGET_SYSTEM_ROCKPI4_PLUS default n help The Broadcom protocol support enables Bluetooth HCI over serial |