From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org,
richard.purdie@linuxfoundation.org
Subject: [PATCH 4/4] linux-firmware: Break out some additional firmware
Date: Tue, 22 Mar 2016 11:13:11 -0700 [thread overview]
Message-ID: <1458670391-26915-5-git-send-email-sgw@linux.intel.com> (raw)
In-Reply-To: <1458670391-26915-1-git-send-email-sgw@linux.intel.com>
This breaks out new firmware from the iwlwifi firmware along with the i915 graphics firmware.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../linux-firmware/linux-firmware_git.bb | 25 +++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 04d9471..6f6581a 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -224,6 +224,9 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \
${PN}-iwlwifi-7260 \
${PN}-iwlwifi-7265 \
+ ${PN}-iwlwifi-7265D ${PN}-iwlwifi-8000C ${PN}-iwlwifi-8265 \
+ ${PN}-i915-license ${PN}-i915 \
+ ${PN}-adsp-sst-license ${PN}-adsp-sst \
${PN}-license \
"
@@ -430,6 +433,10 @@ LICENSE_${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-7260 = "Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware"
+LICENSE_${PN}-iwlwifi-7265D = "Firmware-iwlwifi_firmware"
+LICENSE_${PN}-iwlwifi-8000C = "Firmware-iwlwifi_firmware"
+LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware"
+
FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware"
FILES_${PN}-iwlwifi-135-6 = "/lib/firmware/iwlwifi-135-6.ucode"
@@ -445,6 +452,9 @@ FILES_${PN}-iwlwifi-6050-4 = "/lib/firmware/iwlwifi-6050-4.ucode"
FILES_${PN}-iwlwifi-6050-5 = "/lib/firmware/iwlwifi-6050-5.ucode"
FILES_${PN}-iwlwifi-7260 = "/lib/firmware/iwlwifi-7260-*.ucode"
FILES_${PN}-iwlwifi-7265 = "/lib/firmware/iwlwifi-7265-*.ucode"
+FILES_${PN}-iwlwifi-7265D = "/lib/firmware/iwlwifi-7265D-*.ucode"
+FILES_${PN}-iwlwifi-8000C = "/lib/firmware/iwlwifi-8000C-*.ucode"
+FILES_${PN}-iwlwifi-8265 = "/lib/firmware/iwlwifi-8265-*.ucode"
RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license"
RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license"
@@ -459,6 +469,9 @@ RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license"
RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license"
RDEPENDS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-license"
RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license"
+RDEPENDS_${PN}-iwlwifi-7265D = "${PN}-iwlwifi-license"
+RDEPENDS_${PN}-iwlwifi-8000C = "${PN}-iwlwifi-license"
+RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license"
# Handle package updating for the newly merged iwlwifi groupings
RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7285-9"
@@ -469,13 +482,20 @@ RPROVIDES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-
RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7280-9"
RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7280-9"
-
+LICENSE_${PN}-i915 = "Firmware-i915"
+FILES_${PN}-i915-license = "/lib/firmware/LICENCE.i915"
+FILES_${PN}-i915 = "/lib/firmware/i915"
+RDEPENDS_${PN}-i915 = "${PN}-i915-license"
+
+FILES_${PN}-adsp-sst-license = "/lib/firmware/LICENCE.adsp_sst"
+LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst"
+FILES_${PN}-adsp-sst = "/lib/firmware/intel/dsp_fw*"
+RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license"
# For other firmwares
# Maybe split out to separate packages when needed.
LICENSE_${PN} = "\
Firmware-Abilis \
- & Firmware-adsp_sst \
& Firmware-agere \
& Firmware-amdgpu \
& Firmware-amd-ucode \
@@ -491,7 +511,6 @@ LICENSE_${PN} = "\
& Firmware-go7007 \
& Firmware-hfi1_firmware \
& Firmware-i2400m \
- & Firmware-i915 \
& Firmware-ibt_firmware \
& Firmware-it913x \
& Firmware-IntcSST2 \
--
2.5.0
next prev parent reply other threads:[~2016-03-22 18:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-22 18:13 [PATCH 0/4] linux-firmware update and cleanup Saul Wold
2016-03-22 18:13 ` [PATCH 1/4] linux-firmware: Update to latest HEAD Saul Wold
2016-03-22 18:13 ` [PATCH 2/4] linux-firmware: Collapse iwlwifi firmware blobs for 7260 and 7265 Saul Wold
2016-03-22 18:13 ` [PATCH 3/4] linux-firmware: Clean-up and sync license data Saul Wold
2016-03-22 18:13 ` Saul Wold [this message]
2016-03-22 21:07 ` [PATCH 4/4] linux-firmware: Break out some additional firmware Otavio Salvador
2016-03-22 21:58 ` Saul Wold
2016-03-22 21:27 ` Burton, Ross
2016-03-22 21:56 ` Saul Wold
2016-03-22 22:37 ` Burton, Ross
2016-03-22 22:51 ` Paul Eggleton
2016-03-22 23:09 ` Phil Blundell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458670391-26915-5-git-send-email-sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox