14 files changed, 2 insertions, 12 deletions

diff --git a/wl12xx/wlan/wl1271-fw-r4sp2-multirole-plt.bin b/wl12xx/wlan/wl1271-fw-r4sp2-multirole-plt.bin
deleted file mode 100644
index ebbfb2a..0000000
--- a/wl12xx/wlan/wl1271-fw-r4sp2-multirole-plt.bin
+++ /dev/null
diff --git a/wl12xx/wlan/wl1271-fw-r4sp2-multirole-roc.bin b/wl12xx/wlan/wl1271-fw-r4sp2-multirole-roc.bin
deleted file mode 100644
index c5d2fae..0000000
--- a/wl12xx/wlan/wl1271-fw-r4sp2-multirole-roc.bin
+++ /dev/null
diff --git a/wl12xx/wlan/wl1271-nvs.bin b/wl12xx/wlan/wl1271-nvs.bin
index 6aeb949..28a0928 100644
--- a/wl12xx/wlan/wl1271-nvs.bin
+++ b/wl12xx/wlan/wl1271-nvs.bin
diff --git a/wl12xx/wlan/wl127x-fw-mr.bin.r4 b/wl12xx/wlan/wl127x-fw-mr.bin.r4
deleted file mode 100644
index a433803..0000000
--- a/wl12xx/wlan/wl127x-fw-mr.bin.r4
+++ /dev/null
diff --git a/wl12xx/wlan/wl127x-fw-mr.bin.r5 b/wl12xx/wlan/wl127x-fw-mr.bin.r5
deleted file mode 100644
index a66fe03..0000000
--- a/wl12xx/wlan/wl127x-fw-mr.bin.r5
+++ /dev/null
diff --git a/wl12xx/wlan/wl127x-fw-mr_plt.bin.r4 b/wl12xx/wlan/wl127x-fw-mr_plt.bin.r4
deleted file mode 100644
index bcd05f6..0000000
--- a/wl12xx/wlan/wl127x-fw-mr_plt.bin.r4
+++ /dev/null
diff --git a/wl12xx/wlan/wl128x-fw-mr.bin.r4 b/wl12xx/wlan/wl128x-fw-mr.bin.r4
deleted file mode 100644
index fb33dad..0000000
--- a/wl12xx/wlan/wl128x-fw-mr.bin.r4
+++ /dev/null
diff --git a/wl12xx/wlan/wl128x-fw-mr.bin.r5 b/wl12xx/wlan/wl128x-fw-mr.bin.r5
deleted file mode 100644
index f588da8..0000000
--- a/wl12xx/wlan/wl128x-fw-mr.bin.r5
+++ /dev/null
diff --git a/wl12xx/wlan/wl128x-fw-mr_plt.bin.r4 b/wl12xx/wlan/wl128x-fw-mr_plt.bin.r4
deleted file mode 100644
index 87bc550..0000000
--- a/wl12xx/wlan/wl128x-fw-mr_plt.bin.r4
+++ /dev/null
diff --git a/wl12xx/wlan/wl128x-fw-mr_plt.bin.r5 b/wl12xx/wlan/wl128x-fw-mr_plt.bin.r5
deleted file mode 100644
index 25597b3..0000000
--- a/wl12xx/wlan/wl128x-fw-mr_plt.bin.r5
+++ /dev/null
diff --git a/wl12xx/wlan/wl128x-fw-r4sp2-multirole-plt.bin b/wl12xx/wlan/wl128x-fw-r4sp2-multirole-plt.bin
deleted file mode 100644
index ac6b3eb..0000000
--- a/wl12xx/wlan/wl128x-fw-r4sp2-multirole-plt.bin
+++ /dev/null
diff --git a/wl12xx/wlan/wl128x-fw-r4sp2-multirole-roc.bin b/wl12xx/wlan/wl128x-fw-r4sp2-multirole-roc.bin
deleted file mode 100644
index 4cc6120..0000000
--- a/wl12xx/wlan/wl128x-fw-r4sp2-multirole-roc.bin
+++ /dev/null
diff --git a/wl12xx/wlan/wl12xx-wlan-fw-products.mk b/wl12xx/wlan/wl12xx-wlan-fw-products.mk
index 322456d..7b76f9f 100644
--- a/wl12xx/wlan/wl12xx-wlan-fw-products.mk
+++ b/wl12xx/wlan/wl12xx-wlan-fw-products.mk
@@ -5,16 +5,6 @@ PRODUCT_COPY_FILES += \
         device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-4-mr.bin:system/etc/firmware/ti-connectivity/wl127x-fw-4-mr.bin \
         device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-4-plt.bin:system/etc/firmware/ti-connectivity/wl127x-fw-4-plt.bin \
         device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-4-sr.bin:system/etc/firmware/ti-connectivity/wl127x-fw-4-sr.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-mr.bin.r4:system/etc/firmware/ti-connectivity/wl128x-fw-mr.bin.r4 \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-mr.bin.r5:system/etc/firmware/ti-connectivity/wl128x-fw-mr.bin.r5 \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-mr_plt.bin.r4:system/etc/firmware/ti-connectivity/wl128x-fw-mr_plt.bin.r4 \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-mr_plt.bin.r5:system/etc/firmware/ti-connectivity/wl128x-fw-mr_plt.bin.r5 \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-r4sp2-multirole-roc.bin:system/etc/firmware/ti-connectivity/wl128x-fw-multirole-roc.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-r4sp2-multirole-plt.bin:system/etc/firmware/ti-connectivity/wl128x-fw-multirole-plt.bin \
         device/ti/proprietary-open/wl12xx/wlan/wl1271-nvs.bin:system/etc/firmware/ti-connectivity/wl1271-nvs.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-mr.bin.r4:system/etc/firmware/ti-connectivity/wl127x-fw-mr.bin.r4 \
-        device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-mr.bin.r5:system/etc/firmware/ti-connectivity/wl127x-fw-mr.bin.r5 \
-        device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-mr_plt.bin.r4:system/etc/firmware/ti-connectivity/wl127x-fw-mr_plt.bin.r4 \
-        device/ti/proprietary-open/wl12xx/wlan/wl1271-fw-r4sp2-multirole-roc.bin:system/etc/firmware/ti-connectivity/wl1271-fw-multirole-roc.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl1271-fw-r4sp2-multirole-plt.bin:system/etc/firmware/ti-connectivity/wl1271-fw-multirole-plt.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl1271-nvs_127x.bin:system/etc/firmware/ti-connectivity/wl1271-nvs_127x.bin
+        device/ti/proprietary-open/wl12xx/wlan/wl1271-nvs_127x.bin:system/etc/firmware/ti-connectivity/wl1271-nvs_127x.bin \
+        device/ti/proprietary-open/wl12xx/wlan/wl18xx-fw.bin:system/etc/firmware/ti-connectivity/wl18xx-fw.bin
diff --git a/wl12xx/wlan/wl18xx-fw.bin b/wl12xx/wlan/wl18xx-fw.bin
new file mode 100755
index 0000000..3dfa18a
--- /dev/null
+++ b/wl12xx/wlan/wl18xx-fw.bin