Merge "SGX-BIN: Update SGX driver (1.8@840215) w/SGX kernel modules" into ics-mr1
authorJean Johnson <jean-johnson@ti.com>
Tue, 20 Mar 2012 15:55:56 +0000 (15:55 +0000)
committerGerrit Code Review <gerrit2@git.omapzoom.org>
Tue, 20 Mar 2012 15:55:56 +0000 (15:55 +0000)
14 files changed:
wl12xx/wlan/wl1271-fw-r4sp2-multirole-plt.bin [deleted file]
wl12xx/wlan/wl1271-fw-r4sp2-multirole-roc.bin [deleted file]
wl12xx/wlan/wl1271-nvs.bin
wl12xx/wlan/wl127x-fw-mr.bin.r4 [deleted file]
wl12xx/wlan/wl127x-fw-mr.bin.r5 [deleted file]
wl12xx/wlan/wl127x-fw-mr_plt.bin.r4 [deleted file]
wl12xx/wlan/wl128x-fw-mr.bin.r4 [deleted file]
wl12xx/wlan/wl128x-fw-mr.bin.r5 [deleted file]
wl12xx/wlan/wl128x-fw-mr_plt.bin.r4 [deleted file]
wl12xx/wlan/wl128x-fw-mr_plt.bin.r5 [deleted file]
wl12xx/wlan/wl128x-fw-r4sp2-multirole-plt.bin [deleted file]
wl12xx/wlan/wl128x-fw-r4sp2-multirole-roc.bin [deleted file]
wl12xx/wlan/wl12xx-wlan-fw-products.mk
wl12xx/wlan/wl18xx-fw.bin [new file with mode: 0755]

diff --git a/wl12xx/wlan/wl1271-fw-r4sp2-multirole-plt.bin b/wl12xx/wlan/wl1271-fw-r4sp2-multirole-plt.bin
deleted file mode 100644 (file)
index ebbfb2a..0000000
Binary files a/wl12xx/wlan/wl1271-fw-r4sp2-multirole-plt.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl1271-fw-r4sp2-multirole-roc.bin b/wl12xx/wlan/wl1271-fw-r4sp2-multirole-roc.bin
deleted file mode 100644 (file)
index c5d2fae..0000000
Binary files a/wl12xx/wlan/wl1271-fw-r4sp2-multirole-roc.bin and /dev/null differ
index 6aeb94986e582ce0b1b389a6822d33ddd5319685..28a0928297a48cd5c6e39b6fa3dd39657d4d2a59 100644 (file)
Binary files a/wl12xx/wlan/wl1271-nvs.bin and b/wl12xx/wlan/wl1271-nvs.bin differ
diff --git a/wl12xx/wlan/wl127x-fw-mr.bin.r4 b/wl12xx/wlan/wl127x-fw-mr.bin.r4
deleted file mode 100644 (file)
index a433803..0000000
Binary files a/wl12xx/wlan/wl127x-fw-mr.bin.r4 and /dev/null differ
diff --git a/wl12xx/wlan/wl127x-fw-mr.bin.r5 b/wl12xx/wlan/wl127x-fw-mr.bin.r5
deleted file mode 100644 (file)
index a66fe03..0000000
Binary files a/wl12xx/wlan/wl127x-fw-mr.bin.r5 and /dev/null differ
diff --git a/wl12xx/wlan/wl127x-fw-mr_plt.bin.r4 b/wl12xx/wlan/wl127x-fw-mr_plt.bin.r4
deleted file mode 100644 (file)
index bcd05f6..0000000
Binary files a/wl12xx/wlan/wl127x-fw-mr_plt.bin.r4 and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-mr.bin.r4 b/wl12xx/wlan/wl128x-fw-mr.bin.r4
deleted file mode 100644 (file)
index fb33dad..0000000
Binary files a/wl12xx/wlan/wl128x-fw-mr.bin.r4 and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-mr.bin.r5 b/wl12xx/wlan/wl128x-fw-mr.bin.r5
deleted file mode 100644 (file)
index f588da8..0000000
Binary files a/wl12xx/wlan/wl128x-fw-mr.bin.r5 and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-mr_plt.bin.r4 b/wl12xx/wlan/wl128x-fw-mr_plt.bin.r4
deleted file mode 100644 (file)
index 87bc550..0000000
Binary files a/wl12xx/wlan/wl128x-fw-mr_plt.bin.r4 and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-mr_plt.bin.r5 b/wl12xx/wlan/wl128x-fw-mr_plt.bin.r5
deleted file mode 100644 (file)
index 25597b3..0000000
Binary files a/wl12xx/wlan/wl128x-fw-mr_plt.bin.r5 and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-r4sp2-multirole-plt.bin b/wl12xx/wlan/wl128x-fw-r4sp2-multirole-plt.bin
deleted file mode 100644 (file)
index ac6b3eb..0000000
Binary files a/wl12xx/wlan/wl128x-fw-r4sp2-multirole-plt.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-r4sp2-multirole-roc.bin b/wl12xx/wlan/wl128x-fw-r4sp2-multirole-roc.bin
deleted file mode 100644 (file)
index 4cc6120..0000000
Binary files a/wl12xx/wlan/wl128x-fw-r4sp2-multirole-roc.bin and /dev/null differ
index 322456db338febceae3f791cfe026c2719e672c4..7b76f9f3715f937e932f5f71bcf0ef406a8b6487 100644 (file)
@@ -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 (executable)
index 0000000..3dfa18a
Binary files /dev/null and b/wl12xx/wlan/wl18xx-fw.bin differ