15 files changed, 12 insertions, 204 deletions
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h b/bsps/powerpc/qoriq/include/asm/epapr_hcalls.h
index 3d87cca611..3d87cca611 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h
+++ b/bsps/powerpc/qoriq/include/asm/epapr_hcalls.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/asm/fsl_hcalls.h b/bsps/powerpc/qoriq/include/asm/fsl_hcalls.h
index ba76c132aa..ba76c132aa 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/asm/fsl_hcalls.h
+++ b/bsps/powerpc/qoriq/include/asm/fsl_hcalls.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h b/bsps/powerpc/qoriq/include/bsp.h
index d7e9e95b3f..d7e9e95b3f 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h
+++ b/bsps/powerpc/qoriq/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/intercom.h b/bsps/powerpc/qoriq/include/bsp/intercom.h
index 39b2ba938e..39b2ba938e 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/intercom.h
+++ b/bsps/powerpc/qoriq/include/bsp/intercom.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/irq.h b/bsps/powerpc/qoriq/include/bsp/irq.h
index e178057950..e178057950 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/irq.h
+++ b/bsps/powerpc/qoriq/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/mmu.h b/bsps/powerpc/qoriq/include/bsp/mmu.h
index 4cacb1b375..4cacb1b375 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/mmu.h
+++ b/bsps/powerpc/qoriq/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h b/bsps/powerpc/qoriq/include/bsp/qoriq.h
index 2d28d0aec7..2d28d0aec7 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h
+++ b/bsps/powerpc/qoriq/include/bsp/qoriq.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h b/bsps/powerpc/qoriq/include/bsp/tsec-config.h
index b1a70e7486..b1a70e7486 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h
+++ b/bsps/powerpc/qoriq/include/bsp/tsec-config.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h b/bsps/powerpc/qoriq/include/bsp/uart-bridge.h
index 97e6553b7c..97e6553b7c 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h
+++ b/bsps/powerpc/qoriq/include/bsp/uart-bridge.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/tm27.h b/bsps/powerpc/qoriq/include/tm27.h
index 46264b7e67..46264b7e67 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/tm27.h
+++ b/bsps/powerpc/qoriq/include/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h b/bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
index b4504f3944..b4504f3944 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
+++ b/bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 646dbfbc28..6760cece35 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_asmdir = $(includedir)/asm
-include_uapi_asmdir = $(includedir)/uapi/asm
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
 DISTCLEANFILES = include/bspopts.h
 
 EXTRA_DIST += README
@@ -21,27 +13,6 @@ EXTRA_DIST += README
 noinst_PROGRAMS =
 
 
-include_bsp_HEADERS = include/irq.h \
-	../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h \
-	../../shared/include/bootcard.h \
-	../../shared/include/utility.h \
-	../shared/include/start.h \
-	../shared/include/tictac.h \
-	../shared/include/linker-symbols.h \
-	include/tsec-config.h \
-	include/mmu.h \
-	include/intercom.h \
-	include/uart-bridge.h \
-	include/qoriq.h
-
-include_asm_HEADERS =
-include_asm_HEADERS += include/asm/epapr_hcalls.h
-include_asm_HEADERS += include/asm/fsl_hcalls.h
-
-include_uapi_asm_HEADERS =
-include_uapi_asm_HEADERS += include/uapi/asm/epapr_hcalls.h
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
@@ -57,13 +28,13 @@ rtems_crtn.$(OBJEXT): ../../powerpc/shared/start/rtems_crtn.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crtn.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds \
-	../shared/startup/linkcmds.base \
-	startup/linkcmds.qoriq_core_0 \
-	startup/linkcmds.qoriq_core_1 \
-	startup/linkcmds.qoriq_e500 \
-	startup/linkcmds.qoriq_e6500_32 \
-	startup/linkcmds.qoriq_e6500_64
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.qoriq_core_0
+dist_project_lib_DATA += startup/linkcmds.qoriq_core_1
+dist_project_lib_DATA += startup/linkcmds.qoriq_e500
+dist_project_lib_DATA += startup/linkcmds.qoriq_e6500_32
+dist_project_lib_DATA += startup/linkcmds.qoriq_e6500_64
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -141,5 +112,5 @@ if HAS_SMP
 libbsp_a_SOURCES += startup/bspsmp.c
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/qoriq/headers.am
diff --git a/c/src/lib/libbsp/powerpc/qoriq/configure.ac b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
index f0e8af62d7..02fffa7e7a 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/configure.ac
+++ b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-qoriq],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/qoriq_core_0.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
@@ -168,7 +171,6 @@ AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
 RTEMS_PPC_EXCEPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am b/c/src/lib/libbsp/powerpc/qoriq/preinstall.am
deleted file mode 100644
index 5fe3411548..0000000000
--- a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am
+++ /dev/null
@@ -1,165 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/asm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/asm
-	@: > $(PROJECT_INCLUDE)/asm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/asm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/uapi/asm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/uapi/asm
-	@: > $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/tsec-config.h: include/tsec-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec-config.h
-
-$(PROJECT_INCLUDE)/bsp/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h
-
-$(PROJECT_INCLUDE)/bsp/intercom.h: include/intercom.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/intercom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/intercom.h
-
-$(PROJECT_INCLUDE)/bsp/uart-bridge.h: include/uart-bridge.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-bridge.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-bridge.h
-
-$(PROJECT_INCLUDE)/bsp/qoriq.h: include/qoriq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/qoriq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/qoriq.h
-
-$(PROJECT_INCLUDE)/asm/epapr_hcalls.h: include/asm/epapr_hcalls.h $(PROJECT_INCLUDE)/asm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm/epapr_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm/epapr_hcalls.h
-
-$(PROJECT_INCLUDE)/asm/fsl_hcalls.h: include/asm/fsl_hcalls.h $(PROJECT_INCLUDE)/asm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm/fsl_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm/fsl_hcalls.h
-
-$(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h: include/uapi/asm/epapr_hcalls.h $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crtn.$(OBJEXT): rtems_crtn.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crtn.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crtn.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.qoriq_core_0: startup/linkcmds.qoriq_core_0 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_core_0
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_core_0
-
-$(PROJECT_LIB)/linkcmds.qoriq_core_1: startup/linkcmds.qoriq_core_1 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_core_1
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_core_1
-
-$(PROJECT_LIB)/linkcmds.qoriq_e500: startup/linkcmds.qoriq_e500 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e500
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e500
-
-$(PROJECT_LIB)/linkcmds.qoriq_e6500_32: startup/linkcmds.qoriq_e6500_32 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e6500_32
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e6500_32
-
-$(PROJECT_LIB)/linkcmds.qoriq_e6500_64: startup/linkcmds.qoriq_e6500_64 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e6500_64
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e6500_64
-
diff --git a/c/src/lib/libbsp/powerpc/qoriq/bsp_specs b/c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs
index 001c45b3c4..001c45b3c4 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs