Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc_core: Don't fail if name is the same. 

Otherwise you can't override the UART with another UART, you get an
error like;

```
  File "/home/tansell/github/timvideos/HDMI2USB-litex-firmware/third_party/litex/litex/soc/integration/soc_core.py", line 176, in __init__
    interrupt, mod_name, interrupt_rmap[interrupt]))
AssertionError: Interrupt vector conflict for IRQ 2, user defined uart conflicts with SoC inbuilt uart
```
This commit is contained in:
Tim 'mithro' Ansell 2018-01-13 19:10:57 +11:00
parent bebaef1e25
commit 3d40ad0a82
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
litex/soc/integration/soc_core.py
View File

@ -171,7 +171,7 @@ class SoCCore(Module):
# Add the base SoC's interrupt map # Add the base SoC's interrupt map
for mod_name, interrupt in self.soc_interrupt_map.items(): for mod_name, interrupt in self.soc_interrupt_map.items():
assert interrupt not in interrupt_rmap, ( assert interrupt not in interrupt_rmap or mod_name == interrupt_rmap[interrupt], (
"Interrupt vector conflict for IRQ %s, user defined %s conflicts with SoC inbuilt %s" % ( "Interrupt vector conflict for IRQ %s, user defined %s conflicts with SoC inbuilt %s" % (
interrupt, mod_name, interrupt_rmap[interrupt])) interrupt, mod_name, interrupt_rmap[interrupt]))