WIP dunfell + kirkstone

The the branch is anyway not updated anymore and the autorev is causing
parsing problem even when the recipe is not used.

conf/machine/am335x-hw25.conf

@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the netmodule hw25, aka TC Router
 
 require am335x-nmhw24.conf
-MACHINEOVERRIDES .= ":am335x-nmhw24"
 
 UBOOT_MACHINE = "am335x_hw25_defconfig"
 

conf/machine/am335x-hw26-vcupro.conf

@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: NetModule HW 26 with user module
+#@DESCRIPTION: NG800 (hw26) was based on VCU1 (hw21), but later on,
+# the new VCU pro was based on the changes done on NG800
+
+require am335x-hw26.conf
+MACHINEOVERRIDES =. "am335x-hw26:"
+
+USER_MODULE_MACHINE_FEATURE = "user-module"

conf/machine/am335x-hw26.conf

@@ -5,6 +5,9 @@
 #require conf/machine/include/ti33x.inc
 require am335x-nmhw21.conf
 KERNEL_DEVICETREE_TO_USE = "${HW26_DT}"
-MACHINEOVERRIDES .= ":am335x-nmhw21"
+MACHINEOVERRIDES =. "am335x-nmhw21:"
+
 MACHINE_FEATURES += "pps"
-MACHINE_FEATURES:remove = "user-module"
+
+# Remove usermodule
+USER_MODULE_MACHINE_FEATURE = ""

conf/machine/am335x-nmhw21.conf

@@ -30,7 +30,9 @@ MACHINE_FEATURES += " \
 	neo-m8l \
 	wifi \
 	ti-wifi \
-	user-module \
 	da9063-ignition \
 "
 
+USER_MODULE_MACHINE_FEATURE = "user-module"
+MACHINE_FEATURES:append = " ${USER_MODULE_MACHINE_FEATURE}"
+

conf/machine/am335x-nmhw24.conf

@@ -21,6 +21,7 @@ WWAN_VENDORS = "ublox"
 MACHINE_FEATURES += " \
 	can \
 	wwan \
+	gnss \
 	bluetooth \
 	tibluetooth \
 	atsha \

conf/machine/am335x-nrhw20.conf

@@ -21,6 +21,7 @@ WWAN_VENDORS = "ublox"
 MACHINE_FEATURES += " \
     can \
     wwan \
+    gnss \
     bluetooth \
     tibluetooth \
     atsha \

conf/machine/include/ti33x.inc

@@ -3,7 +3,10 @@ require conf/machine/include/soc-family.inc
 require netmodule-hardware.inc
 
 DEFAULTTUNE ?= "cortexa8thf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa8.inc
+# dunfell
+include conf/machine/include/tune-cortexa8.inc
+# kirkstone+
+include conf/machine/include/arm/armv7a/tune-cortexa8.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 

freescale/recipes-imx/imx-atf/imx-atf_1.5.0.bb

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec
 PV = "1.5.0+git${SRCPV}"
 
 SRCBRANCH = "imx_4.14.98_2.0.0_ga"
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch \
 "
 SRCREV ?= "413e93e10ee4838e9a68b190f1468722f6385e0e"

freescale/recipes-imx/imx-mkimage/imx-mkimage_git.inc

@@ -4,8 +4,8 @@ DEPENDS = "zlib-native openssl-native"
 
 
 SRCBRANCH = "imx_4.14.98_2.0.0_ga"
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV ?= "${AUTOREV}"
+SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
+SRCREV ?= "dd0234001713623c79be92b60fa88bc07b07f24f"
 S = "${WORKDIR}/git"
 
 BOOT_TOOLS = "imx-boot-tools"

recipes-bsp/lm_sensors/lmsensors-config/am335x-hw25

@@ -1 +0,0 @@
-am335x-nmhw24

recipes-bsp/lm_sensors/lmsensors-config/am335x-hw25/sensors.conf

@@ -0,0 +1,7 @@
+chip "da9063-*"
+	label in0 "main-voltage"
+	ignore in1
+	ignore in2
+	label in3 "wwan0-supply"
+	label in4 "rtc-voltage"
+	label temp1 "tjunc"

recipes-bsp/lm_sensors/lmsensors-config/am335x-hw26/sensors.conf

@@ -0,0 +1,13 @@
+chip "da9063-*"
+	label in0 "main-voltage"
+	label in1 "input-voltage"
+	compute in1 15.0*@, @/15.0
+	label in2 "ignition-voltage"
+	compute in2 4.96*@, @/4.96
+	ignore in3
+	label in4 "rtc-voltage"
+	label temp1 "tjunc"
+
+chip "*-mdio-*"
+	ignore in0
+	ignore temp1

recipes-bsp/lm_sensors/lmsensors-config/am335x-nmhw21

@@ -0,0 +1 @@
+am335x-hw26

recipes-bsp/lm_sensors/lmsensors-config/am335x-nmhw24/sensors.conf

@@ -1,3 +1,9 @@
-chip "da9063-hwmon-*"
-        label in3 "wwan0-supply"
-
+chip "da9063-*"
+	label in0 "main-voltage"
+	label in1 "input-voltage"
+	compute in1 15.0*@, @/15.0
+	label in2 "ignition-voltage"
+	compute in2 4.96*@, @/4.96
+	label in3 "wwan0-supply"
+	label in4 "rtc-voltage"
+	label temp1 "tjunc"

recipes-bsp/lm_sensors/lmsensors-config/am335x-nrhw20/sensors.conf

@@ -0,0 +1,7 @@
+chip "da9063-*"
+	label in0 "main-voltage"
+	ignore in1
+	ignore in2
+	ignore in3
+	label in4 "rtc-voltage"
+	label temp1 "tjunc"

recipes-bsp/lm_sensors/lmsensors-config_1.0.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 PACKAGECONFIG = ""
 

recipes-bsp/lm_sensors/lmsensors/0001-libsensors-Fix-support-for-driver-names-with-dashes.patch

@@ -1,138 +0,0 @@
-From 0992bce0612852dd10006a8e182b4e69361c99dc Mon Sep 17 00:00:00 2001
-From: Alexandre Bard <alexandre.bard@netmodule.com>
-Date: Fri, 12 Aug 2022 14:32:09 +0200
-Subject: [PATCH] libsensors: Fix support for driver names with dashes
-
-The dash is used as delimiter in the conversion rules. This works fine
-with kernel drivers with simple names like lm75, but some drivers have a
-compound name like da9063-hwmon which were not handled properly by these
-rules.
-
-Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
----
- lib/data.c | 102 +++++++++++++++++++++++++++++++++--------------------
- 1 file changed, 64 insertions(+), 38 deletions(-)
-
-diff --git a/lib/data.c b/lib/data.c
-index c5aea429..318a35f8 100644
---- a/lib/data.c
-+++ b/lib/data.c
-@@ -83,54 +83,80 @@ void sensors_free_chip_name(sensors_chip_name *chip)
- int sensors_parse_chip_name(const char *name, sensors_chip_name *res)
- {
- 	char *dash;
-+	const char * prefix = name;
-+	const char * bus_type;
- 
- 	/* First, the prefix. It's either "*" or a real chip name. */
--	if (!strncmp(name, "*-", 2)) {
--		res->prefix = SENSORS_CHIP_NAME_PREFIX_ANY;
--		name += 2;
-+	if (!strncmp(prefix, "*-", 2)) {
-+		bus_type = prefix + 2;
- 	} else {
--		if (!(dash = strchr(name, '-')))
-+		if (!(dash = strchr(prefix, '-')))
- 			return -SENSORS_ERR_CHIP_NAME;
--		res->prefix = strndup(name, dash - name);
--		if (!res->prefix)
--			sensors_fatal_error(__func__,
--					    "Allocating name prefix");
--		name = dash + 1;
-+		bus_type = dash + 1;
- 	}
- 
--	/* Then we have either a sole "*" (all chips with this name) or a bus
--	   type and an address. */
--	if (!strcmp(name, "*")) {
--		res->bus.type = SENSORS_BUS_TYPE_ANY;
--		res->bus.nr = SENSORS_BUS_NR_ANY;
--		res->addr = SENSORS_CHIP_NAME_ADDR_ANY;
--		return 0;
-+	/* We go through the name until we find a valid bus type or "*"
-+	   (all chips with this name). Dashes on the way are considered
-+	   part of the prefix. */
-+	while (1) {
-+		if (!strcmp(bus_type, "*")) {
-+			res->bus.type = SENSORS_BUS_TYPE_ANY;
-+			break;
-+		}
-+
-+		if (!(dash = strchr(bus_type, '-')))
-+			return -SENSORS_ERR_CHIP_NAME;
-+
-+		if (!strncmp(bus_type, "i2c", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_I2C;
-+			break;
-+		}
-+		else if (!strncmp(bus_type, "isa", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_ISA;
-+			break;
-+		}
-+		else if (!strncmp(bus_type, "pci", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_PCI;
-+			break;
-+		}
-+		else if (!strncmp(bus_type, "spi", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_SPI;
-+			break;
-+		}
-+		else if (!strncmp(bus_type, "virtual", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_VIRTUAL;
-+			break;
-+		}
-+		else if (!strncmp(bus_type, "acpi", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_ACPI;
-+			break;
-+		}
-+		else if (!strncmp(bus_type, "hid", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_HID;
-+			break;
-+		}
-+		else if (!strncmp(bus_type, "mdio", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_MDIO;
-+			break;
-+		}
-+		else if (!strncmp(bus_type, "scsi", dash - bus_type)) {
-+			res->bus.type = SENSORS_BUS_TYPE_SCSI;
-+			break;
-+		}
-+		else {
-+			/* Assume the prefix contains a dash */
-+			bus_type = dash + 1;
-+		}
- 	}
- 
--	if (!(dash = strchr(name, '-')))
--		goto ERROR;
--	if (!strncmp(name, "i2c", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_I2C;
--	else if (!strncmp(name, "isa", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_ISA;
--	else if (!strncmp(name, "pci", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_PCI;
--	else if (!strncmp(name, "spi", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_SPI;
--	else if (!strncmp(name, "virtual", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_VIRTUAL;
--	else if (!strncmp(name, "acpi", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_ACPI;
--	else if (!strncmp(name, "hid", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_HID;
--	else if (!strncmp(name, "mdio", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_MDIO;
--	else if (!strncmp(name, "scsi", dash - name))
--		res->bus.type = SENSORS_BUS_TYPE_SCSI;
--	else
--		goto ERROR;
- 	name = dash + 1;
- 
-+	/* We can now properly set the prefix */
-+	res->prefix = strndup(prefix, bus_type - prefix - 1);
-+	if (!res->prefix)
-+		sensors_fatal_error(__func__,
-+				    "Allocating name prefix");
-+
- 	/* Some bus types (i2c, spi) have an additional bus number.
- 	   For these, the next part is either a "*" (any bus of that type)
- 	   or a decimal number. */

recipes-bsp/lm_sensors/lmsensors_3.6.0.bbappend

@@ -1,6 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0001-libsensors-Fix-support-for-driver-names-with-dashes.patch"
-
-PACKAGECONFIG = ""
-

recipes-bsp/mac-address-set/mac-address-set.bb

@@ -2,8 +2,11 @@ SUMMARY = "Set mac addresses of Wifi and bluetooth chips"
 DESCRIPTION = "Small scripts that set the mac addresses based on ethernet mac"
 AUTHOR = "Alexandre Bard"
 
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+
+include ${LAYERSERIES_CORENAMES}/licenses.inc
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
 PR = "r2"
 
 inherit systemd

recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb

@@ -7,7 +7,7 @@ require recipes-bsp/u-boot/u-boot.inc
 
 PROVIDES += "u-boot"
 
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2018.03/imx/imx8-nmhw23;destsuffix=git"

recipes-bsp/u-boot/u-boot-nm.inc

@@ -1,6 +1,6 @@
 require recipes-bsp/u-boot/u-boot.inc
 
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 
 S = "${WORKDIR}/git"

recipes-bsp/u-boot/u-boot-ti33x_git.bb

@@ -4,7 +4,7 @@ require u-boot-nm.inc
 SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2016.05/standard/am335x"
 
 # Should be updated when a new U-Boot Version is available
-SRCREV ?= "7b4add1789640d188d2c5d4c7885f942908846f6"
+SRCREV = "4bbdb87d6be83386e15f5c38e80a49be9308f2a7"
 
 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"

recipes-connectivity/gnss-mgr/gnss-mgr.bb

@@ -25,7 +25,7 @@ PV = "1.0-git${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://gitlab.com/netmodule/tools/gnssmgr.git;protocol=ssh;user=git;branch=master"
-SRCREV ?= "e7970e6486473c78c2c6f1f63c5a15fc28606c2d"
+SRCREV ?= "a3dad8288286ba10b6b753d896c9c79586ce2e90"
 S = "${WORKDIR}/git"
 
 PACKAGES =+ "${PN}-test"

recipes-connectivity/libqmi/libqmi_1.32.4.bb

@@ -0,0 +1,28 @@
+SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol"
+DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \
+               devices which speak the Qualcomm MSM Interface (QMI) protocol"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi"
+LICENSE = "GPL-2.0-only& LGPL-2.1-only"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+"
+
+DEPENDS = "glib-2.0 glib-2.0-native"
+
+inherit meson pkgconfig bash-completion gobject-introspection
+
+SRCREV = "6e248aceb66f53b467b343bca1c467a8211dd30d"
+SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-32"
+
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= "udev mbim"
+PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev"
+PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim"
+PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib"
+
+EXTRA_OEMESON = " \
+    -Dgtk_doc=false \
+    -Dman=false \
+"

recipes-connectivity/lpa/lpa_git.bb

@@ -1,34 +0,0 @@
-LICENSE = "CLOSED"
-LIC_FILES_CHKSUM = ""
-
-SRC_URI = "git://gitea@git.netmodule.intranet/NRSW/lpa.git;branch=sdk_1.6;protocol=ssh \
-           "
-
-PV = "1.0+git${SRCPV}"
-SRCREV = "454007f13a713943ae1caff6704d889fde06c1c2"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "curl openssl"
-
-EXTRA_OEMAKE_append = "-j 1 SEMEDIA_TYPE=toby"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-inherit autotools-brokensep
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${datadir}/lpa
-    install -m 755 ${B}/sdk/liblpa.so.1.0.0 ${D}${libdir}
-    ln -sf liblpa.so.1.0.0 ${D}${libdir}/liblpa.so.1
-    ln -sf liblpa.so.1.0.0 ${D}${libdir}/liblpa.so
-    install -d ${D}${bindir}
-    install -m 755 ${B}/lpa/lpa ${D}${bindir}/
-    install -m 644 ${B}/certs/CI-cert_NIST.crt ${D}${datadir}/lpa/
-    install -m 644 ${B}/certs/GSMA_CE_TEST_CI.crt ${D}${datadir}/lpa/
-    install -m 644 ${B}/certs/GSMA_CE_LIVE_CI.crt ${D}${datadir}/lpa/
-    ln -sf GSMA_CE_LIVE_CI.crt ${D}${datadir}/lpa/default.crt
-}
-
-FILES_${PN} += "${bindir}/* ${libdir}/*.so*"

recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch

@@ -1 +0,0 @@
-../../../../meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch

recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch

@@ -0,0 +1,70 @@
+From 35173fa04d0116ba30a86dc1a19f859f2be14a24 Mon Sep 17 00:00:00 2001
+From: "Bruce A. Johnson" <waterfordtrack@gmail.com>
+Date: Wed, 22 Dec 2021 14:24:02 -0500
+Subject: [PATCH] core: switch bash shell scripts to use /bin/sh for use
+ w/Busybox.
+
+Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/483
+
+%% original patch: 0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch
+---
+ data/dispatcher-fcc-unlock/105b | 2 +-
+ data/dispatcher-fcc-unlock/1199 | 2 +-
+ data/dispatcher-fcc-unlock/1eac | 2 +-
+ test/mmcli-test-sms             | 2 +-
+ tools/tests/test-wrapper.sh.in  | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/dispatcher-fcc-unlock/105b b/data/dispatcher-fcc-unlock/105b
+index 444bd51f..772c90f4 100644
+--- a/data/dispatcher-fcc-unlock/105b
++++ b/data/dispatcher-fcc-unlock/105b
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # SPDX-License-Identifier: CC0-1.0
+ # 2021 Aleksander Morgado <aleksander@aleksander.es>
+diff --git a/data/dispatcher-fcc-unlock/1199 b/data/dispatcher-fcc-unlock/1199
+index 83ab2c9e..6dbf8d1b 100644
+--- a/data/dispatcher-fcc-unlock/1199
++++ b/data/dispatcher-fcc-unlock/1199
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # SPDX-License-Identifier: CC0-1.0
+ # 2021 Aleksander Morgado <aleksander@aleksander.es>
+diff --git a/data/dispatcher-fcc-unlock/1eac b/data/dispatcher-fcc-unlock/1eac
+index 1a048dc8..44ce46d7 100644
+--- a/data/dispatcher-fcc-unlock/1eac
++++ b/data/dispatcher-fcc-unlock/1eac
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # SPDX-License-Identifier: CC0-1.0
+ # 2021 Aleksander Morgado <aleksander@aleksander.es>
+diff --git a/test/mmcli-test-sms b/test/mmcli-test-sms
+index 18e0a7b4..7136ee0d 100755
+--- a/test/mmcli-test-sms
++++ b/test/mmcli-test-sms
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ print_usage () {
+     echo "usage: $0 [MODEM INDEX] [all|ucs2|gsm7|data] [NUMBER]"
+diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in
+index d64ea4cb..fcdb56de 100644
+--- a/tools/tests/test-wrapper.sh.in
++++ b/tools/tests/test-wrapper.sh.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # For debugging behavior of test-modemmanager-service.py, you can modify
+ # this line to add --log-file option
+-- 
+2.35.3
+

recipes-connectivity/modemmanager/files/77-mm-netmodule-whitelist.rules

@@ -9,4 +9,9 @@ ATTRS{idVendor}=="1546", ATTRS{idProduct}=="1141", ENV{ID_MM_DEVICE_PROCESS}="1"
 ATTRS{idVendor}=="1546", ATTRS{idProduct}=="1143", ENV{ID_MM_DEVICE_PROCESS}="1"
 ATTRS{idVendor}=="1546", ATTRS{idProduct}=="1146", ENV{ID_MM_DEVICE_PROCESS}="1"
 
+# LARA-L6
+ATTRS{idVendor}=="1546", ATTRS{idProduct}=="1341", ENV{ID_MM_DEVICE_PROCESS}="1"
+ATTRS{idVendor}=="1546", ATTRS{idProduct}=="1342", ENV{ID_MM_DEVICE_PROCESS}="1"
+ATTRS{idVendor}=="1546", ATTRS{idProduct}=="1343", ENV{ID_MM_DEVICE_PROCESS}="1"
+
 LABEL="mm_netmodule_whitelist_end"

recipes-connectivity/modemmanager/modemmanager_1.18.8.bb

@@ -0,0 +1,61 @@
+SUMMARY = "ModemManager is a daemon controlling broadband devices/connections"
+DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gettext systemd gobject-introspection bash-completion
+
+DEPENDS = "glib-2.0 libgudev libxslt-native dbus"
+
+SRCREV ?= "0d8b5e93fc62eb0f41e18a2d9d845331d7af36ec"
+
+# Patch 0001 will be in ModemManager > 1.19
+SRC_URI = " \
+    git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-18 \
+    file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \
+"
+
+S = "${WORKDIR}/git"
+
+# strict, permissive
+MODEMMANAGER_POLKIT_TYPE ??= "permissive"
+
+PACKAGECONFIG ??= "vala mbim qmi \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \
+"
+
+PACKAGECONFIG[at] = "-Dat_command_via_dbus=true"
+PACKAGECONFIG[systemd] = " \
+    -Dsystemdsystemunitdir=${systemd_unitdir}/system/, \
+    -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsystemd_suspend_resume=false \
+"
+PACKAGECONFIG[polkit] = "-Dpolkit=${MODEMMANAGER_POLKIT_TYPE},-Dpolkit=no,polkit"
+# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol.
+PACKAGECONFIG[mbim] = "-Dmbim=true,-Dmbim=false -Dplugin_dell=disabled -Dplugin_foxconn=disabled,libmbim"
+# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol.
+PACKAGECONFIG[qmi] = "-Dqmi=true,-Dqmi=false,libqmi"
+PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib"
+PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)}
+
+EXTRA_OEMESON = " \
+    -Dudevdir=${nonarch_base_libdir}/udev \
+    -Dqrtr=false \
+"
+
+FILES:${PN} += " \
+    ${datadir}/icons \
+    ${datadir}/polkit-1 \
+    ${datadir}/dbus-1 \
+    ${datadir}/ModemManager \
+    ${libdir}/ModemManager \
+    ${systemd_unitdir}/system \
+"
+
+SYSTEMD_SERVICE:${PN} = "ModemManager.service"

recipes-connectivity/modemmanager/modemmanager_git.bb

@@ -1,22 +1,23 @@
 require recipes-connectivity/modemmanager/modemmanager_1.18.8.bb
 
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
 # Use custom git repo as SRC
 SRC_URI = " \
     git://gitlab.com/netmodule/third-party/ModemManager;protocol=ssh;user=git;branch=mm-1-18-netmodule \
     file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \
 "
 
-SRCREV = "a092259df33cc70a04826f0e7117475ac9b26f99"
+SRCREV = "${AUTOREV}"
 S = "${WORKDIR}/git"
 
 # Keep only ublox plugin
-EXTRA_OECONF += "--disable-all-plugins --enable-plugin-ublox"
+EXTRA_OECONF += "--disable-all-plugins --enable-plugin-ublox --enable-plugin-generic"
 
-# Exclude mbim and qmi
-PACKAGECONFIG = "systemd"
+# Exclude mbim
+PACKAGECONFIG = "systemd qmi"
 
 # Add whitelist rules
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI += "file://77-mm-netmodule-whitelist.rules"
 
 do_install:append() {

recipes-connectivity/networkmanager/networkmanager-conf.bb

@@ -1,5 +1,3 @@
-inherit allarch
-
 DESCRIPTION = "Configuration files for NetworkManager"
 
 LICENSE = "Proprietary"
@@ -8,13 +6,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2
 RDEPENDS:${PN} = "networkmanager"
 PACKAGECONFIG ?= ""
 
-DEFAULT_ETH ??= "eth0"
+export DEFAULT_ETH ??= "eth0"
 PACKAGECONFIG[unmanaged-devices] = ""
 PACKAGECONFIG[ethernet-dhcp] = ""
 
 SRC_URI = " \
                  file://eth0-static \
                  file://eth0-dhcp \
+                 file://bridge-slave-eth0.nmconnection \
                  file://NetworkManager.conf \
                  file://00-fallback-dns.conf \
                  file://unmanaged-devices.conf \
@@ -25,24 +24,59 @@ SRC_URI:append_am335x-nrhw20 = " \
                 file://system-connections-dhcp.tar.gz \
 "
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SYSTEM_CONNECTIONS = "${D}${sysconfdir}/NetworkManager/system-connections/"
+
 do_install () {
     install -d ${D}${sysconfdir}/NetworkManager/dnsmasq.d
-    install -d ${D}${sysconfdir}/NetworkManager/system-connections
+    install -d ${SYSTEM_CONNECTIONS}
     install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
     install -m 0644 ${WORKDIR}/00-fallback-dns.conf ${D}${sysconfdir}/NetworkManager/dnsmasq.d/
 
+    static_ifaces=""
+    dhcp_ifaces=""
+    bridged_ifaces=""
+
     if ${@bb.utils.contains('PACKAGECONFIG','ethernet-dhcp','true','false',d)}; then
-        install -m 0600 ${WORKDIR}/eth0-dhcp ${D}${sysconfdir}/NetworkManager/system-connections/eth0.nmconnection
+        # DHCP on main interface and static IP on the user module interface (if present)
+        dhcp_ifaces="$DEFAULT_ETH"
+        if ${@bb.utils.contains('MACHINE_FEATURES','user-module','true','false',d)}; then
+            static_ifaces="umnet0"
+        fi
     else
-        install -m 0600 ${WORKDIR}/eth0-static ${D}${sysconfdir}/NetworkManager/system-connections/eth0.nmconnection
+        # static IP either on the bridge or main interface
+        if ${@bb.utils.contains('MACHINE_FEATURES','user-module','true','false',d)}; then
+            static_ifaces="br0"
+            bridged_ifaces="$DEFAULT_ETH umnet0"
+        else
+            static_ifaces="$DEFAULT_ETH"
+        fi
     fi
 
-    # Handle HWs with different default interface
-    if [ "${DEFAULT_ETH}" != "eth0" ]; then
-        sed -i 's/eth0/${DEFAULT_ETH}/g' ${D}${sysconfdir}/NetworkManager/system-connections/*
-        mv ${D}${sysconfdir}/NetworkManager/system-connections/eth0.nmconnection \
-          ${D}${sysconfdir}/NetworkManager/system-connections/${DEFAULT_ETH}.nmconnection
-    fi
+
+    for iface in $static_ifaces; do
+        install -m 0600 ${WORKDIR}/eth0-static ${SYSTEM_CONNECTIONS}/$iface.nmconnection
+        sed -i "s/eth0/$iface/g" ${SYSTEM_CONNECTIONS}/$iface.nmconnection
+
+        # Handle bridges
+        if ! [ "$iface" = "${iface#br}" ]; then
+            # Change type of main connection to bridge
+            sed -i "s/type=.*/type=bridge/g" ${SYSTEM_CONNECTIONS}/$iface.nmconnection
+            printf "\n[bridge]\nstp=false\n" >> ${SYSTEM_CONNECTIONS}/$iface.nmconnection
+        fi
+    done
+
+    for iface in $dhcp_ifaces; do
+        install -m 0600 ${WORKDIR}/eth0-dhcp ${SYSTEM_CONNECTIONS}/$iface.nmconnection
+        sed -i "s/eth0/$iface/g" ${SYSTEM_CONNECTIONS}/$iface.nmconnection
+    done
+
+
+    for iface in $bridged_ifaces; do
+        install -m 0600 ${WORKDIR}/bridge-slave-eth0.nmconnection ${SYSTEM_CONNECTIONS}/$iface.nmconnection
+        sed -i "s/eth0/$iface/g" ${SYSTEM_CONNECTIONS}/$iface.nmconnection
+    done
 
 
     if ${@bb.utils.contains('PACKAGECONFIG','unmanaged-devices','true','false',d)}; then
@@ -52,11 +86,11 @@ do_install () {
 }
 
 do_install:append_am335x-nrhw20() {
-    rm -rf ${D}${sysconfdir}/NetworkManager/system-connections/*
+    rm -rf ${SYSTEM_CONNECTIONS}/*
     if ${@bb.utils.contains('PACKAGECONFIG','ethernet-dhcp','true','false',d)}; then
-        install -m 0600 ${WORKDIR}/system-connections-dhcp/* ${D}${sysconfdir}/NetworkManager/system-connections/
+        install -m 0600 ${WORKDIR}/system-connections-dhcp/* ${SYSTEM_CONNECTIONS}/
     else
-        install -m 0600 ${WORKDIR}/system-connections-static/* ${D}${sysconfdir}/NetworkManager/system-connections/
+        install -m 0600 ${WORKDIR}/system-connections-static/* ${SYSTEM_CONNECTIONS}/
     fi
 }
 

recipes-connectivity/networkmanager/networkmanager-conf/bridge-slave-eth0.nmconnection

@@ -0,0 +1,12 @@
+[connection]
+id=bridge-slave-eth0
+type=ethernet
+interface-name=eth0
+master=br0
+permissions=
+slave-type=bridge
+
+[ethernet]
+mac-address-blacklist=
+
+[bridge-port]

recipes-connectivity/networkmanager/networkmanager-conf/eth0-dhcp

@@ -1,6 +1,5 @@
 [connection]
 id=ethernet
-uuid=2a2b6485-4d06-4b86-8051-751399c6881a
 type=ethernet
 interface-name=eth0
 permissions=

recipes-connectivity/networkmanager/networkmanager-conf/eth0-static

@@ -1,6 +1,5 @@
 [connection]
 id=ethernet
-uuid=2a2b6485-4d06-4b86-8051-751399c6881a
 type=ethernet
 interface-name=eth0
 permissions=

recipes-connectivity/networkmanager/networkmanager/0001-nm-1-22-Reactivate-GSM-connections-when-ModemManager.patch

@@ -0,0 +1,61 @@
+From f7c129b1775e35f603c1c58c12f958ae81ae6bb8 Mon Sep 17 00:00:00 2001
+From: Alexandre Bard <alexandre.bard@netmodule.com>
+Date: Wed, 13 Nov 2019 17:53:54 +0100
+Subject: [PATCH] Reactivate GSM connections when ModemManager reconnects by
+ itself
+
+After a disconnection from network side, ModemManager can reconnect
+itself if the modem requests it. This commit makes sure that a
+reconnection of the modem makes the GSM connection active in NM.
+
+BugzID: 60029
+---
+ src/devices/wwan/nm-device-modem.c | 8 +++++---
+ src/nm-policy.c                    | 5 +++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
+index 1e3162808..f03818599 100644
+--- a/src/devices/wwan/nm-device-modem.c
++++ b/src/devices/wwan/nm-device-modem.c
+@@ -360,9 +360,11 @@ modem_state_cb (NMModem *modem,
+ 		nm_device_recheck_available_connections (device);
+ 	}
+ 
+-	nm_device_queue_recheck_available (device,
+-	                                   NM_DEVICE_STATE_REASON_MODEM_AVAILABLE,
+-	                                   NM_DEVICE_STATE_REASON_MODEM_FAILED);
++	nm_device_recheck_available_connections (device);
++
++	if (new_state == NM_MODEM_STATE_CONNECTED)
++		nm_device_emit_recheck_auto_activate(device);
++
+ }
+ 
+ static void
+diff --git a/src/nm-policy.c b/src/nm-policy.c
+index 1faba5c7b..02088bb6e 100644
+--- a/src/nm-policy.c
++++ b/src/nm-policy.c
+@@ -1019,6 +1019,9 @@ update_ip4_routing (NMPolicy *self, gboolean force_update)
+ 	       nm_connection_get_id (nm_active_connection_get_applied_connection (best_ac)),
+ 	       ip_iface);
+ 	_notify (self, PROP_DEFAULT_IP4_AC);
++
++	/* Recheck all connections to enable potential VPN depending on new route */
++	schedule_activate_all(self);
+ }
+ 
+ static void
+@@ -2041,6 +2044,8 @@ device_recheck_auto_activate (NMDevice *device, gpointer user_data)
+ 	NMPolicyPrivate *priv = user_data;
+ 	NMPolicy *self = _PRIV_TO_SELF (priv);
+ 
++	/* Reset retries count */
++	reset_autoconnect_all(self, device, FALSE);
+ 	schedule_activate_check (self, device);
+ }
+ 
+-- 
+2.20.1
+

recipes-connectivity/networkmanager/networkmanager_%.bbappend

@@ -1,9 +1,12 @@
-FILESEXTRAPATHS:append := "${THISDIR}/${PN}"
-
 RDEPENDS:${PN} = "networkmanager-conf"
 
-SRC_URI:append = "\
-                 file://0001-Reactivate-GSM-connections-when-ModemManager-reconne.patch \
-                 "
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}"
+
+SRC_URI:append = " \
+    ${@bb.utils.contains('PV', '1.22.16', \
+      'file://0001-nm-1-22-Reactivate-GSM-connections-when-ModemManager.patch', \
+      'file://0001-nm-1-36-Reactivate-GSM-connections-when-ModemManager.patch', \
+    d)} \
+"
 
 #PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq,,,dnsmasq"

recipes-connectivity/nmubxlib/nmubxlib.bb

@@ -18,7 +18,7 @@ PV = "1.0-git${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://gitlab.com/netmodule/tools/nmubxlib.git;protocol=ssh;user=git;branch=master"
-SRCREV ?= "5ccd0fe246be8f381c9b06e2703b6fe22fefcee8"
+SRCREV ?= "7cf0e2563028a9970b88c4b5c9ba43cfaf79d7b2"
 S = "${WORKDIR}/git"
 
 

recipes-connectivity/tibluetooth/tibluetooth.bb

@@ -3,8 +3,11 @@ DESCRIPTION = "Run hciattach for ti bluetooth wl12xx module"
 AUTHOR = "Stefan Eichenberger"
 
 SECTION = "connectivity"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+
+include ${LAYERSERIES_CORENAMES}/licenses.inc
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
 PR = "r2"
 
 inherit systemd

recipes-connectivity/ublox-gnss-fw-update/files/flash.xml

@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE flash SYSTEM "flash.dtd">
-<flash fisVersion="2" revision="$Rev: 100111 $">
-  <category cmd="SST" supply="3V">
-    <sectorSize>4096</sectorSize>
-    <device jedec="xBF2601">
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="xBF2602">
-      <sectorCount>1024</sectorCount>
-    </device>
-    <device jedec="xBF2643" cmd="SST2">
-      <!-- the SQI block only supports up to 32MBit -->
-      <sectorCount>1024</sectorCount>
-    </device>
-  </category>
-  <category cmd="SPANSION" supply="3V">
-    <device jedec="x014016">
-      <sectorCount>1024</sectorCount>
-    </device>
-    <device jedec="x014015">
-      <sectorCount>512</sectorCount>
-    </device>
-  </category>
-  <category cmd="WINBOND" supply="3V">
-    <sectorSize>4096</sectorSize>
-    <device jedec="xEF4013">
-      <sectorCount>128</sectorCount>
-    </device>
-    <device jedec="xEF4014">
-      <sectorCount>256</sectorCount>
-    </device>
-    <device jedec="xEF4015">
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="xEF4016">
-      <sectorCount>1024</sectorCount>
-    </device>
-    <device jedec="xEF4017">
-      <!-- the SQI block only supports up to 32MBit -->
-      <sectorCount>1024</sectorCount>
-    </device>
-    <device jedec="xEF5014" supply="1.8V">
-      <cap writeSuspend="0"/>
-      <sectorCount>256</sectorCount>
-    </device>
-    <device jedec="xEF6013" supply="1.8V">
-      <sectorCount>128</sectorCount>
-    </device>
-    <device jedec="xEF6014" supply="1.8V">
-      <sectorCount>256</sectorCount>
-    </device>
-    <device jedec="xEF6015" supply="1.8V">
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="xEF6016" supply="1.8V">
-      <sectorCount>1024</sectorCount>
-    </device>
-  </category>
-  <category cmd="MACRONIX">
-    <sectorSize>4096</sectorSize>
-    <sectorCount>256</sectorCount>
-    <device jedec="xC22014" supply="3V"/>
-    <device jedec="xC22016" supply="3V">
-      <cap writeSuspend="1"/>
-      <minEraseSuspend>12000</minEraseSuspend>
-      <sectorCount>1024</sectorCount>
-    </device>
-    <device jedec="xC22515" supply="3V">
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="xC22415">
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="xC22534" supply="1.8V">
-      <cap writeSuspend="1"/>
-      <minEraseSuspend>12000</minEraseSuspend>
-    </device>
-    <device jedec="xC22535" supply="1.8V">
-      <cap writeSuspend="1"/>
-      <minEraseSuspend>12000</minEraseSuspend>
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="xC22536" supply="3V" cmd="MACRONIX2">
-      <cap writeSuspend="1"/>
-      <minEraseSuspend>9600</minEraseSuspend>
-      <sectorCount>1024</sectorCount>
-    </device>
-  </category>
-  <category cmd="GIGADEVICE">
-    <device jedec="xC84013" supply="3V">
-      <sectorSize>4096</sectorSize>
-      <sectorCount>128/</sectorCount>
-    </device>
-    <device jedec="xC84014" supply="3V">
-      <sectorSize>4096</sectorSize>
-      <sectorCount>256/</sectorCount>
-    </device>
-    <device jedec="xC84015" supply="3V">
-      <sectorSize>4096</sectorSize>
-      <sectorCount>512/</sectorCount>
-    </device>
-    <device jedec="xC84016" supply="3V">
-      <sectorSize>4096</sectorSize>
-      <sectorCount>1024/</sectorCount>
-    </device>
-  </category>
-  <device cmd="MICRON" jedec="x20BA16" supply="3V">
-    <sectorSize>4096</sectorSize>
-    <sectorCount>1024/</sectorCount>
-  </device>
-  <category cmd="EON">
-    <device jedec="x1C3013">
-      <sectorCount>128</sectorCount>
-      <!-- this device needs a min CS high time of 100ns between two reads -->
-      <cfg>0x000010CC</cfg>
-    </device>
-    <device jedec="x1C3014">
-      <sectorCount>256</sectorCount>
-    </device>
-    <device jedec="x1C7015">
-      <sectorCount>512</sectorCount>
-    </device>
-  </category>
-  <category cmd="EON" supply="1.8V">
-    <!-- these devices needs a min CS high time of 30ns between two reads -->
-    <cfg>0x000004CC</cfg>
-    <device jedec="x1C3814">
-      <sectorCount>256</sectorCount>
-    </device>
-    <device jedec="x1C3815">
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="x1C3816">
-      <sectorCount>1024</sectorCount>
-    </device>
-    <device jedec="x1C3817">
-      <!-- the SQI block only supports up to 32MBit -->
-      <sectorCount>1024</sectorCount>
-    </device>
-  </category>
-  <category cmd="FIDELIX">
-    <device jedec="xF83214">
-      <sectorCount>256</sectorCount>
-    </device>
-    <device jedec="xF83215">
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="xF84214" supply="1.8V">
-      <sectorCount>256</sectorCount>
-    </device>
-    <device jedec="xF84215" supply="1.8V">
-      <sectorCount>512</sectorCount>
-    </device>
-    <device jedec="xF84216" supply="1.8V">
-      <sectorCount>1024</sectorCount>
-    </device>
-    <device jedec="xF84217" supply="1.8V">
-      <!-- the SQI block only supports up to 32MBit -->
-      <sectorCount>1024</sectorCount>
-    </device>
-  </category>
-  <!-- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
-  <!-- %   Don't touch anything below here. This is autogenerated!   % -->
-  <!-- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
-  <cmdset name="EON">
-    <length>4032</length>
-    <checksum>4ae9f731</checksum>
-    <code>021e2406c130140000100000000800005a000000cc020000e02e0000100000008900000025010000b1010000490400003d02000000000000b9ab03ebffffffff0000ff50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070b5234e2148f16a012201eb0005214913460a614ff00500c8614ff480748868c007fcd112b1f06a401b06d5cc618868c007fcd1086ac007f4d1cb6040200b610322ca618a68d207fcd1c0f30742ca618a68d207fcd1c0f30722ca618a68d207fcd1c0b2c8618868c007fcd10a4d7d44cc618a68d207fcd10a6a2e18401c86f844204428f4d3cb6070bd0000006cdc0200a001400020004006ffffff10b5204c7c4420480122026194f83b10c1618168c907fcd1022181610023c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1216901f00f04c1f3031141ea0411c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48073c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c26010bd18ffffff0020004010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bd8cfeffff002000402de9f04f7d4a7a4492f8426001247c4b00254ff4807946b99d611c61ff26de619e68f607fcd1dc602ee01c61dd619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd192f84260de619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd14f46c3f81c909e68f607fcd1df619e68f607fcd1df619e68f607fcd1df619e68f607fcd1dc609d615678f60700d10021a0f500001c610626de619e68f607fcd1dc601c612026de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd1dc60906909b1012600e00026dff824c116b1dcf82c703944dcf82c701c6107eb00084ff0050bc3f81cb09868c007fcd1414f4ff0e02ee24676b1daf82c00b0eb010c06d5b0eb080006d4def8040d384202d0dc60284609e0c3f81c909868c007fcd1186ac007e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08ffefdffff0020004000a0014001600200f0b5734f7f4497f842c0012400252602704bbcf1000f0cd19d611c614ff0ff0cc3f81cc0d3f808c05feacc7cfad1dc6043e01c61c3f81c50d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad197f842c0c3f81cc000bfd3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1dc609d611c614ff0060cc3f81cc0d3f808c05feacc7cfad1dc601c614ff0020cc3f81cc000bfd3f808e05feace7efad1c0f3074ec3f81ce000bfd3f808e05feace7efad1c0f3072ec3f81ce000bfd3f808e05feace7efad1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c610520d8619868c007fcd1dff89ce01ab1def82c00401a06d5de619868c007fcd1186ac007f3d1dc601c6197f83b00d8619868c007fcd1c3f818c0dd619868c007fcd1dd619868c007fcd1dd619868c007fcd1386900f00f01c0f3031040ea0110d8619868c007fcd1dd619868c007fcd1dd619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1dc606046f0bd0000f4fbffff0020004000a00140</code>
-  </cmdset>
-  <cmdset name="FIDELIX">
-    <length>4032</length>
-    <checksum>b2daeed8</checksum>
-    <code>021e5c08c130140000100000800000005a000000cc0a0000e02e000010000000890000008901000015020000ad040000a102000089060000b9ab03ebffffffff757a005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002de9f0433b4cdff8e8c0e26a012102eb0c06394a0d4611614ff00508c2f81c804ff000094ff480739068c007fcd111b1e06a801b06d5d3619068c007fcd1106ac007f4d1d560402015610321d1619168c907fcd1c0f30741d1619168c907fcd1c0f30721d1619168c907fcd1c0b2d0619068c007fcd1214f7f44d3619168c907fcd1116a3e18401c86f844104428f4d3d560484615610621d1619168c907fcd1d5601561d5619168c907fcd1d0619068c007fcd10220d0619068c007fcd1d560e16a012061441561c2f81c809668f607fcd110b1e66a761a06d5d3619668f607fcd1166af607f4d1d560bde8f0830000006cdc0200a0014000200040fcfeffff10b5204c7c4420480122026194f83b10c1618168c907fcd1022181610023c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1216901f00f04c1f3031141ea0411c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48073c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c26010bdb4feffff0020004010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bd28feffff002000402de9f04f7d4a7a4492f8426001247c4b00254ff4807946b99d611c61ff26de619e68f607fcd1dc602ee01c61dd619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd192f84260de619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd14f46c3f81c909e68f607fcd1df619e68f607fcd1df619e68f607fcd1df619e68f607fcd1dc609d615678f60700d10021a0f500001c610626de619e68f607fcd1dc601c612026de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd1dc60906909b1012600e00026dff824c116b1dcf82c703944dcf82c701c6107eb00084ff0050bc3f81cb09868c007fcd1414f4ff0e02ee24676b1daf82c00b0eb010c06d5b0eb080006d4def8040d384202d0dc60284609e0c3f81c909868c007fcd1186ac007e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f9afdffff0020004000a0014001600200f0b5734f7f4497f842c0012400252602704bbcf1000f0cd19d611c614ff0ff0cc3f81cc0d3f808c05feacc7cfad1dc6043e01c61c3f81c50d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad197f842c0c3f81cc000bfd3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1dc609d611c614ff0060cc3f81cc0d3f808c05feacc7cfad1dc601c614ff0020cc3f81cc000bfd3f808e05feace7efad1c0f3074ec3f81ce000bfd3f808e05feace7efad1c0f3072ec3f81ce000bfd3f808e05feace7efad1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c610520d8619868c007fcd1dff89ce01ab1def82c00401a06d5de619868c007fcd1186ac007f3d1dc601c6197f83b00d8619868c007fcd1c3f818c0dd619868c007fcd1dd619868c007fcd1dd619868c007fcd1386900f00f01c0f3031040ea0110d8619868c007fcd1dd619868c007fcd1dd619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1dc606046f0bd000090fbffff0020004000a001402de9f04f6f4a7a4492f8421001246e4b00254ff4807941b99d611c61ff21d9619968c907fcd1dc602ee01c61dd619968c907fcd1dd619968c907fcd1dd619968c907fcd192f84210d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14e46c3f81c909968c907fcd1de619968c907fcd1de619968c907fcd1de619968c907fcd1dc609d611c6192f84110d9619968c907fcd1dc60916908b1012600e00026dff828c116b1dcf82c703844dcf82c701c6107eb01084ff0050bc3f81cb09968c907fcd1424f4ff0e02ee24676b1daf82c10b1eb000c06d5b1eb080106d4def8041d394202d0dc60284609e0c3f81c909968c907fcd1196ac907e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f0000b2f9ffff0020004000a0014001600200</code>
-  </cmdset>
-  <cmdset name="GIGADEVICE">
-    <length>4032</length>
-    <checksum>853b6a2b</checksum>
-    <code>021a5c08c840130000100000800000000a000000cc020000e02e000010000000890000008901000015020000ad040000a102000089060000000000ebffffffff757a005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002de9f0433b4cdff8e8c0e26a012102eb0c06394a0d4611614ff00508c2f81c804ff000094ff480739068c007fcd111b1e06a801b06d5d3619068c007fcd1106ac007f4d1d560402015610321d1619168c907fcd1c0f30741d1619168c907fcd1c0f30721d1619168c907fcd1c0b2d0619068c007fcd1214f7f44d3619168c907fcd1116a3e18401c86f844104428f4d3d560484615610621d1619168c907fcd1d5601561d5619168c907fcd1d0619068c007fcd10220d0619068c007fcd1d560e16a012061441561c2f81c809668f607fcd110b1e66a761a06d5d3619668f607fcd1166af607f4d1d560bde8f0830000006cdc0200a0014000200040fcfeffff10b5204c7c4420480122026194f83b10c1618168c907fcd1022181610023c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1216901f00f04c1f3031141ea0411c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48073c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c26010bdb4feffff0020004010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bd28feffff002000402de9f04f7d4a7a4492f8426001247c4b00254ff4807946b99d611c61ff26de619e68f607fcd1dc602ee01c61dd619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd192f84260de619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd14f46c3f81c909e68f607fcd1df619e68f607fcd1df619e68f607fcd1df619e68f607fcd1dc609d615678f60700d10021a0f500001c610626de619e68f607fcd1dc601c612026de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd1dc60906909b1012600e00026dff824c116b1dcf82c703944dcf82c701c6107eb00084ff0050bc3f81cb09868c007fcd1414f4ff0e02ee24676b1daf82c00b0eb010c06d5b0eb080006d4def8040d384202d0dc60284609e0c3f81c909868c007fcd1186ac007e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f9afdffff0020004000a0014001600200f0b5734f7f4497f842c0012400252602704bbcf1000f0cd19d611c614ff0ff0cc3f81cc0d3f808c05feacc7cfad1dc6043e01c61c3f81c50d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad197f842c0c3f81cc000bfd3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1dc609d611c614ff0060cc3f81cc0d3f808c05feacc7cfad1dc601c614ff0020cc3f81cc000bfd3f808e05feace7efad1c0f3074ec3f81ce000bfd3f808e05feace7efad1c0f3072ec3f81ce000bfd3f808e05feace7efad1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c610520d8619868c007fcd1dff89ce01ab1def82c00401a06d5de619868c007fcd1186ac007f3d1dc601c6197f83b00d8619868c007fcd1c3f818c0dd619868c007fcd1dd619868c007fcd1dd619868c007fcd1386900f00f01c0f3031040ea0110d8619868c007fcd1dd619868c007fcd1dd619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1dc606046f0bd000090fbffff0020004000a001402de9f04f6f4a7a4492f8421001246e4b00254ff4807941b99d611c61ff21d9619968c907fcd1dc602ee01c61dd619968c907fcd1dd619968c907fcd1dd619968c907fcd192f84210d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14e46c3f81c909968c907fcd1de619968c907fcd1de619968c907fcd1de619968c907fcd1dc609d611c6192f84110d9619968c907fcd1dc60916908b1012600e00026dff828c116b1dcf82c703844dcf82c701c6107eb01084ff0050bc3f81cb09968c907fcd1424f4ff0e02ee24676b1daf82c10b1eb000c06d5b1eb080106d4def8041d394202d0dc60284609e0c3f81c909968c907fcd1196ac907e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f0000b2f9ffff0020004000a0014001600200</code>
-  </cmdset>
-  <cmdset name="MACRONIX">
-    <length>4032</length>
-    <checksum>215f4423</checksum>
-    <code>021eb408c22014000010000000010000a5000000cc02000080bb00001000000089000000e10100006d02000005050000f9020000e1060000b9ab14ebffffffffb030005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002de9f043dff84091dff840c1fc44504b0121da6a4f4c4a440d4621614ff00507e7614ff48076a068c007fcd111b1d86a801a06d5e661a068c007fcd1206ac007f4d1e560402025610321e161a168c907fcd1c0f30741e161a168c907fcd1c0f30721e161a168c907fcd1c0b2e061a068c007fcd1dff8d480f844a8f1b008e661a168c907fcd1216a08eb0002401c82f844104428f3d3e5602b202561e061a068c007fcd1e661a068c007fcd1206ae56010f00c0f13d025619cf84100e061a068c007fcd1e56000210a462561e761a068c007fcd13ab1d86a401a04d4e56025610620e06107e0e661a068c007fcd1206ac007efd1f2e7a068c007fcd1e5602561e561a068c007fcd14020e061a068c007fcd1a068c007fcd1e560da6a012002eb09012561e761a268d207fcd110b1da6a521a06d5e661a268d207fcd1226ad207f4d1e560bde8f083006cdc02acffffff00a001400020004010b5204c7c4420480122026194f83b10c1618168c907fcd1022181610023c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1216901f00f04c1f3031141ea0411c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48073c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c26010bd5cfeffff0020004010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bdd0fdffff002000402de9f04f7d4a7a4492f8426001247c4b00254ff4807946b99d611c61ff26de619e68f607fcd1dc602ee01c61dd619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd192f84260de619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd14f46c3f81c909e68f607fcd1df619e68f607fcd1df619e68f607fcd1df619e68f607fcd1dc609d615678f60700d10021a0f500001c610626de619e68f607fcd1dc601c612026de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd1dc60906909b1012600e00026dff824c116b1dcf82c703944dcf82c701c6107eb00084ff0050bc3f81cb09868c007fcd1414f4ff0e02ee24676b1daf82c00b0eb010c06d5b0eb080006d4def8040d384202d0dc60284609e0c3f81c909868c007fcd1186ac007e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f42fdffff0020004000a0014001600200f0b5734f7f4497f842c0012400252602704bbcf1000f0cd19d611c614ff0ff0cc3f81cc0d3f808c05feacc7cfad1dc6043e01c61c3f81c50d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad197f842c0c3f81cc000bfd3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1dc609d611c614ff0060cc3f81cc0d3f808c05feacc7cfad1dc601c614ff0020cc3f81cc000bfd3f808e05feace7efad1c0f3074ec3f81ce000bfd3f808e05feace7efad1c0f3072ec3f81ce000bfd3f808e05feace7efad1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c610520d8619868c007fcd1dff89ce01ab1def82c00401a06d5de619868c007fcd1186ac007f3d1dc601c6197f83b00d8619868c007fcd1c3f818c0dd619868c007fcd1dd619868c007fcd1dd619868c007fcd1386900f00f01c0f3031040ea0110d8619868c007fcd1dd619868c007fcd1dd619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1dc606046f0bd000038fbffff0020004000a001402de9f04f6f4a7a4492f8421001246e4b00254ff4807941b99d611c61ff21d9619968c907fcd1dc602ee01c61dd619968c907fcd1dd619968c907fcd1dd619968c907fcd192f84210d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14e46c3f81c909968c907fcd1de619968c907fcd1de619968c907fcd1de619968c907fcd1dc609d611c6192f84110d9619968c907fcd1dc60916908b1012600e00026dff828c116b1dcf82c703844dcf82c701c6107eb01084ff0050bc3f81cb09968c907fcd1424f4ff0e02ee24676b1daf82c10b1eb000c06d5b1eb080106d4def8041d394202d0dc60284609e0c3f81c909968c907fcd1196ac907e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f00005af9ffff0020004000a0014001600200</code>
-  </cmdset>
-  <cmdset name="MACRONIX2">
-    <length>4032</length>
-    <checksum>d51ae60f</checksum>
-    <code>021eb408c22014000010000000010000a5000000cc02000080bb00001000000089000000e10100006d02000005050000f9020000e1060000b9ab14ebffffffff757a005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002de9f043dff84091dff840c1fc44504b0121da6a4f4c4a440d4621614ff00507e7614ff48076a068c007fcd111b1d86a801a06d5e661a068c007fcd1206ac007f4d1e560402025610321e161a168c907fcd1c0f30741e161a168c907fcd1c0f30721e161a168c907fcd1c0b2e061a068c007fcd1dff8d480f844a8f1b008e661a168c907fcd1216a08eb0002401c82f844104428f3d3e5602b202561e061a068c007fcd1e661a068c007fcd1206ae56010f00c0f13d025619cf84100e061a068c007fcd1e56000210a462561e761a068c007fcd13ab1d86a401a04d4e56025610620e06107e0e661a068c007fcd1206ac007efd1f2e7a068c007fcd1e5602561e561a068c007fcd14020e061a068c007fcd1a068c007fcd1e560da6a012002eb09012561e761a268d207fcd110b1da6a521a06d5e661a268d207fcd1226ad207f4d1e560bde8f083006cdc02acffffff00a001400020004010b5204c7c4420480122026194f83b10c1618168c907fcd1022181610023c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1216901f00f04c1f3031141ea0411c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48073c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c26010bd5cfeffff0020004010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bdd0fdffff002000402de9f04f7d4a7a4492f8426001247c4b00254ff4807946b99d611c61ff26de619e68f607fcd1dc602ee01c61dd619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd192f84260de619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd14f46c3f81c909e68f607fcd1df619e68f607fcd1df619e68f607fcd1df619e68f607fcd1dc609d615678f60700d10021a0f500001c610626de619e68f607fcd1dc601c612026de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd1dc60906909b1012600e00026dff824c116b1dcf82c703944dcf82c701c6107eb00084ff0050bc3f81cb09868c007fcd1414f4ff0e02ee24676b1daf82c00b0eb010c06d5b0eb080006d4def8040d384202d0dc60284609e0c3f81c909868c007fcd1186ac007e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f42fdffff0020004000a0014001600200f0b5734f7f4497f842c0012400252602704bbcf1000f0cd19d611c614ff0ff0cc3f81cc0d3f808c05feacc7cfad1dc6043e01c61c3f81c50d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad197f842c0c3f81cc000bfd3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1dc609d611c614ff0060cc3f81cc0d3f808c05feacc7cfad1dc601c614ff0020cc3f81cc000bfd3f808e05feace7efad1c0f3074ec3f81ce000bfd3f808e05feace7efad1c0f3072ec3f81ce000bfd3f808e05feace7efad1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c610520d8619868c007fcd1dff89ce01ab1def82c00401a06d5de619868c007fcd1186ac007f3d1dc601c6197f83b00d8619868c007fcd1c3f818c0dd619868c007fcd1dd619868c007fcd1dd619868c007fcd1386900f00f01c0f3031040ea0110d8619868c007fcd1dd619868c007fcd1dd619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1dc606046f0bd000038fbffff0020004000a001402de9f04f6f4a7a4492f8421001246e4b00254ff4807941b99d611c61ff21d9619968c907fcd1dc602ee01c61dd619968c907fcd1dd619968c907fcd1dd619968c907fcd192f84210d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14e46c3f81c909968c907fcd1de619968c907fcd1de619968c907fcd1de619968c907fcd1dc609d611c6192f84110d9619968c907fcd1dc60916908b1012600e00026dff828c116b1dcf82c703844dcf82c701c6107eb01084ff0050bc3f81cb09968c907fcd1424f4ff0e02ee24676b1daf82c10b1eb000c06d5b1eb080106d4def8041d394202d0dc60284609e0c3f81c909968c907fcd1196ac907e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f00005af9ffff0020004000a0014001600200</code>
-  </cmdset>
-  <cmdset name="MICRON">
-    <length>4032</length>
-    <checksum>3d2ff0c5</checksum>
-    <code>021a480520ba1600001000000004000000000000cc020000e02e0000100000008900000013010000bd040000fb0100000b03000000000000000000ebffffffff0000ff50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070b5ff480122ff4ef16a134601eb0005fd490a614ff00500c8614ff480748868c007fcd112b1f06a401b06d5cc618868c007fcd1086ac007f4d1cb6040200b610322ca618a68d207fcd1c0f30742ca618a68d207fcd1c0f30722ca618a68d207fcd1c0b2c8618868c007fcd1e74d7d44cc618a68d207fcd10a6a2e18401c86f844204428f4d3cb6070bdf0b5de4901240c610620c8618868c007fcd1cc600c618120c8618868c007fcd16720c8618868c007fcd1cc60d54ed24f7e44d048083efb6a012203440c614ff00500c8614ff0000c4ff480758868c007fcd112b1f86ac01a06d5cd618868c007fcd1086ac007f4d1cc600c6196f83b00c8618868c007fcd102208861c1f81cc08868c007fcd1c1f81cc08868c007fcd1c1f81cc08868c007fcd1306900f00f02c0f3031040ea0210c8618868c007fcd1c1f81cc08868c007fcd1c1f81cc08868c007fcd1cd618868c007fcd1cd618868c007fcd1cd618868c007fcd1cd618868c007fcd1cc60f0bdf0b5a54c7c44c43c94f842300125a14e4ff0000c2f024bb9c6f818c03561ff23f361b368db07fcd1f56032e03561c6f81cc0b368db07fcd1c6f81cc0b368db07fcd1c6f81cc0b368db07fcd194f84230f361b368db07fcd1c6f81cc0b368db07fcd1c6f81cc0b368db07fcd1f761b368db07fcd1f761b368db07fcd1f761b368db07fcd1f761b368db07fcd1f560c6f818c035610623f361b368db07fcd1f56035610224f461b368db07fcd1c0f30743f361b368db07fcd1c0f30723f361b368db07fcd1c0b2f061b068c007fcd111f8010bf061b068c007fcd1521ef7d1f560014635610522f261b268d207fcd1684b11b1da6a121a06d5f761b268d207fcd1326ad207f4d1f560fff706ff2046f0bd2de9f04f624c7c4494f842505e4a01234ff0000c4ff480784db9c2f818c01361ff25d5619568ed07fcd1d36036e01361c2f81cc09568ed07fcd1c2f81cc09568ed07fcd1c2f81cc09568ed07fcd194f84250d5619568ed07fcd1c2f81cc09568ed07fcd1c2f81cc09568ed07fcd1c2f81c809568ed07fcd1c2f81c809568ed07fcd1c2f81c809568ed07fcd1c2f81c809568ed07fcd1d360c2f818c06578ed0700d10021a0f5000013610625d5619568ed07fcd1d36013612025d5619568ed07fcd1c0f30745d5619568ed07fcd1c0f30725d5619568ed07fcd1c0b2d0619068c007fcd1d360a06909b1012500e00025244f0db1fe6a3144fe6a136106444ff0050ac2f81ca09068c007fcd1dff884e04ff0e02bb94665b1d9f82c00471a06d5801b06d4dbf8040d10ea0e0f01d0d36009e0c2f81c809068c007fcd1106ac007e9d1d3609c46bcf1000f01d002242ae0136194f84000d0619068c007fcd1d36001461361c2f81ca09468e407fcd14c46454611b1e66a361a13d5d5610be0006cdc0200a001400020004006ffffff30fdffff016002009668f607efd1166af607e7d1d3600124fff72ffe2046bde8f08f000010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bd80fbffff00200040</code>
-  </cmdset>
-  <cmdset name="SPANSION">
-    <length>4032</length>
-    <checksum>2b5e2d56</checksum>
-    <code>021bbc08ef401300001000008000000002000000cc000000e02e00001000000089000000e9010000750200000d05000001030000e9060000b9ab06ebffffffff757a005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002de9f047dff84891dff848c1fc44524b0121da6a514c4a440d4621614ff00507e7614ff0000a4ff48076a068c007fcd111b1d86a801a06d5e661a068c007fcd1206ac007f4d1e560402025610321e161a168c907fcd1c0f30741e161a168c907fcd1c0f30721e161a168c907fcd1c0b2e061a068c007fcd1dff8d880f844a8f1b408e661a168c907fcd1216a08eb0002401c82f844104428f3d3e56035202561e061a068c007fcd1e661a068c007fcd1206ae56010f0800f13d025619cf84100e061a068c007fcd1e56000210a462561e761a068c007fcd13ab1d86a401a04d4e56025610620e06107e0e661a068c007fcd1206ac007efd1f2e7a068c007fcd1e5602561e561a068c007fcd1c4f81ca0a068c007fcd10220e061a068c007fcd1e560da6a012002eb09012561e761a268d207fcd110b1da6a521a06d5e661a268d207fcd1226ad207f4d1e560bde8f087006cdc02acffffff00a001400020004010b5204c7c4420480122026194f83b10c1618168c907fcd1022181610023c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1216901f00f04c1f3031141ea0411c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48073c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c26010bd54feffff0020004010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bdc8fdffff002000402de9f04f7d4a7a4492f8426001247c4b00254ff4807946b99d611c61ff26de619e68f607fcd1dc602ee01c61dd619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd192f84260de619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd14f46c3f81c909e68f607fcd1df619e68f607fcd1df619e68f607fcd1df619e68f607fcd1dc609d615678f60700d10021a0f500001c610626de619e68f607fcd1dc601c612026de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd1dc60906909b1012600e00026dff824c116b1dcf82c703944dcf82c701c6107eb00084ff0050bc3f81cb09868c007fcd1414f4ff0e02ee24676b1daf82c00b0eb010c06d5b0eb080006d4def8040d384202d0dc60284609e0c3f81c909868c007fcd1186ac007e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f3afdffff0020004000a0014001600200f0b5734f7f4497f842c0012400252602704bbcf1000f0cd19d611c614ff0ff0cc3f81cc0d3f808c05feacc7cfad1dc6043e01c61c3f81c50d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad197f842c0c3f81cc000bfd3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1dc609d611c614ff0060cc3f81cc0d3f808c05feacc7cfad1dc601c614ff0020cc3f81cc000bfd3f808e05feace7efad1c0f3074ec3f81ce000bfd3f808e05feace7efad1c0f3072ec3f81ce000bfd3f808e05feace7efad1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c610520d8619868c007fcd1dff89ce01ab1def82c00401a06d5de619868c007fcd1186ac007f3d1dc601c6197f83b00d8619868c007fcd1c3f818c0dd619868c007fcd1dd619868c007fcd1dd619868c007fcd1386900f00f01c0f3031040ea0110d8619868c007fcd1dd619868c007fcd1dd619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1dc606046f0bd000030fbffff0020004000a001402de9f04f6f4a7a4492f8421001246e4b00254ff4807941b99d611c61ff21d9619968c907fcd1dc602ee01c61dd619968c907fcd1dd619968c907fcd1dd619968c907fcd192f84210d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14e46c3f81c909968c907fcd1de619968c907fcd1de619968c907fcd1de619968c907fcd1dc609d611c6192f84110d9619968c907fcd1dc60916908b1012600e00026dff828c116b1dcf82c703844dcf82c701c6107eb01084ff0050bc3f81cb09968c907fcd1424f4ff0e02ee24676b1daf82c10b1eb000c06d5b1eb080106d4def8041d394202d0dc60284609e0c3f81c909968c907fcd1196ac907e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f000052f9ffff0020004000a0014001600200</code>
-  </cmdset>
-  <cmdset name="SST">
-    <length>4032</length>
-    <checksum>7df33088</checksum>
-    <code>021b6804bf26020000100000000400000000000bc5000000e02e0000100000000f0100008900000000000000ad030000cf010000e502000000000000ffffffff00000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070b5f2480021816101240461ff21c1618168c907fcd1c46004613821c1618168c907fcd1c4600221816104616621c1618168c907fcd1c46000bf00bf00bf00bf04619921c1618168c907fcd1c460e14ddf49eb6a01220b4404614ff00501c1618168c907fcd14ff4807622b1e96ac91a01d4c46070bdc6618168c907fcd1016a0906f2d4f5e7f0b5d04901240c616620c8618868c007fcd1cc6000bf00bf00bf00bf0c619920c8618868c007fcd1cc60c84dc748eb6a012203440c614ff0050cc1f81cc04ff000074ff480768868c007fcd112b1e86ac01a06d5ce618868c007fcd1086a0006f4d4cc600c610620c8618868c007fcd1cc600a200c614222ca618a68d207fcd1cf618a68d207fcd1401ef9d1cc60eb6a4bf6803201201a440c61c1f81cc08b68db07fcd120b1eb6a9b1a01d4cc60f0bdce618b68db07fcd10b6a1b06f2d4f5e72de9f04fa04b0124a0f500001c610527df619a68d207fcd14ff48078c3f81c809a68d207fcd1dc601a6a12f00c0f02d00320bde8f08f1c610622da619a68d207fcd1dc601c612022da619a68d207fcd1c0f30742da619a68d207fcd1c0f30722da619a68d207fcd1c0b2d8619868c007fcd1dc6087487844c06d09b1012200e00022824e0ab1f56a2944f56a1c610544b946df614ff0000b9868c007fcd17d4f4ff0e02a62b1f06ab0eb010c05d5401b06d4daf8040d384202d0dc60584609e0c3f81c809868c007fcd1186a0006e9d42046dc6008b10220abe71c61b020d8619868c007fcd1dc6000210a461c61c3f81c909868c007fcd112b1f06a401a07d5c3f81c809868c007fcd1186a0006f3d4dc6001208de72de9f04f5a4b01241c613021d9619968c907fcd1dc6059497944b839c96d08b1012200e00022dff8508112b1d8f82c502844d8f82c501c610d444ff0050ac3f81ca04ff0000b4ff480769968c907fcd14b4f4ff0e0296ab1d8f82c10b1eb000c05d5491b06d4d9f8041d394202d0dc60584608e0de619968c907fcd1196a0906e9d42046dc60e8b91c61b020d8619868c007fcd1dc6000210a461c61c3f81ca09868c007fcd11ab1d8f82c00401a06d5de619868c007fcd1186a0006f3d4dc6001202be7022029e7f0b5294b01241c610525dd619e68f607fcd14ff48077df619e68f607fcd1dc601e6a16f00c0f01d00320f0bd1c610626de619e68f607fcd1dc601c610226de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c61dd619868c007fcd1094d12b1e86a401a06d5df619868c007fcd1186a0006f4d4dc600220f0bd000000200040006cdc0200a00140b8fdffff01600200</code>
-  </cmdset>
-  <cmdset name="SST2">
-    <length>4032</length>
-    <checksum>7ee13dd7</checksum>
-    <code>021b1409bf26430000100000000800005a000000cc000000e02e0000100000008900000041020000cd020000650500005903000041070000000000ebffffffffb03000500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000feb5654a7a4492f84200002501246349260240b98d610c61ff20c8618868c007fcd1cc602ce00c61cd618868c007fcd1cd618868c007fcd1cd618868c007fcd192f84200c8618868c007fcd1cd618868c007fcd1cd618868c007fcd1ce618868c007fcd1ce618868c007fcd1ce618868c007fcd1ce618868c007fcd1cc608d61484f4748fb6a012203440c614ff00500c8618868c007fcd112b1f86ac01a06d5ce618868c007fcd1086ac007f4d1cc600c610620c8618a68d207fcd1cc600c61cc618a68d207fcd1cd618a68d207fcd10222ca618a68d207fcd1cc600c61c8618868c007fcd1cc600c619820c8618868c007fcd1cc600c610327cf618868c007fcd1cd618868c007fcd1cd618868c007fcd11820c8618868c007fcd16b46ce618a68d207fcd10a6a1a54401c0328f6d3cc600c61cf618868c007fcd19df802008038c8618868c007fcd19df80100c8618868c007fcd19df80000c8618868c007fcd1ce618a68d207fcd10f6a421c1f5410460c2af5d3cc600b490098884209d10a490198884205d109490298884201d108480571febd0000b4ffffff00200040006cdc0200a00140312e30302028353938343329204e002010b5204c7c4420480122026194f83b10c1618168c907fcd1022181610023c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1216901f00f04c1f3031141ea0411c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48073c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c26010bdfcfdffff0020004010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bd70fdffff002000402de9f04f7d4a7a4492f8426001247c4b00254ff4807946b99d611c61ff26de619e68f607fcd1dc602ee01c61dd619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd192f84260de619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd14f46c3f81c909e68f607fcd1df619e68f607fcd1df619e68f607fcd1df619e68f607fcd1dc609d615678f60700d10021a0f500001c610626de619e68f607fcd1dc601c612026de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd1dc60906909b1012600e00026dff824c116b1dcf82c703944dcf82c701c6107eb00084ff0050bc3f81cb09868c007fcd1414f4ff0e02ee24676b1daf82c00b0eb010c06d5b0eb080006d4def8040d384202d0dc60284609e0c3f81c909868c007fcd1186ac007e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08fe2fcffff0020004000a0014001600200f0b5734f7f4497f842c0012400252602704bbcf1000f0cd19d611c614ff0ff0cc3f81cc0d3f808c05feacc7cfad1dc6043e01c61c3f81c50d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad197f842c0c3f81cc000bfd3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1dc609d611c614ff0060cc3f81cc0d3f808c05feacc7cfad1dc601c614ff0020cc3f81cc000bfd3f808e05feace7efad1c0f3074ec3f81ce000bfd3f808e05feace7efad1c0f3072ec3f81ce000bfd3f808e05feace7efad1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c610520d8619868c007fcd1dff89ce01ab1def82c00401a06d5de619868c007fcd1186ac007f3d1dc601c6197f83b00d8619868c007fcd1c3f818c0dd619868c007fcd1dd619868c007fcd1dd619868c007fcd1386900f00f01c0f3031040ea0110d8619868c007fcd1dd619868c007fcd1dd619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1dc606046f0bd0000d8faffff0020004000a001402de9f04f6f4a7a4492f8421001246e4b00254ff4807941b99d611c61ff21d9619968c907fcd1dc602ee01c61dd619968c907fcd1dd619968c907fcd1dd619968c907fcd192f84210d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14e46c3f81c909968c907fcd1de619968c907fcd1de619968c907fcd1de619968c907fcd1dc609d611c6192f84110d9619968c907fcd1dc60916908b1012600e00026dff828c116b1dcf82c703844dcf82c701c6107eb01084ff0050bc3f81cb09968c907fcd1424f4ff0e02ee24676b1daf82c10b1eb000c06d5b1eb080106d4def8041d394202d0dc60284609e0c3f81c909968c907fcd1196ac907e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f0000faf8ffff0020004000a0014001600200</code>
-  </cmdset>
-  <cmdset name="WINBOND">
-    <length>4032</length>
-    <checksum>94ad0fde</checksum>
-    <code>021bbc08ef401300001000008000000002000000c4000000e02e00001000000089000000e9010000750200000d05000001030000e9060000000000e3ffffffff757a005000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002de9f047dff84891dff848c1fc44524b0121da6a514c4a440d4621614ff00507e7614ff0000a4ff48076a068c007fcd111b1d86a801a06d5e661a068c007fcd1206ac007f4d1e560402025610321e161a168c907fcd1c0f30741e161a168c907fcd1c0f30721e161a168c907fcd1c0b2e061a068c007fcd1dff8d880f844a8f1b408e661a168c907fcd1216a08eb0002401c82f844104428f3d3e56035202561e061a068c007fcd1e661a068c007fcd1206ae56010f0800f13d025619cf84100e061a068c007fcd1e56000210a462561e761a068c007fcd13ab1d86a401a04d4e56025610620e06107e0e661a068c007fcd1206ac007efd1f2e7a068c007fcd1e5602561e561a068c007fcd1c4f81ca0a068c007fcd10220e061a068c007fcd1e560da6a012002eb09012561e761a268d207fcd110b1da6a521a06d5e661a268d207fcd1226ad207f4d1e560bde8f087006cdc02acffffff00a001400020004010b5204c7c4420480122026194f83b10c1618168c907fcd1022181610023c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1216901f00f04c1f3031141ea0411c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48073c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c3618168c907fcd1c26010bd54feffff0020004010b5204c7c4494f8421001221e48002341b983610261ff21c1618168c907fcd1c26010bd0261c3618168c907fcd1c3618168c907fcd1c3618168c907fcd194f84210c1618168c907fcd1c3618168c907fcd1c3618168c907fcd14ff48074c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c4618168c907fcd1c260836110bdc8fdffff002000402de9f04f7d4a7a4492f8426001247c4b00254ff4807946b99d611c61ff26de619e68f607fcd1dc602ee01c61dd619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd192f84260de619e68f607fcd1dd619e68f607fcd1dd619e68f607fcd14f46c3f81c909e68f607fcd1df619e68f607fcd1df619e68f607fcd1df619e68f607fcd1dc609d615678f60700d10021a0f500001c610626de619e68f607fcd1dc601c612026de619e68f607fcd1c0f30746de619e68f607fcd1c0f30726de619e68f607fcd1c0b2d8619868c007fcd1dc60906909b1012600e00026dff824c116b1dcf82c703944dcf82c701c6107eb00084ff0050bc3f81cb09868c007fcd1414f4ff0e02ee24676b1daf82c00b0eb010c06d5b0eb080006d4def8040d384202d0dc60284609e0c3f81c909868c007fcd1186ac007e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f3afdffff0020004000a0014001600200f0b5734f7f4497f842c0012400252602704bbcf1000f0cd19d611c614ff0ff0cc3f81cc0d3f808c05feacc7cfad1dc6043e01c61c3f81c50d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad197f842c0c3f81cc000bfd3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1dd61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1de61d3f808c05feacc7cfad1dc609d611c614ff0060cc3f81cc0d3f808c05feacc7cfad1dc601c614ff0020cc3f81cc000bfd3f808e05feace7efad1c0f3074ec3f81ce000bfd3f808e05feace7efad1c0f3072ec3f81ce000bfd3f808e05feace7efad1c0b2d8619868c007fcd111f8010bd8619868c007fcd1521ef7d1dc6000210a461c610520d8619868c007fcd1dff89ce01ab1def82c00401a06d5de619868c007fcd1186ac007f3d1dc601c6197f83b00d8619868c007fcd1c3f818c0dd619868c007fcd1dd619868c007fcd1dd619868c007fcd1386900f00f01c0f3031040ea0110d8619868c007fcd1dd619868c007fcd1dd619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1de619868c007fcd1dc606046f0bd000030fbffff0020004000a001402de9f04f6f4a7a4492f8421001246e4b00254ff4807941b99d611c61ff21d9619968c907fcd1dc602ee01c61dd619968c907fcd1dd619968c907fcd1dd619968c907fcd192f84210d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14e46c3f81c909968c907fcd1de619968c907fcd1de619968c907fcd1de619968c907fcd1dc609d611c6192f84110d9619968c907fcd1dc60916908b1012600e00026dff828c116b1dcf82c703844dcf82c701c6107eb01084ff0050bc3f81cb09968c907fcd1424f4ff0e02ee24676b1daf82c10b1eb000c06d5b1eb080106d4def8041d394202d0dc60284609e0c3f81c909968c907fcd1196ac907e7d12046dc6008b102201fe01c6192f84000d8619868c007fcd1dc6000210e461c61c3f81cb09868c007fcd15746cc4616b1f86a401a07d5c3f81cc09868c007fcd1186ac007f3d1dc6001201c6192f83b10d9619968c907fcd102219961dd619968c907fcd1dd619968c907fcd1dd619968c907fcd1116901f00f02c1f3031141ea0211d9619968c907fcd1dd619968c907fcd1dd619968c907fcd14a46c3f81c909968c907fcd1da619968c907fcd1da619968c907fcd1da619968c907fcd1dc60bde8f08f000052f9ffff0020004000a0014001600200</code>
-  </cmdset>
-</flash>

recipes-connectivity/ublox-gnss-fw-update/files/gnss-fw-update

@@ -1,13 +0,0 @@
-#!/usr/bin/env sh
-
-systemctl stop gpsd
-systemctl stop gpsd.socket
-killall gpsd
-killall ser2net
-fwupdate -p /dev/ttyS3 -F /lib/firmware/ubx-fw-flash.xml /lib/firmware/UBX_M8_301_ADR_421_NEO_M8L.bin
-
-if [ $? -eq 0 ]; then
-	echo "Firmware update was successful, please do a full power cycle of the device"
-else
-	echo "Firmware update failed"
-fi

recipes-connectivity/ublox-gnss-fw-update/ublox-gnss-fw-update.bb

@@ -1,42 +0,0 @@
-SUMMARY = "FW update tool for ublox NEO-M8L"
-DESCRIPTION = "Fw update tool for ublox NEO-M8L"
-SECTION = "utils"
-
-
-LICENSE="Proprietary"
-LIC_FILES_CHKSUM="file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-
-DEPENDS = "ncurses"
-
-SRC_URI = "file://ubx-fw-update.tar.gz \
-           file://flash.xml \
-           file://UBX_M8_301_ADR_421_NEO_M8L.bin \
-           file://gnss-fw-update \
-          "
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[ubx-tool-only] = ""
-
-S = "${WORKDIR}/ubx-fw-update"
-
-do_compile() {
-     oe_runmake
-}
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 fwupdate ${D}${bindir}/
-
-    if ! ${@bb.utils.contains('PACKAGECONFIG','ubx-tool-only','true','false',d)}; then
-        install -m 0755 ../gnss-fw-update ${D}${bindir}/
-
-        install -d  ${D}${nonarch_base_libdir}/firmware/
-        install -m 0644 ../UBX_M8_301_ADR_421_NEO_M8L.bin ${D}${nonarch_base_libdir}/firmware/
-        install -m 0644 ../flash.xml ${D}${nonarch_base_libdir}/firmware/ubx-fw-flash.xml
-    fi
-}
-
-FILES:${PN} = " \
-               ${bindir} \
-               ${nonarch_base_libdir} \
-              "

recipes-connectivity/wwan-config/wwan-config.bb

@@ -22,7 +22,7 @@ PV = "1.0-git${SRCPV}"
 
 PR = "r1"
 
-SRCREV ?= "e656bad963ec54e4f763503a813662b17e23e5ba"
+SRCREV = "44c80a562991b86b913a58f8d5b7dad7dabc6057"
 SRC_URI = "git://gitlab.com/netmodule/tools/wwan-config.git;protocol=ssh;user=git;branch=master \
            file://wwan-config@.service \
            file://default.conf \

recipes-connectivity/wwan-config/wwan-config/default.conf

@@ -3,6 +3,7 @@
 #
 
 # Define a private APN to be used by the modem
+#  ! ONLY REQUIRED WHEN USING UBLOX TOBY-L2, will be ignored for other modems
 #
 # Required fields:
 #     apn:      Name of the access point
@@ -40,6 +41,7 @@ SIM=auto
 #  - Bridge : The modem will only act as a Bridge between the local and the GSM network.
 #
 # usb_profile (+UUSBCONF) :
+#  ! ONLY USED WITH TOBY-L2, will be ignored for other modems
 #  Select between different network/usb interfaces :
 #  - RNDIS
 #  - ECM

recipes-connectivity/wwan-config/wwan-config/wwan-config@.service

@@ -9,6 +9,9 @@ Restart=on-failure
 Nice=-20
 # Start time may include power cycles and start of ModemManager
 TimeoutStartSec=180
+# The default kill mode is killing the subprocesses created by the "os.system"
+# calls used to stop ModemManager when handling the kill signal.
+KillMode=mixed
 
 [Install]
 RequiredBy=multi-user.target

recipes-core/board-descriptor/board-descriptor.bb

@@ -5,8 +5,11 @@ AUTHOR = "Stefan Eichenberger (stefan.eichenberger@netmodule.com)"
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
 SECTION = "core"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+LICENSE = "GPL-2.0-only"
+
+include ${LAYERSERIES_CORENAMES}/licenses.inc
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
 PR = "r0"
 
 inherit python3-dir

recipes-core/udev/udev-rules-nmhw_git.bb

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 SECTION = "base"
 
 S = "${WORKDIR}/git"
-SRCREV ?= "b061655a4cc2553499decc20ee3954a72a69fcee"
+SRCREV ?= "6ecd4c6691c8b71e7147532faea40ba29988c062"
 
 SRC_URI = "git://gitlab.com/netmodule/tools/udev-rules-nmhw;protocol=ssh;user=git;branch=master;"
 

recipes-kernel/linux/linux-netmodule_git-4.14-nxp.bb

@@ -1,5 +1,5 @@
 require linux-netmodule.inc
 
 SRC_URI = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;protocol=ssh;user=git;branch=4.14/nxp/nmhw23"
-SRCREV ?= "4c9842d4b5940a93e38121ce855fb3d6bbbaeaf0"
+SRCREV ?= "3ee53ea1ed03e93237e594621490839a0e2052d6"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"

recipes-kernel/linux/linux-netmodule_git-5.10.bb

@@ -1,7 +1,7 @@
 require linux-netmodule.inc
 
 SRC_URI = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;protocol=ssh;user=git;branch=5.10/standard/base"
-SRCREV ?= "383b4b9a26c1e3ff804a66132842d31e43681b06"
+SRCREV = "68a67a669043c1fdf61da96ce87481e61207a8b5"
 
 # Config fragments
 FILESEXTRAPATHS:prepend := "${THISDIR}/conf:"

recipes-kernel/system-state-framework/packagegroup-system-state-framework.bb

@@ -2,7 +2,9 @@
 DESCRIPTION = "implements a publish/subscribe broker for the various system state topics"
 HOMEPAGE = "http://www.netmodule.com/"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
+include ${LAYERSERIES_CORENAMES}/licenses.inc
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit packagegroup
 

recipes-kernel/system-state-framework/ssc-broker-driver_git.bb

@@ -3,7 +3,9 @@
 DESCRIPTION = "implements a publish/subscribe broker for the various system state topics"
 HOMEPAGE = "http://www.netmodule.com/"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
+include ${LAYERSERIES_CORENAMES}/licenses.inc
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit module
 

recipes-kernel/system-state-framework/ssc-extmod-driver_git.bb

@@ -3,7 +3,9 @@
 DESCRIPTION = "implements a publish/subscribe broker for the various system state topics"
 HOMEPAGE = "http://www.netmodule.com/"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
+include ${LAYERSERIES_CORENAMES}/licenses.inc
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 DEPENDS = "ssc-broker-driver"
 RDEPENDS:${PN} = "ssc-broker-driver"

recipes-kernel/system-state-framework/ssc-sysstate-driver_git.bb

@@ -3,7 +3,10 @@
 DESCRIPTION = "implements a publish/subscribe broker for the various system state topics"
 HOMEPAGE = "http://www.netmodule.com/"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
+include ${LAYERSERIES_CORENAMES}/licenses.inc
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
+
 
 DEPENDS = "ssc-broker-driver"
 RDEPENDS:${PN} = "ssc-broker-driver"
@@ -16,7 +19,7 @@ KERNEL_MODULE_AUTOLOAD += "sysstate"
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
 
 PV = "1.0.0"
-SRCREV ?= "19a75e6acbb5541c905ecdfc63ddba1591a619bf"
+SRCREV ?= "e6cd905b06a04af2a1a5fedd07d1ce0c34cfe433"
 
 EXTRA_OEMAKE += "ccflags-y=\"-I${STAGING_INCDIR}/\""