From 934c1c76ee82401e2085eff79bcce47bcc33fc4c Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Wed, 19 Jun 2019 19:05:38 +0200
Subject: tdx-extra.inc: drop backports for all but TK1

The Wi-Fi drivers from kernel 4.14 provide all needed features. So don't
bother with backports.
While at it move all Wi-Fi related packages into the Wi-Fi variables.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-images/images/tdx-extra.inc | 39 +++++++++++++------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/recipes-images/images/tdx-extra.inc b/recipes-images/images/tdx-extra.inc
index dac346e..c3a9419 100644
--- a/recipes-images/images/tdx-extra.inc
+++ b/recipes-images/images/tdx-extra.inc
@@ -113,7 +113,6 @@ IMAGE_INSTALL_append_colibri-imx7 = " \
 
 IMAGE_INSTALL_append_mx8 = " \
     aspell \
-    bluez-alsa \
     bmode-usb \
     clpeak \
     cpuburn-a53 \
@@ -126,7 +125,6 @@ IMAGE_INSTALL_append_mx8 = " \
     libusbgx \
     libusbgx-examples \
     linuxptp \
-    mwifiexap \
     pciutils \
     perf \
     ptpd \
@@ -142,7 +140,6 @@ IMAGE_INSTALL_append_colibri-imx8qxp = " \
 IMAGE_INSTALL += " \
     packagegroup-dotnet-deps \
     \
-    wireless-regdb-static \
     \
     alsa-utils \
     alsa-utils-aplay \
@@ -150,7 +147,7 @@ IMAGE_INSTALL += " \
     \
     sqlite3 \
     \
-    ${BACKPORTS_WIFI} \
+    ${WIFI} \
     curl \
     can-utils iproute2 \
     nfs-utils-client \
@@ -185,10 +182,10 @@ IMAGE_INSTALL += " \
     tdx-oak-sensors \
 "
 
-#Backports
+# Wi-Fi FW and Packages
 
-BACKPORTS_WIFI = " \
-    backports \
+WIFI = " \
+    hostapd \
     linux-firmware-ath10k    \
     linux-firmware-sd8686    \
     linux-firmware-sd8688    \
@@ -199,37 +196,29 @@ BACKPORTS_WIFI = " \
     linux-firmware-ralink    \
     linux-firmware-rtl8192cu \
     linux-firmware-rtl8188eu \
-    hostapd \
+    wireless-regdb-static \
 "
-BACKPORTS_WIFI_EXTRA = " \
+WIFI_EXTRA = " \
     linux-firmware-ath9k     \
     linux-firmware-iwlwifi   \
 "
 
 IMAGE_INSTALL_append_apalis-tk1 = " \
-     ${BACKPORTS_WIFI_EXTRA} \
+    backports \
+    ${WIFI_EXTRA} \
 "
 
 IMAGE_INSTALL_append_apalis-tk1-mainline = " \
-     ${BACKPORTS_WIFI_EXTRA} \
-"
-
-IMAGE_INSTALL_remove_apalis-tk1-mainline = " \
-    backports \
+    ${WIFI_EXTRA} \
 "
 
 IMAGE_INSTALL_append_apalis-imx6 = " \
-    ${BACKPORTS_WIFI_EXTRA} \
+    ${WIFI_EXTRA} \
 "
 
-IMAGE_INSTALL_remove_mx8 = " \
-    backports \
-"
-
-IMAGE_INSTALL_remove_use-mainline-bsp = " \
-    backports \
+IMAGE_INSTALL_append_mx8 = " \
+    bluez-alsa \
+    mwifiexap \
+    ${WIFI_EXTRA} \
 "
 
-IMAGE_INSTALL_remove_qemuall = " \
-    backports \
-"
-- 
cgit v1.2.3