From 3d40ad0a82d0e5d7360f641b98e6bf74dc56a026 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Sat, 13 Jan 2018 19:10:57 +1100 Subject: [PATCH] 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 ``` --- litex/soc/integration/soc_core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litex/soc/integration/soc_core.py b/litex/soc/integration/soc_core.py index e2dd457fe..02fe0c9c8 100644 --- a/litex/soc/integration/soc_core.py +++ b/litex/soc/integration/soc_core.py @@ -171,7 +171,7 @@ class SoCCore(Module): # Add the base SoC's interrupt map 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, mod_name, interrupt_rmap[interrupt]))