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

raspberrypi-wireless-firmware, raspberrypi-firmware, linux-rpi: sync to Raspberry Pi OS Bookworm release #268280

Merged
merged 3 commits into from
Jan 14, 2024
Merged

raspberrypi-wireless-firmware, raspberrypi-firmware, linux-rpi: sync to Raspberry Pi OS Bookworm release #268280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
621286b
raspberrypi-wireless-firmware: unstable-2023-05-04 -> unstable-2023-1…
peat-psuwit Nov 18, 2023
8f14473
raspberrypi-firmware: 1.20230405 -> stable_20231123
peat-psuwit Nov 18, 2023
80d5430
linux-rpi: 6.1.21-1.20230405 -> 6.1.63-stable_20231123
peat-psuwit Nov 18, 2023
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
14 changes: 6 additions & 8 deletions pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

stdenvNoCC.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "unstable-2023-05-04";
version = "unstable-2023-11-15";

srcs = [
(fetchFromGitHub {
name = "bluez-firmware";
owner = "RPi-Distro";
repo = "bluez-firmware";
rev = "9556b08ace2a1735127894642cc8ea6529c04c90";
hash = "sha256-gKGK0XzNrws5REkKg/JP6SZx3KsJduu53SfH3Dichkc=";
rev = "d9d4741caba7314d6500f588b1eaa5ab387a4ff5";
hash = "sha256-CjbZ3t3TW/iJ3+t9QKEtM9NdQU7SwcUCDYuTmFEwvhU=";
})
(fetchFromGitHub {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "2b465a10b04555b7f45b3acb85959c594922a3ce";
hash = "sha256-9UgB8f2AaxG7S5Px46jOP9wUeO1VXKB0uJiPWh32oDI=";
rev = "88aa085bfa1a4650e1ccd88896f8343c22a24055";
hash = "sha256-Yynww79LPPkau4YDSLI6IMOjH64nMpHUdGjnCfIR2+M=";
})
];

Expand All @@ -35,16 +35,14 @@ stdenvNoCC.mkDerivation {
cp -rv "$NIX_BUILD_TOP/firmware-nonfree/debian/config/brcm80211/." "$out/lib/firmware/"

# Bluetooth firmware
cp -rv "$NIX_BUILD_TOP/bluez-firmware/broadcom/." "$out/lib/firmware/brcm"
cp -rv "$NIX_BUILD_TOP/bluez-firmware/debian/firmware/broadcom/." "$out/lib/firmware/brcm"

# brcmfmac43455-stdio.bin is a symlink to the non-existent path: ../cypress/cyfmac43455-stdio.bin.
# See https://github.com/RPi-Distro/firmware-nonfree/issues/26
ln -s "./cyfmac43455-sdio-standard.bin" "$out/lib/firmware/cypress/cyfmac43455-sdio.bin"

pushd $out/lib/firmware/brcm &>/dev/null
# Symlinks for Zero 2W
ln -s "./brcmfmac43436-sdio.bin" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.bin"
ln -s "./brcmfmac43436-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.txt"
ln -s "./brcmfmac43436-sdio.clm_blob" "$out/lib/firmware/brcm/brcmfmac43430b0-sdio.clm_blob"
popd &>/dev/null

Expand Down
9 changes: 6 additions & 3 deletions pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
version = "1.20230405";
# raspberrypi/firmware no longers tag the releases. However, since each commit
# on the stable branch corresponds to a tag in raspberrypi/linux repo, we
# assume they are cut together.
version = "stable_20231123";

src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
hash = "sha256-UtUd1MbsrDFxd/1C3eOAMDKPZMx+kSMFYOJP+Kc6IU8=";
rev = "524247ac6d8b1f4ddd53730e978a70c76a320bd6";
hash = "sha256-rESwkR7pc5MTwIZ8PaMUPXuzxfv+jVpdRp8ijvxHGcg=";
};

installPhase = ''
Expand Down
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-rpi.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "6.1.21";
tag = "1.20230405";
modDirVersion = "6.1.63";
tag = "stable_20231123";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
Expand All @@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // {
owner = "raspberrypi";
repo = "linux";
rev = tag;
hash = "sha256-ILwecHZ1BN6GhZAUB6/UwiN/rZ8gHndKON6DUhidtxI=";
hash = "sha256-4Rc57y70LmRFwDnOD4rHoHGmfxD9zYEAwYm9Wvyb3no=";
};

defconfig = {
Expand Down