diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2024-04-23 13:36:41 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2024-04-25 06:57:05 +0000 |
| commit | bd1d51e12d9a734f81d64372a77d9f9ae7a57b65 (patch) | |
| tree | d879b28daa72d4a31f2a2fd38c65c2d4cd074f18 | |
| parent | 54a60a0247c90f581a6f1d91520a13f6c7668c28 (diff) | |
- Add deploy conf name
- Enable previously Rpi4-only dual HDMI output
- Add KMS device config entry to get appcontroller
start Demo Launcher successfully on boot.
Task-number: QTBUG-121990
Change-Id: Ifa06765f7efa04a54bda9db10142b6fbd3147ac1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
4 files changed, 19 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc index 47243495..bd792593 100644 --- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc +++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc @@ -33,6 +33,7 @@ DEPLOY_CONF_NAME:raspberrypi2 = "Raspberry Pi 2" DEPLOY_CONF_NAME:raspberrypi3 = "Raspberry Pi 3" DEPLOY_CONF_NAME:raspberrypi4 = "Raspberry Pi 4" DEPLOY_CONF_NAME:raspberrypi4-64 = "Raspberry Pi 4 64-bit" +DEPLOY_CONF_NAME:raspberrypi5 = "Raspberry Pi 5" IMAGE_FSTYPES += "wic.xz" diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend index 9c42dbf6..910b147a 100644 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -do_deploy:append:raspberrypi4() { +do_deploy:append() { echo "# enable both hdmi outputs" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt echo "max_framebuffers=2" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt } diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs.bbappend index 9ca1bb27..21c39157 100644 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -27,8 +27,21 @@ ## ############################################################################ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://kms.conf" + do_configure:append() { echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults echo "QT_QPA_EGLFS_KMS_ATOMIC=0" >> ${WORKDIR}/defaults echo "QT_WAYLAND_HARDWARE_INTEGRATION=linux-dmabuf-unstable-v1" >> ${WORKDIR}/defaults } + +do_configure:append:raspberrypi5() { + echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults +} + +do_install:append:raspberrypi5() { + install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ +} + diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf new file mode 100644 index 00000000..416a053e --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf @@ -0,0 +1,4 @@ +{ + "hwcursor": false, + "device": "/dev/dri/card0" +} |