This patch is a part of the BSP source reorganization. Update #3285. --- bsps/shared/irq-sources.am | 5 +++++ .../shared/src => bsps/shared/irq}/irq-default-handler.c | 0 {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-generic.c | 0 {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-info.c | 0 {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-legacy.c | 0 {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-server.c | 0 {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-shell.c | 0 c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/atsam/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/beagle/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/csb336/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/csb337/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/edb7312/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/gdbarmsim/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/gumstix/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/imx/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/lm3s69xx/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/lpc176x/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/lpc32xx/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/raspberrypi/Makefile.am | 6 +----- c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/smdk2410/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/stm32f4/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/tms570/Makefile.am | 8 ++------ c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am | 8 ++------ c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am | 5 ++--- c/src/lib/libbsp/i386/pc386/Makefile.am | 8 ++------ c/src/lib/libbsp/m68k/genmcf548x/Makefile.am | 2 +- c/src/lib/libbsp/mips/csb350/Makefile.am | 6 +----- c/src/lib/libbsp/mips/hurricane/Makefile.am | 6 +----- c/src/lib/libbsp/mips/jmr3904/Makefile.am | 6 +----- c/src/lib/libbsp/mips/malta/Makefile.am | 6 +----- c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 6 +----- c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 6 +----- c/src/lib/libbsp/or1k/generic_or1k/Makefile.am | 5 ++--- c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 10 +++------- c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 9 +++------ c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 9 +++------ c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 9 +++------ c/src/lib/libbsp/powerpc/psim/Makefile.am | 6 ++++-- c/src/lib/libbsp/powerpc/qemuppc/Makefile.am | 9 +++------ c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 9 +++------ c/src/lib/libbsp/powerpc/t32mppc/Makefile.am | 9 +++------ c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 9 +++------ c/src/lib/libbsp/powerpc/virtex/Makefile.am | 9 +++------ c/src/lib/libbsp/riscv/riscv_generic/Makefile.am | 5 ++--- c/src/lib/libbsp/sparc/erc32/Makefile.am | 8 ++------ c/src/lib/libbsp/sparc/leon2/Makefile.am | 8 ++------ c/src/lib/libbsp/sparc/leon3/Makefile.am | 8 ++------ 51 files changed, 96 insertions(+), 240 deletions(-) create mode 100644 bsps/shared/irq-sources.am rename {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-default-handler.c (100%) rename {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-generic.c (100%) mode change 100755 => 100644 rename {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-info.c (100%) rename {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-legacy.c (100%) rename {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-server.c (100%) rename {c/src/lib/libbsp/shared/src => bsps/shared/irq}/irq-shell.c (100%)
diff --git a/bsps/shared/irq-sources.am b/bsps/shared/irq-sources.am new file mode 100644 index 0000000000..b37591851e --- /dev/null +++ b/bsps/shared/irq-sources.am @@ -0,0 +1,5 @@ +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-generic.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-info.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-legacy.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-server.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-shell.c diff --git a/c/src/lib/libbsp/shared/src/irq-default-handler.c b/bsps/shared/irq/irq-default-handler.c similarity index 100% rename from c/src/lib/libbsp/shared/src/irq-default-handler.c rename to bsps/shared/irq/irq-default-handler.c diff --git a/c/src/lib/libbsp/shared/src/irq-generic.c b/bsps/shared/irq/irq-generic.c old mode 100755 new mode 100644 similarity index 100% rename from c/src/lib/libbsp/shared/src/irq-generic.c rename to bsps/shared/irq/irq-generic.c diff --git a/c/src/lib/libbsp/shared/src/irq-info.c b/bsps/shared/irq/irq-info.c similarity index 100% rename from c/src/lib/libbsp/shared/src/irq-info.c rename to bsps/shared/irq/irq-info.c diff --git a/c/src/lib/libbsp/shared/src/irq-legacy.c b/bsps/shared/irq/irq-legacy.c similarity index 100% rename from c/src/lib/libbsp/shared/src/irq-legacy.c rename to bsps/shared/irq/irq-legacy.c diff --git a/c/src/lib/libbsp/shared/src/irq-server.c b/bsps/shared/irq/irq-server.c similarity index 100% rename from c/src/lib/libbsp/shared/src/irq-server.c rename to bsps/shared/irq/irq-server.c diff --git a/c/src/lib/libbsp/shared/src/irq-shell.c b/bsps/shared/irq/irq-shell.c similarity index 100% rename from c/src/lib/libbsp/shared/src/irq-shell.c rename to bsps/shared/irq/irq-shell.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 4e0df0ac52..ee628f2199 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am @@ -105,12 +105,7 @@ librtemsbsp_a_SOURCES += startup/bspsmp.c endif # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c # Console @@ -139,5 +134,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-l2c-310.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/altera-cyclone-v/headers.am diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am index 0132a58e88..0fc2fbf9ce 100644 --- a/c/src/lib/libbsp/arm/atsam/Makefile.am +++ b/c/src/lib/libbsp/arm/atsam/Makefile.am @@ -111,12 +111,7 @@ librtemsbsp_a_SOURCES += startup/restart.c librtemsbsp_a_SOURCES += startup/sdram-config.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +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 @@ -175,5 +170,6 @@ librtemsbsp_a_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/bsps/arm/atsam/include/libchip/ DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/atsam/headers.am diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am index 4c9613b48a..c5bfe0bd0f 100644 --- a/c/src/lib/libbsp/arm/beagle/Makefile.am +++ b/c/src/lib/libbsp/arm/beagle/Makefile.am @@ -61,12 +61,7 @@ librtemsbsp_a_SOURCES += startup/bspstarthooks.c librtemsbsp_a_SOURCES += startup/bspstartmmu.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq.c # Console @@ -103,5 +98,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/beagle/headers.am diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index 3b600ee3de..dd257fb3c0 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -32,12 +32,7 @@ librtemsbsp_a_SOURCES += timer/timer.c # console librtemsbsp_a_SOURCES += console/uart.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Cache @@ -51,5 +46,6 @@ endif librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/csb336/headers.am diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index 224f57b97c..50702b95a6 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -46,12 +46,7 @@ librtemsbsp_a_SOURCES += ../../shared/console.c console/uarts.c \ librtemsbsp_a_SOURCES += console/dbgu.c librtemsbsp_a_SOURCES += console/usart.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c if ENABLE_LCD librtemsbsp_a_SOURCES += console/sed1356.c console/fbcons.c @@ -76,5 +71,6 @@ endif librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/csb337/headers.am diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index 0fab8ff882..6fef337896 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -38,12 +38,7 @@ librtemsbsp_a_SOURCES += console/uart.c ../../shared/console.c \ librtemsbsp_a_SOURCES += timer/timer.c # irq -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c librtemsbsp_a_SOURCES += irq/bsp_irq_asm.S @@ -55,5 +50,6 @@ librtemsbsp_a_SOURCES += network/network.c endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/edb7312/headers.am diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am index 4a6eeefa1f..e755ab705d 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am +++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am @@ -40,12 +40,7 @@ librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S # IRQ librtemsbsp_a_SOURCES += irq/irq.c librtemsbsp_a_SOURCES += irq/irq-dispatch.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c # Cache librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c @@ -57,5 +52,6 @@ librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/gdbarmsim/headers.am diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am index f4f77125f7..8b3f022239 100644 --- a/c/src/lib/libbsp/arm/gumstix/Makefile.am +++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am @@ -35,12 +35,7 @@ librtemsbsp_a_SOURCES += console/uarts.c ../../shared/console.c \ ../../shared/console_read.c ../../shared/console_write.c librtemsbsp_a_SOURCES += console/ffuart.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Cache @@ -56,5 +51,6 @@ endif librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/gumstix/headers.am diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am index 00537f862c..302ab90cbd 100644 --- a/c/src/lib/libbsp/arm/imx/Makefile.am +++ b/c/src/lib/libbsp/arm/imx/Makefile.am @@ -55,12 +55,7 @@ librtemsbsp_a_SOURCES += startup/bspsmp.c endif # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c # Console @@ -90,5 +85,6 @@ librtemsbsp_a_SOURCES += startup/bspstarthooks.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/imx/headers.am diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am index f180eab135..fe567caeb9 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am @@ -51,12 +51,7 @@ librtemsbsp_a_SOURCES += startup/io.c librtemsbsp_a_SOURCES += startup/syscon.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +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 @@ -89,5 +84,6 @@ librtemsbsp_a_SOURCES += ssi/ssi.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/lm3s69xx/headers.am diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am index 9d0fee0e82..4a466d9187 100644 --- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am @@ -56,12 +56,7 @@ librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c librtemsbsp_a_SOURCES += startup/bspstart.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +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 @@ -123,5 +118,6 @@ librtemsbsp_a_SOURCES += startup/bspstarthooks.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/lpc176x/headers.am diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 846de5f531..68e8bc3336 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -67,12 +67,7 @@ librtemsbsp_a_SOURCES += startup/bspreset-armv4.c librtemsbsp_a_SOURCES += startup/bspstart.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +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 @@ -141,5 +136,6 @@ endif DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/lpc24xx/headers.am diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am index d336516919..0f3e931d23 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am @@ -58,12 +58,7 @@ librtemsbsp_a_SOURCES += startup/bspreset.c librtemsbsp_a_SOURCES += startup/bspstart.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Console @@ -119,5 +114,6 @@ endif DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/lpc32xx/headers.am diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am index 0f399f7e8d..dd374184c3 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am +++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am @@ -66,11 +66,6 @@ librtemsbsp_a_SOURCES += startup/bspreset.c # IRQ librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c librtemsbsp_a_SOURCES += irq/irq.c # Console @@ -128,5 +123,6 @@ librtemsbsp_a_SOURCES += ../shared/mminit.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/raspberrypi/headers.am 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 3cac4f1b3d..fed2c77a1c 100644 --- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am +++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am @@ -60,12 +60,7 @@ librtemsbsp_a_SOURCES += startup/bspsmp.c endif # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c # Console @@ -97,5 +92,6 @@ librtemsbsp_a_SOURCES += startup/fb-config.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/realview-pbx-a9/headers.am diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am index 89f3fd6ccc..2e50731407 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am +++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am @@ -36,12 +36,7 @@ librtemsbsp_a_SOURCES += ../../shared/console.c \ ../../shared/console_select.c ../../shared/console_control.c \ ../../shared/console_read.c ../../shared/console_write.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # debugio librtemsbsp_a_SOURCES += console/uart.c @@ -54,5 +49,6 @@ librtemsbsp_a_SOURCES += network/network.c endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/rtl22xx/headers.am diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index 3c9a1b4df0..a23708111f 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -42,12 +42,7 @@ librtemsbsp_a_SOURCES += ../../shared/console_read.c librtemsbsp_a_SOURCES += ../../shared/console_write.c librtemsbsp_a_SOURCES += ../../shared/console_control.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # smc librtemsbsp_a_SOURCES += smc/smc.c @@ -59,5 +54,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/smdk2410/headers.am diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am index 8187ca900a..959880474a 100644 --- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am +++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am @@ -51,12 +51,7 @@ librtemsbsp_a_SOURCES += startup/rcc.c librtemsbsp_a_SOURCES += startup/start-config-io.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +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 @@ -90,5 +85,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/stm32f4/headers.am diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am index 3c5796682a..7b9793f46e 100644 --- a/c/src/lib/libbsp/arm/tms570/Makefile.am +++ b/c/src/lib/libbsp/arm/tms570/Makefile.am @@ -61,12 +61,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c librtemsbsp_a_SOURCES += pom/tms570-pom.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Console @@ -122,5 +117,6 @@ endif DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/tms570/headers.am diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am index a9c20ef29b..9f38a29c54 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am +++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am @@ -58,12 +58,7 @@ librtemsbsp_a_SOURCES += startup/bspsmp.c endif # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += ../shared/arm-gic-irq.c # Console @@ -92,5 +87,6 @@ librtemsbsp_a_SOURCES += startup/bspstarthooks.c startup/bspstartmmu.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/arm/xilinx-zynq/headers.am diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am index 8c0cfb0a7d..a75774a36d 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am @@ -54,9 +54,7 @@ librtemsbsp_a_SOURCES += timer/timer.c librtemsbsp_a_SOURCES += ../../shared/console-polled.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Cache @@ -68,5 +66,6 @@ librtemsbsp_a_SOURCES += console/console-io.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/epiphany/epiphany_sim/headers.am diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index 797ad659e4..c4c6293aa6 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -126,12 +126,7 @@ librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c librtemsbsp_a_SOURCES += ../../shared/sbrk.c librtemsbsp_a_SOURCES += startup/ldsegs.S librtemsbsp_a_SOURCES += ../../i386/shared/irq/irq_asm.S -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c # timer librtemsbsp_a_SOURCES += timer/timer.c timer/timerisr.S @@ -179,6 +174,7 @@ endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(top_srcdir)/../../../../automake/subdirs.am include $(srcdir)/../../../../../../bsps/i386/pc386/headers.am diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index afd2d858e3..a97f8ab4d2 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -38,7 +38,7 @@ librtemsbsp_a_SOURCES += console/console.c librtemsbsp_a_SOURCES += timer/timer.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index dcb55b024e..8744b9d2d0 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -37,11 +37,6 @@ librtemsbsp_a_SOURCES += ../../shared/console-polled.c # timer librtemsbsp_a_SOURCES += timer/timer.c #isr -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c librtemsbsp_a_SOURCES += ../shared/irq/irq.c librtemsbsp_a_SOURCES += irq/vectorisrs.c @@ -56,5 +51,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentrie librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/mips/csb350/headers.am diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am index f8ddbf3270..8b57e43fb3 100644 --- a/c/src/lib/libbsp/mips/hurricane/Makefile.am +++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am @@ -44,11 +44,6 @@ librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S librtemsbsp_a_SOURCES += ../shared/liblnk/regs.h #isr -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c librtemsbsp_a_SOURCES += ../shared/irq/irq.c librtemsbsp_a_SOURCES += irq/vectorisrs.c @@ -61,5 +56,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/mips/hurricane/headers.am diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am index 2a2d4ec7cf..d7206e52b4 100644 --- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am @@ -36,11 +36,6 @@ librtemsbsp_a_SOURCES += console/console-io.c # timer librtemsbsp_a_SOURCES += timer/timer.c #isr -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c librtemsbsp_a_SOURCES += ../shared/irq/irq.c librtemsbsp_a_SOURCES += irq/vectorisrs.c @@ -51,5 +46,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentrie librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/mips/jmr3904/headers.am diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am index 509c5d0a9c..3fd58a0d8a 100644 --- a/c/src/lib/libbsp/mips/malta/Makefile.am +++ b/c/src/lib/libbsp/mips/malta/Makefile.am @@ -61,11 +61,6 @@ librtemsbsp_a_SOURCES += pci/pci.c librtemsbsp_a_SOURCES += ../../shared/pci/pci_find_device.c #isr -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c librtemsbsp_a_SOURCES += ../shared/irq/irq.c librtemsbsp_a_SOURCES += irq/vectorisrs.c @@ -73,5 +68,6 @@ librtemsbsp_a_SOURCES += irq/interruptmask.c librtemsbsp_a_SOURCES += ../shared/irq/i8259.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/mips/malta/headers.am diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index b443ee1dd0..53e321c0ca 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am @@ -43,11 +43,6 @@ librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S librtemsbsp_a_SOURCES += ../shared/liblnk/regs.h #isr -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c librtemsbsp_a_SOURCES += ../shared/irq/irq.c librtemsbsp_a_SOURCES += irq/vectorisrs.c @@ -60,5 +55,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/mips/rbtx4925/headers.am diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am index d06ff86a90..a1e3325078 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am @@ -44,11 +44,6 @@ librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S librtemsbsp_a_SOURCES += ../shared/liblnk/regs.h #isr -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c librtemsbsp_a_SOURCES += ../shared/irq/irq.c librtemsbsp_a_SOURCES += irq/vectorisrs.c @@ -61,5 +56,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/mips/rbtx4938/headers.am diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am index 7e5d653fc2..508efa15e9 100644 --- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am +++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am @@ -66,9 +66,7 @@ librtemsbsp_a_SOURCES += timer/timer.c librtemsbsp_a_SOURCES += clock/clockdrv.c ../../../shared/clockdrv_shell.h # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Cache @@ -81,5 +79,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/shared/cache/cache.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/or1k/generic_or1k/headers.am diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am index 1fc2fdfd85..7c664a6cf1 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -62,13 +62,7 @@ librtemsbsp_a_SOURCES += ide/ata-instance.c librtemsbsp_a_SOURCES += ide/ata-dma-pio-single.c # irq -librtemsbsp_a_SOURCES += include/irq.h \ - irq/irq.c \ - ../../shared/src/irq-generic.c \ - ../../shared/src/irq-legacy.c \ - ../../shared/src/irq-info.c \ - ../../shared/src/irq-shell.c \ - ../../shared/src/irq-server.c +librtemsbsp_a_SOURCES += irq/irq.c # mscan librtemsbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h @@ -114,7 +108,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/gen5200/headers.am diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index 66a2c63f2a..bd196fada8 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am @@ -52,12 +52,7 @@ librtemsbsp_a_SOURCES += \ librtemsbsp_a_SOURCES += ../shared/clock/clock.c # irq -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # console @@ -86,7 +81,9 @@ endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/gen83xx/headers.am diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index 7dcfbe84d0..5dc04adac5 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -81,12 +81,7 @@ librtemsbsp_a_SOURCES += console/console-generic.c librtemsbsp_a_SOURCES += console/console-linflex.c # irq_generic -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c # Misc librtemsbsp_a_SOURCES += startup/sd-card-init.c @@ -114,7 +109,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/irq.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/siu.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/mpc55xxevb/headers.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index 4128c595fa..44db70271d 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -29,12 +29,7 @@ librtemsbsp_a_SOURCES += ../shared/clock/clock.c librtemsbsp_a_SOURCES += console/console.c # irq -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # startup @@ -61,7 +56,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/mmu.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/mpc8260ads/headers.am diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 3f03a19cd3..a421fec114 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -39,8 +39,8 @@ librtemsbsp_a_SOURCES += console/console-io.c console/consupp.S # irq librtemsbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c \ - ../shared/openpic/openpic.c ../../shared/src/irq-server.c \ - ../../shared/src/irq-generic.c ../../shared/src/irq-default-handler.c + ../shared/openpic/openpic.c \ + ../../../../../../bsps/shared/irq/irq-default-handler.c # vectors librtemsbsp_a_SOURCES += vectors/align_h.S @@ -66,7 +66,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/psim/headers.am diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am index 1fc1652144..47e38cea05 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am @@ -36,12 +36,7 @@ console_SOURCES = ../../shared/console-polled.c console/console-io.c # irq irq_SOURCES = -irq_SOURCES += ../../shared/src/irq-default-handler.c -irq_SOURCES += ../../shared/src/irq-generic.c -irq_SOURCES += ../../shared/src/irq-info.c -irq_SOURCES += ../../shared/src/irq-legacy.c -irq_SOURCES += ../../shared/src/irq-server.c -irq_SOURCES += ../../shared/src/irq-shell.c +irq_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c irq_SOURCES += irq/irq_init.c noinst_LIBRARIES = librtemsbsp.a @@ -55,7 +50,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/qemuppc/headers.am diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am index 1e801ce6c4..0d8366664a 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am @@ -67,12 +67,7 @@ librtemsbsp_a_SOURCES += clock/clock-config.c \ librtemsbsp_a_SOURCES += timer/timer.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Console @@ -105,7 +100,9 @@ librtemsbsp_a_SOURCES += startup/bspsmp.c endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/qoriq/headers.am diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am index b2ee742326..237c1540f9 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am @@ -48,12 +48,7 @@ librtemsbsp_a_SOURCES += clock/clock-config.c librtemsbsp_a_SOURCES += ../../shared/timerstub.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Console @@ -67,7 +62,9 @@ librtemsbsp_a_SOURCES += ../../shared/bspsmp.c endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/t32mppc/headers.am diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am index 05106e69fc..50351decc2 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am @@ -25,12 +25,7 @@ noinst_LIBRARIES = librtemsbsp.a librtemsbsp_a_SOURCES = # irq -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # clock @@ -66,7 +61,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/dpram.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/mmu.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/tqm8xx/headers.am diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am index 23e412ea31..24ee0352cf 100644 --- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am @@ -44,12 +44,7 @@ librtemsbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \ ../../shared/console_read.c ../../shared/console_write.c # irq -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq_init.c # clock @@ -63,7 +58,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/powerpc/shared/exceptions-sources.am include $(srcdir)/../../../../../../bsps/powerpc/virtex/headers.am diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am index 1b3eff455f..97e996e8fe 100644 --- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am +++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am @@ -55,9 +55,7 @@ librtemsbsp_a_SOURCES += timer/timer.c librtemsbsp_a_SOURCES += ../../shared/console-polled.c # IRQ -librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c -librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c librtemsbsp_a_SOURCES += irq/irq.c # Cache @@ -69,5 +67,6 @@ librtemsbsp_a_SOURCES += console/console-io.c DISTCLEANFILES = include/bspopts.h include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/riscv/riscv_generic/headers.am diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index 717be8620b..9ffc3b1305 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -58,12 +58,7 @@ librtemsbsp_a_SOURCES += timer/timer.c librtemsbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../sparc/shared/irq/bsp_isr_handler.c \ - ../../shared/src/irq-default-handler.c \ - ../../shared/src/irq-generic.c \ - ../../shared/src/irq-info.c \ - ../../shared/src/irq-legacy.c \ - ../../shared/src/irq-server.c \ - ../../shared/src/irq-shell.c + ../../../../../../bsps/shared/irq/irq-default-handler.c if HAS_SMP librtemsbsp_a_SOURCES += ../../shared/bspsmp.c @@ -78,5 +73,6 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/sparc/erc32/headers.am diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 94fa427cd8..dd31d1abce 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -53,12 +53,7 @@ librtemsbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c librtemsbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../sparc/shared/irq/bsp_isr_handler.c \ - ../../shared/src/irq-default-handler.c \ - ../../shared/src/irq-generic.c \ - ../../shared/src/irq-info.c \ - ../../shared/src/irq-legacy.c \ - ../../shared/src/irq-server.c \ - ../../shared/src/irq-shell.c + ../../../../../../bsps/shared/irq/irq-default-handler.c # AMBA bus librtemsbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c @@ -176,5 +171,6 @@ endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/sparc/leon2/headers.am diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index fe9f3ce1a1..c1e9e6ac3f 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -80,12 +80,7 @@ librtemsbsp_a_SOURCES += \ ../../sparc/shared/irq/genirq.c \ ../../sparc/shared/irq/irq-shared.c \ ../../sparc/shared/irq/bsp_isr_handler.c \ - ../../shared/src/irq-default-handler.c \ - ../../shared/src/irq-generic.c \ - ../../shared/src/irq-info.c \ - ../../shared/src/irq-legacy.c \ - ../../shared/src/irq-server.c \ - ../../shared/src/irq-shell.c + ../../../../../../bsps/shared/irq/irq-default-handler.c # PCI librtemsbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c @@ -201,5 +196,6 @@ endif include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/shared/irq-sources.am include $(srcdir)/../../../../../../bsps/shared/shared-sources.am include $(srcdir)/../../../../../../bsps/sparc/leon3/headers.am -- 2.12.3 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel