search

polarfire-soc / polarfire-soc-zephyr-applications

Zephyr test and demo applications targeting PolarFire SoC
3 stars 1 forks source link

Process for efficiently merging Polar Fire changes into the evolving Zephyr code base #1

Open bob2oneil opened 2 years ago

bob2oneil commented 2 years ago

Rather than simply comparing the files provided with this source release, to the current Zephyr release, certainly there has to be a more automated and less error prone method of effectively merging PolarFire specific source and configuration files into the frequently evolving Zephyr RTOS.

For example, while this release has updates within the past month, the VERSION file contain in the Zephyr folder indicates the following:

PolarFile GIT is version 2.4.99 of Zephyr - released Sept 2020 time frame.

The current version of Zephyr is 2.7.99 for Oct 20th Zephyr release.

There are bug fixes and mods that I need from the more recent release, but I want to at the same time, merge in the changes made to support the PolarFire SoC.

Please advice on the "right way" to provide migration support of PolarFire changes into the constantly improving Zephyr RTOS.

con-pax commented 2 years ago

Hi @bob2oneil,

Thank you for getting in touch. Our intent is to rebase our development work for Polarfire SoC with the latest Zephyr code base and then work on up-streaming it to the official Zephyr repository. The Zephyr repository that we maintain here is a temp repository used for initial development. You can follow our progress on the Zephyr Developers mailing list here: https://lists.zephyrproject.org/g/devel/message/8103

bob2oneil commented 2 years ago

Is there any proposed schedule for compliance with the more recent 2.7.99 track of Zephyr.

con-pax commented 2 years ago

Hi @bob2oneil,

We are working on it. Our plan is to include the mpfs hal as a module in the zephyr project. This significantly reduces the amount of code changes to the Zephyr base project. We are currently starting to test with the head of the main branch of the Zephyr repository. I will keep you informed.

Kind Regards,

Conor