30 files changed, 12 insertions, 260 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/bsps/powerpc/gen5200/include/bsp.h
index 40ac1116c5..40ac1116c5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
+++ b/bsps/powerpc/gen5200/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/ata.h b/bsps/powerpc/gen5200/include/bsp/ata.h
index 3d8ccfc49a..3d8ccfc49a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/ata.h
+++ b/bsps/powerpc/gen5200/include/bsp/ata.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h b/bsps/powerpc/gen5200/include/bsp/bestcomm.h
index 366465565a..366465565a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h
index f1fa22d1d5..f1fa22d1d5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
index 18827b77c7..18827b77c7 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h
index 102fc082cb..102fc082cb 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h
index 6b07cbcb2a..6b07cbcb2a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h
index 1f8b86cded..1f8b86cded 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h
index 9e4b94cd10..9e4b94cd10 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h
index 52d84777ad..52d84777ad 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h
index ff2aed1997..ff2aed1997 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h
index dc529d6a22..dc529d6a22 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h
index 3712bae3d0..3712bae3d0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h
index 7f261d21ee..7f261d21ee 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h
index be7bb9d7b0..be7bb9d7b0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h b/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
index 2b74adf366..2b74adf366 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h b/bsps/powerpc/gen5200/include/bsp/i2c.h
index e5d7d472dd..e5d7d472dd 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h
+++ b/bsps/powerpc/gen5200/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h b/bsps/powerpc/gen5200/include/bsp/i2cdrv.h
index 4b4a1ec141..4b4a1ec141 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h
+++ b/bsps/powerpc/gen5200/include/bsp/i2cdrv.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/irq.h b/bsps/powerpc/gen5200/include/bsp/irq.h
index 5a0b3bd29e..5a0b3bd29e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/irq.h
+++ b/bsps/powerpc/gen5200/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h b/bsps/powerpc/gen5200/include/bsp/mpc5200.h
index 263e66fb9e..263e66fb9e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h
+++ b/bsps/powerpc/gen5200/include/bsp/mpc5200.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h b/bsps/powerpc/gen5200/include/bsp/mscan-base.h
index a2b8737d8e..a2b8737d8e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h
+++ b/bsps/powerpc/gen5200/include/bsp/mscan-base.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h b/bsps/powerpc/gen5200/include/bsp/mscan.h
index 9cb7fd44e7..9cb7fd44e7 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h
+++ b/bsps/powerpc/gen5200/include/bsp/mscan.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h b/bsps/powerpc/gen5200/include/bsp/nvram.h
index b05c35986f..b05c35986f 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h
+++ b/bsps/powerpc/gen5200/include/bsp/nvram.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h b/bsps/powerpc/gen5200/include/bsp/slicetimer.h
index e089dbc8ad..e089dbc8ad 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h
+++ b/bsps/powerpc/gen5200/include/bsp/slicetimer.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h b/bsps/powerpc/gen5200/include/bsp/u-boot-config.h
index 2fee83bce9..2fee83bce9 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h
+++ b/bsps/powerpc/gen5200/include/bsp/u-boot-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h b/bsps/powerpc/gen5200/include/tm27.h
index ff43cc9ab6..ff43cc9ab6 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h
+++ b/bsps/powerpc/gen5200/include/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 88e8d5191b..a727020c0a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -4,18 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_bestcommdir = $(include_bspdir)/bestcomm
-include_bestcomm_includedir = $(include_bestcommdir)/include
-include_bestcomm_include_mgt5200dir = $(include_bestcomm_includedir)/mgt5200
-include_bestcomm_task_apidir = $(include_bestcommdir)/task_api
+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
 
 noinst_PROGRAMS =
@@ -31,14 +21,14 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.brs5l
+dist_project_lib_DATA += startup/linkcmds.brs6l
+dist_project_lib_DATA += startup/linkcmds.dp2
 dist_project_lib_DATA += startup/linkcmds.gen5200_base
-project_lib_DATA += startup/linkcmds
-EXTRA_DIST += startup/linkcmds.brs5l
-EXTRA_DIST += startup/linkcmds.brs6l
-EXTRA_DIST += startup/linkcmds.icecube
-EXTRA_DIST += startup/linkcmds.pm520_cr825
-EXTRA_DIST += startup/linkcmds.pm520_ze30
-EXTRA_DIST += startup/linkcmds.dp2
+dist_project_lib_DATA += startup/linkcmds.icecube
+dist_project_lib_DATA += startup/linkcmds.pm520_cr825
+dist_project_lib_DATA += startup/linkcmds.pm520_ze30
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -61,19 +51,6 @@ libbsp_a_SOURCES += bestcomm/include/ppctypes.h \
     bestcomm/task_api/bestcomm_api_mem.h bestcomm/task_api/bestcomm_cntrl.h \
     bestcomm/task_api/tasksetup_bdtable.h \
     bestcomm/task_api/tasksetup_general.h
-include_bestcomm_HEADERS = bestcomm/bestcomm_priv.h \
-	bestcomm/dma_image.h \
-	bestcomm/dma_image.capi.h \
-	bestcomm/bestcomm_api.h \
-	bestcomm/bestcomm_glue.h
-include_bestcomm_include_HEADERS = bestcomm/include/ppctypes.h
-include_bestcomm_include_mgt5200_HEADERS = bestcomm/include/mgt5200/mgt5200.h \
-	bestcomm/include/mgt5200/sdma.h
-include_bestcomm_task_api_HEADERS = bestcomm/task_api/tasksetup_general.h \
-	bestcomm/task_api/tasksetup_bdtable.h \
-	bestcomm/task_api/bestcomm_cntrl.h \
-	bestcomm/task_api/bestcomm_api_mem.h
-
 # clock
 # clock
 libbsp_a_SOURCES += ../shared/clock/clock.c
@@ -87,24 +64,6 @@ libbsp_a_SOURCES += ide/ata.c
 libbsp_a_SOURCES += ide/ata-instance.c
 libbsp_a_SOURCES += ide/ata-dma-pio-single.c
 
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/bootcard.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/u-boot.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../shared/include/u-boot-board-info.h
-include_bsp_HEADERS += include/ata.h
-include_bsp_HEADERS += include/bestcomm.h
-include_bsp_HEADERS += include/bestcomm_ops.h
-include_bsp_HEADERS += include/i2cdrv.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/mpc5200.h
-include_bsp_HEADERS += include/mscan-base.h
-include_bsp_HEADERS += include/u-boot-config.h
-include_bsp_HEADERS += mscan/mscan.h
-
 # irq
 libbsp_a_SOURCES += include/irq.h \
 	irq/irq.c \
@@ -117,11 +76,9 @@ libbsp_a_SOURCES += include/irq.h \
 # mscan
 libbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h
 
-include_bsp_HEADERS += nvram/nvram.h
 # nvram
 libbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
 
-include_bsp_HEADERS += slicetimer/slicetimer.h
 # slicetimer
 libbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h
 
@@ -161,5 +118,5 @@ libbsp_a_LIBADD =  ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
 	../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/gen5200/headers.am
diff --git a/c/src/lib/libbsp/powerpc/gen5200/configure.ac b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
index 74b7440f44..b5cf38f8de 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-powerpc-gen5200],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/brs5l.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -129,7 +132,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AC_CONFIG_FILES([Makefile])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 RTEMS_PPC_EXCEPTIONS
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am b/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
deleted file mode 100644
index 73c986eacc..0000000000
--- a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
+++ /dev/null
@@ -1,207 +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)/bsp/bestcomm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm
-	@: > $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/include
-	@: > $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200
-	@: > $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/task_api
-	@: > $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(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_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)/linkcmds.gen5200_base: startup/linkcmds.gen5200_base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gen5200_base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gen5200_base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h: bestcomm/bestcomm_priv.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h: bestcomm/dma_image.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h: bestcomm/dma_image.capi.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h: bestcomm/bestcomm_api.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h: bestcomm/bestcomm_glue.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h: bestcomm/include/ppctypes.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h: bestcomm/include/mgt5200/mgt5200.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h: bestcomm/include/mgt5200/sdma.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h: bestcomm/task_api/tasksetup_general.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h: bestcomm/task_api/tasksetup_bdtable.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h: bestcomm/task_api/bestcomm_cntrl.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h: bestcomm/task_api/bestcomm_api_mem.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.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/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/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.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/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-
-$(PROJECT_INCLUDE)/bsp/ata.h: include/ata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ata.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm.h: include/bestcomm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm_ops.h: include/bestcomm_ops.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm_ops.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm_ops.h
-
-$(PROJECT_INCLUDE)/bsp/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cdrv.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.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/mpc5200.h: include/mpc5200.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc5200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc5200.h
-
-$(PROJECT_INCLUDE)/bsp/mscan-base.h: include/mscan-base.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mscan-base.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mscan-base.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-
-$(PROJECT_INCLUDE)/bsp/mscan.h: mscan/mscan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mscan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mscan.h
-
-$(PROJECT_INCLUDE)/bsp/nvram.h: nvram/nvram.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/nvram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/nvram.h
-
-$(PROJECT_INCLUDE)/bsp/slicetimer.h: slicetimer/slicetimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/slicetimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/slicetimer.h
-
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bsp_specs b/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs