linux-firmware: restore and merge bluez-firmware

The attempt to Raspbian updated firmware blobs in packages separate from
linux-firmware introduced unresolvable conflicts with the standard
linux-firmware roll-up package.  Revert to using an augmented
linux-firmware recipe that overrides and adds firmware from two Raspbian
repositories that have up-to-date images.

Closes #244

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
This commit is contained in:
Peter A. Bigot
2018-05-10 19:33:45 -05:00
committed by Andrei Gherzan
parent de8912cbcb
commit f3ecec38aa
9 changed files with 101 additions and 249 deletions
+6 -1
View File
@@ -6,7 +6,12 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
require conf/machine/include/tune-cortexa7.inc
include conf/machine/include/rpi-base.inc
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-raspbian-bcm43430 linux-firmware-raspbian-bcm43455"
MACHINE_EXTRA_RRECOMMENDS += "\
linux-firmware-bcm43430 \
linux-firmware-bcm43455 \
linux-firmware-bcm43430a1-hcd \
linux-firmware-bcm4345c0-hcd \
"
SDIMG_KERNELIMAGE ?= "kernel7.img"
UBOOT_MACHINE = "rpi_3_32b_config"