summaryrefslogtreecommitdiff
path: root/recipes-core
diff options
context:
space:
mode:
authorJeff Hatch <jhatch@multitech.com>2019-05-08 10:52:00 -0500
committerJeff Hatch <jhatch@multitech.com>2019-05-08 10:52:00 -0500
commit59c967a1fccd46ebe0612df29840fc0280cfb133 (patch)
treefa0015742039669e00e1d6f0c1ba46a01a06ddce /recipes-core
parent46c0dfd29d55c9db1d8b614d25f5b004e77cf148 (diff)
parent1eb511049142fe12e5ea4215fe7ce56abe1fdbc9 (diff)
downloadmeta-mlinux-atmel-59c967a1fccd46ebe0612df29840fc0280cfb133.tar.gz
meta-mlinux-atmel-59c967a1fccd46ebe0612df29840fc0280cfb133.tar.bz2
meta-mlinux-atmel-59c967a1fccd46ebe0612df29840fc0280cfb133.zip
Merge branch 'Linux4' of gitlab.multitech.net:mirrors/meta-mlinux into Linux4
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/images/mlinux-factory-image.bb2
-rw-r--r--recipes-core/images/mlinux-mtrv1-image.bb2
-rw-r--r--recipes-core/images/mtr-modules.inc1
3 files changed, 2 insertions, 3 deletions
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index 37a6533..a20e64b 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -92,6 +92,6 @@ IMAGE_INSTALL += "pps-tools"
IMAGE_INSTALL += "dnsmasq bluez5-pand bluez5-rfcomm"
# When ntp is to use the GPS, gps-utils is required
-IMAGE_INSTALL += "gpsd libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL += "gpsd libgps24 libgps ntp ntp-utils gpspipe gps-utils"
IMAGE_INSTALL += "lxfp uvccapture"
diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb
index ab5c30b..3c10593 100644
--- a/recipes-core/images/mlinux-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-mtrv1-image.bb
@@ -60,7 +60,7 @@ MISC_FEATURES = "minicom lrzsz nano"
# Extra stuff to install
IMAGE_INSTALL += "kernel-module-rs9113 rs9113-util rs9113-autostart"
-IMAGE_INSTALL += "gpsd libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL += "gpsd libgps libgps24 ntp ntp-utils gpspipe gps-utils"
IMAGE_INSTALL += " \
${WIFI_FEATURES} \
diff --git a/recipes-core/images/mtr-modules.inc b/recipes-core/images/mtr-modules.inc
index db841ff..f5a57b3 100644
--- a/recipes-core/images/mtr-modules.inc
+++ b/recipes-core/images/mtr-modules.inc
@@ -232,7 +232,6 @@ IMAGE_INSTALL_append = " \
kernel-module-sha512-generic \
kernel-module-sit \
kernel-module-slhc \
- kernel-module-spi-atmel \
kernel-module-spidev \
kernel-module-spi-nor \
kernel-module-stp \