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.

Sign up for GitHub

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

bsp: linux-firmware: add SRCREV_FORMAT #1204

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

bsp: linux-firmware: add SRCREV_FORMAT #1204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions meta-lmp-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ SRC_URI:append:imx-nxp-bsp = "\
git://github.com/NXP/imx-firmware.git;protocol=https;branch=${IMX_FIRMWARE_BRANCH};destsuffix=imx-firmware;name=imx-firmware; \
"
SRCREV_imx-firmware ?= "982bb10dfabfb9e7b9dc106c59a4fbb2c45bfb44"
SRCREV_FORMAT = "imx-firmware"
Copy link
Member

Choose a reason for hiding this comment

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

Should we use just the main SRCURI or combine both here? In the end this imx-firmware is just an extra.

Copy link
Member Author

Choose a reason for hiding this comment

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

This was a quick fix on main-next, maybe the better solution would be to submit upstream all those we have in this bbapppend.

Copy link
Member

Choose a reason for hiding this comment

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

Upstream should help, but this would be needed anyway. My thinking is that the leading SRCREV to be used here would be from the main git repo instead of imx-firmware.

Copy link
Member Author

Choose a reason for hiding this comment

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

It should be the two but because main repo uses just one they don't set the name so we don't know it.
We can add a name to the default to use the two but look a bit ugly:

SRC_URI:remove =  "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=https;branch=main"
SRC_URI:append = " git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=https;branch=main;name=main"
SRCREV_FORMAT = "main_imx-firmware"

Copy link
Member

Choose a reason for hiding this comment

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

Right, I think the right thing to do here would instead remove all these extra appends (as we have logic here for multiple socs) into separated recipes, as then we would probably be able to drop this append entirely.

Copy link
Member

Choose a reason for hiding this comment

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

Since I don't think it makes sense for the stm32mp15 build to have a linux-firmware package that has the hash from imx-firmware, maybe to start we could duplicate the original SRC_URI to add a name to it, and have SRCREV_FORMAT = "main" only, what do you think?

Copy link
Member Author

Choose a reason for hiding this comment

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

Currently this only affect main-next and what I have on SRCREV_FORMAT solves the problem for now but as I am here it will be better to separated it to new recipes so I will do that.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks, it would be a nice change for us anyway :-)


SRC_URI:append:beaglebone-yocto = "\
https://github.com/beagleboard/beaglebone-black-wireless/raw/d9135000a223228158d92fd2e3f00e495f642fee/firmware/wl18xx-conf.bin;name=wl18xx-conf \
Expand Down