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

meta-lxatac-bsp: linux-lxatac: upgrade to 6.9 #138

Merged
merged 2 commits into from
Jun 12, 2024

Conversation

hnez
Copy link
Member

@hnez hnez commented May 14, 2024

umpf tag is now: 6.9/customers/lxa/lxatac/20240514-1
The tag includes the following topic branches:

  • v6.8/topic/reproducible-build
  • v6.7/topic/net-ksz-switch
  • v6.9/topic/stm32mp1-spi-fix-hang
  • v6.8/customers/lxa/lxatac

This means we got rid of two topic branches, thanks to Uwe's mainlining efforts, but gained one new topic branch:

  • v6.9/topic/stm32mp1-spi-fix-hang

    This topic branch reverts kernel commit 52b62e7a5d4fb
    ("spi: stm32: enable controller before asserting CS")
    which broke SPI on the LXA TAC.
    The issue has been reported upstream and the offending
    commit will likely be reverted upstream as well.

The series.inc file generated by umpf has again changed a bit and does not set the package PV anymore.
Since we have already migrated to using the series.inc-provided PV the linux-lxatac.bb was adapted to preserve the previous behaviour.

TODO before merging:

  • Since this is a PR into the new scarthgap branch, that does not yet contain scarthgap-y content Update to Yocto 5.0 - Scarthgap #137 should be merged first, which performs the scarthgap update.

@hnez hnez requested a review from jluebbe May 14, 2024 09:50
The new scarthgap yocto release comes with a new gcc and toolchain in
general, resulting in some changes to the defconfig, even no other
changes are performed.

Perform these automatic changes in a separate commit,
to decouple them from the following defconfig changes from a kernel
update.

Signed-off-by: Leonard Göhrs <[email protected]>
@hnez
Copy link
Member Author

hnez commented May 30, 2024

Hi, now that #137 is merged and the dust has settled (default branches are updated, build jobs are updated and ran successfully, labgrid tests are updated and also ran fine and the first scarthgap based testing bundle is available and installable) we can go ahead and merge this PR as well..

@hnez
Copy link
Member Author

hnez commented Jun 11, 2024

I've just noticed that this PR is still open. I think we should get this merged.

Copy link
Member

@jluebbe jluebbe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM from the Yocto side, but someone else should look at the kernel patches.

@hnez Is 0503-ARM-dts-stm32-lxa-tac-reduce-RGMII-interface-drive-s.patch no longer needed?

@hnez
Copy link
Member Author

hnez commented Jun 11, 2024

@hnez Is 0503-ARM-dts-stm32-lxa-tac-reduce-RGMII-interface-drive-s.patch no longer needed?

I've had a look and it is actually no longer needed, since https://lore.kernel.org/all/[email protected]/ was merged between 6.8 and 6.9.
That must have slipped through when writing the update commit message.

umpf tag is now: 6.9/customers/lxa/lxatac/20240514-1
The tag includes the following topic branches:

  - v6.8/topic/reproducible-build
  - v6.7/topic/net-ksz-switch
  - v6.9/topic/stm32mp1-spi-fix-hang
  - v6.8/customers/lxa/lxatac

This means we got rid of two topic branches, thanks to Uwe's mainlining
efforts, but gained one new topic branch:

  - v6.9/topic/stm32mp1-spi-fix-hang

    This topic branch reverts kernel commit 52b62e7a5d4fb
    ("spi: stm32: enable controller before asserting CS")
    which broke SPI on the LXA TAC.
    The issue has been reported upstream and the offending
    commit will likely be reverted upstream as well.

With the inclusion of commit e3fb8e8ba72b0 ("net: dsa: microchip: make
sure drive strength configuration is not lost by soft reset") can also
get rid of the hack patch to set the drive strength of the RGMII lines
coming from the ethernet switch.

The defconfig was modified to disable the `CONFIG_NTFS_FS` option,
which only serves to select `CONFIG_NTFS3_FS` (thanks to @a3f).

The series.inc file generated by umpf has again changed a bit and does
not set the package PV anymore.
Since we have already migrated to using the series.inc-provided PV
the linux-lxatac.bb was adapted to preserve the previous behaviour.

Signed-off-by: Leonard Göhrs <[email protected]>
@hnez hnez merged commit 8ac7d30 into linux-automation:scarthgap Jun 12, 2024
2 checks passed
@hnez hnez deleted the linux-6.9 branch June 12, 2024 05:23
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.

3 participants