Merge pull request #818 from YoeDistro/cbrake/master

make mx8 patches specfic to machine

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to
 
 - Move projects to toplevel conf directory
 - Implement new project detection logic in envsetup
+- Upgrade Simple IoT to v0.12.2
+- Fix dependencies for yoe-kiosk-browser
 
 ### Added
 

conf/projects/var-som-mx8m-nano/config.conf

@@ -31,6 +31,8 @@ TEST_TARGET_IP = "10.0.0.36"
 TEST_SERVER_IP = "10.0.0.13"
 TEST_TARGET = "simpleremote"
 
+do_image_wic[depends] += "imx-boot:do_deploy"
+
 IMG_VERSION = "0.0.1"
 #####################################################################
 # add project specific configuration below this line

sources/meta-yoe/dynamic-layers/qt6-layer/recipes-qt/kiosk-browser/yoe-kiosk-browser.bb

@@ -14,6 +14,9 @@ inherit cmake qt6-cmake systemd
 
 DEPENDS += "qtbase qtwebview qtdeclarative qtdeclarative-native"
 
+RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)}"
+RDEPENDS:${PN} += "qtvirtualkeyboard"
+
 INITSCRIPT_NAME = "yoe-kiosk-browser"
 INITSCRIPT_PARAMS = "start 99 5 . stop 20 6 ."
 

sources/meta-yoe/dynamic-layers/variscite-bsp/recipes-bsp/u-boot-variscite/u-boot-variscite.bbappend

@@ -1,10 +1,16 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:yoe = "\
-    file://0001-imx8qm_var_som-Adjust-for-boot-root-data-paritioning.patch \
-    file://0001-imx8qxp_var_som-Adjust-for-boot-root-data-paritioning.patch \
-    file://0001-imx8mn_var_som-Adjust-for-boot-root-data-paritioning.patch \
+SRC_URI:append:yoe:imx8mn-var-som = "\
     file://0001-move-fdt-load-up-to-make-space-for-kernel.patch \
+    file://0001-imx8mn_var_som-Adjust-for-boot-root-data-paritioning.patch \
+"
+
+SRC_URI:append:yoe:imx8qxp-var-som = "\
+    file://0001-imx8qxp_var_som-Adjust-for-boot-root-data-paritioning.patch \
+"
+
+SRC_URI:append:yoe:imx8qm-var-som = "\
+    file://0001-imx8qm_var_som-Adjust-for-boot-root-data-paritioning.patch \
 "
 
 SRC_URI += "file://nologo.cfg"

sources/meta-yoe/dynamic-layers/variscite-bsp/recipes-bsp/u-boot-variscite/u-boot-variscite/0001-imx8mn_var_som-Adjust-for-boot-root-data-paritioning.patch

@@ -1,14 +1,14 @@
-From 96338d5df13744052a74eab44faecfb6e08483a8 Mon Sep 17 00:00:00 2001
+From 141cf431c581ba39c45bc8b766edc56f6317ca93 Mon Sep 17 00:00:00 2001
 From: Cliff Brake <[email protected]>
-Date: Fri, 16 Jun 2023 14:25:01 -0400
-Subject: [PATCH] imx8mn_var_som: Adjust for boot/root/data paritioning scheme
+Date: Tue, 1 Aug 2023 17:16:42 -0400
+Subject: [PATCH] imx8mn_var_som: Adjust for boot/root/data partitioning scheme
 
 ---
  include/configs/imx8mn_var_som.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h
-index 5cf49f528c..8713720356 100644
+index 85843ac8d2..3692ede332 100644
 --- a/include/configs/imx8mn_var_som.h
 +++ b/include/configs/imx8mn_var_som.h
 @@ -81,7 +81,7 @@
@@ -18,12 +18,12 @@ index 5cf49f528c..8713720356 100644
 -	"bootdir=/boot\0" \
 +	"bootdir=\0" \
  	BOOTENV \
+ 	"prepare_mcore=setenv mcore_clk clk-imx8mn.mcore_booted;\0" \
  	"scriptaddr=0x43500000\0" \
- 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-@@ -120,7 +120,7 @@
+@@ -121,7 +121,7 @@
  		"bootaux ${m7_addr};\0" \
  	"optargs=setenv bootargs ${bootargs} ${kernelargs};\0" \
- 	"mmcargs=setenv bootargs console=${console} " \
+ 	"mmcargs=setenv bootargs ${mcore_clk} console=${console} " \
 -		"root=/dev/mmcblk${mmcblk}p${mmcpart} rootwait rw ${cma_size} cma_name=linux,cma\0 " \
 +		"root=/dev/mmcblk${mmcblk}p2 rootwait rw ${cma_size} cma_name=linux,cma\0 " \
  	"loadbootscript=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootdir}/${bsp_script};\0" \