github-mirrors/VexRiscv
1
0
Fork 0
mirror of https://github.com/SpinalHDL/VexRiscv.git synced 2025-04-24 05:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes GPIO width mismatch

Browse source 
Adds explicit type to apbDecoder.slave to suppress IDE errors
This commit is contained in:
Tony Kao 2017-11-16 15:02:13 -05:00
parent 9f9ec823b8
commit 290dbc106e
1 changed files with 2 additions and 2 deletions
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())
//Peripherals IO
val gpioA = master(TriStateArray(32 bits))
val gpioA = master(TriStateArray(gpioWidth bits))
val uart = master(Uart())
}
@ -266,7 +266,7 @@ case class Murax(config : MuraxConfig) extends Component{
//******** Memory mappings *********
val apbDecoder = Apb3Decoder(
master = apbBridge.io.apb,
slaves = List(
slaves = List[(Apb3, SizeMapping)](
gpioACtrl.io.apb -> (0x00000, 4 kB),
uartCtrl.io.apb -> (0x10000, 4 kB),
timer.io.apb -> (0x20000, 4 kB)