diff options
author | Jason Andryuk <jandryuk@gmail.com> | 2023-12-05 13:42:05 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-06 22:55:50 +0000 |
commit | bfae97c50dcb84690375822bd8d4d14c9ba7b905 (patch) | |
tree | 717d360d6bccc43fc5bd44bf8dbaf705886f435e /meta/recipes-kernel | |
parent | 4bfbe2cffb5178ed4b5be48dc9868722278b9e2b (diff) | |
download | poky-bfae97c50dcb84690375822bd8d4d14c9ba7b905.tar.gz |
linux-firmware: Change bnx2 packaging
The bnx2 module uses both the mips and rv2p files, so package them all
together. Remove -mips from the package name, but add an RPROVIDES for
compatibility.
(From OE-Core rev: 46f2b7b3bebc7efdb4199cdfe386dc16c049d8d7)
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb index b849c086b6..a1229e4827 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20231030.bb | |||
@@ -340,7 +340,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ | |||
340 | ${PN}-ice-license ${PN}-ice \ | 340 | ${PN}-ice-license ${PN}-ice \ |
341 | ${PN}-ice-enhanced-license ${PN}-ice-enhanced \ | 341 | ${PN}-ice-enhanced-license ${PN}-ice-enhanced \ |
342 | ${PN}-adsp-sst-license ${PN}-adsp-sst \ | 342 | ${PN}-adsp-sst-license ${PN}-adsp-sst \ |
343 | ${PN}-bnx2-mips \ | 343 | ${PN}-bnx2 \ |
344 | ${PN}-liquidio \ | 344 | ${PN}-liquidio \ |
345 | ${PN}-nvidia-license \ | 345 | ${PN}-nvidia-license \ |
346 | ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \ | 346 | ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \ |
@@ -1087,18 +1087,22 @@ RDEPENDS:${PN}-bcm4356-pcie += "${PN}-cypress-license" | |||
1087 | LICENSE:${PN}-bcm4373 = "Firmware-cypress" | 1087 | LICENSE:${PN}-bcm4373 = "Firmware-cypress" |
1088 | RDEPENDS:${PN}-bcm4373 += "${PN}-cypress-license" | 1088 | RDEPENDS:${PN}-bcm4373 += "${PN}-cypress-license" |
1089 | 1089 | ||
1090 | # For Broadcom bnx2-mips | 1090 | # For Broadcom bnx2 |
1091 | # | 1091 | # |
1092 | # which is a separate case to the other Broadcom firmwares since its | 1092 | # which is a separate case to the other Broadcom firmwares since its |
1093 | # license is contained in the shared WHENCE file. | 1093 | # license is contained in the shared WHENCE file. |
1094 | 1094 | ||
1095 | LICENSE:${PN}-bnx2-mips = "WHENCE" | 1095 | LICENSE:${PN}-bnx2 = "WHENCE" |
1096 | LICENSE:${PN}-whence-license = "WHENCE" | 1096 | LICENSE:${PN}-whence-license = "WHENCE" |
1097 | 1097 | ||
1098 | FILES:${PN}-bnx2-mips = "${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" | 1098 | FILES:${PN}-bnx2 = " \ |
1099 | ${nonarch_base_libdir}/firmware/bnx2/bnx2-mips*.fw \ | ||
1100 | ${nonarch_base_libdir}/firmware/bnx2/bnx2-rv2p*.fw \ | ||
1101 | " | ||
1099 | FILES:${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" | 1102 | FILES:${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" |
1100 | 1103 | ||
1101 | RDEPENDS:${PN}-bnx2-mips += "${PN}-whence-license" | 1104 | RDEPENDS:${PN}-bnx2 += "${PN}-whence-license" |
1105 | RPROVIDES:${PN}-bnx2 = "${PN}-bnx2-mips" | ||
1102 | 1106 | ||
1103 | # For cirrus | 1107 | # For cirrus |
1104 | LICENSE:${PN}-cirrus = "Firmware-cirrus" | 1108 | LICENSE:${PN}-cirrus = "Firmware-cirrus" |