Update #3254.
Update #3268.
---
c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 1 +
.../include => libbsp/powerpc/mpc55xxevb/include/bsp}/irq.h | 0
c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am | 4 ++++
c/src/lib/libcpu/powerpc/Makefile.am | 3 ---
c/src/lib/libcpu/powerpc/preinstall.am | 8 --------
5 files changed, 5 insertions(+), 11 deletions(-)
rename c/src/lib/{libcpu/powerpc/mpc55xx/include =>
libbsp/powerpc/mpc55xxevb/include/bsp}/irq.h (100%)
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 9853f1fe5a..fa8eb58fe8 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -58,6 +58,7 @@ include_bsp_HEADERS += ../../shared/include/utility.h
include_bsp_HEADERS += ../shared/include/linker-symbols.h
include_bsp_HEADERS += ../shared/include/start.h
include_bsp_HEADERS += ../shared/include/tictac.h
+include_bsp_HEADERS += include/bsp/irq.h
include_bsp_HEADERS += include/mpc55xx-config.h
include_bsp_HEADERS += include/smsc9218i.h
include_bsp_HEADERS += include/console-esci.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
rename to c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
index ce7256f838..b6238a58c3 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
@@ -157,6 +157,10 @@ $(PROJECT_INCLUDE)/bsp/tictac.h:
../shared/include/tictac.h $(PROJECT_INCLUDE)/b
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
+$(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
+
$(PROJECT_INCLUDE)/bsp/mpc55xx-config.h: include/mpc55xx-config.h
$(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc55xx-config.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc55xx-config.h
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am
b/c/src/lib/libcpu/powerpc/Makefile.am
index ed4c6056a2..2d407dd8a8 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -425,7 +425,6 @@ include_mpc55xx_HEADERS += mpc55xx/include/edma.h
include_mpc55xx_HEADERS += mpc55xx/include/emios.h
include_mpc55xx_HEADERS += mpc55xx/include/mpc55xx.h
include_mpc55xx_HEADERS += mpc55xx/include/siu.h
-include_mpc55xx_HEADERS += mpc55xx/include/irq.h
include_mpc55xx_HEADERS += mpc55xx/include/watchdog.h
include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc551x.h
include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc555x.h
@@ -436,8 +435,6 @@ include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc567x.h
include_mpc55xx_HEADERS += mpc55xx/include/regs-edma.h
include_mpc55xx_HEADERS += mpc55xx/include/regs-mmu.h
-include_bsp_HEADERS += mpc55xx/include/irq.h
-
# IRQ
noinst_PROGRAMS += mpc55xx/irq.rel
mpc55xx_irq_rel_SOURCES = mpc55xx/irq/irq.c
diff --git a/c/src/lib/libcpu/powerpc/preinstall.am
b/c/src/lib/libcpu/powerpc/preinstall.am
index 69dd1d3517..a964686dd1 100644
--- a/c/src/lib/libcpu/powerpc/preinstall.am
+++ b/c/src/lib/libcpu/powerpc/preinstall.am
@@ -272,10 +272,6 @@ $(PROJECT_INCLUDE)/mpc55xx/siu.h: mpc55xx/include/siu.h
$(PROJECT_INCLUDE)/mpc55
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/siu.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/siu.h
-$(PROJECT_INCLUDE)/mpc55xx/irq.h: mpc55xx/include/irq.h
$(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/irq.h
-
$(PROJECT_INCLUDE)/mpc55xx/watchdog.h: mpc55xx/include/watchdog.h
$(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/watchdog.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/watchdog.h
@@ -311,10 +307,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs-edma.h
$(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h: mpc55xx/include/regs-mmu.h
$(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: mpc55xx/include/irq.h
$(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
endif
if qoriq
$(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h
$(PROJECT_INCLUDE)/bsp/$(dirstamp)
--
2.12.3
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
