bsps/powerpc: Use public include path

Update #3254.

6 files changed, 11 insertions, 8 deletions

diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 2d407dd8a8..3779ddc6c7 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -14,6 +14,7 @@ include_libcpu_HEADERS = shared/include/powerpc-utility.h
 include_bspdir = $(includedir)/bsp
 
 include_bsp_HEADERS =
+include_bsp_HEADERS += new-exceptions/bspsupport/irq_supp.h
 include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h
 
 include_mpc83xxdir = $(includedir)/mpc83xx
@@ -60,8 +61,6 @@ new_exceptions_irq_bspsupport_rel_CPPFLAGS = $(AM_CPPFLAGS)
 new_exceptions_irq_bspsupport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-EXTRA_DIST += new-exceptions/bspsupport/vectors.h
-EXTRA_DIST += new-exceptions/bspsupport/irq_supp.h
 EXTRA_DIST += new-exceptions/bspsupport/README
 EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_test.c
 
diff --git a/c/src/lib/libcpu/powerpc/e500/mmu/mmu.c b/c/src/lib/libcpu/powerpc/e500/mmu/mmu.c
index c93a660d29..15fe88f91a 100644
--- a/c/src/lib/libcpu/powerpc/e500/mmu/mmu.c
+++ b/c/src/lib/libcpu/powerpc/e500/mmu/mmu.c
@@ -74,7 +74,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#include "e500_mmu.h"
+#include <libcpu/e500_mmu.h>
 
 #define TLBIVAX_TLBSEL  (1<<(63-60))
 #define TLBIVAX_INV_ALL  (1<<(63-61))
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
index fb346ead11..93ef909776 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
@@ -76,7 +76,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "pte121.h"
+#include <libcpu/pte121.h>
 
 /************************** CONSTANT DEFINITIONS **************************/
 
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
index a6daad479f..931a9c6074 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
@@ -12,11 +12,11 @@
 #include <stdlib.h>
 
 #include <rtems.h>
-#include "irq_supp.h"
-#include <bsp/vectors.h>
 #include <stdlib.h>
 #include <rtems/bspIo.h> /* for printk */
 #include <libcpu/spr.h>
+#include <bsp/irq_supp.h>
+#include <bsp/vectors.h>
 
 /*
  * default handler connected on each irq after bsp initialization
diff --git a/c/src/lib/libcpu/powerpc/preinstall.am b/c/src/lib/libcpu/powerpc/preinstall.am
index a964686dd1..178763b3ab 100644
--- a/c/src/lib/libcpu/powerpc/preinstall.am
+++ b/c/src/lib/libcpu/powerpc/preinstall.am
@@ -54,6 +54,10 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp):
 	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 
+$(PROJECT_INCLUDE)/bsp/irq_supp.h: new-exceptions/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h
+
 $(PROJECT_INCLUDE)/bsp/vectors.h: new-exceptions/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
diff --git a/c/src/lib/libcpu/powerpc/shared/src/stack.c b/c/src/lib/libcpu/powerpc/shared/src/stack.c
index f19cecd87d..1e13b3d9ed 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/stack.c
+++ b/c/src/lib/libcpu/powerpc/shared/src/stack.c
@@ -1,7 +1,7 @@
-#include "stackTrace.h"
+#include <inttypes.h>
 #include <rtems/bspIo.h>
+#include <libcpu/stackTrace.h>
 #include <libcpu/spr.h>
-#include <inttypes.h>
 
 SPR_RO(PPC_LR)