From 8023b19728afa7607fb851e991d922b07a0bbbbb Mon Sep 17 00:00:00 2001
From: Ramon Moesching <ramon.moesching@netmodule.com>
Date: Tue, 7 Jan 2020 08:34:20 +0100
Subject: [PATCH] gpsd: get rid of shaky baudrate configuration

serial gnss receiver baudrate configuration with gpsctl tool is too
shaky and not reliable. gps CLI tools calls are reconfigure
baudrate back to 9600 instead of forced 115200 baud.

Configuration is then blocking whole gpsd action and no gnss positon
data are delivered.

BugzID: 60550

Signed-off-by: Ramon Moesching <ramon.moesching@netmodule.com>
---
 recipes-connectivity/gpsd/files/gpsbaud.service | 13 -------------
 recipes-connectivity/gpsd/gpsd_%.bbappend       |  6 ------
 2 files changed, 19 deletions(-)
 delete mode 100644 recipes-connectivity/gpsd/files/gpsbaud.service

diff --git a/recipes-connectivity/gpsd/files/gpsbaud.service b/recipes-connectivity/gpsd/files/gpsbaud.service
deleted file mode 100644
index c360ab4..0000000
--- a/recipes-connectivity/gpsd/files/gpsbaud.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=GPS baud rate configuration
-Requires=gpsd.socket
-After=gpsd.service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/gpsctl -s 115200 /dev/ttyS3
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Also=gpsd.socket
diff --git a/recipes-connectivity/gpsd/gpsd_%.bbappend b/recipes-connectivity/gpsd/gpsd_%.bbappend
index dc7bc07..3927b9b 100644
--- a/recipes-connectivity/gpsd/gpsd_%.bbappend
+++ b/recipes-connectivity/gpsd/gpsd_%.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI_prepend = " \
-            file://gpsbaud.service \
             git://gitlab.com/netmodule/third-party/gpsd.git;protocol=ssh;user=git;branch=3.19/hancock \
             file://60-ublox-neo.rules \ 
             "
@@ -11,10 +10,8 @@ SRCREV = "${AUTOREV}"
 S = "${WORKDIR}/git"
 
 SYSTEMD_SERVICE_${PN} += "${BPN}.service \
-                          gpsbaud.service \
                           "
 
-FILES_${PN} += " gpsbaud.serivce "
 
 TTY_DEVICE = "/dev/ttyS3"
 TTY_DEVICE_imx8-nmhw23 = "/dev/gps0"
@@ -26,9 +23,6 @@ do_install_append () {
     install -d ${D}${sysconfdir}/udev/rules.d
     install -m 0644 ${WORKDIR}/60-ublox-neo.rules ${D}${sysconfdir}/udev/rules.d
 
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/gpsbaud.service ${D}${systemd_unitdir}/system/
-
 	sed -i 's|DEVICES=""|DEVICES="${TTY_DEVICE}"|g' ${D}/etc/default/gpsd.default
 	sed -i 's|USBAUTO="true"|USBAUTO="${USBAUTO_STATE}"|g' ${D}/etc/default/gpsd.default 
 }