diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/package.mk
similarity index 79%
rename from packages/linux-firmware/brcmfmac_sdio-firmware/package.mk
rename to packages/linux-firmware/brcmfmac_sdio-firmware-aml/package.mk
index ef36790c42..5673c06180 100644
--- a/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/package.mk
@@ -16,7 +16,7 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="brcmfmac_sdio-firmware"
+PKG_NAME="brcmfmac_sdio-firmware-aml"
 PKG_VERSION="0.1"
 PKG_REV="1"
 PKG_ARCH="any"
@@ -26,8 +26,8 @@ PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="firmware"
-PKG_SHORTDESC="brcmfmac_sdio-firmware: firmware for brcm bluetooth devices"
-PKG_LONGDESC="Firmware for Broadcom Bluetooth devices and brcm-patchram-plus that downloads a patchram files in the HCD format to the Bluetooth based silicon and combo chips and other utility functions."
+PKG_SHORTDESC="brcmfmac_sdio-firmware: firmware for brcm bluetooth chips used in some Amlogic based devices"
+PKG_LONGDESC="Firmware for Broadcom Bluetooth devices used in some Amlogic based devices, and brcm-patchram-plus that downloads a patchram files in the HCD format to the Bluetooth based silicon and combo chips and other utility functions."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware/system.d/brcmfmac_sdio-firmware-aml@.service b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/system.d/brcmfmac_sdio-firmware@.service
similarity index 100%
rename from packages/linux-firmware/brcmfmac_sdio-firmware/system.d/brcmfmac_sdio-firmware-aml@.service
rename to packages/linux-firmware/brcmfmac_sdio-firmware-aml/system.d/brcmfmac_sdio-firmware@.service
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-aml/udev.d/80-brcmfmac_sdio.rules b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/udev.d/80-brcmfmac_sdio.rules
new file mode 100644
index 0000000000..7059847cfc
--- /dev/null
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/udev.d/80-brcmfmac_sdio.rules
@@ -0,0 +1,15 @@
+################################################################################
+# udev rules file for loading brcmfmac_sdio-firmware
+################################################################################
+
+ACTION!="add", GOTO="end"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa962", GOTO="begin"
+GOTO="end"
+LABEL="begin"
+### Broadcom bcm43362/bcm20710a1 bluetooth device
+ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa962", \
+  ENV{brcm_device}="bcm20710a1"
+
+ENV{brcm_device}=="bcm20*", ACTION=="add", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="brcmfmac_sdio-firmware@$env{brcm_device}.service"
+LABEL="end"
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk
new file mode 100644
index 0000000000..b43c875ae1
--- /dev/null
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk
@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="brcmfmac_sdio-firmware-imx"
+PKG_VERSION="0.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/OpenELEC/OpenELEC.tv"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="firmware"
+PKG_SHORTDESC="brcmfmac_sdio-firmware: firmware for brcm bluetooth chips used in some Freescale iMX based devices"
+PKG_LONGDESC="Firmware for Broadcom Bluetooth chips used in some Freescale iMX based devices, and brcm-patchram-plus that downloads a patchram files in the HCD format to the Bluetooth based silicon and combo chips and other utility functions."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware/system.d/brcmfmac_sdio-firmware-imx@.service b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/system.d/brcmfmac_sdio-firmware$.service
similarity index 100%
rename from packages/linux-firmware/brcmfmac_sdio-firmware/system.d/brcmfmac_sdio-firmware-imx@.service
rename to packages/linux-firmware/brcmfmac_sdio-firmware-imx/system.d/brcmfmac_sdio-firmware$.service
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware/udev.d/80-brcmfmac_sdio.rules b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/udev.d/80-brcmfmac_sdio.rules
similarity index 55%
rename from packages/linux-firmware/brcmfmac_sdio-firmware/udev.d/80-brcmfmac_sdio.rules
rename to packages/linux-firmware/brcmfmac_sdio-firmware-imx/udev.d/80-brcmfmac_sdio.rules
index 68e775eedc..e29b8e152d 100644
--- a/packages/linux-firmware/brcmfmac_sdio-firmware/udev.d/80-brcmfmac_sdio.rules
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/udev.d/80-brcmfmac_sdio.rules
@@ -5,21 +5,15 @@
 ACTION!="add", GOTO="end"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4329", GOTO="begin"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4330", GOTO="begin"
-SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa962", GOTO="begin"
 GOTO="end"
 LABEL="begin"
-### Brodcom bcm4330 bluetooth device
+### Broadcom bcm4330 bluetooth device
 ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4330", \
   ENV{brcm_device}="bcm4330"
-### Brodcom bcm4329 bluetooth device
+### Broadcom bcm4329 bluetooth device
 ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4329", \
   ENV{brcm_device}="bcm4329"
-### Brodcom bcm43362/bcm20710a1 bluetooth device
-ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa962", \
-  ENV{brcm_device}="bcm20710a1"
 
 ENV{brcm_device}=="bcm43*", ACTION=="add", \
-  TAG+="systemd", ENV{SYSTEMD_WANTS}+="brcmfmac_sdio-firmware-imx@$env{brcm_device}.service"
-ENV{brcm_device}=="bcm20*", ACTION=="add", \
-  TAG+="systemd", ENV{SYSTEMD_WANTS}+="brcmfmac_sdio-firmware-aml@$env{brcm_device}.service"
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="brcmfmac_sdio-firmware@$env{brcm_device}.service"
 LABEL="end"
diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options
index 26918e9883..40de01bcd8 100644
--- a/projects/WeTek_Play/options
+++ b/projects/WeTek_Play/options
@@ -125,7 +125,7 @@
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-    FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware"
+    FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware-aml"
 
   # build and install ATV IR remote support (yes / no)
     ATVCLIENT_SUPPORT="no"
diff --git a/projects/imx6/options b/projects/imx6/options
index 7f7e9b9ca5..652ea54edf 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -130,7 +130,7 @@
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-    FIRMWARE="misc-firmware wlan-firmware iwlwifi-firmware dvb-firmware brcmfmac_sdio-firmware"
+    FIRMWARE="misc-firmware wlan-firmware iwlwifi-firmware dvb-firmware brcmfmac_sdio-firmware-imx"
 
   # build and install ATV IR remote support (yes / no)
     ATVCLIENT_SUPPORT="no"