Hardware
/
VexRiscv
mirror of https://github.com/SpinalHDL/VexRiscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from kaofishy/master 

Minor fixes to Murax.scala
This commit is contained in:
Dolu1990 2017-11-16 21:16:53 +01:00 committed by GitHub
parent 9f9ec823b8 290dbc106e
commit 635417aec2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/vexriscv/demo/Murax.scala
View File

@ -145,7 +145,7 @@ case class Murax(config : MuraxConfig) extends Component{
val jtag = slave(Jtag()) val jtag = slave(Jtag())
//Peripherals IO //Peripherals IO
val gpioA = master(TriStateArray(32 bits)) val gpioA = master(TriStateArray(gpioWidth bits))
val uart = master(Uart()) val uart = master(Uart())
} }
@ -266,7 +266,7 @@ case class Murax(config : MuraxConfig) extends Component{
//******** Memory mappings ********* //******** Memory mappings *********
val apbDecoder = Apb3Decoder( val apbDecoder = Apb3Decoder(
master = apbBridge.io.apb, master = apbBridge.io.apb,
slaves = List( slaves = List[(Apb3, SizeMapping)](
gpioACtrl.io.apb -> (0x00000, 4 kB), gpioACtrl.io.apb -> (0x00000, 4 kB),
uartCtrl.io.apb -> (0x10000, 4 kB), uartCtrl.io.apb -> (0x10000, 4 kB),
timer.io.apb -> (0x20000, 4 kB) timer.io.apb -> (0x20000, 4 kB)