diff options
-rw-r--r-- | conf/machine/imx53ard.conf | 4 | ||||
-rw-r--r-- | conf/machine/imx53qsb.conf | 4 | ||||
-rw-r--r-- | recipes-bsp/firmware-imx/firmware-imx.inc | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf index 63048f7..5e6137c 100644 --- a/conf/machine/imx53ard.conf +++ b/conf/machine/imx53ard.conf | |||
@@ -12,6 +12,6 @@ KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts" | |||
12 | 12 | ||
13 | UBOOT_MACHINE = "mx53ard_config" | 13 | UBOOT_MACHINE = "mx53ard_config" |
14 | 14 | ||
15 | MACHINE_FIRMWARE += "firmware-imx-ar3k \ | 15 | MACHINE_FIRMWARE += "linux-firmware-ar3k \ |
16 | firmware-imx-ath6k" | 16 | linux-firmware-ath6k" |
17 | MACHINE_FEATURES += "wifi bluetooth" | 17 | MACHINE_FEATURES += "wifi bluetooth" |
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf index 3114688..ca84243 100644 --- a/conf/machine/imx53qsb.conf +++ b/conf/machine/imx53qsb.conf | |||
@@ -12,6 +12,6 @@ KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts" | |||
12 | 12 | ||
13 | UBOOT_MACHINE = "mx53loco_config" | 13 | UBOOT_MACHINE = "mx53loco_config" |
14 | 14 | ||
15 | MACHINE_FIRMWARE += "firmware-imx-ar3k \ | 15 | MACHINE_FIRMWARE = "linux-firmware-ar3k \ |
16 | firmware-imx-ath6k" | 16 | linux-firmware-ath6k" |
17 | MACHINE_FEATURES += " wifi bluetooth" | 17 | MACHINE_FEATURES += " wifi bluetooth" |
diff --git a/recipes-bsp/firmware-imx/firmware-imx.inc b/recipes-bsp/firmware-imx/firmware-imx.inc index f321617..43bdf2f 100644 --- a/recipes-bsp/firmware-imx/firmware-imx.inc +++ b/recipes-bsp/firmware-imx/firmware-imx.inc | |||
@@ -19,12 +19,10 @@ do_install() { | |||
19 | find ${D}/lib/firmware/ -name Android.mk -exec rm '{}' ';' | 19 | find ${D}/lib/firmware/ -name Android.mk -exec rm '{}' ';' |
20 | rm ${D}/lib/firmware/LICENCE.atheros_firmware \ | 20 | rm ${D}/lib/firmware/LICENCE.atheros_firmware \ |
21 | ${D}/lib/firmware/README | 21 | ${D}/lib/firmware/README |
22 | } | ||
23 | |||
24 | PACKAGES += "${PN}-ath6k ${PN}-ar3k" | ||
25 | 22 | ||
26 | FILES_${PN}-ath6k = "/lib/firmware/ath6k/*" | 23 | # FIXME: Remove firmware packaged in linux-firmware |
27 | FILES_${PN}-ar3k = "/lib/firmware/ar3k/*" | 24 | rm -r ${D}/lib/firmware/ath6k ${D}/lib/firmware/ar3k |
25 | } | ||
28 | 26 | ||
29 | python populate_packages_prepend() { | 27 | python populate_packages_prepend() { |
30 | vpudir = bb.data.expand('/lib/firmware/vpu', d) | 28 | vpudir = bb.data.expand('/lib/firmware/vpu', d) |