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

*/bsp.vh: fix conflitct after IOb-SoC update. #63

Merged
merged 4 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ endif
setup:
make build-setup SETUP_ARGS="$(SETUP_ARGS)"

test-linux:
nix-shell --run "make clean"
nix-shell --run "make setup INIT_MEM=1 RUN_LINUX=1"
nix-shell --run "make -C ../iob_soc_o* sim-run SIMULATOR=verilator"

sim-test:
# IOb-SoC-Opencryptolinux only supports USE_EXTMEM=1
#make clean && make setup && make -C ../iob_soc_opencryptolinux_V*/ sim-test
Expand Down
Empty file removed hardware/simulation/.empty
Empty file.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//`define BAUD 115200
`define BAUD 115200
`define BAUD 3000000
`define FREQ 100000000
`define DDR_DATA_W 32
`define DDR_ADDR_W 26
Expand Down
12 changes: 5 additions & 7 deletions iob_soc_opencryptolinux.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,11 @@ def _post_setup(cls):
# If RUN_LINUX is not set, use 3000000 baud in simulation
for arg in sys.argv[1:]:
if arg == "RUN_LINUX":
break
else:
inplace_change(
os.path.join(cls.build_dir, "hardware/simulation/bsp.vh"),
"define BAUD 115200",
"define BAUD 3000000",
)
inplace_change(
os.path.join(cls.build_dir, "hardware/simulation/src/bsp.vh"),
"define BAUD 3000000",
"define BAUD 115200",
)

# Override periphs_tmp.h of iob-soc with one specific for opencryptolinux
create_periphs_tmp(
Expand Down
2 changes: 1 addition & 1 deletion submodules/IOBSOC
Loading