7 files changed, 6 insertions, 339 deletions
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index f52d6ca76f..9acbd1bf8e 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/cplb.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -24,7 +16,7 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -49,5 +41,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/bfin/eZKit533/headers.am
diff --git a/c/src/lib/libbsp/bfin/eZKit533/configure.ac b/c/src/lib/libbsp/bfin/eZKit533/configure.ac
index 90c48195a2..63eb2766c9 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/configure.ac
+++ b/c/src/lib/libbsp/bfin/eZKit533/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-bfin-eZKit533],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/eZKit533.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])
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h
deleted file mode 100644
index 865ed72259..0000000000
--- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * @file
- * @ingroup bfin_ezkit533
- * @brief Global BSP definitions.
- */
-
-/*  bsp.h
- *
- *  This include file contains all board IO definitions for eZKit533.
- *
- *  Copyright (c) 2006 by Atos Automacao Industrial Ltda.
- *             written by Alain Schaefer <alain.schaefer@easc.ch>
- *                    and Antonio Giovanini <antonio@atos.com.br>
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-
-#ifndef LIBBSP_BFIN_EZKIT533_BSP_H
-#define LIBBSP_BFIN_EZKIT533_BSP_H
-
-#ifndef ASM
-
-#include <libcpu/bf533.h>
-
-#include <bspopts.h>
-#include <bsp/default-initial-extension.h>
-
-#include <rtems.h>
-#include <rtems/score/bfin.h>
-#include <rtems/bfin/bf533.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup bfin_ezkit533 eZKit533 Support
- * @ingroup bsp_bfin
- * @brief eZKit533 Board Support Package
- * @{
- */
-
-/**
- * @name PLL and clock setup values:
- * @brief  PLL configuration for ezkit533
- *
- *  XTL   =  27 MHz
- *  CLKIN =  13 MHz
- *  VCO   = 391 MHz
- *  CCLK  = 391 MHz
- *  SCLK  = 130 MHz
- *
- * @{
- *
- */
-
-#define PLL_CSEL    0x0000      ///< @brief CCLK = VCO      */
-#define PLL_SSEL    0x0003      ///< @brief SCLK = CCLK/3   */
-#define PLL_MSEL    0x3A00      ///< @brief VCO = 29xCLKIN  */
-#define PLL_DF      0x0001      ///< @brief CLKIN = XTL/2   */
-
-#define CCLK        391000000   ///< @brief CORE CLOCK     */
-#define SCLK        130000000   ///< @brief SYSTEM CLOCK   */
-
-/** @} */
-
-/**
- * @name UART setup values
- * @{
- */
-
-#define BAUDRATE    57600       ///< @brief Console Baudrate   */
-#define WORD_5BITS  0x00        ///< @brief 5 bits word        */
-#define WORD_6BITS  0x01        ///< @brief 6 bits word        */
-#define WORD_7BITS  0x02        ///< @brief 7 bits word        */
-#define WORD_8BITS  0x03        ///< @brief 8 bits word        */
-#define EVEN_PARITY 0x18        ///< @brief Enable EVEN parity */
-#define ODD_PARITY  0x08        ///< @brief Enable ODD parity  */
-#define TWO_STP_BIT 0x04        ///< @brief 2 stop bits        */
-
-/** @} */
-
-/**
- * @name Ezkit flash ports
- * @{
- */
-
-#define FlashA_PortB_Dir  0x20270007L
-#define FlashA_PortB_Data 0x20270005L
-
-/** @} */
-
-/**
- * @brief Blackfin environment memory map
- */
-#define L1_DATA_SRAM_A 0xff800000L
-
-#define FIFOLENGTH 0x100
-
-/**
- * @name Constants
- * @{
- */
-
-#define RAM_START 0
-#define RAM_END   0x100000
-
-/** @} */
-
-/**
- * @name functions
- * @{
- */
-
-/**
- * @brief Helper Function to use the EzKits LEDS.
- * Can be used by the Application.
- */
-void setLED (uint8_t value);
-
-/**
- * @brief Helper Function to use the EzKits LEDS
- */
-uint8_t getLED (void);
-
-/**
- * @brief Install an interrupt handler
- *
- * This method installs an interrupt handle.
- *
- * @param[in] handler is the isr routine
- * @param[in] vector is the vector number
- * @param[in] type indicates whether RTEMS or RAW intr
- *
- * @return returns old vector
- */
-rtems_isr_entry set_vector(
-  rtems_isr_entry     handler,
-  rtems_vector_number vector,
-  int                 type
-);
-
-/*
- *  Internal BSP methods that are used across file boundaries
- */
-void Init_RTC(void);
-
-/*
- * Prototype for methods in .S files that are referenced from C.
- */
-void bfin_null_isr(void);
-
-/** @} */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-#endif
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/cplb.h b/c/src/lib/libbsp/bfin/eZKit533/include/cplb.h
deleted file mode 100644
index 2c215e8954..0000000000
--- a/c/src/lib/libbsp/bfin/eZKit533/include/cplb.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file
- * @ingroup ezkit533_cplb
- * @brief CPLB configurations.
- */
-
-/*  cplb.h
- *
- *  Copyright (c) 2006 by Atos Automacao Industrial Ltda.
- *             written by Alain Schaefer <alain.schaefer@easc.ch>
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-#ifndef _CPLB_H
-#define _CPLB_H
-
-/**
- * @defgroup ezkit533_cplb CPLB Configuration
- * @ingroup bfin_ezkit533
- * @brief CPLB Configuration
- * @{
- */
-
-/* CPLB configurations */
-#define CPLB_DEF_CACHE_WT	CPLB_L1_CHBL | CPLB_WT
-#define CPLB_DEF_CACHE_WB	CPLB_L1_CHBL
-#define CPLB_CACHE_ENABLED	CPLB_L1_CHBL | CPLB_DIRTY
-
-#define CPLB_DEF_CACHE		CPLB_L1_CHBL | CPLB_WT
-#define CPLB_ALL_ACCESS	CPLB_SUPV_WR | CPLB_USER_RD | CPLB_USER_WR
-
-#define CPLB_I_PAGE_MGMT	CPLB_LOCK | CPLB_VALID
-#define CPLB_D_PAGE_MGMT	CPLB_LOCK | CPLB_ALL_ACCESS | CPLB_VALID
-
-#define CPLB_DNOCACHE		CPLB_ALL_ACCESS | CPLB_VALID
-#define CPLB_DDOCACHE		CPLB_DNOCACHE | CPLB_DEF_CACHE
-#define CPLB_INOCACHE   	CPLB_USER_RD | CPLB_VALID
-#define CPLB_IDOCACHE   	CPLB_INOCACHE | CPLB_L1_CHBL
-
-#define CPLB_DDOCACHE_WT	CPLB_DNOCACHE | CPLB_DEF_CACHE_WT
-#define CPLB_DDOCACHE_WB	CPLB_DNOCACHE | CPLB_DEF_CACHE_WB
-
-/** @} */
-
-#endif /* _CPLB_H */
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h b/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h
deleted file mode 100644
index 6aaf4cfa1d..0000000000
--- a/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @file
- * @ingroup ezkit533_tm27
- * @brief Interrupt mechanisms for the tm27 test.
- */
-
-/*
- *  tm27.h
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef _RTEMS_TMTEST27
-#error "This is an RTEMS internal file you must not include directly."
-#endif
-
-#ifndef __tm27_h
-#define __tm27_h
-
-/**
- * @defgroup ezkit533_tm27 TM27 Test Support
- * @ingroup bfin_ezkit533
- * @brief Interrupt Mechanisms for TM27
- * @{
- */
-
-/*
- *  Define the interrupt mechanism for Time Test 27
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 0
-
-#define Install_tm27_vector(handler) \
-{ \
-  set_vector( handler, 0x06, 1 ); \
-}
-
-#define Cause_tm27_intr() __asm__ volatile("raise 0x06;" : :);
-
-#define Clear_tm27_intr() /* empty */
-
-#define Lower_tm27_intr() /* empty */
-
-/** @} */
-
-#endif
diff --git a/c/src/lib/libbsp/bfin/eZKit533/preinstall.am b/c/src/lib/libbsp/bfin/eZKit533/preinstall.am
deleted file mode 100644
index f36f0fe865..0000000000
--- a/c/src/lib/libbsp/bfin/eZKit533/preinstall.am
+++ /dev/null
@@ -1,67 +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)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/cplb.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/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_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
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/bfin/eZKit533/bsp_specs b/c/src/lib/libbsp/bfin/eZKit533/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/bsp_specs
+++ b/c/src/lib/libbsp/bfin/eZKit533/startup/bsp_specs