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.

Sign up for GitHub

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

Jump to bottom

Fix tests #390

Merged
merged 3 commits into from
Apr 28, 2022
Merged

Fix tests #390

merged 3 commits into from
Apr 28, 2022

Conversation

JDLopes
Copy link
Contributor

@JDLopes JDLopes commented Apr 28, 2022

  • Add dependency from firmware.bin when running console;
  • Fix document targets;
  • Cleanup root Makefile;
  • Remove dummy trap on simulation build target;
  • Simplify boot.hex and firmware.hex targets.

jjts
jjts reviewed Apr 28, 2022
View reviewed changes
hardware/simulation/simulation.mk
@@ -56,14 +56,14 @@ endif
#RULES
build: $(VSRC) $(VHDR) $(HEXPROGS)
ifeq ($(SIM_SERVER),)
bash -c "trap 'make kill-sim' INT TERM KILL EXIT; make comp"
make comp
Copy link
Contributor

Choose a reason for hiding this comment

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

why delete this ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because here is running a build, not a simulation. So there is no simulation stuck to kill.

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks

hardware/hardware.mk Outdated
$(PYTHON_DIR)/hex_split.py firmware .
cp $(FIRM_DIR)/firmware.bin .

firmware.bin: $(FIRM_DIR)/firmware.bin
Copy link
Contributor

Choose a reason for hiding this comment

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

delete this target

hardware/simulation/simulation.mk
@@ -56,14 +56,14 @@ endif
#RULES
build: $(VSRC) $(VHDR) $(HEXPROGS)
Copy link
Contributor

Choose a reason for hiding this comment

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

copy bin here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done!

@jjts jjts merged commit fbc2ad0 into IObundle:devel Apr 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jjts jjts jjts left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JDLopes @jjts