summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-03 07:39:16 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-03 07:40:00 +0100
commitfb01816bd24b6398d717a69d2b95327ffb8607d5 (patch)
treea70bcf07be75f4d6a517dbe3e31be9eea06f439c
parentsparc: Remove <bsp.h> from PCI shell command (diff)
downloadrtems-fb01816bd24b6398d717a69d2b95327ffb8607d5.tar.bz2
bsps/powerpc: Move shared irq.h
This header file is only used by motorola_powerpc, so not shared. Update #3254. Update #3268.
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/shared/irq/irq.h)0
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am2
-rw-r--r--c/src/lib/libbsp/powerpc/mvme3100/Makefile.am3
4 files changed, 4 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index ade69a2323..657dde206a 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -84,13 +84,13 @@ libbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
libbsp_a_SOURCES += ../../powerpc/shared/console/keyboard.h
libbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
-include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \
+include_bsp_HEADERS += include/bsp/irq.h \
../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h
# irq
libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c
libbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
-libbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.h
+libbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c
include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h
# motorola
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h
index 2d575d8122..2d575d8122 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq.h
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
index 6396cb5b66..8604111de3 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
@@ -85,7 +85,7 @@ $(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-$(PROJECT_INCLUDE)/bsp/irq.h: ../../powerpc/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 6bf46a9f67..b86c21a864 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -74,8 +74,7 @@ libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
include_bsp_HEADERS += irq/irq.h
# irq
libbsp_a_SOURCES += irq/irq_init.c \
- ../../powerpc/shared/irq/openpic_i8259_irq.c \
- ../../powerpc/shared/irq/irq.h
+ ../../powerpc/shared/irq/openpic_i8259_irq.c
include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
# openpic