From a9c06bc4327cd8b96c098394b210c5234872b098 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 19 Jan 2023 17:21:41 +0100
Subject: [PATCH] weston-init: add customizations for ccimx93

Update the recipe (using meta-imx's reference) to add support for the
ccimx93 and delete obsolete code.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../wayland/weston-init.bbappend              | 30 +++++++------------
 .../weston-init/imx-nxp-bsp/weston.ini        |  3 +-
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
index 798876fb1..1deaca1b9 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2021 Digi International.
+# Copyright (C) 2019-2023 Digi International.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
@@ -7,17 +7,13 @@ SRC_URI += " \
     file://profile \
 "
 
-# Remove duplicate entries for the ccimx6 platform
-# and uncomment with an individual append
-INI_UNCOMMENT_ASSIGNMENTS:remove:ccimx6 = "use-g2d=1"
-
-INI_UNCOMMENT_ASSIGNMENTS:append:mx8ulp-nxp-bsp = " \
+INI_UNCOMMENT_ASSIGNMENTS:append:mx9-nxp-bsp = " \
+    repaint-window=16 \
+"
+INI_UNCOMMENT_ASSIGNMENTS:append:mx93-nxp-bsp = " \
     use-g2d=1 \
 "
 
-WATCHDOG_SEC = "40"
-WATCHDOG_SEC:mx8ulp-nxp-bsp = "240"
-
 update_file() {
     if ! grep -q "$1" $3; then
         bbfatal $1 not found in $3
@@ -25,28 +21,22 @@ update_file() {
     sed -i -e "s,$1,$2," $3
 }
 
-do_install:append:ccimx6() {
-    uncomment "use-g2d=1" ${D}${sysconfdir}/xdg/weston/weston.ini
-}
-
 do_install:append() {
-    install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
-
     # Add weston.log back, used by NXP for testing
     update_file "ExecStart=/usr/bin/weston " "ExecStart=/usr/bin/weston --log=\$\{XDG_RUNTIME_DIR\}/weston.log " ${D}${systemd_system_unitdir}/weston.service
 
     # FIXME: weston should be run as weston, not as root
     update_file "User=weston" "User=root" ${D}${systemd_system_unitdir}/weston.service
     update_file "Group=weston" "Group=root" ${D}${systemd_system_unitdir}/weston.service
+}
 
-    update_file "WatchdogSec=20" "WatchdogSec=${WATCHDOG_SEC}" ${D}${systemd_system_unitdir}/weston.service
+# DEY customizations
+do_install:append() {
+    install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
+    install -Dm0644 ${WORKDIR}/digi_background.png ${D}${datadir}/weston/digi_background.png
 
     update_file "Before=graphical.target" "Before=multi-user.target" ${D}${systemd_system_unitdir}/weston.service
     update_file "WantedBy=graphical.target" "WantedBy=multi-user.target" ${D}${systemd_system_unitdir}/weston.service
-
-    # Add custom background image
-    install -d ${D}${datadir}/weston
-    install ${WORKDIR}/digi_background.png ${D}${datadir}/weston
 }
 
 FILES:${PN} += "${datadir}/weston/digi_background.png"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
index 76ec836ea..62d46f5d1 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini
@@ -1,6 +1,5 @@
 [core]
 #gbm-format=argb8888
-#gbm-format=rgb565
 idle-time=0
 #use-g2d=1
 #xwayland=true
@@ -29,7 +28,7 @@ touchscreen_calibrator=true
 #transform=rotate-90
 
 [screen-share]
-command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize --rdp-tls-cert=/etc/freerdp/keys/server.crt --rdp-tls-key=/etc/freerdp/keys/server.key
+command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize --rdp-tls-cert=/etc/freerdp/keys/server.crt --rdp-tls-key=/etc/freerdp/keys/server.key
 
 # Digi: Set custom background
 [shell]