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

Merge pull request #49 from mithro/fix-uart-override 

soc_core: Don't fail if name is the same.
This commit is contained in:
Tim Ansell 2018-01-13 19:12:50 +11:00 committed by GitHub
parent bebaef1e25 3d40ad0a82
commit ab1146e1b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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]))