Skip to content

Conversation

@ShadeTechnik
Copy link
Contributor

new file:   HW/hm2/config/DExx_Nano_xxx_Cramps/atlas_st_fpga_soc_dc1G.sv

	new file:   HW/hm2/config/DExx_Nano_xxx_Cramps/atlas_st_fpga_soc_dc1G.sv
@ShadeTechnik
Copy link
Contributor Author

Added custom Board config. config "dc1f" from previous PR obsolete

@the-snowwhite
Copy link
Contributor

Hi @ShadeTechnik
It is not possible to merge 2 parallel commits (on top of the same commit) at once (sideways).
This pr has to be rebased on top of the PR you are updating after it has been merged into the mksocfpga repo master branch.

@ShadeTechnik
Copy link
Contributor Author

Yeah I dunno.......I'm sure somebody will fix it lol.

@ArcEye
Copy link
Contributor

ArcEye commented Oct 1, 2019

@ShadeTechnik
If your PR updates a file in @the-snowwhite s commit, that just means his needs
to be merged first.

It may throw a conflict but that can be fixed.

Leave it here for a while until #109 is merged.

@ArcEye ArcEye mentioned this pull request Oct 1, 2019
@ArcEye
Copy link
Contributor

ArcEye commented Oct 1, 2019

Bear with me. There was a problem with the vivado build that seems strange, I need to look at it properly tomorrow.
The quartus stuff seems OK, so your PR should be able to merge on top of #109 without problem.

@ArcEye
Copy link
Contributor

ArcEye commented Oct 2, 2019

Can only build for quartus at present.
I will go back and build for vivado once the docker is sorted

@ArcEye ArcEye merged commit b0a8492 into machinekit:master Oct 2, 2019
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