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

[hw,otp_ctrl_darjeeling] Hard fork of OTP Ctrl from integrated_dev #25014

Closed
wants to merge 1 commit into from

Conversation

Razer6
Copy link
Member

@Razer6 Razer6 commented Nov 5, 2024

To unblock the work for integrated, we decided to create a temporary hard fork of otp_ctrl based on the integrated_dev branch. This fork only lives until otp_ctrl is ipgen'ed and will be removed later on.

To avoid package conflicts, all fusesoc packages are renamed to otp_ctrl_darjeeling(_XYZ). The CIP_ID remains the same for the time being.

@Razer6 Razer6 requested a review from a team as a code owner November 5, 2024 16:34
@Razer6 Razer6 requested review from eshapira, rswarbrick, andreaskurth and a team and removed request for a team and eshapira November 5, 2024 16:34
@Razer6 Razer6 force-pushed the sync-otp-ctrl branch 2 times, most recently from 18ac559 to c2bce22 Compare November 5, 2024 16:58
@matutem
Copy link
Contributor

matutem commented Nov 6, 2024

A better fix should be possible when this is ipgen-ed. See #25019.

@matutem
Copy link
Contributor

matutem commented Nov 17, 2024

@Razer6, this is probably okay, but we should make sure the CI failures are understood and addressed if needed.

@andreaskurth
Copy link
Contributor

A better fix should be possible when this is ipgen-ed. See #25019.

I agree, I think this is the long-term solution we all want. At the same time, a "hard fork" of otp_ctrl for Darjeeling as implemented in this PR can unblock work, so it's a viable stepping stone.

@Razer6, this is probably okay, but we should make sure the CI failures are understood and addressed if needed.

Agreed; probably some CI failures (hopefully most) can be resolved with a rebase on master. I'm taking the liberty to do so.

@rswarbrick rswarbrick removed their request for review December 11, 2024 14:41
@Razer6
Copy link
Member Author

Razer6 commented Dec 21, 2024

Closing in favor of the ipgen'ed otp_ctrl from #25503

@Razer6 Razer6 closed this Dec 21, 2024
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