[rtems commit] bsps: Move interrupt controller support to bsps
Sebastian Huber
sebh at rtems.org
Mon Apr 23 13:20:31 UTC 2018
Module: rtems
Branch: master
Commit: 8f8ccee0d9e1c3adfb1de484f26f6d9f6ff08708
Changeset: http://git.rtems.org/rtems/commit/?id=8f8ccee0d9e1c3adfb1de484f26f6d9f6ff08708
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Mon Apr 23 09:50:39 2018 +0200
bsps: Move interrupt controller support to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
---
{c/src/lib/libbsp/arm/beagle => bsps/arm/beagle/irq}/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/csb336/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/csb337/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/edb7312/irq/bsp_irq_asm.S | 0
{c/src/lib/libbsp => bsps}/arm/edb7312/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/gdbarmsim/irq/irq-dispatch.c | 0
{c/src/lib/libbsp => bsps}/arm/gdbarmsim/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/gumstix/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/lpc176x/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/lpc24xx/irq/irq-dispatch.c | 0
{c/src/lib/libbsp => bsps}/arm/lpc24xx/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/lpc32xx/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/raspberrypi/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/rtl22xx/irq/irq.c | 0
.../irq/armv7m-irq.c => bsps/arm/shared/irq/irq-armv7m.c | 0
.../arm/shared/irq/irq-dispatch-armv7m.c | 0
.../arm/shared/arm-gic-irq.c => bsps/arm/shared/irq/irq-gic.c | 0
{c/src/lib/libbsp => bsps}/arm/smdk2410/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/arm/tms570/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/epiphany/epiphany_sim/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/i386/shared/irq/elcr.c | 0
{c/src/lib/libbsp => bsps}/i386/shared/irq/elcr.h | 0
{c/src/lib/libbsp => bsps}/i386/shared/irq/idt.c | 0
{c/src/lib/libbsp => bsps}/i386/shared/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/i386/shared/irq/irq_asm.S | 0
{c/src/lib/libbsp => bsps}/i386/shared/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/lm32/shared/irq/irq.c | 0
.../libbsp => bsps}/m68k/genmcf548x/irq/intc-icr-init-values.c | 0
{c/src/lib/libbsp => bsps}/m68k/genmcf548x/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/mips/csb350/irq/vectorisrs.c | 0
{c/src/lib/libbsp => bsps}/mips/hurricane/irq/vectorisrs.c | 0
{c/src/lib/libbsp => bsps}/mips/jmr3904/irq/vectorisrs.c | 0
{c/src/lib/libbsp => bsps}/mips/malta/irq/interruptmask.c | 0
{c/src/lib/libbsp => bsps}/mips/malta/irq/vectorisrs.c | 0
{c/src/lib/libbsp => bsps}/mips/rbtx4925/irq/vectorisrs.c | 0
{c/src/lib/libbsp => bsps}/mips/rbtx4938/irq/vectorisrs.c | 0
{c/src/lib/libbsp => bsps}/mips/shared/irq/exception.S | 0
{c/src/lib/libbsp => bsps}/mips/shared/irq/i8259.c | 0
{c/src/lib/libbsp => bsps}/mips/shared/irq/interruptmask.c | 0
.../lib/libbsp => bsps}/mips/shared/irq/interruptmask_TX49.c | 0
{c/src/lib/libbsp => bsps}/mips/shared/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/mips/shared/irq/vectorexceptions.c | 0
{c/src/lib/libbsp => bsps}/or1k/generic_or1k/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/beatnik/irq/discovery_pic.c | 0
{c/src/lib/libbsp => bsps}/powerpc/beatnik/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/powerpc/beatnik/irq/irq_test_app.c | 0
{c/src/lib/libbsp => bsps}/powerpc/gen5200/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/gen83xx/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/haleakala/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/haleakala/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/powerpc/mpc8260ads/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/mvme3100/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/powerpc/mvme5500/README.irq | 0
{c/src/lib/libbsp => bsps}/powerpc/mvme5500/irq/BSP_irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/mvme5500/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/powerpc/psim/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/powerpc/qemuppc/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/powerpc/qoriq/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/shared/irq/i8259.c | 0
{c/src/lib/libbsp => bsps}/powerpc/shared/irq/irq_init.c | 0
.../shared/openpic => bsps/powerpc/shared/irq}/openpic.c | 0
.../lib/libbsp => bsps}/powerpc/shared/irq/openpic_i8259_irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/t32mppc/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/tqm8xx/irq/irq.c | 0
{c/src/lib/libbsp => bsps}/powerpc/virtex/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/powerpc/virtex4/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/powerpc/virtex5/irq/irq_init.c | 0
{c/src/lib/libbsp => bsps}/riscv/riscv_generic/irq/irq.c | 0
c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am | 2 +-
c/src/lib/libbsp/arm/atsam/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/beagle/Makefile.am | 2 +-
c/src/lib/libbsp/arm/csb336/Makefile.am | 2 +-
c/src/lib/libbsp/arm/csb337/Makefile.am | 2 +-
c/src/lib/libbsp/arm/edb7312/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/gdbarmsim/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/gumstix/Makefile.am | 2 +-
c/src/lib/libbsp/arm/imx/Makefile.am | 2 +-
c/src/lib/libbsp/arm/lm3s69xx/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/lpc176x/Makefile.am | 6 +++---
c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 8 ++++----
c/src/lib/libbsp/arm/lpc32xx/Makefile.am | 2 +-
c/src/lib/libbsp/arm/raspberrypi/Makefile.am | 2 +-
c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am | 2 +-
c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 2 +-
c/src/lib/libbsp/arm/smdk2410/Makefile.am | 2 +-
c/src/lib/libbsp/arm/stm32f4/Makefile.am | 4 ++--
c/src/lib/libbsp/arm/tms570/Makefile.am | 2 +-
c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am | 2 +-
c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am | 2 +-
c/src/lib/libbsp/i386/pc386/Makefile.am | 10 +++++-----
c/src/lib/libbsp/lm32/milkymist/Makefile.am | 2 +-
c/src/lib/libbsp/m68k/genmcf548x/Makefile.am | 4 ++--
c/src/lib/libbsp/mips/csb350/Makefile.am | 8 ++++----
c/src/lib/libbsp/mips/hurricane/Makefile.am | 10 +++++-----
c/src/lib/libbsp/mips/jmr3904/Makefile.am | 8 ++++----
c/src/lib/libbsp/mips/malta/Makefile.am | 10 +++++-----
c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 10 +++++-----
c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 10 +++++-----
c/src/lib/libbsp/or1k/generic_or1k/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/haleakala/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 8 ++++----
c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 6 +++---
c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 4 ++--
c/src/lib/libbsp/powerpc/psim/Makefile.am | 6 +++---
c/src/lib/libbsp/powerpc/qemuppc/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/t32mppc/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/virtex/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/virtex4/Makefile.am | 2 +-
c/src/lib/libbsp/powerpc/virtex5/Makefile.am | 2 +-
c/src/lib/libbsp/riscv/riscv_generic/Makefile.am | 2 +-
116 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/c/src/lib/libbsp/arm/beagle/irq.c b/bsps/arm/beagle/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/irq.c
rename to bsps/arm/beagle/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/csb336/irq/irq.c b/bsps/arm/csb336/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/csb336/irq/irq.c
rename to bsps/arm/csb336/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/csb337/irq/irq.c b/bsps/arm/csb337/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/irq/irq.c
rename to bsps/arm/csb337/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S b/bsps/arm/edb7312/irq/bsp_irq_asm.S
similarity index 100%
rename from c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S
rename to bsps/arm/edb7312/irq/bsp_irq_asm.S
diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.c b/bsps/arm/edb7312/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/edb7312/irq/irq.c
rename to bsps/arm/edb7312/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/irq/irq-dispatch.c b/bsps/arm/gdbarmsim/irq/irq-dispatch.c
similarity index 100%
rename from c/src/lib/libbsp/arm/gdbarmsim/irq/irq-dispatch.c
rename to bsps/arm/gdbarmsim/irq/irq-dispatch.c
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/irq/irq.c b/bsps/arm/gdbarmsim/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/gdbarmsim/irq/irq.c
rename to bsps/arm/gdbarmsim/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/gumstix/irq/irq.c b/bsps/arm/gumstix/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/irq/irq.c
rename to bsps/arm/gumstix/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/irq/irq.c b/bsps/arm/lpc176x/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/irq/irq.c
rename to bsps/arm/lpc176x/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c b/bsps/arm/lpc24xx/irq/irq-dispatch.c
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c
rename to bsps/arm/lpc24xx/irq/irq-dispatch.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c b/bsps/arm/lpc24xx/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/irq/irq.c
rename to bsps/arm/lpc24xx/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c b/bsps/arm/lpc32xx/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/irq/irq.c
rename to bsps/arm/lpc32xx/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/irq/irq.c b/bsps/arm/raspberrypi/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/irq/irq.c
rename to bsps/arm/raspberrypi/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/irq/irq.c b/bsps/arm/rtl22xx/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/rtl22xx/irq/irq.c
rename to bsps/arm/rtl22xx/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/shared/armv7m/irq/armv7m-irq.c b/bsps/arm/shared/irq/irq-armv7m.c
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/armv7m/irq/armv7m-irq.c
rename to bsps/arm/shared/irq/irq-armv7m.c
diff --git a/c/src/lib/libbsp/arm/shared/armv7m/irq/armv7m-irq-dispatch.c b/bsps/arm/shared/irq/irq-dispatch-armv7m.c
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/armv7m/irq/armv7m-irq-dispatch.c
rename to bsps/arm/shared/irq/irq-dispatch-armv7m.c
diff --git a/c/src/lib/libbsp/arm/shared/arm-gic-irq.c b/bsps/arm/shared/irq/irq-gic.c
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/arm-gic-irq.c
rename to bsps/arm/shared/irq/irq-gic.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/irq/irq.c b/bsps/arm/smdk2410/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/irq/irq.c
rename to bsps/arm/smdk2410/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/tms570/irq/irq.c b/bsps/arm/tms570/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/irq/irq.c
rename to bsps/arm/tms570/irq/irq.c
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/irq/irq.c b/bsps/epiphany/epiphany_sim/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/epiphany/epiphany_sim/irq/irq.c
rename to bsps/epiphany/epiphany_sim/irq/irq.c
diff --git a/c/src/lib/libbsp/i386/shared/irq/elcr.c b/bsps/i386/shared/irq/elcr.c
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/elcr.c
rename to bsps/i386/shared/irq/elcr.c
diff --git a/c/src/lib/libbsp/i386/shared/irq/elcr.h b/bsps/i386/shared/irq/elcr.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/elcr.h
rename to bsps/i386/shared/irq/elcr.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/idt.c b/bsps/i386/shared/irq/idt.c
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/idt.c
rename to bsps/i386/shared/irq/idt.c
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.c b/bsps/i386/shared/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/irq.c
rename to bsps/i386/shared/irq/irq.c
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_asm.S b/bsps/i386/shared/irq/irq_asm.S
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/irq_asm.S
rename to bsps/i386/shared/irq/irq_asm.S
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_init.c b/bsps/i386/shared/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/irq_init.c
rename to bsps/i386/shared/irq/irq_init.c
diff --git a/c/src/lib/libbsp/lm32/shared/irq/irq.c b/bsps/lm32/shared/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/irq/irq.c
rename to bsps/lm32/shared/irq/irq.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/irq/intc-icr-init-values.c b/bsps/m68k/genmcf548x/irq/intc-icr-init-values.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/genmcf548x/irq/intc-icr-init-values.c
rename to bsps/m68k/genmcf548x/irq/intc-icr-init-values.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/irq/irq.c b/bsps/m68k/genmcf548x/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/genmcf548x/irq/irq.c
rename to bsps/m68k/genmcf548x/irq/irq.c
diff --git a/c/src/lib/libbsp/mips/csb350/irq/vectorisrs.c b/bsps/mips/csb350/irq/vectorisrs.c
similarity index 100%
rename from c/src/lib/libbsp/mips/csb350/irq/vectorisrs.c
rename to bsps/mips/csb350/irq/vectorisrs.c
diff --git a/c/src/lib/libbsp/mips/hurricane/irq/vectorisrs.c b/bsps/mips/hurricane/irq/vectorisrs.c
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/irq/vectorisrs.c
rename to bsps/mips/hurricane/irq/vectorisrs.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c b/bsps/mips/jmr3904/irq/vectorisrs.c
similarity index 100%
rename from c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c
rename to bsps/mips/jmr3904/irq/vectorisrs.c
diff --git a/c/src/lib/libbsp/mips/malta/irq/interruptmask.c b/bsps/mips/malta/irq/interruptmask.c
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/irq/interruptmask.c
rename to bsps/mips/malta/irq/interruptmask.c
diff --git a/c/src/lib/libbsp/mips/malta/irq/vectorisrs.c b/bsps/mips/malta/irq/vectorisrs.c
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/irq/vectorisrs.c
rename to bsps/mips/malta/irq/vectorisrs.c
diff --git a/c/src/lib/libbsp/mips/rbtx4925/irq/vectorisrs.c b/bsps/mips/rbtx4925/irq/vectorisrs.c
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4925/irq/vectorisrs.c
rename to bsps/mips/rbtx4925/irq/vectorisrs.c
diff --git a/c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c b/bsps/mips/rbtx4938/irq/vectorisrs.c
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c
rename to bsps/mips/rbtx4938/irq/vectorisrs.c
diff --git a/c/src/lib/libbsp/mips/shared/irq/exception.S b/bsps/mips/shared/irq/exception.S
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/irq/exception.S
rename to bsps/mips/shared/irq/exception.S
diff --git a/c/src/lib/libbsp/mips/shared/irq/i8259.c b/bsps/mips/shared/irq/i8259.c
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/irq/i8259.c
rename to bsps/mips/shared/irq/i8259.c
diff --git a/c/src/lib/libbsp/mips/shared/irq/interruptmask.c b/bsps/mips/shared/irq/interruptmask.c
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/irq/interruptmask.c
rename to bsps/mips/shared/irq/interruptmask.c
diff --git a/c/src/lib/libbsp/mips/shared/irq/interruptmask_TX49.c b/bsps/mips/shared/irq/interruptmask_TX49.c
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/irq/interruptmask_TX49.c
rename to bsps/mips/shared/irq/interruptmask_TX49.c
diff --git a/c/src/lib/libbsp/mips/shared/irq/irq.c b/bsps/mips/shared/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/irq/irq.c
rename to bsps/mips/shared/irq/irq.c
diff --git a/c/src/lib/libbsp/mips/shared/irq/vectorexceptions.c b/bsps/mips/shared/irq/vectorexceptions.c
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/irq/vectorexceptions.c
rename to bsps/mips/shared/irq/vectorexceptions.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/irq/irq.c b/bsps/or1k/generic_or1k/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/irq/irq.c
rename to bsps/or1k/generic_or1k/irq/irq.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c b/bsps/powerpc/beatnik/irq/discovery_pic.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c
rename to bsps/powerpc/beatnik/irq/discovery_pic.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/irq_init.c b/bsps/powerpc/beatnik/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/irq/irq_init.c
rename to bsps/powerpc/beatnik/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/irq_test_app.c b/bsps/powerpc/beatnik/irq/irq_test_app.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/irq/irq_test_app.c
rename to bsps/powerpc/beatnik/irq/irq_test_app.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c b/bsps/powerpc/gen5200/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
rename to bsps/powerpc/gen5200/irq/irq.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c b/bsps/powerpc/gen83xx/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c
rename to bsps/powerpc/gen83xx/irq/irq.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/irq/irq.c b/bsps/powerpc/haleakala/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/haleakala/irq/irq.c
rename to bsps/powerpc/haleakala/irq/irq.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c b/bsps/powerpc/haleakala/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c
rename to bsps/powerpc/haleakala/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c b/bsps/powerpc/mpc8260ads/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
rename to bsps/powerpc/mpc8260ads/irq/irq.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq_init.c b/bsps/powerpc/mvme3100/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/irq/irq_init.c
rename to bsps/powerpc/mvme3100/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/README.irq b/bsps/powerpc/mvme5500/README.irq
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/README.irq
rename to bsps/powerpc/mvme5500/README.irq
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/BSP_irq.c b/bsps/powerpc/mvme5500/irq/BSP_irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/irq/BSP_irq.c
rename to bsps/powerpc/mvme5500/irq/BSP_irq.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c b/bsps/powerpc/mvme5500/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c
rename to bsps/powerpc/mvme5500/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq_init.c b/bsps/powerpc/psim/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/irq/irq_init.c
rename to bsps/powerpc/psim/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq_init.c b/bsps/powerpc/qemuppc/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qemuppc/irq/irq_init.c
rename to bsps/powerpc/qemuppc/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/irq/irq.c b/bsps/powerpc/qoriq/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/irq/irq.c
rename to bsps/powerpc/qoriq/irq/irq.c
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/i8259.c b/bsps/powerpc/shared/irq/i8259.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/irq/i8259.c
rename to bsps/powerpc/shared/irq/i8259.c
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/bsps/powerpc/shared/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
rename to bsps/powerpc/shared/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c b/bsps/powerpc/shared/irq/openpic.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/openpic/openpic.c
rename to bsps/powerpc/shared/irq/openpic.c
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c b/bsps/powerpc/shared/irq/openpic_i8259_irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
rename to bsps/powerpc/shared/irq/openpic_i8259_irq.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/irq/irq.c b/bsps/powerpc/t32mppc/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/t32mppc/irq/irq.c
rename to bsps/powerpc/t32mppc/irq/irq.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/irq/irq.c b/bsps/powerpc/tqm8xx/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/irq/irq.c
rename to bsps/powerpc/tqm8xx/irq/irq.c
diff --git a/c/src/lib/libbsp/powerpc/virtex/irq/irq_init.c b/bsps/powerpc/virtex/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/irq/irq_init.c
rename to bsps/powerpc/virtex/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/virtex4/irq/irq_init.c b/bsps/powerpc/virtex4/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex4/irq/irq_init.c
rename to bsps/powerpc/virtex4/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c b/bsps/powerpc/virtex5/irq/irq_init.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c
rename to bsps/powerpc/virtex5/irq/irq_init.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/irq/irq.c b/bsps/riscv/riscv_generic/irq/irq.c
similarity index 100%
rename from c/src/lib/libbsp/riscv/riscv_generic/irq/irq.c
rename to bsps/riscv/riscv_generic/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
index d3a4880..1b9f584 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -66,7 +66,7 @@ endif
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-gic.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index af0185a..5aab0b2 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -107,8 +107,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/sdram-config.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-dispatch-armv7m.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index 72a80b0..eaff46c 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -59,7 +59,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/start/bspstartmmu.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/irq/irq.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 8702c2c..78ea9d1 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb336/btimer/btimer.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb336/console/uart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb336/irq/irq.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 2d93949..945ea01 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -48,7 +48,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/dbgu.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/usart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/irq/irq.c
if ENABLE_LCD
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/sed1356.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/console/fbcons.c
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index eb15e50..1b53e8c 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -38,8 +38,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/btimer/btimer.c
# irq
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
-librtemsbsp_a_SOURCES += irq/bsp_irq_asm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/irq/bsp_irq_asm.S
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index cefe752..630e508 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -39,8 +39,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gdbarmsim/start/bspstarthook
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
# IRQ
-librtemsbsp_a_SOURCES += irq/irq.c
-librtemsbsp_a_SOURCES += irq/irq-dispatch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gdbarmsim/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gdbarmsim/irq/irq-dispatch.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
# Cache
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 6eac30b..c39d886 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -37,7 +37,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/console/uarts.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/console/ffuart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/irq/irq.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index 5d151d6..84e0432 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -53,7 +53,7 @@ endif
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-gic.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index 10ce313..cfdcb79 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -49,8 +49,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/start/syscon.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-dispatch-armv7m.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 1437b12..383bbfd 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -54,9 +54,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/start/bspstart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-dispatch-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/irq/irq.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index c1f33ae..57ffe00 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -65,10 +65,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/bspstart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
-librtemsbsp_a_SOURCES += irq/irq.c
-librtemsbsp_a_SOURCES += irq/irq-dispatch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-dispatch-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/irq/irq-dispatch.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index f11cd6a..4fa17d3 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -56,7 +56,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/start/bspstart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/irq/irq.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index a2ca41b..1e70a2b 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -63,7 +63,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/bspreset.c
# IRQ
librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/irq/irq.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
index 64b8975..2eb2cec 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -58,7 +58,7 @@ endif
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-gic.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index 7a8ff9e..94fadf0 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -36,7 +36,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/rtl22xx/console/uart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/rtl22xx/irq/irq.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 6fe9190..b51434d 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -37,7 +37,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/smdk2410/console/uart.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/smdk2410/irq/irq.c
# smc
librtemsbsp_a_SOURCES += smc/smc.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index 4671386..5f4be7d 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -49,8 +49,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/start/start-config-i
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-dispatch-armv7m.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 4532449..57762d0 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -59,7 +59,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/tms570/start/tms570-pom.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/tms570/irq/irq.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 4118198..aebb25c 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -56,7 +56,7 @@ endif
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-gic.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index 271dc7f..b51e76e 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -52,7 +52,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/epiphany/epiphany_sim/irq/irq.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 2e9441e..8cd12e3 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -111,14 +111,14 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspstart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspcmdline.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspreset.c
-librtemsbsp_a_SOURCES += ../shared/irq/idt.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq_init.c
-librtemsbsp_a_SOURCES += ../shared/irq/elcr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/shared/irq/idt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/shared/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/shared/irq/elcr.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/ldsegs.S
-librtemsbsp_a_SOURCES += ../shared/irq/irq_asm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/shared/irq/irq_asm.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
# timer
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index 99f530b..617ad77 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
# irq
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/irq/irq.c
# clock
librtemsbsp_a_SOURCES += ../shared/milkymist_clock/ckinit.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index a031241..b84cda2 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -39,8 +39,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/btimer/btimer.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
-librtemsbsp_a_SOURCES += irq/intc-icr-init-values.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/irq/intc-icr-init-values.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index f8a6874..cda2405 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -33,10 +33,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled
# timer
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/csb350/btimer/btimer.c
#isr
-librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
-librtemsbsp_a_SOURCES += irq/vectorisrs.c
-librtemsbsp_a_SOURCES += ../shared/irq/interruptmask.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/vectorexceptions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/csb350/irq/vectorisrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/interruptmask.c
if HAS_NETWORKING
librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index ed95241..ae8e599 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/hurricane/start/inittlb.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idtmem.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idttlb.S
-librtemsbsp_a_SOURCES += ../shared/irq/exception.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/exception.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/hurricane/start/usc.S
# clock
librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/hurricane/clock/ckinit.c
@@ -39,10 +39,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/hurricane/console/console.c
librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S
librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S
#isr
-librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
-librtemsbsp_a_SOURCES += irq/vectorisrs.c
-librtemsbsp_a_SOURCES += ../shared/irq/interruptmask.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/vectorexceptions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/hurricane/irq/vectorisrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/interruptmask.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index ccffd01..84dabfd 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -32,10 +32,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/console/console-io.
# timer
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/btimer/btimer.c
#isr
-librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
-librtemsbsp_a_SOURCES += irq/vectorisrs.c
-librtemsbsp_a_SOURCES += ../shared/irq/interruptmask.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/vectorexceptions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/irq/vectorisrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/interruptmask.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index ce78801..3240ea9 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -55,11 +55,11 @@ librtemsbsp_a_SOURCES += pci/pci.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/pci/pci_find_device.c
#isr
-librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
-librtemsbsp_a_SOURCES += irq/vectorisrs.c
-librtemsbsp_a_SOURCES += irq/interruptmask.c
-librtemsbsp_a_SOURCES += ../shared/irq/i8259.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/vectorexceptions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/irq/vectorisrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/irq/interruptmask.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/i8259.c
include $(top_srcdir)/../../../../automake/local.am
include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index b483b24..42be304 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4925/start/inittlb.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idttlb.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idtmem.S
-librtemsbsp_a_SOURCES += ../shared/irq/exception.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/exception.S
# clock
librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4925/clock/clockdrv.c
# console
@@ -38,10 +38,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4925/console/console-io
librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S
librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S
#isr
-librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
-librtemsbsp_a_SOURCES += irq/vectorisrs.c
-librtemsbsp_a_SOURCES += ../shared/irq/interruptmask_TX49.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/vectorexceptions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4925/irq/vectorisrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/interruptmask_TX49.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index d8b53ef..2eeb2d3 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/start/inittlb.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idttlb.S
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idtmem.S
-librtemsbsp_a_SOURCES += ../shared/irq/exception.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/exception.S
# clock
librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4938/clock/clockdrv.c
# console
@@ -39,10 +39,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/console/console-io
librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S
librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S
#isr
-librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
-librtemsbsp_a_SOURCES += irq/vectorisrs.c
-librtemsbsp_a_SOURCES += ../shared/irq/interruptmask_TX49.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/vectorexceptions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/irq/vectorisrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/interruptmask_TX49.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index 629e72b..d9e14c5 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -62,7 +62,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/or1k/generic_or1k/clock/clockdrv.
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/irq/irq.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index a2910c7..e5c57f8 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -62,8 +62,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
#irq
-librtemsbsp_a_SOURCES += irq/irq_init.c
-librtemsbsp_a_SOURCES += irq/discovery_pic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/irq/discovery_pic.c
#marvell
librtemsbsp_a_SOURCES += marvell/discovery.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index afa2c53..66c7379 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -69,7 +69,7 @@ librtemsbsp_a_SOURCES += ide/ata-instance.c
librtemsbsp_a_SOURCES += ide/ata-dma-pio-single.c
# irq
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/irq/irq.c
# mscan
librtemsbsp_a_SOURCES += mscan/mscan.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index eb2abcc..7f5131c 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -48,7 +48,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
# irq
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/irq/irq.c
# console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index b617fd5..8c2f7fb 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -34,8 +34,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
# irq
-librtemsbsp_a_SOURCES += irq/irq_init.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/irq/irq.c
if HAS_NETWORKING
librtemsbsp_a_SOURCES += network/network.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index b0bea03..ac5cc2c 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -59,15 +59,15 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
# irq
-librtemsbsp_a_SOURCES += ../shared/irq/irq_init.c
-librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
-librtemsbsp_a_SOURCES += ../shared/irq/i8259.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/i8259.c
# motorola
librtemsbsp_a_SOURCES += ../shared/motorola/motorola.c
# openpic
-librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic.c
# pci
librtemsbsp_a_SOURCES += ../shared/pci/pci.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 4e10602..6fe77e9 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -29,7 +29,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/console/conso
# irq
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/irq/irq.c
# startup
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index bd453ee..6cd02dc 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -56,11 +56,11 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/uart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/console/console.c
# irq
-librtemsbsp_a_SOURCES += irq/irq_init.c
-librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic_i8259_irq.c
# openpic
-librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic.c
# pci
librtemsbsp_a_SOURCES += ../shared/pci/pci.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 8af0c2b..8d7e859 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -39,8 +39,8 @@ librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/pci/pci_find_device.c
# irq
-librtemsbsp_a_SOURCES += irq/irq_init.c
-librtemsbsp_a_SOURCES += irq/BSP_irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/irq/BSP_irq.c
# tod
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index c956060..fc9ee6e 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -38,9 +38,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/console/console-io.
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/console/consupp.S
# irq
-librtemsbsp_a_SOURCES += irq/irq_init.c
-librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
-librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/openpic.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
# vectors
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index d87eb49..a7facf5 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -36,7 +36,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qemuppc/console/console-
# irq
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qemuppc/irq/irq_init.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/btimer/btimer-ppc-dec.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 6f6972c..3e18139 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -62,7 +62,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/btimer/btimer.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/irq/irq.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 71dc32b..a8a3582 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -44,7 +44,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/t32mppc/irq/irq.c
# Console
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 3775b32..b95f56f 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -25,7 +25,7 @@ librtemsbsp_a_SOURCES =
# irq
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/irq/irq.c
# clock
librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index e884c8f..c16d057 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -45,7 +45,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex/console/consoleli
# irq
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex/irq/irq_init.c
# clock
librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index 350807f..1cb8b3a 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -35,7 +35,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex4/start/dummy_cons
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
# irq
-librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex4/irq/irq_init.c
# mmu
librtemsbsp_a_SOURCES += mmu/mmu.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 8bb9be4..d7cef6e 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -37,7 +37,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex5/start/dummy_cons
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
# irq
-librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex5/irq/irq_init.c
# mmu
librtemsbsp_a_SOURCES += mmu/mmu.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index 80afe8d..31d1cf2 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
@@ -52,7 +52,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled
# IRQ
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/irq/irq.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
More information about the vc
mailing list