Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

firmware-nxp-wifi: create symbolic links to firmware/mrvl folder #2135

Merged

Conversation

hiagofranco
Copy link
Contributor

The upstream kernel Wi-Fi driver expects the sdiouart8997_combo_v4 and sdiouartiw416_combo_v0 binaries to be located under firmware/mrvl [1], different from the out-of-tree driver, which places them under firmware/nxp. Create symbolic links to deploy these binaries in the correct location for the upstream driver.

Due to this change, bump the recipe version to 1.1.

[1] https://github.com/torvalds/linux/blob/master/drivers/net/wireless/marvell/mwifiex/sdio.h#L31

The upstream kernel Wi-Fi driver expects the sdiouart8997_combo_v4 and
sdiouartiw416_combo_v0 binaries to be located under firmware/mrvl [1],
different from the out-of-tree driver, which places them under
firmware/nxp. Create symbolic links to deploy these binaries in the
correct location for the upstream driver.

Due to this change, bump the recipe version to 1.1.

[1] https://github.com/torvalds/linux/blob/master/drivers/net/wireless/marvell/mwifiex/sdio.h#L31

Signed-off-by: Hiago De Franco <[email protected]>
@hiagofranco
Copy link
Contributor Author

Hi, this would also be needed for Scarthgap. Thanks!

The current COMPATIBLE_MACHINE is set to build every i.MX SoC with both
BSP variants. However the firmware-nxp-wifi deploys firmware related to
the NXP Wi-Fi Modules (e.g. Maya IW416), which can be used with other
SoCs as well, as example the Toradex Verdin-AM62 wich uses the TI SoC
and the NXP Wi-Fi Module.

With the current COMPATIBLE_MACHINE it is not possible to build this
recipe and deploy the NXP firmware with different SoCs, therefore remove
it.

Signed-off-by: Hiago De Franco <[email protected]>
@hiagofranco hiagofranco force-pushed the add-symlinks-to-firmware-nxp-wifi branch from 5782139 to 8e7ebc0 Compare February 18, 2025 18:08
@@ -168,5 +173,3 @@ RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-common"
RPROVIDES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
RREPLACES:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"
RCONFLICTS:${PN}-nxpiw612-sdio = "linux-firmware-nxpiw612-sdio"

COMPATIBLE_MACHINE = "(imx-generic-bsp)"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be removed since this recipe should not be restricted to NXP machines, as explained on the commit message.

Copy link
Contributor

Backport failed for scarthgap, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin scarthgap
git worktree add -d .worktree/backport-2135-to-scarthgap origin/scarthgap
cd .worktree/backport-2135-to-scarthgap
git checkout -b backport-2135-to-scarthgap
ancref=$(git merge-base d366bc4436cb07dcb426ffb0ab648e158d56dd75 b54c7357bb0af32e6150ae003194807fe8f16b65)
git cherry-pick -x $ancref..b54c7357bb0af32e6150ae003194807fe8f16b65

Copy link
Contributor

Successfully created backport PR #2136 for styhead.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants