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

meson64: bump edge to 6.11 (currently v6.11-rc7) #7241

Conversation

rpardini
Copy link
Member

meson64: bump edge to 6.11 (currently v6.11-rc7)

  • meson64-6.10: rebase against v6.10.10; drop dt-bindings-only patch, otherwise no changes
    • jethome-0003-dt-bindings-arm-amlogic-add-binding-for-JetHome-JetH.patch contains only dt-bindings, and those are ignored by the rewriter
  • meson64-6.11: copy patches from 6.10
  • meson64: bump edge to 6.11 (currently v6.11-rc7)
  • meson64-6.11: manually fix 4 patches for 6.11
    • general-add-overlay-compilation-support.patch: same fix as done in rk3588's 6.11
    • board-bananapism1-add-uart_A-and-AO_B.patch: manually rebase, guess there was an indent change
    • general-socinfo-sm-1-soc-amlogic-meson-gx-socinfo-Add-S905L-ID.patch and general-socinfo-sm-2-soc-amlogic-meson-gx-socinfo-add-new-A113X-SoC-id.patch: landed upstream
  • meson64-6.11: rebase/rewrite remaining patches, no changes
  • meson64-6.11: hackfix for general-socinfo-sm-4-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch
    • otherwise
      drivers/soc/amlogic/meson-gx-socinfo-sm.c:178:19: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
           178 |         .remove = meson_gx_socinfo_sm_remove,
               |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
      
  • meson64-6.10: drop 6.10 patch directory after bump to 6.11
    • as 6.10 is not an LTS release

…therwise no changes

- jethome-0003-dt-bindings-arm-amlogic-add-binding-for-JetHome-JetH.patch contains only dt-bindings, and those are ignored by the rewriter
- general-add-overlay-compilation-support.patch: same fix as done in rk3588's 6.11
- board-bananapism1-add-uart_A-and-AO_B.patch: manually rebase, guess there was an indent change
- general-socinfo-sm-1-soc-amlogic-meson-gx-socinfo-Add-S905L-ID.patch and general-socinfo-sm-2-soc-amlogic-meson-gx-socinfo-add-new-A113X-SoC-id.patch: landed upstream
…ocinfo-sm-Add-Amlogic-secure-m.patch

- otherwise
  ```
  drivers/soc/amlogic/meson-gx-socinfo-sm.c:178:19: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
       178 |         .remove = meson_gx_socinfo_sm_remove,
           |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
  ```
@github-actions github-actions bot added size/medium PR with more then 50 and less then 250 lines Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Sep 14, 2024
@rpardini
Copy link
Member Author

@adeepn if you could check my hackfix for the socinfo? a call back was changed to void.
@pyavitz if you check the uart stuff? I think it was only indent change upstream.

@rpardini rpardini requested review from pyavitz and adeepn September 14, 2024 16:20
@rpardini rpardini marked this pull request as ready for review September 14, 2024 16:20
@pyavitz
Copy link
Collaborator

pyavitz commented Sep 14, 2024

@adeepn if you could check my hackfix for the socinfo? a call back was changed to void. @pyavitz if you check the uart stuff? I think it was only indent change upstream.

Actually I believe this bit pinctrl can be removed. As reflected in my own repo: https://github.com/pyavitz/debian-image-builder/blob/feature/patches/amlogic/6.11/003-arch-arm64-dts-amlogic-meson-sm1-bananapi.patch#L151

If it compiles as is, just let it slide and I'll fix it up. I plan on doing a commit once this is merged for the Gateway GZ80x anyway.

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 11 Milestone: Fourth quarter release labels Sep 15, 2024
@igorpecovnik
Copy link
Member

@adeepn @pyavitz
I have to merge all those 6.11 at once or build train fails. If anything needs additional fixing, open separate PR.

@igorpecovnik igorpecovnik merged commit 79ba487 into armbian:main Sep 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
11 Milestone: Fourth quarter release Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/medium PR with more then 50 and less then 250 lines
Development

Successfully merging this pull request may close these issues.

3 participants