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

Blackparrot litex #278

Merged
merged 1 commit into from
Feb 8, 2020
Merged

Conversation

scanakci
Copy link
Contributor

Start point for Blackparrot-Litex

@mithro
Copy link
Collaborator

mithro commented Oct 11, 2019

Hi @scanakci,

Would you mind rebasing these changes on top of the latest version?

Thanks!

@mithro
Copy link
Collaborator

mithro commented Oct 11, 2019

Also, did you mean to include the simout? It looks like that is generated code which shouldn't be committed?

@mithro
Copy link
Collaborator

mithro commented Oct 11, 2019

@scanakci - You will also want to update the wiki page at https://github.com/enjoy-digital/litex/wiki/Soft-CPU to include details about BlackParrot.

@scanakci
Copy link
Contributor Author

scanakci commented Oct 11, 2019 via email

@scanakci
Copy link
Contributor Author

scanakci commented Oct 11, 2019 via email

@enjoy-digital
Copy link
Owner

Thanks @scanakci. The pull request is difficult to review since the generated files are included and we won't be able to merge it without doing a rebase. Can you do a rebase and force push to your branch only the changes that will be integrated in the LiteX? (not the generated files) To allow me to review the changes you did on the output files, can you send them to me by mail? (florent [AT] enjoy-digital.fr) Thanks

@scanakci
Copy link
Contributor Author

Sure. After rebasing, blackparrot is not working due to some changes in soc_core. I will let you know once I am done.

@scanakci scanakci force-pushed the blackparrot_litex branch 3 times, most recently from 08fb083 to 3e6b982 Compare October 11, 2019 21:02
@enjoy-digital
Copy link
Owner

@scanakci: thanks for the rebase.

@enjoy-digital
Copy link
Owner

Hi @scanakci, is your work going well?

@scanakci
Copy link
Contributor Author

scanakci commented Nov 6, 2019 via email

w/ Litex BIOS simulation including LiteDRAM
w/ Litex BIOS working on FPGA excluding LiteDRAM
@enjoy-digital
Copy link
Owner

Thanks @scanakci for the update and rebase. I had a first quick look and if things are working we could probably merge soon. I'll do the cosmetic changes if needed. Just a question, is there anything preventing running the simulation directly with litex_sim? (I see you are preparing the simulation with it but running with another command)

cp bp_hardware/bp_nonsynth_host.v $BP_TOP_DIR/test/common/.

# Neccessary files for FPGA Implementations
cp -r bp_fpga $BP_TOP/DIR
Copy link
Contributor Author

@scanakci scanakci Jan 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cp -r bp_fpga $BP_TOP/DIR ------> there is a typo here, the correct version is -----> cp -r bp_fpga $BP_TOP_DIR/

@scanakci
Copy link
Contributor Author

Thanks, @enjoy-digital. After following the Readme File to setup BlackParrot and also copy necessary hardware/software files for LiteX integration, there is nothing preventing running the simulation directly with litex_sim. The preparation is a one-time process, it basically clones blackparrot repo, installs necessary tools for it, modifies some files in BP repo, and sets some environment variables.

You should be able to use the following command and hopefully get a BIOS terminal with no issues after the one-time preparation.
"./litex_sim.py --output-dir $PWD/BP_BIOS --cpu-type blackparrot --cpu-variant standard --threads 6 --integrated-rom-size 40960 --with-sdram"

@enjoy-digital enjoy-digital merged commit 1dced81 into enjoy-digital:master Feb 8, 2020
@enjoy-digital
Copy link
Owner

Thanks @scanakci, this seems fine for an initial PR and i just merged it. I will probably do some cleanup in the next days. If you have updates on your side, please create new PRs for that.

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