lowRISC / tock

A secure embedded operating system for microcontrollers
https://www.tockos.org
Other
2 stars 3 forks source link

Rebase of opentitan-master on top of TockOS upstream branch #9

Closed mazurek-michal closed 1 year ago

mazurek-michal commented 1 year ago

Rebase of opentitan-master branch on top of TockOS upstream branch

mazurek-michal commented 1 year ago

I updated this PR with code that allow to run TockOS with current OT ROM manifest struct. It also contain cherry-picked @cfrantz commit with fix for OT init setup.

cfrantz commented 1 year ago

I rebased to the latest upstream tock/master this afternoon and tested this branch with my hello world demo.

To make this easier next time, I reordered commits a bit so that the empty "this is our fork" commit is first in the line of commits. You can easily see this in the history:

$ git log --oneline
45bacead3 (HEAD -> m3, lowrisc/opentitan-master, cfrantz/opentitan-master) board/opentitan: Fix capsule references
a2983899e board/opentitan: Update linker memory map
...
0e51bf064 Update the manifest layout
857ec1075 =============== OpenTitan Fork ===============
37ce3b74d Merge #3431
100e0fbc0 Merge pull request #3436 from lschuermann/dev/nix-shell-update-2023-05-17

Because of the apparent merge conflicts (because we really want a rebase, not a true merge), I did a manual force-push from my rebasing branch to the lowRISC:opentitan-master branch rather than trying to merge this PR in the github GUI.

$ git remote -v
cfrantz git@github.com:cfrantz/tock.git (fetch)
cfrantz git@github.com:cfrantz/tock.git (push)
lowrisc git@github.com:lowRISC/tock.git (fetch)
lowrisc git@github.com:lowRISC/tock.git (push)
mazurek git@github.com:semihalf-mazurek-michal/tock.git (fetch)
mazurek git@github.com:semihalf-mazurek-michal/tock.git (push)
upstream    git@github.com:tock/tock.git (fetch)
upstream    git@github.com:tock/tock.git (push)

$ git push lowrisc HEAD:opentitan-master --force

You'll have to do a fetch and a pull --rebase to pull the lowRISC:opentitan-master into your local opentitan-master branch.