bsps: Move interrupt controller support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

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
index 2fa1a5b0f0..2fa1a5b0f0 100644
--- a/c/src/lib/libbsp/arm/beagle/irq.c
+++ b/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
index e5887b9717..e5887b9717 100644
--- a/c/src/lib/libbsp/arm/csb336/irq/irq.c
+++ b/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
index 95e93845b9..95e93845b9 100644
--- a/c/src/lib/libbsp/arm/csb337/irq/irq.c
+++ b/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
index c48466967b..c48466967b 100644
--- a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_asm.S
+++ b/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
index 1d9151a1bd..1d9151a1bd 100644
--- a/c/src/lib/libbsp/arm/edb7312/irq/irq.c
+++ b/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
index f045fb8149..f045fb8149 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/irq/irq-dispatch.c
+++ b/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
index 886f928d2d..886f928d2d 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/irq/irq.c
+++ b/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
index 425795b165..425795b165 100644
--- a/c/src/lib/libbsp/arm/gumstix/irq/irq.c
+++ b/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
index e05fd59e6c..e05fd59e6c 100644
--- a/c/src/lib/libbsp/arm/lpc176x/irq/irq.c
+++ b/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
index 66d05fdf9d..66d05fdf9d 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c
+++ b/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
index 7801c37843..7801c37843 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c
+++ b/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
index eac320000b..eac320000b 100755
--- a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c
+++ b/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
index 5b10385bfe..5b10385bfe 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/irq/irq.c
+++ b/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
index 83e140bd7b..83e140bd7b 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/irq/irq.c
+++ b/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
index 99c0e373bf..99c0e373bf 100644
--- a/c/src/lib/libbsp/arm/shared/armv7m/irq/armv7m-irq.c
+++ b/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
index c810a9784a..c810a9784a 100644
--- a/c/src/lib/libbsp/arm/shared/armv7m/irq/armv7m-irq-dispatch.c
+++ b/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
index ea4b6ef06a..ea4b6ef06a 100644
--- a/c/src/lib/libbsp/arm/shared/arm-gic-irq.c
+++ b/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
index ea8f610353..ea8f610353 100644
--- a/c/src/lib/libbsp/arm/smdk2410/irq/irq.c
+++ b/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
index 579c11ed2a..579c11ed2a 100644
--- a/c/src/lib/libbsp/arm/tms570/irq/irq.c
+++ b/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
index 994e25bf0e..994e25bf0e 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/irq/irq.c
+++ b/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
index f72e36c33f..f72e36c33f 100644
--- a/c/src/lib/libbsp/i386/shared/irq/elcr.c
+++ b/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
index a006d4f149..a006d4f149 100644
--- a/c/src/lib/libbsp/i386/shared/irq/elcr.h
+++ b/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
index d3adbc4f05..d3adbc4f05 100644
--- a/c/src/lib/libbsp/i386/shared/irq/idt.c
+++ b/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
index ac08f1f7be..ac08f1f7be 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq.c
+++ b/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
index 181293351e..181293351e 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq_asm.S
+++ b/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
index fdf4801a5a..fdf4801a5a 100644
--- a/c/src/lib/libbsp/i386/shared/irq/irq_init.c
+++ b/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
index 79626ee449..79626ee449 100644
--- a/c/src/lib/libbsp/lm32/shared/irq/irq.c
+++ b/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
index afc58224ea..afc58224ea 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/irq/intc-icr-init-values.c
+++ b/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
index f02231b67c..f02231b67c 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/irq/irq.c
+++ b/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
index d8e071281e..d8e071281e 100644
--- a/c/src/lib/libbsp/mips/csb350/irq/vectorisrs.c
+++ b/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
index e55566697d..e55566697d 100644
--- a/c/src/lib/libbsp/mips/hurricane/irq/vectorisrs.c
+++ b/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
index 629c4c45f8..629c4c45f8 100644
--- a/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c
+++ b/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
index d639ab17a9..d639ab17a9 100644
--- a/c/src/lib/libbsp/mips/malta/irq/interruptmask.c
+++ b/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
index a2b9288646..a2b9288646 100644
--- a/c/src/lib/libbsp/mips/malta/irq/vectorisrs.c
+++ b/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
index 09020c5020..09020c5020 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/irq/vectorisrs.c
+++ b/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
index d38e4f81c2..d38e4f81c2 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c
+++ b/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
index e916ae55fe..e916ae55fe 100644
--- a/c/src/lib/libbsp/mips/shared/irq/exception.S
+++ b/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
index d92b5400a9..d92b5400a9 100644
--- a/c/src/lib/libbsp/mips/shared/irq/i8259.c
+++ b/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
index c63421e569..c63421e569 100644
--- a/c/src/lib/libbsp/mips/shared/irq/interruptmask.c
+++ b/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
index 5b1daa57c3..5b1daa57c3 100644
--- a/c/src/lib/libbsp/mips/shared/irq/interruptmask_TX49.c
+++ b/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
index 1c2d3b8c5b..1c2d3b8c5b 100644
--- a/c/src/lib/libbsp/mips/shared/irq/irq.c
+++ b/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
index cdfd94c136..cdfd94c136 100644
--- a/c/src/lib/libbsp/mips/shared/irq/vectorexceptions.c
+++ b/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
index f9a7b6426d..f9a7b6426d 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/irq/irq.c
+++ b/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
index f77125c4a7..f77125c4a7 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c
+++ b/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
index 2c0554c988..2c0554c988 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/irq/irq_init.c
+++ b/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
index cb9ff146ad..cb9ff146ad 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/irq/irq_test_app.c
+++ b/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
index 11d9e3992e..11d9e3992e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
+++ b/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
index 7a8ce3cc0b..7a8ce3cc0b 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq.c
+++ b/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
index c9607a032d..c9607a032d 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/irq/irq.c
+++ b/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
index d48855a979..d48855a979 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c
+++ b/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
index baca1e0e05..baca1e0e05 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
+++ b/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
index c40692e688..c40692e688 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq_init.c
+++ b/bsps/powerpc/mvme3100/irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/README.irq b/bsps/powerpc/mvme5500/README.irq
index fb31c4a5c3..fb31c4a5c3 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/README.irq
+++ b/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
index eb36cc2a80..eb36cc2a80 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/irq/BSP_irq.c
+++ b/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
index ede4014f22..ede4014f22 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c
+++ b/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
index 3d2a82f2c0..3d2a82f2c0 100644
--- a/c/src/lib/libbsp/powerpc/psim/irq/irq_init.c
+++ b/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
index 24b15dcd49..24b15dcd49 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq_init.c
+++ b/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
index 625b9fce1b..625b9fce1b 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/irq/irq.c
+++ b/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
index 7363e87ba0..7363e87ba0 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/i8259.c
+++ b/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
index 1a44992a5b..1a44992a5b 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
+++ b/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
index 556014964b..556014964b 100644
--- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c
+++ b/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
index 4a9c393f7f..4a9c393f7f 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
+++ b/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
index 5b2c34d2c9..5b2c34d2c9 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/irq/irq.c
+++ b/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
index 2a94c27d1b..2a94c27d1b 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/irq/irq.c
+++ b/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
index 55194cb1e6..55194cb1e6 100644
--- a/c/src/lib/libbsp/powerpc/virtex/irq/irq_init.c
+++ b/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
index 5feafaf4b6..5feafaf4b6 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/irq/irq_init.c
+++ b/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
index 1fea9214aa..1fea9214aa 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c
+++ b/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
index 8090dcea98..8090dcea98 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/irq/irq.c
+++ b/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 d3a48806ea..1b9f584a5a 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 af0185a41e..5aab0b2bb2 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 72a80b0b35..eaff46c48a 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 8702c2cbb6..78ea9d1f3d 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 2d9394965c..945ea01a89 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 eb15e50200..1b53e8c6ff 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 cefe752a62..630e508797 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 6eac30b7c9..c39d886ca8 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 5d151d693f..84e043281b 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 10ce313f81..cfdcb79190 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 1437b12ea3..383bbfd51d 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 c1f33ae67f..57ffe00383 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 f11cd6ac48..4fa17d3361 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 a2ca41b2c1..1e70a2b657 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 64b89754a2..2eb2cec443 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 7a8ff9e58e..94fadf0507 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 6fe9190c4b..b51434df50 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 4671386696..5f4be7dc71 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 4532449623..57762d0314 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 411819841f..aebb25c13f 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 271dc7f089..b51e76e444 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 2e9441e5bc..8cd12e3430 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 99f530bd5a..617ad7781b 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 a031241dc9..b84cda2236 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 f8a6874390..cda24059e0 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 ed952418d0..ae8e599f4f 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 ccffd01669..84dabfd775 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 ce78801123..3240ea9ea2 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 b483b2413e..42be304001 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 d8b53efe8b..2eeb2d39b5 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 629e72bdaf..d9e14c56ed 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 a2910c7fbb..e5c57f8dc3 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 afa2c53b00..66c7379c36 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 eb2abcc4ca..7f5131c4a0 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 b617fd5f11..8c2f7fb5c4 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 b0bea03813..ac5cc2c73c 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 4e10602377..6fe77e9ed4 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 bd453ee559..6cd02dceab 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 8af0c2bbb1..8d7e85945c 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 c9560601cb..fc9ee6eec8 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 d87eb49b56..a7facf5712 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 6f6972ca2b..3e18139f32 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 71dc32b321..a8a35824e2 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 3775b32268..b95f56f26a 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 e884c8f0e3..c16d057bb5 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 350807f1de..1cb8b3a269 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 8bb9be4c7e..d7cef6eee4 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 80afe8dd39..31d1cf2d49 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