| commit | 1fef1c3abb1d8e195fc97f37e220129a51d9d7be | [log] [tgz] |
|---|---|---|
| author | Staf Verhaegen <staf.verhaegen@chipflow.io> | Sun Dec 04 16:09:43 2022 +0100 |
| committer | Staf Verhaegen <staf.verhaegen@chipflow.io> | Sun Dec 04 16:09:43 2022 +0100 |
| tree | 3e032ef94bfa5a4891b943471629e06080755c5c | |
| parent | 02e2759161d6b3c072d14237213d0b2c7dfc504c [diff] | |
| parent | 2a57f9adb415e180c84d7fb0767f2c1527142790 [diff] |
Merge branch 'efabless-caravel' into main Bringing in changes from gfmpw-0c -> gfmwp-0d
This is template repository used as the base for GFMPW tapeout for ChipFlow projects. It contains reduced setup based on the gf180mcu branch in the caravel_user_project repo. The commit is squashed to save disk space and download bandwidth.
The use of this template is mainly to allow to easily make a repo that can be used to commit a design for tape-out on the efabless platform. Repo that are based on this template should put the user_project_wrapper.gds(.gz) to tape out in the gds directory and replace this README with a proper reference to the repo and code that is used to generate this gds file.
The branch efabless-caravel branch is used to track the upstream repo. Updating to new version is done by manually adding squashed changes in the upstream gf180mcu to the commit version mentioned in the last commit on the efabless-caravel branch. In the new commit message on the efabless-caravel branch the new commit version of the upstream repo should be mentioned so a new update can done in the future. Only squashed changes are added in this branch to avoid brining in the whole (convoluted) history of the upstream branch.
After an update to the efabless-caravel project it needs to be merged into the main branch. This most likely will involve fixing merge conflicts; each merge conflict will need to be what changes need to be done to main branch to reflect the changes in the efabless-caravel branch.