From 8e21b8a53bd0fc97481ebe3c203a6b8b832ef1bc Mon Sep 17 00:00:00 2001 From: Joshua Riek Date: Sun, 23 Jun 2024 13:29:48 -0400 Subject: [PATCH] install camera-engine-rkaiq by default for rk3588 --- config/boards/armsom-sige7.sh | 3 +++ config/boards/armsom-w3.sh | 3 +++ config/boards/indiedroid-nova.sh | 3 +++ config/boards/lubancat-4.sh | 3 +++ config/boards/mixtile-blade3.sh | 3 +++ config/boards/mixtile-core3588e.sh | 3 +++ config/boards/nanopc-t6.sh | 3 +++ config/boards/nanopi-r6c.sh | 3 +++ config/boards/nanopi-r6s.sh | 3 +++ config/boards/orangepi-5-plus.sh | 3 +++ config/boards/orangepi-5-pro.sh | 3 +++ config/boards/orangepi-5.sh | 3 +++ config/boards/orangepi-5b.sh | 3 +++ config/boards/radxa-cm5-io.sh | 3 +++ config/boards/radxa-cm5-rpi-cm4-io.sh | 3 +++ config/boards/radxa-nx5-io.sh | 3 +++ config/boards/roc-rk3588s-pc.sh | 3 +++ config/boards/rock-5-itx.sh | 3 +++ config/boards/rock-5a.sh | 3 +++ config/boards/rock-5b-plus.sh | 3 +++ config/boards/rock-5b.sh | 3 +++ config/boards/rock-5c.sh | 3 +++ config/boards/rock-5d.sh | 3 +++ config/boards/turing-rk1.sh | 3 +++ 24 files changed, 72 insertions(+) diff --git a/config/boards/armsom-sige7.sh b/config/boards/armsom-sige7.sh index 7634fbef..f2540a7a 100755 --- a/config/boards/armsom-sige7.sh +++ b/config/boards/armsom-sige7.sh @@ -20,6 +20,9 @@ function config_image_hook__armsom-sige7() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Enable bluetooth for AP6275P mkdir -p "${rootfs}/usr/lib/scripts" cp "${overlay}/usr/lib/systemd/system/ap6275p-bluetooth.service" "${rootfs}/usr/lib/systemd/system/ap6275p-bluetooth.service" diff --git a/config/boards/armsom-w3.sh b/config/boards/armsom-w3.sh index f8968be5..4a231fe5 100755 --- a/config/boards/armsom-w3.sh +++ b/config/boards/armsom-w3.sh @@ -20,6 +20,9 @@ function config_image_hook__armsom-w3() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Fix and configure audio device mkdir -p "${rootfs}"/usr/lib/scripts cp "${overlay}/usr/lib/scripts/alsa-audio-config" "${rootfs}/usr/lib/scripts/alsa-audio-config" diff --git a/config/boards/indiedroid-nova.sh b/config/boards/indiedroid-nova.sh index 795deb80..5776e753 100755 --- a/config/boards/indiedroid-nova.sh +++ b/config/boards/indiedroid-nova.sh @@ -20,6 +20,9 @@ function config_image_hook__indiedroid-nova() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Enable the on-board WiFi / Bluetooth module RTL8821CS cp "${overlay}/usr/bin/rtk_hciattach" "${rootfs}/usr/bin/rtk_hciattach" cp "${overlay}/usr/bin/bt_load_rtk_firmware" "${rootfs}/usr/bin/bt_load_rtk_firmware" diff --git a/config/boards/lubancat-4.sh b/config/boards/lubancat-4.sh index 8e5fa727..7e191516 100755 --- a/config/boards/lubancat-4.sh +++ b/config/boards/lubancat-4.sh @@ -19,5 +19,8 @@ function config_image_hook__lubancat-4() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/mixtile-blade3.sh b/config/boards/mixtile-blade3.sh index 4ef16404..34575a95 100755 --- a/config/boards/mixtile-blade3.sh +++ b/config/boards/mixtile-blade3.sh @@ -19,5 +19,8 @@ function config_image_hook__mixtile-blade3() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/mixtile-core3588e.sh b/config/boards/mixtile-core3588e.sh index 6270a269..5ab0a895 100755 --- a/config/boards/mixtile-core3588e.sh +++ b/config/boards/mixtile-core3588e.sh @@ -19,5 +19,8 @@ function config_image_hook__mixtile-core3588e() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/nanopc-t6.sh b/config/boards/nanopc-t6.sh index 77126b12..dc5af12a 100755 --- a/config/boards/nanopc-t6.sh +++ b/config/boards/nanopc-t6.sh @@ -19,5 +19,8 @@ function config_image_hook__nanopc-t6() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/nanopi-r6c.sh b/config/boards/nanopi-r6c.sh index 80caffad..78fda4bd 100755 --- a/config/boards/nanopi-r6c.sh +++ b/config/boards/nanopi-r6c.sh @@ -19,5 +19,8 @@ function config_image_hook__nanopi-r6c() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/nanopi-r6s.sh b/config/boards/nanopi-r6s.sh index 0edf5d03..4443a08e 100755 --- a/config/boards/nanopi-r6s.sh +++ b/config/boards/nanopi-r6s.sh @@ -19,5 +19,8 @@ function config_image_hook__nanopi-r6s() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/orangepi-5-plus.sh b/config/boards/orangepi-5-plus.sh index 12244721..574360f0 100755 --- a/config/boards/orangepi-5-plus.sh +++ b/config/boards/orangepi-5-plus.sh @@ -20,6 +20,9 @@ function config_image_hook__orangepi-5-plus() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Fix WiFi not working when bluetooth enabled for the official RTL8852BE WiFi + BT card mkdir -p "${rootfs}"/usr/lib/scripts cp "${overlay}/usr/lib/systemd/system/rtl8852be-reload.service" "${rootfs}/usr/lib/systemd/system/rtl8852be-reload.service" diff --git a/config/boards/orangepi-5-pro.sh b/config/boards/orangepi-5-pro.sh index d1d9736a..3a84f19a 100755 --- a/config/boards/orangepi-5-pro.sh +++ b/config/boards/orangepi-5-pro.sh @@ -20,6 +20,9 @@ function config_image_hook__orangepi-5-pro() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Enable bluetooth cp "${overlay}/usr/bin/brcm_patchram_plus" "${rootfs}/usr/bin/brcm_patchram_plus" cp "${overlay}/usr/lib/systemd/system/ap6256-bluetooth.service" "${rootfs}/usr/lib/systemd/system/ap6256-bluetooth.service" diff --git a/config/boards/orangepi-5.sh b/config/boards/orangepi-5.sh index 0a49f0ef..adefbf03 100755 --- a/config/boards/orangepi-5.sh +++ b/config/boards/orangepi-5.sh @@ -21,6 +21,9 @@ function config_image_hook__orangepi-5() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Enable bluetooth for AP6275P mkdir -p "${rootfs}/usr/lib/scripts" cp "${overlay}/usr/lib/systemd/system/ap6275p-bluetooth.service" "${rootfs}/usr/lib/systemd/system/ap6275p-bluetooth.service" diff --git a/config/boards/orangepi-5b.sh b/config/boards/orangepi-5b.sh index a5e37def..ba294127 100755 --- a/config/boards/orangepi-5b.sh +++ b/config/boards/orangepi-5b.sh @@ -20,6 +20,9 @@ function config_image_hook__orangepi-5b() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Enable bluetooth for AP6275P mkdir -p "${rootfs}/usr/lib/scripts" cp "${overlay}/usr/lib/systemd/system/ap6275p-bluetooth.service" "${rootfs}/usr/lib/systemd/system/ap6275p-bluetooth.service" diff --git a/config/boards/radxa-cm5-io.sh b/config/boards/radxa-cm5-io.sh index 30c5a325..2deba724 100755 --- a/config/boards/radxa-cm5-io.sh +++ b/config/boards/radxa-cm5-io.sh @@ -20,6 +20,9 @@ function config_image_hook__radxa-cm5-io() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Fix and configure audio device mkdir -p "${rootfs}/usr/lib/scripts" cp "${overlay}/usr/lib/scripts/alsa-audio-config" "${rootfs}/usr/lib/scripts/alsa-audio-config" diff --git a/config/boards/radxa-cm5-rpi-cm4-io.sh b/config/boards/radxa-cm5-rpi-cm4-io.sh index 9aad942a..af02fe70 100755 --- a/config/boards/radxa-cm5-rpi-cm4-io.sh +++ b/config/boards/radxa-cm5-rpi-cm4-io.sh @@ -20,6 +20,9 @@ function config_image_hook__radxa-cm5-rpi-cm4-io() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Fix and configure audio device mkdir -p "${rootfs}/usr/lib/scripts" cp "${overlay}/usr/lib/scripts/alsa-audio-config" "${rootfs}/usr/lib/scripts/alsa-audio-config" diff --git a/config/boards/radxa-nx5-io.sh b/config/boards/radxa-nx5-io.sh index 304b58b8..ab7aec45 100755 --- a/config/boards/radxa-nx5-io.sh +++ b/config/boards/radxa-nx5-io.sh @@ -19,5 +19,8 @@ function config_image_hook__radxa-nx-io() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/roc-rk3588s-pc.sh b/config/boards/roc-rk3588s-pc.sh index 467ccb52..a515b0b8 100755 --- a/config/boards/roc-rk3588s-pc.sh +++ b/config/boards/roc-rk3588s-pc.sh @@ -19,5 +19,8 @@ function config_image_hook__roc-rk3588s-pc() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/rock-5-itx.sh b/config/boards/rock-5-itx.sh index 96a350f3..1951b5bf 100755 --- a/config/boards/rock-5-itx.sh +++ b/config/boards/rock-5-itx.sh @@ -19,5 +19,8 @@ function config_image_hook__rock-5-itx() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + return 0 } diff --git a/config/boards/rock-5a.sh b/config/boards/rock-5a.sh index 383c7425..eb7604e0 100755 --- a/config/boards/rock-5a.sh +++ b/config/boards/rock-5a.sh @@ -21,6 +21,9 @@ function config_image_hook__rock-5a() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Fix Bluetooth not working with Radxa RTL8852BE WiFi + BT card cp "${overlay}/usr/lib/systemd/system/radxa-a8-bluetooth.service" "${rootfs}/usr/lib/systemd/system/radxa-a8-bluetooth.service" chroot "${rootfs}" systemctl enable radxa-a8-bluetooth diff --git a/config/boards/rock-5b-plus.sh b/config/boards/rock-5b-plus.sh index 8f94b921..318fcbb5 100755 --- a/config/boards/rock-5b-plus.sh +++ b/config/boards/rock-5b-plus.sh @@ -20,6 +20,9 @@ function config_image_hook__rock-5b-plus() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Fix and configure audio device mkdir -p "${rootfs}/usr/lib/scripts" cp "${overlay}/usr/lib/scripts/alsa-audio-config" "${rootfs}/usr/lib/scripts/alsa-audio-config" diff --git a/config/boards/rock-5b.sh b/config/boards/rock-5b.sh index b2d4b841..c6ea89ee 100755 --- a/config/boards/rock-5b.sh +++ b/config/boards/rock-5b.sh @@ -20,6 +20,9 @@ function config_image_hook__rock-5b() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Fix Bluetooth not working with Radxa RTL8852BE WiFi + BT card cp "${overlay}/usr/lib/systemd/system/radxa-a8-bluetooth.service" "${rootfs}/usr/lib/systemd/system/radxa-a8-bluetooth.service" chroot "${rootfs}" systemctl enable radxa-a8-bluetooth diff --git a/config/boards/rock-5c.sh b/config/boards/rock-5c.sh index f97ec9ec..d7bb3ec3 100755 --- a/config/boards/rock-5c.sh +++ b/config/boards/rock-5c.sh @@ -20,6 +20,9 @@ function config_image_hook__rock-5c() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Install AIC8800 WiFi and Bluetooth DKMS chroot "${rootfs}" apt-get -y install dkms aic8800-firmware aic8800-usb-dkms diff --git a/config/boards/rock-5d.sh b/config/boards/rock-5d.sh index 9004dce5..5e6297a6 100755 --- a/config/boards/rock-5d.sh +++ b/config/boards/rock-5d.sh @@ -20,6 +20,9 @@ function config_image_hook__rock-5d() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # Install AIC8800 WiFi and Bluetooth DKMS chroot "${rootfs}" apt-get -y install dkms aic8800-firmware aic8800-usb-dkms diff --git a/config/boards/turing-rk1.sh b/config/boards/turing-rk1.sh index d634060c..94791d67 100755 --- a/config/boards/turing-rk1.sh +++ b/config/boards/turing-rk1.sh @@ -19,6 +19,9 @@ function config_image_hook__turing-rk1() { # Install libmali blobs alongside panfork chroot "${rootfs}" apt-get -y install libmali-g610-x11 + # Install the rockchip camera engine + chroot "${rootfs}" apt-get -y install camera-engine-rkaiq-rk3588 + # The RK1 uses UART9 for console output sed -i 's/console=ttyS2,1500000/console=ttyS9,115200/g' "${rootfs}/etc/kernel/cmdline"