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

raspberrypi: update kernel, firmware, eeprom and userland #113363

Merged
merged 5 commits into from
Apr 5, 2021

Conversation

mweinelt
Copy link
Member

@mweinelt mweinelt commented Feb 17, 2021

Motivation for this change

The kernel went from 5.4 to 5.10, I'm still building things and have not tested everything yet.

If someone beats me to it that is totally fine.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mweinelt mweinelt marked this pull request as draft February 17, 2021 04:10
@mweinelt mweinelt changed the title raspberrypi: update kernel, firmware, eeprom and userland tools raspberrypi: update kernel, firmware, eeprom and userland Feb 17, 2021
@mweinelt
Copy link
Member Author

The kernel currently fails to build:

  CC [M]  drivers/gpu/drm/ast/ast_mode.o
../drivers/gpu/drm/ast/ast_mode.c:851:18: error: initialization of 'void (*)(struct drm_crtc *, struct drm_atomic_state *)' from incompatible pointer type 'void (*)(struct drm_crtc *, struct drm_crtc_state *)' [-Werror=incompatible-pointer-types]
  851 |  .atomic_flush = ast_crtc_helper_atomic_flush,
      |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush')
  CC [M]  net/x25/x25_route.o
cc1: some warnings being treated as errors
make[5]: *** [../scripts/Makefile.build:279: drivers/gpu/drm/ast/ast_mode.o] Error 1
make[4]: *** [../scripts/Makefile.build:496: drivers/gpu/drm/ast] Error 2
make[3]: *** [../scripts/Makefile.build:496: drivers/gpu/drm] Error 2
make[2]: *** [../scripts/Makefile.build:496: drivers/gpu] Error 2
make[1]: *** [/build/source/Makefile:1808: drivers] Error 2
make[1]: *** Waiting for unfinished jobs....

I'm disabling DRM_AST now and retrying.

@mweinelt
Copy link
Member Author

Builds for me, still untested.

@flokli flokli removed their request for review February 18, 2021 22:01
@mweinelt
Copy link
Member Author

mweinelt commented Apr 5, 2021

# uname -a
Linux dione 5.10.11 #1-NixOS SMP Tue Jan 1 00:00:00 UTC 1980 aarch64 GNU/Linux

wfm.

@mweinelt mweinelt merged commit 791c91f into NixOS:master Apr 5, 2021
@mweinelt mweinelt deleted the rpi branch April 5, 2021 03:07
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