From f3ecec38aa8ae4137b1a0e11b925d0e736e8ffda Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Thu, 10 May 2018 19:33:45 -0500 Subject: 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 --- conf/machine/raspberrypi0-wifi.conf | 5 ++++- conf/machine/raspberrypi3-64.conf | 7 ++++++- conf/machine/raspberrypi3.conf | 7 ++++++- 3 files changed, 16 insertions(+), 3 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf index 590c669..accdf3c 100644 --- a/conf/machine/raspberrypi0-wifi.conf +++ b/conf/machine/raspberrypi0-wifi.conf @@ -6,7 +6,10 @@ DEFAULTTUNE ?= "arm1176jzfshf" require conf/machine/include/tune-arm1176jzf-s.inc include conf/machine/include/rpi-base.inc -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-raspbian-bcm43430" +MACHINE_EXTRA_RRECOMMENDS += "\ + linux-firmware-bcm43430 \ + linux-firmware-bcm43430a1-hcd \ +" SDIMG_KERNELIMAGE ?= "kernel.img" UBOOT_MACHINE ?= "rpi_0_w_defconfig" diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index 3e7aade..4a5a494 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf @@ -4,7 +4,12 @@ MACHINEOVERRIDES = "raspberrypi3:${MACHINE}" -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 \ +" require conf/machine/include/arm/arch-armv8.inc include conf/machine/include/rpi-base.inc diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf index 61c60e6..8b5cce5 100644 --- a/conf/machine/raspberrypi3.conf +++ b/conf/machine/raspberrypi3.conf @@ -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" -- cgit v1.2.3-54-g00ecf