LAKITU: sys-kernel/linux-firmware: add Intel ICE support
This is a manual merge of a few upstream changes that are difficult to
cherry pick, due to the incremental updates to stable ebuild
configuration.
When this repository is rebased to a newer upstream version, this CL can
be discarded upon merge conflicts.
BUG=b/208831268
TEST=DDP loads at boot
RELEASE_NOTE=None
Change-Id: I080cd598e4da2d9210921139ee77a9dc832fe63f
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/30120
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/licenses/LICENSE.ice b/licenses/LICENSE.ice
new file mode 100644
index 0000000..497ee18
--- /dev/null
+++ b/licenses/LICENSE.ice
@@ -0,0 +1,39 @@
+Copyright (c) 2019, Intel Corporation.
+All rights reserved.
+
+Redistribution. Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions must reproduce the above copyright notice and the
+ following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+* Neither the name of Intel Corporation nor the names of its suppliers
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+* No reverse engineering, decompilation, or disassembly of this software
+ is permitted.
+
+Limited patent license. Intel Corporation grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell ("Utilize") this software, but solely to the extent that any
+such patent is necessary to Utilize the software alone, or in
+combination with an operating system licensed under an approved Open
+Source license as listed by the Open Source Initiative at
+http://opensource.org/licenses. The patent license shall not apply to
+any other combinations which include this software. No hardware per
+se is licensed hereunder.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/sys-kernel/linux-firmware/linux-firmware-0.0.1-r493.ebuild b/sys-kernel/linux-firmware/linux-firmware-0.0.1-r494.ebuild
similarity index 98%
rename from sys-kernel/linux-firmware/linux-firmware-0.0.1-r493.ebuild
rename to sys-kernel/linux-firmware/linux-firmware-0.0.1-r494.ebuild
index e73f3021..8b2ac9f 100644
--- a/sys-kernel/linux-firmware/linux-firmware-0.0.1-r493.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-0.0.1-r494.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-CROS_WORKON_COMMIT="1ad04936b4e616a3cc6d05354c5fa257b68eb30f"
-CROS_WORKON_TREE="2d91d63b8e88955ece22fe15bcddcf7750194ee9"
+CROS_WORKON_COMMIT="da00e5a41ca57f81d5684567a6731a0ad37be1ee"
+CROS_WORKON_TREE="3e847614239ea287582fa5b72de0756dcd3a307c"
CROS_WORKON_PROJECT="chromiumos/third_party/linux-firmware"
CROS_WORKON_OUTOFTREE_BUILD=1
CROS_WORKON_EGIT_BRANCH="master"
@@ -98,6 +98,7 @@
ibt_ax201
ibt_ax211
ibt-hw
+ ice
ipu3_fw
keyspan_usb
marvell-mwlwifi
@@ -183,6 +184,7 @@
linux_firmware_ibt_ax201? ( LICENCE.ibt_firmware )
linux_firmware_ibt_ax211? ( LICENCE.ibt_firmware )
linux_firmware_ibt-hw? ( LICENCE.ibt_firmware )
+ linux_firmware_ice? ( LICENSE.ice )
linux_firmware_keyspan_usb? ( LICENSE.keyspan_usb )
linux_firmware_marvell-mwlwifi? ( LICENCE.Marvell )
linux_firmware_marvell-pcie8897? ( LICENCE.NXP )
@@ -370,6 +372,7 @@
use_fw ibt_ax201 && doins_subdir intel/ibt-19-*.*
use_fw ibt_ax211 && doins_subdir intel/ibt-0040-0041.*
use_fw ibt-hw && doins_subdir intel/ibt-hw-*.bseq
+ use_fw ice && doins_subdir intel/ice/ddp/*
use_fw keyspan_usb && doins_subdir keyspan/*
use_fw marvell-mwlwifi && doins_subdir mwlwifi/*.bin
use_fw marvell-pcie8897 && doins_subdir mrvl/pcie8897_uapsta.bin
diff --git a/sys-kernel/linux-firmware/linux-firmware-9999.ebuild b/sys-kernel/linux-firmware/linux-firmware-9999.ebuild
index 6692a43..55bd391 100644
--- a/sys-kernel/linux-firmware/linux-firmware-9999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-9999.ebuild
@@ -96,6 +96,7 @@
ibt_ax201
ibt_ax211
ibt-hw
+ ice
ipu3_fw
keyspan_usb
marvell-mwlwifi
@@ -181,6 +182,7 @@
linux_firmware_ibt_ax201? ( LICENCE.ibt_firmware )
linux_firmware_ibt_ax211? ( LICENCE.ibt_firmware )
linux_firmware_ibt-hw? ( LICENCE.ibt_firmware )
+ linux_firmware_ice? ( LICENSE.ice )
linux_firmware_keyspan_usb? ( LICENSE.keyspan_usb )
linux_firmware_marvell-mwlwifi? ( LICENCE.Marvell )
linux_firmware_marvell-pcie8897? ( LICENCE.NXP )
@@ -368,6 +370,7 @@
use_fw ibt_ax201 && doins_subdir intel/ibt-19-*.*
use_fw ibt_ax211 && doins_subdir intel/ibt-0040-0041.*
use_fw ibt-hw && doins_subdir intel/ibt-hw-*.bseq
+ use_fw ice && doins_subdir intel/ice/ddp/*
use_fw keyspan_usb && doins_subdir keyspan/*
use_fw marvell-mwlwifi && doins_subdir mwlwifi/*.bin
use_fw marvell-pcie8897 && doins_subdir mrvl/pcie8897_uapsta.bin
