Merge pull request #716 from gsomlo/gls-irq-misc
miscellaneous (mostly cosmetic) soc irq init fixes
This commit is contained in:
commit
2e7203d930
|
@ -624,7 +624,7 @@ class SoCIRQHandler(SoCLocHandler):
|
||||||
# Check IRQ Number
|
# Check IRQ Number
|
||||||
if n_irqs > 32:
|
if n_irqs > 32:
|
||||||
self.logger.error("Unsupported IRQs number: {} supporteds: {:s}".format(
|
self.logger.error("Unsupported IRQs number: {} supporteds: {:s}".format(
|
||||||
colorer(n, color="red"), colorer("Up to 32", color="green")))
|
colorer(n_irqs, color="red"), colorer("Up to 32", color="green")))
|
||||||
raise
|
raise
|
||||||
|
|
||||||
# Create IRQ Handler
|
# Create IRQ Handler
|
||||||
|
@ -1047,8 +1047,7 @@ class SoC(Module):
|
||||||
raise
|
raise
|
||||||
|
|
||||||
# SoC IRQ Interconnect ---------------------------------------------------------------------
|
# SoC IRQ Interconnect ---------------------------------------------------------------------
|
||||||
if hasattr(self, "cpu"):
|
if hasattr(self, "cpu") and hasattr(self.cpu, "interrupt"):
|
||||||
if hasattr(self.cpu, "interrupt"):
|
|
||||||
for name, loc in sorted(self.irq.locs.items()):
|
for name, loc in sorted(self.irq.locs.items()):
|
||||||
if name in self.cpu.interrupts.keys():
|
if name in self.cpu.interrupts.keys():
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Reference in New Issue