Merge pull request #924 from YoeDistro/cbrake/master

imx8mn_var_som updates

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

@@ -58,3 +58,9 @@ IMG_VERSION = "0.0.1"
 # For running oe-selftest uncomment below lines
 #USER_CLASSES:remove = "buildhistory"
 #PRSERV_HOST = ""
+
+# the following is a hack to trick the imx-boot compile_mx8m function
+# as Variscite is overriding do_compile but not setting the following var.
+# This is likely a mismatch between the version of meta-freescale we are
+# using vs Variscite
+UBOOT_DTB_NAME_EXTRA = "imx8mn-var-som-symphony.dtb"

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

@@ -4,6 +4,7 @@ BBFILES ?= ""
 BBLAYERS = "\
     ${TOPDIR}/sources/meta-yoe \
     \
+    ${TOPDIR}/sources/meta-variscite-bsp-common \
     ${TOPDIR}/sources/meta-variscite-bsp \
     ${TOPDIR}/sources/meta-freescale \
     \

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

@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
 SRC_URI = "git://github.com/YoeDistro/yoe-kiosk-browser;branch=main;protocol=https"
-SRCREV = "6e94c4013f4f636a9d65561243e675dff0ae381d"
+SRCREV = "c4550fd947fcb6ef4b75eca514701aad2b588134"
 
 PV = "1.0.0+git"
 
@@ -27,6 +27,16 @@ YOE_KIOSK_BROWSER_URL ?= "http://localhost:8118"
 YOE_KIOSK_BROWSER_ROTATE ?= "0"
 # the following scale should be <= 1
 YOE_KIOSK_BROWSER_KEYBOARD_SCALE ?= "1"
+# the following is the interval at which we try
+# to reload a failed web page (seconds)
+# default is 5s if not specified.
+YOE_KIOSK_BROWSER_RETRY_INTERVAL = "10"
+# the following is typically a local web page that is loaded
+# instead of the default error screen.
+# If this is not set, the default error screen is shown.
+YOE_KIOSK_BROWSER_EXCEPTION_URL=""
+
+
 # Define it via a knob which can be set from config file e.g. local.conf
 YOE_KIOSK_BROWSER_SYSTEMD_UNIT ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'yoe-kiosk-browser-wayland.service', 'yoe-kiosk-browser-eglfs.service', d)}"
 
@@ -45,6 +55,13 @@ do_install:append() {
 
     sed -i "s|@KEYBOARD_SCALE@|${YOE_KIOSK_BROWSER_KEYBOARD_SCALE}|" \
         ${D}${sysconfdir}/default/yoe-kiosk-browser
+
+    sed -i "s|@RETRY_INTERVAL@|${YOE_KIOSK_BROWSER_RETRY_INTERVAL}|" \
+        ${D}${sysconfdir}/default/yoe-kiosk-browser
+
+    sed -i "s|@@|${YOE_KIOSK_BROWSER_KEYBOARD_SCALE}|" \
+        ${D}${sysconfdir}/default/yoe-kiosk-browser
+
 }
 
 SYSTEMD_SERVICE:${PN} = "yoe-kiosk-browser.service"

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

@@ -1,7 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 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 \
 "
 

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,31 +1,43 @@
-From 141cf431c581ba39c45bc8b766edc56f6317ca93 Mon Sep 17 00:00:00 2001
+From 9daf99369c9ddc1bb63f74edf76bb4f5a6a37477 Mon Sep 17 00:00:00 2001
 From: Cliff Brake <[email protected]>
-Date: Tue, 1 Aug 2023 17:16:42 -0400
-Subject: [PATCH] imx8mn_var_som: Adjust for boot/root/data partitioning scheme
+Date: Thu, 18 Apr 2024 16:51:05 -0400
+Subject: [PATCH] imx8mn_var_som - adjust for boot root data partitioning
 
 ---
- include/configs/imx8mn_var_som.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ include/configs/imx8mn_var_som.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h
-index 85843ac8d2..3692ede332 100644
+index 2854032248..8b4cf330aa 100644
 --- a/include/configs/imx8mn_var_som.h
 +++ b/include/configs/imx8mn_var_som.h
-@@ -81,7 +81,7 @@
+@@ -62,7 +62,7 @@
  /* Initial environment variables */
- #define CONFIG_EXTRA_ENV_SETTINGS \
- 	CONFIG_MFG_ENV_SETTINGS \
+ #define CFG_EXTRA_ENV_SETTINGS \
+ 	CFG_MFG_ENV_SETTINGS \
 -	"bootdir=/boot\0" \
 +	"bootdir=\0" \
  	BOOTENV \
  	"prepare_mcore=setenv mcore_clk clk-imx8mn.mcore_booted;\0" \
  	"scriptaddr=0x43500000\0" \
-@@ -121,7 +121,7 @@
+@@ -71,7 +71,7 @@
+ 	"image=Image.gz\0" \
+ 	"img_addr=0x42000000\0" \
+ 	"console=ttymxc3,115200 earlycon=ec_imx6q,0x30a60000,115200\0" \
+-	"fdt_addr_r=0x43000000\0" \
++	"fdt_addr_r=0x44000000\0" \
+ 	"fdt_addr=0x43000000\0" \
+ 	"fdt_high=0xffffffffffffffff\0" \
+ 	"boot_fdt=try\0" \
+@@ -102,7 +102,7 @@
  		"bootaux ${m7_addr};\0" \
  	"optargs=setenv bootargs ${bootargs} ${kernelargs};\0" \
  	"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 " \
+ 	"bootenv=uEnv.txt\0" \
  	"loadbootscript=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootdir}/${bsp_script};\0" \
  	"bootscript=echo Running bootscript from mmc ...; " \
- 		"source\0" \
+-- 
+2.44.0
+

sources/meta-yoe/recipes-core/images/yoe-simpleiot-image.bb

@@ -10,6 +10,8 @@ SIMPLEIOT:riscv32 = ""
 
 IMAGE_INSTALL += "\
     ${SIMPLEIOT} \
+    networkmanager \
+    wireguard-tools \
 "
 
 export IMAGE_BASENAME = "yoe-simpleiot-image"

sources/meta-yoe/recipes-support/updater/files/imx8mn-var-som/platform

@@ -1,4 +1,4 @@
-TITLE="VAR-SOM-MX8X Symphony Board"
+TITLE="VAR-SOM-MX8M-NANO Symphony Board"
 PLAT="imx8mn-var-som"
 UPDATE_FILE_NAME="${PLAT}"