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

Microchip uboot build failure with nixpkgs 23.05 #661

Merged
merged 2 commits into from
Jul 11, 2023
Merged

Microchip uboot build failure with nixpkgs 23.05 #661

merged 2 commits into from
Jul 11, 2023

Conversation

gangaram-tii
Copy link
Contributor

Fix for NixOS/nixpkgs#235179
Update Microchip uboot version to linux4microchip+fpga-2023.06

Description of changes

Patch for Microchip uboot, which fixes build issue against binutils 2.38
From version 2.38, binutils default to ISA spec version 20191213. This
means that the csr read/write (csrr*/csrw*) instructions and fence.i
instruction has separated from the I extension, become two standalone
extensions: Zicsr and Zifencei. As the kernel uses those instruction,
this causes build failure.

Things done
  • [OK] Tested the changes in your own NixOS Configuration
  • [OK] Tested the changes end-to-end by using your fork of nixos-hardware and
    importing it via <nixos-hardware> or Flake input

Fix for NixOS/nixpkgs#235179
Update Microchip uboot version to linux4microchip+fpga-2023.06

Signed-off-by: Ganga Ram <[email protected]>
@gangaram-tii
Copy link
Contributor Author

These changes are backward compatible i.e. works fine with nixpkgs 22.11
For more detailed information please visit:
NixOS/nixpkgs#235179

@gangaram-tii
Copy link
Contributor Author

Please review.

@Mic92 Mic92 marked this pull request as draft July 10, 2023 05:19
@Mic92
Copy link
Member

Mic92 commented Jul 10, 2023

Just undraft when you are done and I will have a look again.

Added branch name, for better trackability.

Co-authored-by: Sandro <[email protected]>
@gangaram-tii gangaram-tii marked this pull request as ready for review July 10, 2023 07:34
@Mic92
Copy link
Member

Mic92 commented Jul 11, 2023

bors merge

bors bot added a commit that referenced this pull request Jul 11, 2023
661: Microchip uboot build failure with nixpkgs 23.05 r=Mic92 a=codehub8



Co-authored-by: Ganga Ram <[email protected]>
Co-authored-by: Ganga Ram <[email protected]>
@bors
Copy link
Contributor

bors bot commented Jul 11, 2023

This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried.

@bors
Copy link
Contributor

bors bot commented Jul 11, 2023

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot merged commit 44bc025 into NixOS:master Jul 11, 2023
1 check passed
@GangaRamX
Copy link

Thank you :-)

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

Successfully merging this pull request may close these issues.

4 participants