summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-12-22 17:07:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:11 +0000
commitc6e41018df2f3f75be7707ff3f7aea929d6e7dbd (patch)
treea15e6fafacc7c364a4373f0cfa05c8195dcadd80
parenta250452f5625ea0885f0983e61c1f64bcde55b98 (diff)
downloadpoky-c6e41018df2f3f75be7707ff3f7aea929d6e7dbd.tar.gz
linux-firmware: remove alternatives for brcmfmac-stdio.bin
These alternatives are only used to provide an unversioned brcmfmac-sdio.bin, which was required by kernels prior to 3.13. As these alternatives all have the same priority there's no determinism in which one is selected, and current kernels (since January 2014) use the appropriately versioned firmware names. (From OE-Core rev: 7ac00f2efee4973703ef9725c81242bd6eae36c0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb24
1 files changed, 1 insertions, 23 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 1d881d714e..4fedcfbc67 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -186,7 +186,7 @@ SRC_URI[iwlwifi-19.sha256sum] = "2034470df64d323b827c4f2d4d0d55be2846b7360179b55
186 186
187S = "${WORKDIR}/git" 187S = "${WORKDIR}/git"
188 188
189inherit allarch update-alternatives 189inherit allarch
190 190
191CLEANBROKEN = "1" 191CLEANBROKEN = "1"
192 192
@@ -413,10 +413,6 @@ FILES_${PN}-vt6656 = " \
413RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license" 413RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license"
414 414
415# For broadcom 415# For broadcom
416#
417# WARNING: The ALTERNATIVE_* variables are not using ${PN} because of
418# a bug in bitbake; when this is fixed and bitbake learns how to proper
419# pass variable flags with expansion we can rework this patch.
420 416
421LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx" 417LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx"
422LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx" 418LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx"
@@ -452,24 +448,6 @@ FILES_${PN}-bcm4354 = " \
452 /lib/firmware/brcm/brcmfmac4354-sdio.bin \ 448 /lib/firmware/brcm/brcmfmac4354-sdio.bin \
453" 449"
454 450
455ALTERNATIVE_LINK_NAME[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac-sdio.bin"
456
457ALTERNATIVE_linux-firmware-bcm4334 = "brcmfmac-sdio.bin"
458ALTERNATIVE_TARGET_linux-firmware-bcm4334[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4334-sdio.bin"
459ALTERNATIVE_linux-firmware-bcm43340 = "brcmfmac-sdio.bin"
460ALTERNATIVE_TARGET_linux-firmware-bcm43340[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac43340-sdio.bin"
461ALTERNATIVE_linux_firmware-bcm4354 = "brcmfmac-sdio.bin"
462ALTERNATIVE_TARGET_linux-firmware-bcm4354[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4354-sdio.bin"
463ALTERNATIVE_linux-firmware-bcm4329 = "brcmfmac-sdio.bin"
464ALTERNATIVE_TARGET_linux-firmware-bcm4329[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4329-sdio.bin"
465ALTERNATIVE_linux-firmware-bcm4330 = "brcmfmac-sdio.bin"
466ALTERNATIVE_TARGET_linux-firmware-bcm4330[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4330-sdio.bin"
467ALTERNATIVE_linux-firmware-bcm4339 = "brcmfmac-sdio.bin"
468ALTERNATIVE_TARGET_linux-firmware-bcm4339[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4339-sdio.bin"
469ALTERNATIVE_PRIORITY_linux-firmware-bcm4339[brcmfmac-sdio.bin] = "20"
470ALTERNATIVE_linux-firmware-bcm43430 = "brcmfmac-sdio.bin"
471ALTERNATIVE_TARGET_linux-firmware-bcm43430[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac43430-sdio.bin"
472
473RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" 451RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license"
474RDEPENDS_${PN}-bcm4330 += "${PN}-broadcom-license" 452RDEPENDS_${PN}-bcm4330 += "${PN}-broadcom-license"
475RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" 453RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license"