search

openrisc / orpsoc-cores

Core description files for FuseSoC
123 stars 78 forks source link

Icarus support after Verilator support #35

Closed jjts closed 10 years ago

jjts commented 10 years ago

This pull request should be applied after pull req #33.

A few files and need to me modified so that Icarus can compile and run, after adding Verilator support.

fjullien commented 10 years ago

I think it is less work for both if you do it. Thanks Jose

Done.

fjullien commented 10 years ago

Not sure what happened. I pulled the latest changes before adding mine....

This what I do when I want to apply a patch on a clean, up-to-date branch:

git remote add upstream https://github.com/the/upstream/you/want/to/patch.git git fetch upstream git checkout -b fix-blabla upstream/master

Then you can add your patch here using git cherry-pick your-patch-hash-from-another-branch

Finally, git push -u origin fix-blabla

Franck.

jjts commented 10 years ago

Thanks for the help. I followed a similar process, except that I did not apply a patch but merged my files in the upstream files. I must have picked a dated upstream -- seems the only explanation. Anyway, is this still mergeable?

On Tue, Jan 28, 2014 at 8:19 PM, Franck Jullien notifications@github.comwrote:

Not sure what happened. I pulled the latest changes before adding mine....

This what I do when I want to apply a patch on a clean, up-to-date branch:

git remote add upstream https://github.com/the/upstream/you/want/to/patch.git git fetch upstream git checkout -b fix-blabla upstream/master

Then you can add your patch here using git cherry-pick your-patch-hash-from-another-branch

Finally, git push -u origin fix-blabla

Franck.

Reply to this email directly or view it on GitHubhttps://github.com/openrisc/orpsoc-cores/pull/35#issuecomment-33520268 .

jjts commented 10 years ago

This request has been superseded by recent work on Verilator support