From bfc35b773ff405394d066d7d8efb32ced3ac0410 Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Tue, 13 Nov 2018 14:44:21 -0600 Subject: linux-firmware: replace machine override with new recipes Raspberry Pi hardware requires firmware that supersedes or is not present in the standard linux-firmware distribution. These files are maintained in the RPi-Distro project on github. Several attempts have been made to reconcile conflicts between what's in linux-firmware and what the hardware needs. The existing approach is functional but not maintainable since it combines material from three repositories into a single package that claims to be linux-firmware. Remove the appends that change the content of linux-firmware for rpi hardware. Add two new recipes that follow the RPi-Distro repositories: * firmware-nonfree which forked from linux-firmware and replaces content is provided as linux-firmware-rpidistro; * bluez-firmware which forked from (very old) bluez and adds content is provided as bluez-firmware-rpidistro. The packages are named to make clear that these come from RPi-Distro, rather than generic sources. Licensing attempts to record the state of licensing as documented in RPi-Distro. Resolves: #298 Signed-off-by: Peter A. Bigot --- conf/machine/raspberrypi0-wifi.conf | 4 ++-- conf/machine/raspberrypi3-64.conf | 8 ++++---- conf/machine/raspberrypi3.conf | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/raspberrypi0-wifi.conf b/conf/machine/raspberrypi0-wifi.conf index 7d7f1da..2c4f760 100644 --- a/conf/machine/raspberrypi0-wifi.conf +++ b/conf/machine/raspberrypi0-wifi.conf @@ -7,8 +7,8 @@ require conf/machine/include/tune-arm1176jzf-s.inc include conf/machine/include/rpi-base.inc MACHINE_EXTRA_RRECOMMENDS += "\ - linux-firmware-bcm43430 \ - linux-firmware-bcm43430a1-hcd \ + linux-firmware-rpidistro-bcm43430 \ + bluez-firmware-rpidistro-bcm43430a1-hcd \ " SDIMG_KERNELIMAGE ?= "kernel.img" diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index 456373d..635e4f6 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf @@ -5,10 +5,10 @@ MACHINEOVERRIDES = "raspberrypi3:${MACHINE}" MACHINE_EXTRA_RRECOMMENDS += "\ - linux-firmware-bcm43430 \ - linux-firmware-bcm43455 \ - linux-firmware-bcm43430a1-hcd \ - linux-firmware-bcm4345c0-hcd \ + linux-firmware-rpidistro-bcm43430 \ + linux-firmware-rpidistro-bcm43455 \ + bluez-firmware-rpidistro-bcm43430a1-hcd \ + bluez-firmware-rpidistro-bcm4345c0-hcd \ " require conf/machine/include/arm/arch-armv8.inc diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf index 4fcff18..df64cbb 100644 --- a/conf/machine/raspberrypi3.conf +++ b/conf/machine/raspberrypi3.conf @@ -7,10 +7,10 @@ require conf/machine/include/tune-cortexa7.inc include conf/machine/include/rpi-base.inc MACHINE_EXTRA_RRECOMMENDS += "\ - linux-firmware-bcm43430 \ - linux-firmware-bcm43455 \ - linux-firmware-bcm43430a1-hcd \ - linux-firmware-bcm4345c0-hcd \ + linux-firmware-rpidistro-bcm43430 \ + linux-firmware-rpidistro-bcm43455 \ + bluez-firmware-rpidistro-bcm43430a1-hcd \ + bluez-firmware-rpidistro-bcm4345c0-hcd \ " SDIMG_KERNELIMAGE ?= "kernel7.img" -- cgit v1.2.3-54-g00ecf