debian: remove wcnss-wlan and mac generation utility

wcnss-wlan is no longer needed to start the WCN core, which is done directly by
wcnss-start.

for the MAC address, it is now expected to come from the bootloader as
local-mad-address property in the DTB. The driver no longer supports reading the
MAC address in /lib/firmware/wlan/macaddr0, this was never meant to be upstreamed.

Change-Id: If14724e4f3a6520cf97e8ac75bc870be8573603f
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

7 files changed, 0 insertions, 54 deletions

diff --git a/debian/control b/debian/control
index 239c7ac..bd48d82 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,6 @@ Homepage: https://git.linaro.org/landing-teams/working/qualcomm/wcnss-config.git
 Vcs-Git: https://git.linaro.org/landing-teams/working/qualcomm/wcnss-config.git
 Vcs-Browser: https://git.linaro.org/landing-teams/working/qualcomm/wcnss-config.git
 
-Package: wcnss-wlan
-Architecture: all
-Depends: ${misc:Depends} wcnss-start
-Description: WLAN configuration files for WCN
- WCN is the integrated core in many QCOM devices that provides WLAN
- functionalities.
-
 Package: wcnss-start
 Architecture: all
 Depends: ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 61f0eaa..ce10672 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,5 @@
 %:
 	dh $@ --with=systemd
 
-# wcnss-wlan should not be started, they are triggered by udev rules
 override_dh_systemd_start:
-	dh_systemd_start -pwcnss-wlan --no-start wcnss-wlan.service
 	dh_systemd_start -pwcnss-start wcnss-start.service
diff --git a/debian/wcnss-wlan.install b/debian/wcnss-wlan.install
deleted file mode 100644
index de956a9..0000000
--- a/debian/wcnss-wlan.install
+++ /dev/null
@@ -1 +0,0 @@
-wcnss-gen-macaddr /usr/sbin/
diff --git a/debian/wcnss-wlan.service b/debian/wcnss-wlan.service
deleted file mode 100644
index ceeb4d7..0000000
--- a/debian/wcnss-wlan.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=wifi mac address generator
-Before=sysinit.target
-DefaultDependencies=false
-
-[Service]
-ExecStart=/usr/sbin/wcnss-gen-macaddr
-Type=oneshot
diff --git a/debian/wcnss-wlan.udev b/debian/wcnss-wlan.udev
deleted file mode 100644
index 145aeb4..0000000
--- a/debian/wcnss-wlan.udev
+++ /dev/null
@@ -1,5 +0,0 @@
-# set unique mac address
-# for 4.0 kernel, with downstream SMD
-SUBSYSTEM=="platform", ACTION=="add", DRIVERS=="WCNSS_CTRL", TAG+="systemd", ENV{SYSTEMD_WANTS}+="wcnss-wlan.service"
-# for 4.2+ with upstream-headed SMD
-SUBSYSTEM=="qcom_smd", ACTION=="add", DRIVERS=="qcom_smd_wcnss_ctrl", TAG+="systemd", ENV{SYSTEMD_WANTS}+="wcnss-wlan.service"
diff --git a/wcnss-gen-macaddr b/wcnss-gen-macaddr
deleted file mode 100755
index 912a12a..0000000
--- a/wcnss-gen-macaddr
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-MAC_FILE="/lib/firmware/wlan/macaddr0"
-MMC0_SERIAL=$(find /sys/devices/platform/soc/*.sdhci/mmc_host/mmc0/mmc0:0001 -name serial -print0)
-
-# don't touch if the file already exists
-if [ ! -f "${MAC_FILE}" ]; then
-    # First try to probe the kernel cmd line
-    SERIAL=$(sed -n 's/.*androidboot.serialno=\(\S*\).*/\1/p' /proc/cmdline)
-    if [ -z "${SERIAL}" ] && [ -f "${MMC0_SERIAL}" ]; then
-        # If not in cmdline, try grabbing from the mmc0 serial entry
-        SERIAL=$(sed -e 's/^0x//' "${MMC0_SERIAL}")
-    fi
-    if [ -z "${SERIAL}" ]; then
-        echo "Unable to find a valid serial number, not setting MAC address"
-        exit 1
-    fi
-    echo "Setting MAC address in ${MAC_FILE}"
-    # make sure that mac is 4-byte long (the serialno is an unsigned 32-bit)
-    # pad with '0' if needed
-    SERIAL=$(echo "${SERIAL}" | awk  '{ string=substr($0, 1, 8); print string; }')
-    while [ ${#SERIAL} -lt 8 ]; do SERIAL="0$SERIAL"; done
-    echo "0200${SERIAL}" > ${MAC_FILE}
-
-    sed -i -e 's/.\{2\}/&:/g;s/.$//' "${MAC_FILE}"
-else
-    echo "File ${MAC_FILE} already exists, do not override"
-fi
diff --git a/wcnss-start b/wcnss-start
index 866ef40..40550b7 100755
--- a/wcnss-start
+++ b/wcnss-start
@@ -15,8 +15,5 @@ done
 # no WCNSS, then move on..
 [ $found -eq 0 ] && exit
 
-# MAC addr
-wcnss-gen-macaddr
-
 modprobe wcn36xx
 echo start > "$f"/state