mpower-dev-thud: merge meta-mlinux:master (92cbb8fb Feb 11 2020) to meta-mlinux:multiarch5-thud (ed01626 Feb 3 2020)

8 files changed, 99 insertions, 4 deletions

diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb
index c5ad887..38e246a 100644
--- a/recipes-core/images/mlinux-base-image.bb
+++ b/recipes-core/images/mlinux-base-image.bb
@@ -15,6 +15,7 @@ NETWORKING_FEATURES_append = " \
                        openssl \
                        rsync \
                        iperf3 \
+                       lldpd \
 					   mii-diag \
 					   tcpdump \
 					   netcat \
diff --git a/recipes-core/images/mlinux-basetest-image.bb b/recipes-core/images/mlinux-basetest-image.bb
new file mode 100644
index 0000000..807b16e
--- /dev/null
+++ b/recipes-core/images/mlinux-basetest-image.bb
@@ -0,0 +1,9 @@
+# Conduit 0.0 or 0.1 without RS9113
+DESCRIPTION = "mLinux base test image"
+LICENSE = "MIT"
+
+require mlinux-base-image.bb
+
+# Open console for test image
+CONSOLE = "sysvinit-inittab-start-open"
+
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb
index 8b8afa9..41829ec 100644
--- a/recipes-core/images/mlinux-minimal-image.bb
+++ b/recipes-core/images/mlinux-minimal-image.bb
@@ -67,11 +67,14 @@ MULTITECH_BB = ""
 UPGRADE_FEATURES = ""
 UPGRADE_FEATURES_mtbsp-at91 = "mtd-utils-static"
 
+CONSOLE = "sysvinit-inittab-start"
+
 IMAGE_INSTALL = "${CORE_FEATURES} \
                  ${NETWORKING_FEATURES} \
                  ${UPGRADE_FEATURES} \
                  ${MULTITECH_FEATURES} \
                  ${MULTITECH_MTAC} \
                  ${MULTITECH_BB} \
+                 ${CONSOLE} \
                  "
 
diff --git a/recipes-core/images/mlinux-mths-image.bb b/recipes-core/images/mlinux-mths-image.bb
new file mode 100644
index 0000000..9a90eea
--- /dev/null
+++ b/recipes-core/images/mlinux-mths-image.bb
@@ -0,0 +1,8 @@
+# Factory testing image for MTHS.
+# config-mths is needed for factory
+# reset.
+require mlinux-rs9113-mtrv1-image.bb
+DESCRIPTION = "MTHS images for Factory Testing"
+
+# Extra stuff to install
+IMAGE_INSTALL += "config-mths dnsmasq"
diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb
index 0aaf875..ff9af34 100644
--- a/recipes-core/images/mlinux-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-mtrv1-image.bb
@@ -29,7 +29,7 @@ WIFI_FEATURES = " \
                 hostapd \
                 "
 
-BLUETOOTH_FEATURES = "bluez5"
+BLUETOOTH_FEATURES = "bluez5 bluez5-pand"
 
 # Add all timezones available
 # ntpdate will sync time every 30 min by default via cron
@@ -54,7 +54,7 @@ MULTITECH_FEATURES_append = " \
 					 jsparser \
                      "
 
-MISC_FEATURES = "minicom lrzsz nano"
+MISC_FEATURES = "minicom lrzsz nano pps-tools"
 
 # Extra stuff to install
 IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113-util rs9113-autostart"
diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb
index f351132..40a4610 100644
--- a/recipes-core/images/mlinux-rs9113-factory-image.bb
+++ b/recipes-core/images/mlinux-rs9113-factory-image.bb
@@ -2,4 +2,4 @@ require mlinux-factory-image.bb
 DESCRIPTION = "mLinux factory image with rs9113 drivers"
 
 # Extra stuff to install
-IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python-dbus kernel-module-rs9113 rs9113-autostart rs9113-util"
+IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python-dbus kernel-module-rs9113 rs9113-autostart rs9113-util rs9113-misc rs9113-utils-extra"
diff --git a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
new file mode 100644
index 0000000..553d9cb
--- /dev/null
+++ b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
@@ -0,0 +1,74 @@
+require mtr-modules.inc
+DESCRIPTION = "mLinux base mtr image"
+LICENSE = "MIT"
+
+require mlinux-minimal-image.bb
+MULTITECH_MTAC = ""
+
+FILESYSTEM_FEATURES = "dosfstools \
+                 cifs-utils \
+				 lsof \
+                 "
+
+NETWORKING_FEATURES += "bridge-utils \
+                       dnsmasq \
+                       inetutils-ftp \
+                       openssl \
+                       rsync \
+                       iperf \
+                       iperf3 \
+					   mii-diag \
+					   tcpdump \
+					   netcat \
+					   wget \
+					   strongswan \
+					   busybox-ifplugd \
+                       "
+
+WIFI_FEATURES = " \
+                libnl \
+                wpa-supplicant \
+                wireless-tools \
+                iw \
+                hostap-daemon hostap-utils \
+                "
+
+BLUETOOTH_FEATURES = "bluez5 bluez5-pand"
+
+# Add all timezones available
+# ntpdate will sync time every 30 min by default via cron
+TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
+				 tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
+				 tzdata-misc \
+				 cronie \
+                 ntpdate \
+                 "
+
+# u-boot-linux-utils: U-Boot environment access from Linux
+# mlinux-scripts: sample scripts for setting up Conduit for various tasks
+# reset-handler: default reset button handler
+# radio-cmd: supports cellular radio activation and other configuration commands
+# radio-query: queries cellular radio for common info (IMEI, RSSI, etc)
+# jsparser: command line tool to parse JSON files
+MULTITECH_FEATURES += " \
+                     u-boot-linux-utils \
+                     mlinux-scripts \
+					 reset-handler \
+					 radio-cmd radio-query \
+					 jsparser \
+                     "
+
+MISC_FEATURES = "minicom lrzsz nano pps-tools"
+
+# Extra stuff to install
+IMAGE_INSTALL += "kernel-module-rs9113 rs9113rf rs9113-util rs9113-utils-extra rs9113-misc rs9113-autostart"
+IMAGE_INSTALL += "gpsd libgps libgps24 ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL += "lxfp"
+
+IMAGE_INSTALL += " \
+				${WIFI_FEATURES} \
+				${BLUETOOTH_FEATURES} \
+				${FILESYSTEM_FEATURES} \
+                ${TIME_FEATURES} \
+                ${MISC_FEATURES} \
+                "
diff --git a/recipes-core/images/mlinux-sdk.bb b/recipes-core/images/mlinux-sdk.bb
index fa6f811..abdadbf 100644
--- a/recipes-core/images/mlinux-sdk.bb
+++ b/recipes-core/images/mlinux-sdk.bb
@@ -2,4 +2,4 @@
 require mlinux-factory-image.bb
 DESCRIPTION = "mLinux SDK"
 
-IMAGE_INSTALL_append = " boost"
+IMAGE_INSTALL_append = " boost i2c-tools"