18 files changed, 10 insertions, 184 deletions
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200.h b/bsps/arm/csb337/include/at91rm9200.h
index 3ed64c7073..3ed64c7073 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200.h
+++ b/bsps/arm/csb337/include/at91rm9200.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_dbgu.h b/bsps/arm/csb337/include/at91rm9200_dbgu.h
index 9a65483db0..9a65483db0 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_dbgu.h
+++ b/bsps/arm/csb337/include/at91rm9200_dbgu.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_emac.h b/bsps/arm/csb337/include/at91rm9200_emac.h
index 77c42d1526..77c42d1526 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_emac.h
+++ b/bsps/arm/csb337/include/at91rm9200_emac.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_gpio.h b/bsps/arm/csb337/include/at91rm9200_gpio.h
index 9fa18ad476..9fa18ad476 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_gpio.h
+++ b/bsps/arm/csb337/include/at91rm9200_gpio.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_mem.h b/bsps/arm/csb337/include/at91rm9200_mem.h
index fafb18f6e8..fafb18f6e8 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_mem.h
+++ b/bsps/arm/csb337/include/at91rm9200_mem.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_pmc.h b/bsps/arm/csb337/include/at91rm9200_pmc.h
index 70cf77fc5a..70cf77fc5a 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_pmc.h
+++ b/bsps/arm/csb337/include/at91rm9200_pmc.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_usart.h b/bsps/arm/csb337/include/at91rm9200_usart.h
index 387f353992..387f353992 100644
--- a/c/src/lib/libbsp/arm/csb337/include/at91rm9200_usart.h
+++ b/bsps/arm/csb337/include/at91rm9200_usart.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/bits.h b/bsps/arm/csb337/include/bits.h
index 6f2c4036b6..6f2c4036b6 100644
--- a/c/src/lib/libbsp/arm/csb337/include/bits.h
+++ b/bsps/arm/csb337/include/bits.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/bsps/arm/csb337/include/bsp.h
index c99de2fd0a..c99de2fd0a 100644
--- a/c/src/lib/libbsp/arm/csb337/include/bsp.h
+++ b/bsps/arm/csb337/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp/irq.h b/bsps/arm/csb337/include/bsp/irq.h
index 771059a3e4..771059a3e4 100644
--- a/c/src/lib/libbsp/arm/csb337/include/bsp/irq.h
+++ b/bsps/arm/csb337/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/csb337/console/font8x16.h b/bsps/arm/csb337/include/font8x16.h
index 0445b67668..0445b67668 100644
--- a/c/src/lib/libbsp/arm/csb337/console/font8x16.h
+++ b/bsps/arm/csb337/include/font8x16.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/sed1356.h b/bsps/arm/csb337/include/sed1356.h
index d4451ab7e1..d4451ab7e1 100644
--- a/c/src/lib/libbsp/arm/csb337/include/sed1356.h
+++ b/bsps/arm/csb337/include/sed1356.h
diff --git a/c/src/lib/libbsp/arm/csb337/console/sed1356_16bit.h b/bsps/arm/csb337/include/sed1356_16bit.h
index 5ccf85d01c..5ccf85d01c 100644
--- a/c/src/lib/libbsp/arm/csb337/console/sed1356_16bit.h
+++ b/bsps/arm/csb337/include/sed1356_16bit.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/tm27.h b/bsps/arm/csb337/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/csb337/include/tm27.h
+++ b/bsps/arm/csb337/include/tm27.h
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 6999c0250e..a2d448c3e9 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -4,47 +4,21 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/at91rm9200_dbgu.h
-include_HEADERS += include/at91rm9200_emac.h
-include_HEADERS += include/at91rm9200_gpio.h
-include_HEADERS += include/at91rm9200.h
-include_HEADERS += include/at91rm9200_mem.h
-include_HEADERS += include/at91rm9200_pmc.h
-include_HEADERS += include/at91rm9200_usart.h
-include_HEADERS += include/bits.h
+dist_project_lib_DATA = startup/bsp_specs
 
 if ENABLE_LCD
-include_HEADERS += include/sed1356.h
 endif
 
-include_bsp_HEADERS =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 if ENABLE_UMON
-include_umondir = $(includedir)/umon
-include_umon_HEADERS  = ../../shared/umon/cli.h
-include_umon_HEADERS += ../../shared/umon/monlib.h
-include_umon_HEADERS += ../../shared/umon/tfs.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS  = ../../shared/umon/umon.h
 endif
 
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
 
 if ENABLE_LCD
-nodist_include_HEADERS += console/sed1356_16bit.h
-nodist_include_HEADERS += console/font8x16.h
 endif
 
 EXTRA_DIST += start/start.S
@@ -52,9 +26,10 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-EXTRA_DIST += startup/linkcmds.csb337
-EXTRA_DIST += startup/linkcmds.csb637
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.csb337
+dist_project_lib_DATA += startup/linkcmds.csb637
+
 EXTRA_DIST += README
 EXTRA_DIST += README.kit637_v6
 
@@ -80,9 +55,6 @@ libbsp_a_SOURCES += ../../shared/console.c console/uarts.c \
 libbsp_a_SOURCES += console/dbgu.c
 libbsp_a_SOURCES += console/usart.c
 # IRQ
-include_bsp_HEADERS += ../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h
-include_bsp_HEADERS += include/bsp/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
@@ -122,5 +94,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/csb337/headers.am
diff --git a/c/src/lib/libbsp/arm/csb337/configure.ac b/c/src/lib/libbsp/arm/csb337/configure.ac
index 5567bf06f4..066d425e56 100644
--- a/c/src/lib/libbsp/arm/csb337/configure.ac
+++ b/c/src/lib/libbsp/arm/csb337/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-csb337],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/csb337.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])
@@ -63,7 +66,6 @@ RTEMS_BSPOPTS_HELP([ENABLE_USART3],
 AM_CONDITIONAL(ENABLE_USART3,test "$ENABLE_USART3" = "1")
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/arm/csb337/preinstall.am b/c/src/lib/libbsp/arm/csb337/preinstall.am
deleted file mode 100644
index 57ab234874..0000000000
--- a/c/src/lib/libbsp/arm/csb337/preinstall.am
+++ /dev/null
@@ -1,148 +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_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)/at91rm9200_dbgu.h: include/at91rm9200_dbgu.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
-
-$(PROJECT_INCLUDE)/at91rm9200_emac.h: include/at91rm9200_emac.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_emac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_emac.h
-
-$(PROJECT_INCLUDE)/at91rm9200_gpio.h: include/at91rm9200_gpio.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_gpio.h
-
-$(PROJECT_INCLUDE)/at91rm9200.h: include/at91rm9200.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200.h
-
-$(PROJECT_INCLUDE)/at91rm9200_mem.h: include/at91rm9200_mem.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_mem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_mem.h
-
-$(PROJECT_INCLUDE)/at91rm9200_pmc.h: include/at91rm9200_pmc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_pmc.h
-
-$(PROJECT_INCLUDE)/at91rm9200_usart.h: include/at91rm9200_usart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_usart.h
-
-$(PROJECT_INCLUDE)/bits.h: include/bits.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bits.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bits.h
-
-if ENABLE_LCD
-$(PROJECT_INCLUDE)/sed1356.h: include/sed1356.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sed1356.h
-endif
-if ENABLE_UMON
-$(PROJECT_INCLUDE)/umon/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/umon
-	@: > $(PROJECT_INCLUDE)/umon/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/umon/$(dirstamp)
-
-$(PROJECT_INCLUDE)/umon/cli.h: ../../shared/umon/cli.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/cli.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/cli.h
-
-$(PROJECT_INCLUDE)/umon/monlib.h: ../../shared/umon/monlib.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/monlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/monlib.h
-
-$(PROJECT_INCLUDE)/umon/tfs.h: ../../shared/umon/tfs.h $(PROJECT_INCLUDE)/umon/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/tfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/tfs.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/umon.h: ../../shared/umon/umon.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/umon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/umon.h
-endif
-$(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/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-if ENABLE_LCD
-$(PROJECT_INCLUDE)/sed1356_16bit.h: console/sed1356_16bit.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356_16bit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sed1356_16bit.h
-
-$(PROJECT_INCLUDE)/font8x16.h: console/font8x16.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/font8x16.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/font8x16.h
-endif
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(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/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/arm/csb337/bsp_specs b/c/src/lib/libbsp/arm/csb337/startup/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/csb337/bsp_specs
+++ b/c/src/lib/libbsp/arm/csb337/startup/bsp_specs