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

brcmfmac_sdio-firmware-rpi: Consolidate firmware files #1922

Merged
merged 4 commits into from
Aug 30, 2017
Merged

brcmfmac_sdio-firmware-rpi: Consolidate firmware files #1922

merged 4 commits into from
Aug 30, 2017

Conversation

MilhouseVH
Copy link
Contributor

Currently we install:

BCM43430A1.hcd from brcmfmac_sdio-firmware-rpi
brcmfmac43430-sdio.bin from kernel-firmware
brcmfmac43430-sdio.txt from wlan-firmware

This is crazy, particularly as we need to install updated brcmfmac43430-sdio.{bin,txt} (see here) but pulling the files from kernel-firmware (a repo not under our control) means that is more difficult to do - yes, we could binary patch it...

Now, all three files will be installed from brcmfmac_sdio-firmware-rpi.

This PR depends on LibreELEC/wlan-firmware#4 (I'll update this once it is merged).

The change to kernel-firmware is a hack, but the best I could think of right now.

If any non-RPi0/RPi3 platforms require brcmfmac43430-sdio.{bin,txt} then this PR is wrong, as we will only be installing these files for RPi/RPi2.

This can be backported to libreelec-8.2.

@MilhouseVH MilhouseVH changed the title Le90 update rpi wifi bt brcmfmac_sdio-firmware-rpi: Consolidate firmware files Aug 25, 2017
@MilhouseVH
Copy link
Contributor Author

MilhouseVH commented Aug 25, 2017

A second option would be to leave wlan-firmware as it is and apply the same hack I used in kernel-firmware to wlan-firmware as well, but in both cases add a condition so that we only remove the brcmfmac43430-sdio.* files if the build includes brcmfmac_sdio-firmware-rpi firmware (ie. check $FIRMWARE), ie.

if [ -n "$(echo "$FIRMWARE" | grep brcmfmac_sdio-firmware-rpi ]; then
  rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430-sdio.bin
fi

and a similar change to wlan-firmware.

That way, we continue to install brcmfmac43430-sdio.{bin,txt} from wlan-firmware and kernel-firmware unless we are installing brcmfmac_sdio-firmware-rpi which installs different (newer) versions of the files.

A third option would be to add all 3 brcmfmac_sdio-firmware-rpi firmware files to wlan-firmware, and use the kernel-firmware hack. Only problem then is that if wlan-firmware were not installed for any reason, the brcmfmac_sdio-firmware-rpi package will be "broken".

@chewitt chewitt merged commit ab7496d into LibreELEC:master Aug 30, 2017
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.

None yet

2 participants