Updating build.sbt as a precursor to updating Maven#152
Updating build.sbt as a precursor to updating Maven#152tianrui-wei merged 5 commits intoucb-bar:masterfrom
Conversation
|
This commit bumps |
|
I feel like this will break when testchipip is built with chipyard, since the chipyard testchipip project will inherit these settings. |
|
The dependency on sifive-blocks is regrettable. IMO we should refactor the stuff that depends on sifive-blocks out of this into chipyard directly. UARTAdapter and SPIFlash can both go in chipyard. Then testchipip only needs rocket-chip |
|
I feel chipyard should override the dependency in its settings when you flip on a development switch, in which case it will clone dependencies as submodules. But in default mode, it should just use binary dependency off maven. Until we figure out how to publish CY as a maven package, I'd avoid moving stuff into chipyard, as the original intention would be enabling stand-alone use of packages, rather than have everything depend on chipyard. |
Ok, I think that might be ok for now, but I think we should avoid adding more overrides to chipyard's build.sbt. Can you open a PR to Chipyard bumping testchipip and updating the chipyard build.sbt? |
|
Sorry for the blip, restored the old master branch |
|
I meant open a PR for chipyard, then we merge that PR and this one at the same time, once we confirm the chipyard changes work. Its not a big deal, but I stlil reverted your changes for now, also so we can get feedback from @abejgonzalez and others |
|
Sounds good, yeah sorry for the wrong push. I was meaning to push to my own fork... Thanks for the help. Actually this depends on chipsalliance/rocket-chip-blocks#9 so this should probably not be merged until that one is merged and a maven package is already upstream |
|
CY PR opened at ucb-bar/chipyard#1299, new PR at #153 |
|
For Chipyard I mean a chipyard PR that bumps testchipip submodule, and fixes and issues with build.sbt. |
|
Oh I see lol |
No description provided.