search

efabless / caravel

Caravel is a standard SoC harness with on chip resources to control and read/write operations from a user-dedicated space.
https://caravel-harness.readthedocs.io/
Apache License 2.0
265 stars 64 forks source link

caravel_openframe `master` branch vs `openframe_development` branch #471

Open kareefardi opened 1 year ago

kareefardi commented 1 year ago

There have been a couple of PRs adding caravel_openframe to master and then there is also openframe_development which is different from master. What are the differences between the already merged openframe and the development branch - especially that the PRs done to master were done after the latest updated to the development branch. Also, will the development branch be merged to master?

shalan commented 1 year ago

@RTimothyEdwards We have been using the master branch. Switching to openframe_development (as requested by you over the weekend) is not a possibility now. It is behind master and there are conflicts between the two branches.

@jeffdi Given the above, I don't think the open frame example tape-out is a possibility today.

RTimothyEdwards commented 1 year ago

Some additional changes were made to the openframe_development branch between March 14 and March 30. I'm not exactly sure why they would conflict, but they do need to be folded back into the main branch carefully.

RTimothyEdwards commented 1 year ago

In the end, I don't think there were any outstanding edits in openframe_development, and everything was in main except that some fixes were needed. Those fixes have been made in PR #473.