[rtems commit] Remove make preinstall

Sebastian Huber sebh at rtems.org
Thu Jan 25 09:16:54 UTC 2018


Module:    rtems
Branch:    master
Commit:    2afb22b7e1ebcbe40373ff7e0efae7d207c655a9
Changeset: http://git.rtems.org/rtems/commit/?id=2afb22b7e1ebcbe40373ff7e0efae7d207c655a9

Author:    Chris Johns <chrisj at rtems.org>
Date:      Sat Dec 23 18:18:56 2017 +1100

Remove make preinstall

A speciality of the RTEMS build system was the make preinstall step.  It
copied header files from arbitrary locations into the build tree.  The
header files were included via the -Bsome/build/tree/path GCC command
line option.

This has at least seven problems:

* The make preinstall step itself needs time and disk space.

* Errors in header files show up in the build tree copy.  This makes it
  hard for editors to open the right file to fix the error.

* There is no clear relationship between source and build tree header
  files.  This makes an audit of the build process difficult.

* The visibility of all header files in the build tree makes it
  difficult to enforce API barriers.  For example it is discouraged to
  use BSP-specifics in the cpukit.

* An introduction of a new build system is difficult.

* Include paths specified by the -B option are system headers.  This
  may suppress warnings.

* The parallel build had sporadic failures on some hosts.

This patch removes the make preinstall step.   All installed header
files are moved to dedicated include directories in the source tree.
Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc,
etc.  Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g.
erc32, imx, qoriq, etc.

The new cpukit include directories are:

* cpukit/include

* cpukit/score/cpu/@RTEMS_CPU@/include

* cpukit/libnetworking

The new BSP include directories are:

* bsps/include

* bsps/@RTEMS_CPU@/include

* bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include

There are build tree include directories for generated files.

The include directory order favours the most general header file, e.g.
it is not possible to override general header files via the include path
order.

The "bootstrap -p" option was removed.  The new "bootstrap -H" option
should be used to regenerate the "headers.am" files.

Update #3254.

---

 aclocal/rtems-bsp-includes.m4                      |   13 +
 aclocal/rtems-build-top.m4                         |   12 +
 aclocal/rtems-includes.m4                          |   23 +
 aclocal/rtems-source-top.m4                        |    8 +
 automake/host.am                                   |    3 -
 automake/local.am                                  |    6 +-
 automake/subdirs.am                                |   23 -
 bootstrap                                          |   78 +-
 bsps/arm/altera-cyclone-v/headers.am               |   45 +
 .../arm/altera-cyclone-v/include/bsp.h             |    0
 .../altera-cyclone-v/include/bsp}/alt_16550_uart.h |    0
 .../include/bsp}/alt_address_space.h               |    0
 .../arm/altera-cyclone-v/include/bsp}/alt_cache.h  |    0
 .../include/bsp}/alt_clock_group.h                 |    0
 .../include/bsp}/alt_clock_manager.h               |    0
 .../arm/altera-cyclone-v/include/bsp}/alt_dma.h    |    0
 .../altera-cyclone-v/include/bsp}/alt_dma_common.h |    0
 .../include/bsp}/alt_dma_program.h                 |    0
 .../include/bsp}/alt_generalpurpose_io.h           |    0
 .../altera-cyclone-v/include/bsp}/alt_hwlibs_ver.h |    0
 .../arm/altera-cyclone-v/include/bsp}/alt_i2c.h    |    0
 .../include/bsp}/alt_interrupt_common.h            |    0
 .../include/bsp}/alt_mpu_registers.h               |    0
 .../include/bsp}/alt_qspi_private.h                |    0
 .../include/bsp}/alt_reset_manager.h               |    0
 .../arm/altera-cyclone-v/include/bsp}/hwlib.h      |    0
 .../arm/altera-cyclone-v/include/bsp}/i2cdrv.h     |    0
 .../arm/altera-cyclone-v/include/bsp}/irq.h        |    0
 .../include/bsp}/socal/alt_acpidmap.h              |    0
 .../include/bsp}/socal/alt_clkmgr.h                |    0
 .../include/bsp}/socal/alt_dmanonsecure.h          |    0
 .../include/bsp}/socal/alt_dmasecure.h             |    0
 .../altera-cyclone-v/include/bsp}/socal/alt_gpio.h |    0
 .../altera-cyclone-v/include/bsp}/socal/alt_i2c.h  |    0
 .../altera-cyclone-v/include/bsp}/socal/alt_l3.h   |    0
 .../altera-cyclone-v/include/bsp}/socal/alt_qspi.h |    0
 .../include/bsp}/socal/alt_qspidata.h              |    0
 .../include/bsp}/socal/alt_rstmgr.h                |    0
 .../altera-cyclone-v/include/bsp}/socal/alt_sdr.h  |    0
 .../include/bsp}/socal/alt_sysmgr.h                |    0
 .../altera-cyclone-v/include/bsp}/socal/alt_uart.h |    0
 .../arm/altera-cyclone-v/include/bsp}/socal/hps.h  |    0
 .../altera-cyclone-v/include/bsp}/socal/socal.h    |    0
 .../arm/altera-cyclone-v}/include/tm27.h           |    0
 bsps/arm/atsam/headers.am                          |  269 +++++
 {c/src/lib/libbsp => bsps}/arm/atsam/include/bsp.h |    0
 .../arm/atsam/include/bsp}/atsam-clock-config.h    |    0
 .../arm/atsam/include/bsp}/atsam-i2c.h             |    0
 .../arm/atsam/include/bsp}/atsam-spi.h             |    0
 .../include => bsps/arm/atsam/include/bsp}/i2c.h   |    0
 .../include => bsps/arm/atsam/include/bsp}/irq.h   |    0
 .../arm/atsam/include/bsp}/pin-config.h            |    0
 .../include => bsps/arm/atsam/include/bsp}/power.h |    0
 .../arm/atsam/include/bsp}/sc16is752.h             |    0
 .../include => bsps/arm/atsam/include/bsp}/spi.h   |    0
 .../arm/atsam/include}/libchip/chip.h              |    0
 .../arm/atsam/include}/libchip/compiler.h          |    0
 .../arm/atsam/include}/libchip/include/acc.h       |    0
 .../arm/atsam/include}/libchip/include/adc.h       |    0
 .../arm/atsam/include}/libchip/include/aes.h       |    0
 .../arm/atsam/include}/libchip/include/afe_dma.h   |    0
 .../arm/atsam/include}/libchip/include/afec.h      |    0
 .../arm/atsam/include}/libchip/include/chip.h      |    0
 .../arm/atsam/include}/libchip/include/dac_dma.h   |    0
 .../arm/atsam/include}/libchip/include/efc.h       |    0
 .../atsam/include}/libchip/include/exceptions.h    |    0
 .../arm/atsam/include}/libchip/include/flashd.h    |    0
 .../arm/atsam/include}/libchip/include/gmac.h      |    0
 .../arm/atsam/include}/libchip/include/gmacd.h     |    0
 .../arm/atsam/include}/libchip/include/hsmci.h     |    0
 .../arm/atsam/include}/libchip/include/icm.h       |    0
 .../arm/atsam/include}/libchip/include/isi.h       |    0
 .../arm/atsam/include}/libchip/include/iso7816_4.h |    0
 .../arm/atsam/include}/libchip/include/mcan.h      |    0
 .../arm/atsam/include}/libchip/include/mcid.h      |    0
 .../arm/atsam/include}/libchip/include/mediaLB.h   |    0
 .../arm/atsam/include}/libchip/include/mpu.h       |    0
 .../arm/atsam/include}/libchip/include/pio.h       |    0
 .../atsam/include}/libchip/include/pio_capture.h   |    0
 .../arm/atsam/include}/libchip/include/pio_it.h    |    0
 .../arm/atsam/include}/libchip/include/pmc.h       |    0
 .../arm/atsam/include}/libchip/include/pwmc.h      |    0
 .../arm/atsam/include}/libchip/include/qspi.h      |    0
 .../arm/atsam/include}/libchip/include/qspi_dma.h  |    0
 .../arm/atsam/include}/libchip/include/rstc.h      |    0
 .../arm/atsam/include}/libchip/include/rtc.h       |    0
 .../arm/atsam/include}/libchip/include/rtt.h       |    0
 .../include/same70/component/component_acc.h       |    0
 .../include/same70/component/component_aes.h       |    0
 .../include/same70/component/component_afec.h      |    0
 .../include/same70/component/component_chipid.h    |    0
 .../include/same70/component/component_dacc.h      |    0
 .../include/same70/component/component_efc.h       |    0
 .../include/same70/component/component_gmac.h      |    0
 .../include/same70/component/component_gpbr.h      |    0
 .../include/same70/component/component_hsmci.h     |    0
 .../include/same70/component/component_icm.h       |    0
 .../include/same70/component/component_isi.h       |    0
 .../include/same70/component/component_matrix.h    |    0
 .../include/same70/component/component_mcan.h      |    0
 .../include/same70/component/component_pio.h       |    0
 .../include/same70/component/component_pmc.h       |    0
 .../include/same70/component/component_pwm.h       |    0
 .../include/same70/component/component_qspi.h      |    0
 .../include/same70/component/component_rstc.h      |    0
 .../include/same70/component/component_rswdt.h     |    0
 .../include/same70/component/component_rtc.h       |    0
 .../include/same70/component/component_rtt.h       |    0
 .../include/same70/component/component_sdramc.h    |    0
 .../include/same70/component/component_smc.h       |    0
 .../include/same70/component/component_spi.h       |    0
 .../include/same70/component/component_ssc.h       |    0
 .../include/same70/component/component_supc.h      |    0
 .../include/same70/component/component_tc.h        |    0
 .../include/same70/component/component_trng.h      |    0
 .../include/same70/component/component_twihs.h     |    0
 .../include/same70/component/component_uart.h      |    0
 .../include/same70/component/component_usart.h     |    0
 .../include/same70/component/component_usbhs.h     |    0
 .../include/same70/component/component_utmi.h      |    0
 .../include/same70/component/component_wdt.h       |    0
 .../include/same70/component/component_xdmac.h     |    0
 .../libchip/include/same70/pio/pio_same70j19.h     |    0
 .../libchip/include/same70/pio/pio_same70j20.h     |    0
 .../libchip/include/same70/pio/pio_same70j21.h     |    0
 .../libchip/include/same70/pio/pio_same70n19.h     |    0
 .../libchip/include/same70/pio/pio_same70n20.h     |    0
 .../libchip/include/same70/pio/pio_same70n21.h     |    0
 .../libchip/include/same70/pio/pio_same70q19.h     |    0
 .../libchip/include/same70/pio/pio_same70q20.h     |    0
 .../libchip/include/same70/pio/pio_same70q21.h     |    0
 .../atsam/include}/libchip/include/same70/same70.h |    0
 .../include}/libchip/include/same70/same70j19.h    |    0
 .../include}/libchip/include/same70/same70j20.h    |    0
 .../include}/libchip/include/same70/same70j21.h    |    0
 .../include}/libchip/include/same70/same70n19.h    |    0
 .../include}/libchip/include/same70/same70n20.h    |    0
 .../include}/libchip/include/same70/same70n21.h    |    0
 .../include}/libchip/include/same70/same70q19.h    |    0
 .../include}/libchip/include/same70/same70q20.h    |    0
 .../include}/libchip/include/same70/same70q21.h    |    0
 .../libchip/include/same70/system_same70.h         |    0
 .../include/sams70/component/component_acc.h       |    0
 .../include/sams70/component/component_aes.h       |    0
 .../include/sams70/component/component_afec.h      |    0
 .../include/sams70/component/component_chipid.h    |    0
 .../include/sams70/component/component_dacc.h      |    0
 .../include/sams70/component/component_efc.h       |    0
 .../include/sams70/component/component_gpbr.h      |    0
 .../include/sams70/component/component_hsmci.h     |    0
 .../include/sams70/component/component_icm.h       |    0
 .../include/sams70/component/component_isi.h       |    0
 .../include/sams70/component/component_matrix.h    |    0
 .../include/sams70/component/component_pio.h       |    0
 .../include/sams70/component/component_pmc.h       |    0
 .../include/sams70/component/component_pwm.h       |    0
 .../include/sams70/component/component_qspi.h      |    0
 .../include/sams70/component/component_rstc.h      |    0
 .../include/sams70/component/component_rswdt.h     |    0
 .../include/sams70/component/component_rtc.h       |    0
 .../include/sams70/component/component_rtt.h       |    0
 .../include/sams70/component/component_sdramc.h    |    0
 .../include/sams70/component/component_smc.h       |    0
 .../include/sams70/component/component_spi.h       |    0
 .../include/sams70/component/component_ssc.h       |    0
 .../include/sams70/component/component_supc.h      |    0
 .../include/sams70/component/component_tc.h        |    0
 .../include/sams70/component/component_trng.h      |    0
 .../include/sams70/component/component_twihs.h     |    0
 .../include/sams70/component/component_uart.h      |    0
 .../include/sams70/component/component_usart.h     |    0
 .../include/sams70/component/component_usbhs.h     |    0
 .../include/sams70/component/component_utmi.h      |    0
 .../include/sams70/component/component_wdt.h       |    0
 .../include/sams70/component/component_xdmac.h     |    0
 .../libchip/include/sams70/pio/pio_sams70j19.h     |    0
 .../libchip/include/sams70/pio/pio_sams70j20.h     |    0
 .../libchip/include/sams70/pio/pio_sams70j21.h     |    0
 .../libchip/include/sams70/pio/pio_sams70n19.h     |    0
 .../libchip/include/sams70/pio/pio_sams70n20.h     |    0
 .../libchip/include/sams70/pio/pio_sams70n21.h     |    0
 .../libchip/include/sams70/pio/pio_sams70q19.h     |    0
 .../libchip/include/sams70/pio/pio_sams70q20.h     |    0
 .../libchip/include/sams70/pio/pio_sams70q21.h     |    0
 .../atsam/include}/libchip/include/sams70/sams70.h |    0
 .../include}/libchip/include/sams70/sams70j19.h    |    0
 .../include}/libchip/include/sams70/sams70j20.h    |    0
 .../include}/libchip/include/sams70/sams70j21.h    |    0
 .../include}/libchip/include/sams70/sams70n19.h    |    0
 .../include}/libchip/include/sams70/sams70n20.h    |    0
 .../include}/libchip/include/sams70/sams70n21.h    |    0
 .../include}/libchip/include/sams70/sams70q19.h    |    0
 .../include}/libchip/include/sams70/sams70q20.h    |    0
 .../include}/libchip/include/sams70/sams70q21.h    |    0
 .../libchip/include/sams70/system_sams70.h         |    0
 .../include/samv71/component/component_acc.h       |    0
 .../include/samv71/component/component_aes.h       |    0
 .../include/samv71/component/component_afec.h      |    0
 .../include/samv71/component/component_chipid.h    |    0
 .../include/samv71/component/component_dacc.h      |    0
 .../include/samv71/component/component_efc.h       |    0
 .../include/samv71/component/component_gmac.h      |    0
 .../include/samv71/component/component_gpbr.h      |    0
 .../include/samv71/component/component_hsmci.h     |    0
 .../include/samv71/component/component_icm.h       |    0
 .../include/samv71/component/component_isi.h       |    0
 .../include/samv71/component/component_matrix.h    |    0
 .../include/samv71/component/component_mcan.h      |    0
 .../include/samv71/component/component_mlb.h       |    0
 .../include/samv71/component/component_pio.h       |    0
 .../include/samv71/component/component_pmc.h       |    0
 .../include/samv71/component/component_pwm.h       |    0
 .../include/samv71/component/component_qspi.h      |    0
 .../include/samv71/component/component_rstc.h      |    0
 .../include/samv71/component/component_rswdt.h     |    0
 .../include/samv71/component/component_rtc.h       |    0
 .../include/samv71/component/component_rtt.h       |    0
 .../include/samv71/component/component_sdramc.h    |    0
 .../include/samv71/component/component_smc.h       |    0
 .../include/samv71/component/component_spi.h       |    0
 .../include/samv71/component/component_ssc.h       |    0
 .../include/samv71/component/component_supc.h      |    0
 .../include/samv71/component/component_tc.h        |    0
 .../include/samv71/component/component_trng.h      |    0
 .../include/samv71/component/component_twihs.h     |    0
 .../include/samv71/component/component_uart.h      |    0
 .../include/samv71/component/component_usart.h     |    0
 .../include/samv71/component/component_usbhs.h     |    0
 .../include/samv71/component/component_utmi.h      |    0
 .../include/samv71/component/component_wdt.h       |    0
 .../include/samv71/component/component_xdmac.h     |    0
 .../libchip/include/samv71/pio/pio_samv71j19.h     |    0
 .../libchip/include/samv71/pio/pio_samv71j20.h     |    0
 .../libchip/include/samv71/pio/pio_samv71j21.h     |    0
 .../libchip/include/samv71/pio/pio_samv71n19.h     |    0
 .../libchip/include/samv71/pio/pio_samv71n20.h     |    0
 .../libchip/include/samv71/pio/pio_samv71n21.h     |    0
 .../libchip/include/samv71/pio/pio_samv71q19.h     |    0
 .../libchip/include/samv71/pio/pio_samv71q20.h     |    0
 .../libchip/include/samv71/pio/pio_samv71q21.h     |    0
 .../atsam/include}/libchip/include/samv71/samv71.h |    0
 .../include}/libchip/include/samv71/samv71j19.h    |    0
 .../include}/libchip/include/samv71/samv71j20.h    |    0
 .../include}/libchip/include/samv71/samv71j21.h    |    0
 .../include}/libchip/include/samv71/samv71n19.h    |    0
 .../include}/libchip/include/samv71/samv71n20.h    |    0
 .../include}/libchip/include/samv71/samv71n21.h    |    0
 .../include}/libchip/include/samv71/samv71q19.h    |    0
 .../include}/libchip/include/samv71/samv71q20.h    |    0
 .../include}/libchip/include/samv71/samv71q21.h    |    0
 .../libchip/include/samv71/system_samv71.h         |    0
 .../arm/atsam/include}/libchip/include/sdramc.h    |    0
 .../arm/atsam/include}/libchip/include/smc.h       |    0
 .../arm/atsam/include}/libchip/include/spi.h       |    0
 .../arm/atsam/include}/libchip/include/spi_dma.h   |    0
 .../arm/atsam/include}/libchip/include/ssc.h       |    0
 .../arm/atsam/include}/libchip/include/supc.h      |    0
 .../arm/atsam/include}/libchip/include/tc.h        |    0
 .../arm/atsam/include}/libchip/include/timetick.h  |    0
 .../arm/atsam/include}/libchip/include/trace.h     |    0
 .../arm/atsam/include}/libchip/include/trng.h      |    0
 .../arm/atsam/include}/libchip/include/twi.h       |    0
 .../arm/atsam/include}/libchip/include/twid.h      |    0
 .../arm/atsam/include}/libchip/include/uart.h      |    0
 .../arm/atsam/include}/libchip/include/uart_dma.h  |    0
 .../arm/atsam/include}/libchip/include/usart.h     |    0
 .../arm/atsam/include}/libchip/include/usart_dma.h |    0
 .../arm/atsam/include}/libchip/include/usbhs.h     |    0
 .../arm/atsam/include}/libchip/include/video.h     |    0
 .../arm/atsam/include}/libchip/include/wdt.h       |    0
 .../libchip/include/xdma_hardware_interface.h      |    0
 .../arm/atsam/include}/libchip/include/xdmac.h     |    0
 .../arm/atsam/include}/libchip/include/xdmad.h     |    0
 .../gdbv850sim => bsps/arm/atsam}/include/tm27.h   |    0
 bsps/arm/beagle/headers.am                         |   14 +
 .../lib/libbsp => bsps}/arm/beagle/include/bsp.h   |    0
 .../arm/beagle/include/bsp}/bbb-gpio.h             |    0
 .../arm/beagle/include/bsp}/bbb-pwm.h              |    0
 .../arm/beagle/include/bsp}/beagleboneblack.h      |    0
 .../include => bsps/arm/beagle/include/bsp}/i2c.h  |    0
 .../include => bsps/arm/beagle/include/bsp}/irq.h  |    0
 .../usiii => bsps/arm/beagle}/include/tm27.h       |    0
 bsps/arm/csb336/headers.am                         |   11 +
 .../lib/libbsp => bsps}/arm/csb336/include/bsp.h   |    0
 .../libbsp => bsps}/arm/csb336/include/bsp/irq.h   |    0
 .../libbsp => bsps}/arm/csb336/include/mc9328mxl.h |    0
 .../niagara => bsps/arm/csb336}/include/tm27.h     |    0
 bsps/arm/csb337/headers.am                         |   21 +
 .../arm/csb337/include/at91rm9200.h                |    0
 .../arm/csb337/include/at91rm9200_dbgu.h           |    0
 .../arm/csb337/include/at91rm9200_emac.h           |    0
 .../arm/csb337/include/at91rm9200_gpio.h           |    0
 .../arm/csb337/include/at91rm9200_mem.h            |    0
 .../arm/csb337/include/at91rm9200_pmc.h            |    0
 .../arm/csb337/include/at91rm9200_usart.h          |    0
 .../lib/libbsp => bsps}/arm/csb337/include/bits.h  |    0
 .../lib/libbsp => bsps}/arm/csb337/include/bsp.h   |    0
 .../libbsp => bsps}/arm/csb337/include/bsp/irq.h   |    0
 .../console => bsps/arm/csb337/include}/font8x16.h |    0
 .../libbsp => bsps}/arm/csb337/include/sed1356.h   |    0
 .../arm/csb337/include}/sed1356_16bit.h            |    0
 .../sh/shsim => bsps/arm/csb337}/include/tm27.h    |    0
 bsps/arm/edb7312/headers.am                        |   11 +
 .../lib/libbsp => bsps}/arm/edb7312/include/bsp.h  |    0
 .../irq => bsps/arm/edb7312/include/bsp}/irq.h     |    0
 .../libbsp => bsps}/arm/edb7312/include/ep7312.h   |    0
 .../sh/gensh2 => bsps/arm/edb7312}/include/tm27.h  |    0
 bsps/arm/gdbarmsim/headers.am                      |   11 +
 .../libbsp => bsps}/arm/gdbarmsim/include/bsp.h    |    0
 .../arm/gdbarmsim/include/bsp}/irq.h               |    0
 .../arm/gdbarmsim/include/bsp}/swi.h               |    0
 .../gensh1 => bsps/arm/gdbarmsim}/include/tm27.h   |    0
 bsps/arm/gumstix/headers.am                        |   12 +
 .../lib/libbsp => bsps}/arm/gumstix/include/bsp.h  |    0
 .../libbsp => bsps}/arm/gumstix/include/bsp/irq.h  |    0
 .../libbsp => bsps}/arm/gumstix/include/ffuart.h   |    0
 .../libbsp => bsps}/arm/gumstix/include/pxa255.h   |    0
 .../arm/gumstix}/include/tm27.h                    |    0
 bsps/arm/headers.am                                |   45 +
 bsps/arm/imx/headers.am                            |   22 +
 .../arm/imx/include/arm/freescale/imx/imx_ccmvar.h |    0
 .../imx/include/arm/freescale/imx/imx_ecspireg.h   |    0
 .../arm/imx/include/arm/freescale/imx/imx_gpcreg.h |    0
 .../arm/imx/include/arm/freescale/imx/imx_i2creg.h |    0
 .../imx/include/arm/freescale/imx/imx_iomuxreg.h   |    0
 .../imx/include/arm/freescale/imx/imx_iomuxvar.h   |    0
 .../arm/imx/include/arm/freescale/imx/imx_srcreg.h |    0
 .../imx/include/arm/freescale/imx/imx_uartreg.h    |    0
 .../imx/include/arm/freescale/imx/imx_wdogreg.h    |    0
 {c/src/lib/libbsp => bsps}/arm/imx/include/bsp.h   |    0
 .../imx/include => bsps/arm/imx/include/bsp}/irq.h |    0
 .../arm/imx}/include/tm27.h                        |    0
 .../arm/include/bsp}/arm-a8core-start.h            |    0
 .../arm/include/bsp}/arm-a9mpcore-clock.h          |    0
 .../arm/include/bsp}/arm-a9mpcore-irq.h            |    0
 .../arm/include/bsp}/arm-a9mpcore-regs.h           |    0
 .../arm/include/bsp}/arm-a9mpcore-start.h          |    0
 .../arm/include/bsp}/arm-cp15-start.h              |    0
 .../include => bsps/arm/include/bsp}/arm-errata.h  |    0
 .../include => bsps/arm/include/bsp}/arm-gic-irq.h |    0
 .../arm/include/bsp}/arm-gic-regs.h                |    0
 .../arm/include/bsp}/arm-gic-tm27.h                |    0
 .../include => bsps/arm/include/bsp}/arm-gic.h     |    0
 .../arm/include/bsp}/arm-pl011-regs.h              |    0
 .../include => bsps/arm/include/bsp}/arm-pl011.h   |    0
 .../arm/include/bsp}/arm-pl050-regs.h              |    0
 .../include => bsps/arm/include/bsp}/arm-pl050.h   |    0
 .../arm/include/bsp}/arm-pl111-fb.h                |    0
 .../arm/include/bsp}/arm-pl111-regs.h              |    0
 .../arm/include/bsp}/arm-release-id.h              |    0
 .../include => bsps/arm/include/bsp}/armv7m-irq.h  |    0
 .../arm/include/bsp}/linker-symbols.h              |    0
 .../lpc/include => bsps/arm/include/bsp}/lpc-dma.h |    0
 .../lpc/include => bsps/arm/include/bsp}/lpc-emc.h |    0
 .../lpc/include => bsps/arm/include/bsp}/lpc-i2s.h |    0
 .../lpc/include => bsps/arm/include/bsp}/lpc-lcd.h |    0
 .../include => bsps/arm/include/bsp}/lpc-timer.h   |    0
 .../include => bsps/arm/include/bsp}/start.h       |    0
 .../CMSIS/Include => bsps/arm/include}/cmsis_gcc.h |    0
 .../CMSIS/Include => bsps/arm/include}/core_cm7.h  |    0
 .../Include => bsps/arm/include}/core_cmFunc.h     |    0
 .../Include => bsps/arm/include}/core_cmInstr.h    |    0
 .../Include => bsps/arm/include}/core_cmSimd.h     |    0
 .../include => bsps/arm/include/libcpu}/am335x.h   |    0
 .../include => bsps/arm/include/libcpu}/mmu.h      |    0
 .../include => bsps/arm/include/libcpu}/omap3.h    |    0
 .../arm/include/libcpu}/omap_timer.h               |    0
 .../arm/shared/comm => bsps/arm/include}/uart.h    |    0
 bsps/arm/lm3s69xx/headers.am                       |   15 +
 .../lib/libbsp => bsps}/arm/lm3s69xx/include/bsp.h |    0
 .../include => bsps/arm/lm3s69xx/include/bsp}/io.h |    0
 .../arm/lm3s69xx/include/bsp}/irq.h                |    0
 .../arm/lm3s69xx/include/bsp}/lm3s69xx.h           |    0
 .../arm/lm3s69xx/include/bsp}/ssi.h                |    0
 .../arm/lm3s69xx/include/bsp}/syscon.h             |    0
 .../arm/lm3s69xx/include/bsp}/uart.h               |    0
 .../virtex5 => bsps/arm/lm3s69xx}/include/tm27.h   |    0
 bsps/arm/lpc176x/headers.am                        |   30 +
 .../lib/libbsp => bsps}/arm/lpc176x/include/bsp.h  |    0
 .../arm/lpc176x/include/bsp}/adc-defs.h            |    0
 .../include => bsps/arm/lpc176x/include/bsp}/adc.h |    0
 .../arm/lpc176x/include/bsp}/can-defs.h            |    0
 .../include => bsps/arm/lpc176x/include/bsp}/can.h |    0
 .../arm/lpc176x/include/bsp}/common-types.h        |    0
 .../include => bsps/arm/lpc176x/include/bsp}/dma.h |    0
 .../arm/lpc176x/include/bsp}/gpio-defs.h           |    0
 .../arm/lpc176x/include/bsp}/io-defs.h             |    0
 .../include => bsps/arm/lpc176x/include/bsp}/io.h  |    0
 .../include => bsps/arm/lpc176x/include/bsp}/irq.h |    0
 .../arm/lpc176x/include/bsp}/lpc-clock-config.h    |    0
 .../arm/lpc176x/include/bsp}/lpc-gpio.h            |    0
 .../arm/lpc176x/include/bsp}/lpc176x.h             |    0
 .../arm/lpc176x/include/bsp}/mbed-pinmap.h         |    0
 .../arm/lpc176x/include/bsp}/pwmout-defs.h         |    0
 .../arm/lpc176x/include/bsp}/pwmout.h              |    0
 .../arm/lpc176x/include/bsp}/system-clocks.h       |    0
 .../arm/lpc176x/include/bsp}/timer-defs.h          |    0
 .../arm/lpc176x/include/bsp}/timer.h               |    0
 .../arm/lpc176x/include/bsp}/watchdog-defs.h       |    0
 .../arm/lpc176x/include/bsp}/watchdog.h            |    0
 .../virtex4 => bsps/arm/lpc176x}/include/tm27.h    |    0
 bsps/arm/lpc24xx/headers.am                        |   21 +
 .../lib/libbsp => bsps}/arm/lpc24xx/include/bsp.h  |    0
 .../include => bsps/arm/lpc24xx/include/bsp}/dma.h |    0
 .../include => bsps/arm/lpc24xx/include/bsp}/i2c.h |    0
 .../include => bsps/arm/lpc24xx/include/bsp}/io.h  |    0
 .../include => bsps/arm/lpc24xx/include/bsp}/irq.h |    0
 .../include => bsps/arm/lpc24xx/include/bsp}/lcd.h |    0
 .../arm/lpc24xx/include/bsp}/lpc-clock-config.h    |    0
 .../arm/lpc24xx/include/bsp}/lpc-ethernet-config.h |    0
 .../arm/lpc24xx/include/bsp}/lpc17xx.h             |    0
 .../arm/lpc24xx/include/bsp}/lpc24xx.h             |    0
 .../include => bsps/arm/lpc24xx/include/bsp}/ssp.h |    0
 .../arm/lpc24xx/include/bsp}/start-config.h        |    0
 .../arm/lpc24xx/include/bsp}/system-clocks.h       |    0
 .../virtex => bsps/arm/lpc24xx}/include/tm27.h     |    0
 bsps/arm/lpc32xx/headers.am                        |   19 +
 .../lib/libbsp => bsps}/arm/lpc32xx/include/bsp.h  |    0
 .../arm/lpc32xx/include/bsp}/boot.h                |    0
 .../include => bsps/arm/lpc32xx/include/bsp}/emc.h |    0
 .../include => bsps/arm/lpc32xx/include/bsp}/hsu.h |    0
 .../include => bsps/arm/lpc32xx/include/bsp}/i2c.h |    0
 .../include => bsps/arm/lpc32xx/include/bsp}/irq.h |    0
 .../arm/lpc32xx/include/bsp}/lpc-clock-config.h    |    0
 .../arm/lpc32xx/include/bsp}/lpc-ethernet-config.h |    0
 .../arm/lpc32xx/include/bsp}/lpc32xx.h             |    0
 .../include => bsps/arm/lpc32xx/include/bsp}/mmu.h |    0
 .../arm/lpc32xx/include/bsp}/nand-mlc.h            |    0
 .../lib/libbsp => bsps}/arm/lpc32xx/include/tm27.h |    0
 bsps/arm/raspberrypi/headers.am                    |   20 +
 .../libbsp => bsps}/arm/raspberrypi/include/bsp.h  |    0
 .../arm/raspberrypi/include/bsp}/fbcons.h          |    0
 .../arm/raspberrypi/include/bsp}/i2c.h             |    0
 .../arm/raspberrypi/include/bsp}/irq.h             |    0
 .../arm/raspberrypi/include/bsp}/mailbox.h         |    0
 .../arm/raspberrypi/include/bsp}/mmu.h             |    0
 .../arm/raspberrypi/include/bsp}/raspberrypi.h     |    0
 .../arm/raspberrypi/include/bsp}/rpi-fb.h          |    0
 .../arm/raspberrypi/include/bsp}/rpi-gpio.h        |    0
 .../arm/raspberrypi/include/bsp}/spi.h             |    0
 .../arm/raspberrypi/include/bsp}/usart.h           |    0
 .../arm/raspberrypi/include/bsp}/vc.h              |    0
 .../tqm8xx => bsps/arm/raspberrypi}/include/tm27.h |    0
 bsps/arm/realview-pbx-a9/headers.am                |   10 +
 .../arm/realview-pbx-a9/include/bsp.h              |    0
 .../arm/realview-pbx-a9/include/bsp}/irq.h         |    0
 .../arm/realview-pbx-a9/include/tm27.h             |    0
 bsps/arm/rtl22xx/headers.am                        |   11 +
 .../lib/libbsp => bsps}/arm/rtl22xx/include/bsp.h  |    0
 .../libbsp => bsps}/arm/rtl22xx/include/bsp/irq.h  |    0
 .../libbsp => bsps}/arm/rtl22xx/include/lpc22xx.h  |    0
 .../t32mppc => bsps/arm/rtl22xx}/include/tm27.h    |    0
 bsps/arm/smdk2410/headers.am                       |   14 +
 .../lib/libbsp => bsps}/arm/smdk2410/include/bsp.h |    0
 .../libbsp => bsps}/arm/smdk2410/include/bsp/irq.h |    0
 .../libbsp => bsps}/arm/smdk2410/include/s3c2400.h |    0
 .../libbsp => bsps}/arm/smdk2410/include/s3c2410.h |    0
 .../libbsp => bsps}/arm/smdk2410/include/s3c24xx.h |    0
 .../smc => bsps/arm/smdk2410/include}/smc.h        |    0
 .../qemuppc => bsps/arm/smdk2410}/include/tm27.h   |    0
 bsps/arm/stm32f4/headers.am                        |   29 +
 .../lib/libbsp => bsps}/arm/stm32f4/include/bsp.h  |    0
 .../include => bsps/arm/stm32f4/include/bsp}/i2c.h |    0
 .../include => bsps/arm/stm32f4/include/bsp}/io.h  |    0
 .../include => bsps/arm/stm32f4/include/bsp}/irq.h |    0
 .../include => bsps/arm/stm32f4/include/bsp}/rcc.h |    0
 .../arm/stm32f4/include/bsp}/stm32_i2c.h           |    0
 .../arm/stm32f4/include/bsp}/stm32_usart.h         |    0
 .../arm/stm32f4/include/bsp}/stm32f10xxx_exti.h    |    0
 .../arm/stm32f4/include/bsp}/stm32f10xxx_gpio.h    |    0
 .../arm/stm32f4/include/bsp}/stm32f10xxx_rcc.h     |    0
 .../arm/stm32f4/include/bsp}/stm32f4.h             |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_adc.h     |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_exti.h    |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_flash.h   |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_gpio.h    |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_otgfs.h   |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_pwr.h     |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_rcc.h     |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_syscfg.h  |    0
 .../arm/stm32f4/include/bsp}/stm32f4xxxx_tim.h     |    0
 .../arm/stm32f4/include/bsp}/usart.h               |    0
 .../mvme3100 => bsps/arm/stm32f4}/include/tm27.h   |    0
 bsps/arm/tms570/headers.am                         |   63 ++
 .../lib/libbsp => bsps}/arm/tms570/include/bsp.h   |    0
 .../include => bsps/arm/tms570/include/bsp}/irq.h  |    0
 .../arm/tms570/include/bsp}/system-clocks.h        |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_adc.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_ccmsr.h    |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_crc.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_dcan.h     |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_dcc.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_dma.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_dmm.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_efuse.h    |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_emacc.h    |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_emacm.h    |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_emif.h     |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_esm.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_flash.h    |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_flex_ray.h |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_gio.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_htu.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_i2c.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_iomm.h     |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_lin.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_mdio.h     |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_n2het.h    |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_pbist.h    |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_pcr.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_pll.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_pmm.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_pom.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_rti.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_rtp.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_sci.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_spi.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_stc.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_sys.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_sys2.h     |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_tcr.h      |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_tcram.h    |    0
 .../arm/tms570/include/bsp}/ti_herc/reg_vim.h      |    0
 .../arm/tms570/include/bsp}/tms570-pinmux.h        |    0
 .../arm/tms570/include/bsp}/tms570-pins.h          |    0
 .../arm/tms570/include/bsp}/tms570-pom.h           |    0
 .../arm/tms570/include/bsp}/tms570-rti.h           |    0
 .../arm/tms570/include/bsp}/tms570-sci-driver.h    |    0
 .../arm/tms570/include/bsp}/tms570-sci.h           |    0
 .../arm/tms570/include/bsp}/tms570-vim.h           |    0
 .../arm/tms570/include/bsp}/tms570.h               |    0
 .../arm/tms570/include/bsp}/tms570_hwinit.h        |    0
 .../arm/tms570/include/bsp}/tms570_selftest.h      |    0
 .../tms570/include/bsp}/tms570_selftest_parity.h   |    0
 .../arm/tms570/include/bsp}/tms570lc4357-pins.h    |    0
 .../arm/tms570/include/bsp}/tms570ls3137zwt-pins.h |    0
 .../mpc55xxevb => bsps/arm/tms570}/include/tm27.h  |    0
 bsps/arm/xilinx-zynq/headers.am                    |   15 +
 .../libbsp => bsps}/arm/xilinx-zynq/include/bsp.h  |    0
 .../xilinx-zynq/include/bsp}/cadence-i2c-regs.h    |    0
 .../arm/xilinx-zynq/include/bsp}/cadence-i2c.h     |    0
 .../arm/xilinx-zynq/include/bsp}/i2c.h             |    0
 .../arm/xilinx-zynq/include/bsp}/irq.h             |    0
 .../arm/xilinx-zynq/include/bsp}/zynq-uart-regs.h  |    0
 .../arm/xilinx-zynq/include/bsp}/zynq-uart.h       |    0
 .../libbsp => bsps}/arm/xilinx-zynq/include/tm27.h |    0
 bsps/bfin/TLL6527M/headers.am                      |    7 +
 .../libbsp => bsps}/bfin/TLL6527M/include/bsp.h    |    0
 .../libbsp => bsps}/bfin/TLL6527M/include/cplb.h   |    0
 .../libbsp => bsps}/bfin/TLL6527M/include/tm27.h   |    0
 bsps/bfin/bf537Stamp/headers.am                    |    6 +
 .../libbsp => bsps}/bfin/bf537Stamp/include/bsp.h  |    0
 .../bfin/bf537Stamp}/include/tm27.h                |    0
 bsps/bfin/eZKit533/headers.am                      |    7 +
 .../libbsp => bsps}/bfin/eZKit533/include/bsp.h    |    0
 .../libbsp => bsps}/bfin/eZKit533/include/cplb.h   |    0
 .../libbsp => bsps}/bfin/eZKit533/include/tm27.h   |    0
 bsps/bfin/headers.am                               |   37 +
 .../bfin/bf52x => bsps/bfin}/include/bf52x.h       |    0
 .../bfin/include/bsp}/interrupt.h                  |    0
 .../include => bsps/bfin/include/libcpu}/bf533.h   |    0
 .../include => bsps/bfin/include/libcpu}/bf537.h   |    0
 .../include => bsps/bfin/include/libcpu}/cecRegs.h |    0
 .../bfin/include/libcpu}/coreTimerRegs.h           |    0
 .../include => bsps/bfin/include/libcpu}/dmaRegs.h |    0
 .../bfin/include/libcpu}/ebiuRegs.h                |    0
 .../bfin/include/libcpu}/ethernet.h                |    0
 .../bfin/include/libcpu}/ethernetRegs.h            |    0
 .../bfin/include/libcpu}/gpioRegs.h                |    0
 .../bfin/include/libcpu}/interrupt.h               |    0
 .../bfin/include/libcpu}/memoryRegs.h              |    0
 .../bfin/mmu => bsps/bfin/include/libcpu}/mmu.h    |    0
 .../include => bsps/bfin/include/libcpu}/mmuRegs.h |    0
 .../include => bsps/bfin/include/libcpu}/ppiRegs.h |    0
 .../include => bsps/bfin/include/libcpu}/rtcRegs.h |    0
 .../include => bsps/bfin/include/libcpu}/sicRegs.h |    0
 .../bfin/serial => bsps/bfin/include/libcpu}/spi.h |    0
 .../include => bsps/bfin/include/libcpu}/spiRegs.h |    0
 .../serial => bsps/bfin/include/libcpu}/sport.h    |    0
 .../bfin/include/libcpu}/sportRegs.h               |    0
 .../bfin/include/libcpu}/timerRegs.h               |    0
 .../bfin/serial => bsps/bfin/include/libcpu}/twi.h |    0
 .../include => bsps/bfin/include/libcpu}/twiRegs.h |    0
 .../serial => bsps/bfin/include/libcpu}/uart.h     |    0
 .../bfin/include/libcpu}/uartRegs.h                |    0
 .../bfin/include/libcpu}/wdogRegs.h                |    0
 bsps/epiphany/epiphany_sim/headers.am              |   10 +
 .../epiphany/epiphany_sim/include/bsp.h            |    0
 .../epiphany/epiphany_sim/include/bsp}/irq.h       |    0
 .../epiphany/epiphany_sim}/include/tm27.h          |    0
 bsps/epiphany/headers.am                           |    5 +
 .../epiphany/include/bsp}/linker-symbols.h         |    0
 bsps/headers.am                                    |   83 ++
 bsps/i386/headers.am                               |   20 +
 .../shared/irq => bsps/i386/include/bsp}/apic.h    |    0
 .../shared/irq => bsps/i386/include/bsp}/irq.h     |    0
 .../shared/irq => bsps/i386/include/bsp}/irq_asm.h |    0
 .../i386/include/bsp}/realmode_int.h               |    0
 .../smp => bsps/i386/include/bsp}/smp-imps.h       |    0
 .../comm => bsps/i386/include/bsp}/tty_drv.h       |    0
 .../shared/comm => bsps/i386/include}/i386_io.h    |    0
 .../i386 => bsps/i386/include/libcpu}/byteorder.h  |    0
 .../i386 => bsps/i386/include/libcpu}/cpuModel.h   |    0
 .../i386 => bsps/i386/include/libcpu}/page.h       |    0
 .../i386/shared/comm => bsps/i386/include}/uart.h  |    0
 bsps/i386/pc386/headers.am                         |   25 +
 .../lib/libbsp => bsps}/i386/pc386/include/bsp.h   |    0
 .../i386/pc386/include/bsp}/bspimpl.h              |    0
 .../i386/pc386/include/bsp}/exar17d15x.h           |    0
 .../i386/pc386/include/bsp}/fb_default_mode.h      |    0
 .../i386/pc386/include/bsp}/fb_vesa.h              |    0
 .../i386/pc386/include/bsp}/rtd316.h               |    0
 .../i386/pc386/include/bsp}/tblsizes.h             |    0
 .../include => bsps/i386/pc386/include/bsp}/vbe3.h |    0
 .../lib/libbsp => bsps}/i386/pc386/include/crt.h   |    0
 .../lib/libbsp => bsps}/i386/pc386/include/edid.h  |    0
 .../console => bsps/i386/pc386/include/rtems}/kd.h |    0
 .../i386/pc386/include/rtems}/keyboard.h           |    0
 .../i386/pc386/include/rtems}/ps2_drv.h            |    0
 .../i386/pc386/include/rtems}/vgacons.h            |    0
 .../lib/libbsp => bsps}/i386/pc386/include/tm27.h  |    0
 .../shared/vmeUniverse => bsps/include/bsp}/VME.h  |    0
 .../vmeUniverse => bsps/include/bsp}/VMEDMA.h      |    0
 .../shared/include => bsps/include/bsp}/bootcard.h |    0
 .../include/bsp}/bspVmeDmaList.h                   |    0
 .../include => bsps/include/bsp}/console-polled.h  |    0
 .../include => bsps/include/bsp}/console-termios.h |    0
 .../include/bsp}/default-initial-extension.h       |    0
 .../shared/include => bsps/include/bsp}/fatal.h    |    0
 .../shared/include => bsps/include/bsp}/fdt.h      |    0
 .../shared/include => bsps/include/bsp}/gpio.h     |    0
 .../include => bsps/include/bsp}/irq-generic.h     |    0
 .../shared/include => bsps/include/bsp}/irq-info.h |    0
 .../shared/include => bsps/include/bsp}/mm.h       |    0
 .../include => bsps/include/bsp}/stackalloc.h      |    0
 .../shared/include => bsps/include/bsp}/u-boot.h   |    0
 .../include/bsp}/uart-output-char.h                |    0
 .../shared/include => bsps/include/bsp}/utility.h  |    0
 .../vmeUniverse => bsps/include/bsp}/vmeTsi148.h   |    0
 .../include/bsp}/vmeTsi148DMA.h                    |    0
 .../vmeUniverse => bsps/include/bsp}/vmeUniverse.h |    0
 .../include/bsp}/vmeUniverseDMA.h                  |    0
 .../vmeUniverse => bsps/include/bsp}/vme_am_defs.h |    0
 .../flash => bsps/include/libchip}/am29lv160.h     |    0
 {c/src/libchip/ide => bsps/include/libchip}/ata.h  |    0
 .../ide => bsps/include/libchip}/ata_internal.h    |    0
 .../network => bsps/include/libchip}/cs8900.h      |    0
 .../include/libchip}/disp_hcms29xx.h               |    0
 .../rtc => bsps/include/libchip}/ds1375-rtc.h      |    0
 .../network => bsps/include/libchip}/greth.h       |    0
 .../i2c => bsps/include/libchip}/i2c-2b-eeprom.h   |    0
 .../i2c => bsps/include/libchip}/i2c-ds1621.h      |    0
 .../i2c => bsps/include/libchip}/i2c-sc620.h       |    0
 .../network => bsps/include/libchip}/i82586var.h   |    0
 .../libchip/rtc => bsps/include/libchip}/icm7170.h |    0
 .../ide => bsps/include/libchip}/ide_ctrl.h        |    0
 .../ide => bsps/include/libchip}/ide_ctrl_cfg.h    |    0
 .../ide => bsps/include/libchip}/ide_ctrl_io.h     |    0
 .../network => bsps/include/libchip}/if_dcreg.h    |    0
 .../network => bsps/include/libchip}/if_fxpvar.h   |    0
 .../libchip/rtc => bsps/include/libchip}/m48t08.h  |    0
 .../rtc => bsps/include/libchip}/mc146818a.h       |    0
 .../serial => bsps/include/libchip}/mc68681.h      |    0
 .../serial => bsps/include/libchip}/ns16550.h      |    0
 .../serial => bsps/include/libchip}/ns16550_p.h    |    0
 .../network => bsps/include/libchip}/open_eth.h    |    0
 {c/src/libchip/rtc => bsps/include/libchip}/rtc.h  |    0
 .../serial => bsps/include/libchip}/serial.h       |    0
 .../serial => bsps/include/libchip}/sersupp.h      |    0
 .../network => bsps/include/libchip}/smc91111.h    |    0
 .../network => bsps/include/libchip}/smc91111exp.h |    0
 .../network => bsps/include/libchip}/sonic.h       |    0
 .../include/libchip}/spi-flash-m25p40.h            |    0
 .../include/libchip}/spi-fram-fm25l256.h           |    0
 .../i2c => bsps/include/libchip}/spi-memdrv.h      |    0
 .../i2c => bsps/include/libchip}/spi-sd-card.h     |    0
 .../network => bsps/include/libchip}/wd80x3.h      |    0
 .../serial => bsps/include/libchip}/z85c30.h       |    0
 {c/src/libchip/shmdr => bsps/include}/mpci.h       |    0
 .../shared/umon => bsps/include/rtems}/umon.h      |    0
 .../include => bsps/include/rtems}/zilog/z8036.h   |    0
 .../include => bsps/include/rtems}/zilog/z8530.h   |    0
 {c/src/libchip/shmdr => bsps/include}/shm_driver.h |    0
 .../lib/libbsp/shared => bsps/include}/umon/cli.h  |    0
 .../libbsp/shared => bsps/include}/umon/monlib.h   |    0
 .../lib/libbsp/shared => bsps/include}/umon/tfs.h  |    0
 bsps/lm32/headers.am                               |   18 +
 .../shared/include => bsps/lm32/include/bsp}/irq.h |    0
 .../lm32/include/bsp}/milkymist_ac97.h             |    0
 .../lm32/include/bsp}/milkymist_buttons.h          |    0
 .../lm32/include/bsp}/milkymist_dmx.h              |    0
 .../lm32/include/bsp}/milkymist_flash.h            |    0
 .../lm32/include/bsp}/milkymist_gpio.h             |    0
 .../lm32/include/bsp}/milkymist_ir.h               |    0
 .../lm32/include/bsp}/milkymist_memcard.h          |    0
 .../lm32/include/bsp}/milkymist_midi.h             |    0
 .../lm32/include/bsp}/milkymist_pfpu.h             |    0
 .../lm32/include/bsp}/milkymist_tmu.h              |    0
 .../lm32/include/bsp}/milkymist_usbinput.h         |    0
 .../lm32/include/bsp}/milkymist_versions.h         |    0
 .../lm32/include/bsp}/milkymist_video.h            |    0
 bsps/lm32/lm32_evr/headers.am                      |    7 +
 .../libbsp => bsps}/lm32/lm32_evr/include/bsp.h    |    0
 .../lm32/lm32_evr/include/system_conf.h            |    0
 .../libbsp => bsps}/lm32/lm32_evr/include/tm27.h   |    0
 bsps/lm32/milkymist/headers.am                     |    7 +
 .../libbsp => bsps}/lm32/milkymist/include/bsp.h   |    0
 .../lm32/milkymist/include/system_conf.h           |    0
 .../lm32/milkymist}/include/tm27.h                 |    0
 bsps/m32c/m32cbsp/headers.am                       |    6 +
 .../lib/libbsp => bsps}/m32c/m32cbsp/include/bsp.h |    0
 .../no_bsp => bsps/m32c/m32cbsp}/include/tm27.h    |    0
 bsps/m68k/av5282/headers.am                        |    6 +
 .../lib/libbsp => bsps}/m68k/av5282/include/bsp.h  |    0
 .../lib/libbsp => bsps}/m68k/av5282/include/tm27.h |    0
 bsps/m68k/csb360/headers.am                        |    6 +
 .../lib/libbsp => bsps}/m68k/csb360/include/bsp.h  |    0
 .../lib/libbsp => bsps}/m68k/csb360/include/tm27.h |    0
 bsps/m68k/gen68340/headers.am                      |   11 +
 .../libbsp => bsps}/m68k/gen68340/include/bsp.h    |    0
 .../m68k/gen68340/include/m340timer.h              |    0
 .../m68k/gen68340/include/m340uart.h               |    0
 .../libbsp => bsps}/m68k/gen68340/include/m68340.h |    0
 .../m68k/gen68340/include/m68340.inc               |    0
 .../m68k/gen68340/include/m68349.inc               |    0
 .../m68k/gen68340}/include/tm27.h                  |    0
 bsps/m68k/gen68360/headers.am                      |    6 +
 .../libbsp => bsps}/m68k/gen68360/include/bsp.h    |    0
 .../libbsp => bsps}/m68k/gen68360/include/tm27.h   |    0
 bsps/m68k/genmcf548x/headers.am                    |   10 +
 .../libbsp => bsps}/m68k/genmcf548x/include/bsp.h  |    0
 .../m68k/genmcf548x/include/bsp}/irq.h             |    0
 .../libbsp => bsps}/m68k/genmcf548x/include/tm27.h |    0
 bsps/m68k/headers.am                               |   47 +
 .../m68k/include/bsp}/linker-symbols.h             |    0
 .../m68k/include/mcf5206}/mcf5206e.h               |    0
 .../m68k/include/mcf5206}/mcfmbus.h                |    0
 .../m68k/include/mcf5206}/mcfuart.h                |    0
 .../m68k/include/mcf5223x}/mcf5223x.h              |    0
 .../include => bsps/m68k/include/mcf5225x}/fec.h   |    0
 .../m68k/include/mcf5225x}/mcf5225x.h              |    0
 .../m68k/include/mcf5235}/mcf5235.h                |    0
 .../m68k/include/mcf5272}/mcf5272.h                |    0
 .../m68k/include/mcf5282}/mcf5282.h                |    0
 .../m68k/include/mcf532x}/mcf532x.h                |    0
 .../mcdma => bsps/m68k/include/mcf548x}/MCD_dma.h  |    0
 .../m68k/include/mcf548x}/MCD_progCheck.h          |    0
 .../m68k/include/mcf548x}/MCD_tasksInit.h          |    0
 .../m68k/include/mcf548x}/mcdma_glue.h             |    0
 .../m68k/include/mcf548x}/mcf548x.h                |    0
 .../shared/mvme => bsps/m68k/include}/mvme16x_hw.h |    0
 bsps/m68k/mcf5206elite/headers.am                  |   10 +
 .../m68k/mcf5206elite/include/bsp.h                |    0
 .../m68k/mcf5206elite/include/ds1307.h             |    0
 .../m68k/mcf5206elite/include/i2c.h                |    0
 .../m68k/mcf5206elite}/include/i2cdrv.h            |    0
 .../m68k/mcf5206elite/include/nvram.h              |    0
 .../m68k/mcf5206elite/include/tm27.h               |    0
 bsps/m68k/mcf52235/headers.am                      |    6 +
 .../libbsp => bsps}/m68k/mcf52235/include/bsp.h    |    0
 .../libbsp => bsps}/m68k/mcf52235/include/tm27.h   |    0
 bsps/m68k/mcf5225x/headers.am                      |    6 +
 .../libbsp => bsps}/m68k/mcf5225x/include/bsp.h    |    0
 .../libbsp => bsps}/m68k/mcf5225x/include/tm27.h   |    0
 bsps/m68k/mcf5235/headers.am                       |    6 +
 .../lib/libbsp => bsps}/m68k/mcf5235/include/bsp.h |    0
 .../libbsp => bsps}/m68k/mcf5235/include/tm27.h    |    0
 bsps/m68k/mcf5329/headers.am                       |    6 +
 .../lib/libbsp => bsps}/m68k/mcf5329/include/bsp.h |    0
 .../libbsp => bsps}/m68k/mcf5329/include/tm27.h    |    0
 bsps/m68k/mrm332/headers.am                        |    7 +
 .../lib/libbsp => bsps}/m68k/mrm332/include/bsp.h  |    0
 .../libbsp => bsps}/m68k/mrm332/include/mrm332.h   |    0
 .../moxiesim => bsps/m68k/mrm332}/include/tm27.h   |    0
 bsps/m68k/mvme147/headers.am                       |    6 +
 .../lib/libbsp => bsps}/m68k/mvme147/include/bsp.h |    0
 .../libbsp => bsps}/m68k/mvme147/include/tm27.h    |    0
 bsps/m68k/mvme147s/headers.am                      |    6 +
 .../libbsp => bsps}/m68k/mvme147s/include/bsp.h    |    0
 .../libbsp => bsps}/m68k/mvme147s/include/tm27.h   |    0
 bsps/m68k/mvme162/headers.am                       |    7 +
 .../lib/libbsp => bsps}/m68k/mvme162/include/bsp.h |    0
 .../m68k/mvme162/include/page_table.h              |    0
 .../libbsp => bsps}/m68k/mvme162/include/tm27.h    |    0
 bsps/m68k/mvme167/headers.am                       |    7 +
 .../lib/libbsp => bsps}/m68k/mvme167/include/bsp.h |    0
 .../m68k/mvme167/include/page_table.h              |    0
 .../libbsp => bsps}/m68k/mvme167/include/tm27.h    |    0
 bsps/m68k/uC5282/headers.am                        |    6 +
 .../lib/libbsp => bsps}/m68k/uC5282/include/bsp.h  |    0
 .../lib/libbsp => bsps}/m68k/uC5282/include/tm27.h |    0
 bsps/mips/csb350/headers.am                        |   10 +
 .../lib/libbsp => bsps}/mips/csb350/include/bsp.h  |    0
 .../include => bsps/mips/csb350/include/bsp}/irq.h |    0
 .../lib/libbsp => bsps}/mips/csb350/include/tm27.h |    0
 bsps/mips/headers.am                               |   15 +
 bsps/mips/hurricane/headers.am                     |   11 +
 .../libbsp => bsps}/mips/hurricane/include/bsp.h   |    0
 .../mips/hurricane/include/bsp}/irq.h              |    0
 .../mips/hurricane}/include/tm27.h                 |    0
 .../libbsp => bsps}/mips/hurricane/include/usc.h   |    0
 .../shared/irq => bsps/mips/include/bsp}/i8259.h   |    0
 .../shared/liblnk => bsps/mips/include/bsp}/regs.h |    0
 .../include => bsps/mips/include/libcpu}/au1x00.h  |    0
 .../mips/include/libcpu}/isr_entries.h             |    0
 .../include => bsps/mips/include/libcpu}/rm5231.h  |    0
 .../include => bsps/mips/include/libcpu}/tx3904.h  |    0
 .../include => bsps/mips/include/libcpu}/tx4925.h  |    0
 .../include => bsps/mips/include/libcpu}/tx4938.h  |    0
 bsps/mips/jmr3904/headers.am                       |   10 +
 .../lib/libbsp => bsps}/mips/jmr3904/include/bsp.h |    0
 .../mips/jmr3904/include/bsp}/irq.h                |    0
 .../libbsp => bsps}/mips/jmr3904/include/tm27.h    |    0
 bsps/mips/malta/headers.am                         |   11 +
 .../lib/libbsp => bsps}/mips/malta/include/bsp.h   |    0
 .../include => bsps/mips/malta/include/bsp}/irq.h  |    0
 .../include => bsps/mips/malta/include/bsp}/pci.h  |    0
 .../rbtx4925 => bsps/mips/malta}/include/tm27.h    |    0
 bsps/mips/rbtx4925/headers.am                      |   10 +
 .../libbsp => bsps}/mips/rbtx4925/include/bsp.h    |    0
 .../mips/rbtx4925/include/bsp}/irq.h               |    0
 .../malta => bsps/mips/rbtx4925}/include/tm27.h    |    0
 bsps/mips/rbtx4938/headers.am                      |   10 +
 .../libbsp => bsps}/mips/rbtx4938/include/bsp.h    |    0
 .../mips/rbtx4938/include/bsp}/irq.h               |    0
 .../mips/rbtx4938}/include/tm27.h                  |    0
 bsps/moxie/moxiesim/headers.am                     |    6 +
 .../libbsp => bsps}/moxie/moxiesim/include/bsp.h   |    0
 .../mrm332 => bsps/moxie/moxiesim}/include/tm27.h  |    0
 bsps/nios2/nios2_iss/headers.am                    |    6 +
 .../libbsp => bsps}/nios2/nios2_iss/include/bsp.h  |    0
 .../nios2/nios2_iss}/include/tm27.h                |    0
 bsps/no_cpu/no_bsp/headers.am                      |    6 +
 .../libbsp => bsps}/no_cpu/no_bsp/include/bsp.h    |    0
 .../m32cbsp => bsps/no_cpu/no_bsp}/include/tm27.h  |    0
 bsps/or1k/generic_or1k/headers.am                  |   12 +
 .../or1k/generic_or1k/include/bsp.h                |    0
 .../or1k/generic_or1k/include/bsp}/generic_or1k.h  |    0
 .../or1k/generic_or1k/include/bsp}/irq.h           |    0
 .../or1k/generic_or1k/include/bsp}/uart.h          |    0
 .../or1k/generic_or1k}/include/tm27.h              |    0
 bsps/or1k/headers.am                               |    6 +
 .../include => bsps/or1k/include/bsp}/cache_.h     |    0
 .../or1k/include/bsp}/linker-symbols.h             |    0
 bsps/powerpc/beatnik/headers.am                    |   22 +
 .../libbsp => bsps}/powerpc/beatnik/include/bsp.h  |    0
 .../powerpc/beatnik/include/bsp}/VMEConfig.h       |    0
 .../beatnik/include/bsp}/bsp_bsdnet_attach.h       |    0
 .../beatnik/include/bsp}/early_enet_link_status.h  |    0
 .../powerpc/beatnik/include/bsp}/gt_timer.h        |    0
 .../powerpc/beatnik/include/bsp}/gti2c_busdrv.h    |    0
 .../powerpc/beatnik/include/bsp}/gti2creg.h        |    0
 .../powerpc/beatnik/include/bsp}/gtintrreg.h       |    0
 .../powerpc/beatnik/include/bsp}/gtpcireg.h        |    0
 .../powerpc/beatnik/include/bsp}/gtreg.h           |    0
 .../powerpc/beatnik/include/bsp}/if_em_pub.h       |    0
 .../powerpc/beatnik/include/bsp}/if_gfe_pub.h      |    0
 .../powerpc/beatnik/include/bsp}/if_mve_pub.h      |    0
 .../irq => bsps/powerpc/beatnik/include/bsp}/irq.h |    0
 .../powerpc/beatnik}/include/tm27.h                |    0
 bsps/powerpc/gen5200/headers.am                    |   45 +
 .../libbsp => bsps}/powerpc/gen5200/include/bsp.h  |    0
 .../powerpc/gen5200/include/bsp}/ata.h             |    0
 .../powerpc/gen5200/include/bsp}/bestcomm.h        |    0
 .../gen5200/include/bsp}/bestcomm/bestcomm_api.h   |    0
 .../gen5200/include/bsp}/bestcomm/bestcomm_glue.h  |    0
 .../gen5200/include/bsp}/bestcomm/bestcomm_priv.h  |    0
 .../gen5200/include/bsp}/bestcomm/dma_image.capi.h |    0
 .../gen5200/include/bsp}/bestcomm/dma_image.h      |    0
 .../bsp}/bestcomm/include/mgt5200/mgt5200.h        |    0
 .../include/bsp}/bestcomm/include/mgt5200/sdma.h   |    0
 .../include/bsp}/bestcomm/include/ppctypes.h       |    0
 .../bsp}/bestcomm/task_api/bestcomm_api_mem.h      |    0
 .../bsp}/bestcomm/task_api/bestcomm_cntrl.h        |    0
 .../bsp}/bestcomm/task_api/tasksetup_bdtable.h     |    0
 .../bsp}/bestcomm/task_api/tasksetup_general.h     |    0
 .../powerpc/gen5200/include/bsp}/bestcomm_ops.h    |    0
 .../powerpc/gen5200/include/bsp}/i2c.h             |    0
 .../powerpc/gen5200/include/bsp}/i2cdrv.h          |    0
 .../powerpc/gen5200/include/bsp}/irq.h             |    0
 .../powerpc/gen5200/include/bsp}/mpc5200.h         |    0
 .../powerpc/gen5200/include/bsp}/mscan-base.h      |    0
 .../powerpc/gen5200/include/bsp}/mscan.h           |    0
 .../powerpc/gen5200/include/bsp}/nvram.h           |    0
 .../powerpc/gen5200/include/bsp}/slicetimer.h      |    0
 .../powerpc/gen5200/include/bsp}/u-boot-config.h   |    0
 .../libbsp => bsps}/powerpc/gen5200/include/tm27.h |    0
 bsps/powerpc/gen83xx/headers.am                    |   13 +
 .../libbsp => bsps}/powerpc/gen83xx/include/bsp.h  |    0
 .../powerpc/gen83xx/include/bsp}/hwreg_vals.h      |    0
 .../powerpc/gen83xx/include/bsp}/irq.h             |    0
 .../powerpc/gen83xx/include/bsp}/tsec-config.h     |    0
 .../powerpc/gen83xx/include/bsp}/u-boot-config.h   |    0
 .../libbsp => bsps}/powerpc/gen83xx/include/tm27.h |    0
 bsps/powerpc/haleakala/headers.am                  |   11 +
 .../powerpc/haleakala/include/bsp.h                |    0
 .../powerpc/haleakala/include/bsp}/irq.h           |    0
 .../powerpc/haleakala/include/mmu_405.h            |    0
 .../powerpc/haleakala}/include/tm27.h              |    0
 bsps/powerpc/headers.am                            |  101 ++
 .../powerpc/include/bsp}/consoleIo.h               |    0
 .../flash => bsps/powerpc/include/bsp}/flashPgm.h  |    0
 .../powerpc/include/bsp}/flashPgmPvt.h             |    0
 .../powerpc/include/bsp}/irq_supp.h                |    0
 .../powerpc/include/bsp}/linker-symbols.h          |    0
 .../powerpc/include/bsp}/motorola.h                |    0
 .../openpic => bsps/powerpc/include/bsp}/openpic.h |    0
 .../shared/pci => bsps/powerpc/include/bsp}/pci.h  |    0
 .../residual => bsps/powerpc/include/bsp}/pnp.h    |    0
 .../powerpc/include/bsp}/residual.h                |    0
 .../include => bsps/powerpc/include/bsp}/start.h   |    0
 .../include => bsps/powerpc/include/bsp}/tictac.h  |    0
 .../network => bsps/powerpc/include/bsp}/tsec.h    |    0
 .../powerpc/include/bsp}/u-boot-board-info.h       |    0
 .../console => bsps/powerpc/include/bsp}/uart.h    |    0
 .../powerpc/include/bsp}/vectors.h                 |    0
 .../motorola => bsps/powerpc/include/bsp}/vpd.h    |    0
 .../mpc505/ictrl => bsps/powerpc/include}/ictrl.h  |    0
 .../mmu => bsps/powerpc/include/libcpu}/bat.h      |    0
 .../powerpc/include/libcpu}/byteorder.h            |    0
 .../powerpc/include/libcpu}/c_clock.h              |    0
 .../powerpc/include/libcpu}/cpuIdent.h             |    0
 .../mmu => bsps/powerpc/include/libcpu}/e500_mmu.h |    0
 .../include => bsps/powerpc/include/libcpu}/io.h   |    0
 .../irq => bsps/powerpc/include/libcpu}/irq.h      |    0
 .../include => bsps/powerpc/include/libcpu}/mmu.h  |    0
 .../include => bsps/powerpc/include/libcpu}/page.h |    0
 .../powerpc/include/libcpu}/pgtable.h              |    0
 .../powerpc/include/libcpu}/powerpc-utility.h      |    0
 .../mmu => bsps/powerpc/include/libcpu}/pte121.h   |    0
 .../powerpc/include/libcpu}/raw_exception.h        |    0
 .../include => bsps/powerpc/include/libcpu}/spr.h  |    0
 .../powerpc/include/libcpu}/stackTrace.h           |    0
 .../powerpc/include/libcpu}/vectors.h              |    0
 .../powerpc/include/mpc55xx}/dspi.h                |    0
 .../powerpc/include/mpc55xx}/edma.h                |    0
 .../powerpc/include/mpc55xx}/emios.h               |    0
 .../powerpc/include/mpc55xx}/fsl-mpc551x.h         |    0
 .../powerpc/include/mpc55xx}/fsl-mpc555x.h         |    0
 .../powerpc/include/mpc55xx}/fsl-mpc556x.h         |    0
 .../powerpc/include/mpc55xx}/fsl-mpc564xL.h        |    0
 .../powerpc/include/mpc55xx}/fsl-mpc5668.h         |    0
 .../powerpc/include/mpc55xx}/fsl-mpc567x.h         |    0
 .../powerpc/include/mpc55xx}/mpc55xx.h             |    0
 .../powerpc/include/mpc55xx}/reg-defs.h            |    0
 .../powerpc/include/mpc55xx}/regs-edma.h           |    0
 .../powerpc/include/mpc55xx}/regs-mmu.h            |    0
 .../powerpc/include/mpc55xx}/regs.h                |    0
 .../include => bsps/powerpc/include/mpc55xx}/siu.h |    0
 .../powerpc/include/mpc55xx}/watchdog.h            |    0
 .../mpc5xx => bsps/powerpc}/include/mpc5xx.h       |    0
 .../powerpc/include/mpc5xx}/console.h              |    0
 .../mpc8260 => bsps/powerpc}/include/mpc8260.h     |    0
 .../powerpc/include/mpc8260}/console.h             |    0
 .../include => bsps/powerpc/include/mpc8260}/cpm.h |    0
 .../include => bsps/powerpc/include/mpc8260}/mmu.h |    0
 .../include => bsps/powerpc/include/mpc83xx}/gtm.h |    0
 .../powerpc/include/mpc83xx}/mpc83xx.h             |    0
 .../powerpc/include/mpc83xx}/mpc83xx_i2cdrv.h      |    0
 .../powerpc/include/mpc83xx}/mpc83xx_spidrv.h      |    0
 .../mpc8xx => bsps/powerpc}/include/mpc8xx.h       |    0
 .../powerpc/include/mpc8xx}/console.h              |    0
 .../include => bsps/powerpc/include/mpc8xx}/cpm.h  |    0
 .../include => bsps/powerpc/include/mpc8xx}/mmu.h  |    0
 .../shared => bsps/powerpc}/include/nvram.h        |    0
 .../powerpc/include/ppc4xx}/ppc405ex.h             |    0
 .../powerpc/include/ppc4xx}/ppc405gp.h             |    0
 .../powerpc/include}/rtems/powerpc/cache.h         |    0
 .../powerpc/include}/rtems/powerpc/debugmod.h      |    0
 .../powerpc/include}/rtems/powerpc/powerpc.h       |    0
 .../tty_drv => bsps/powerpc/include}/tty_drv.h     |    0
 bsps/powerpc/motorola_powerpc/headers.am           |   11 +
 .../powerpc/motorola_powerpc/include/bsp.h         |    0
 .../motorola_powerpc/include/bsp/VMEConfig.h       |    0
 .../powerpc/motorola_powerpc/include/bsp/irq.h     |    0
 .../powerpc/motorola_powerpc/include/tm27.h        |    0
 bsps/powerpc/mpc55xxevb/headers.am                 |   15 +
 .../powerpc/mpc55xxevb/include/bsp.h               |    0
 .../powerpc/mpc55xxevb/include/bsp}/console-esci.h |    0
 .../mpc55xxevb/include/bsp}/console-generic.h      |    0
 .../mpc55xxevb/include/bsp}/console-linflex.h      |    0
 .../powerpc/mpc55xxevb/include/bsp/irq.h           |    0
 .../mpc55xxevb/include/bsp}/mpc55xx-config.h       |    0
 .../powerpc/mpc55xxevb/include/bsp}/smsc9218i.h    |    0
 .../powerpc/mpc55xxevb}/include/tm27.h             |    0
 bsps/powerpc/mpc8260ads/headers.am                 |   10 +
 .../powerpc/mpc8260ads/include/bsp.h               |    0
 .../powerpc/mpc8260ads/include/bsp}/irq.h          |    0
 .../powerpc/mpc8260ads/include/tm27.h              |    0
 bsps/powerpc/mvme3100/headers.am                   |   13 +
 .../libbsp => bsps}/powerpc/mvme3100/include/bsp.h |    0
 .../powerpc/mvme3100/include/bsp}/VMEConfig.h      |    0
 .../powerpc/mvme3100/include/bsp}/if_tsec_pub.h    |    0
 .../powerpc/mvme3100/include/bsp}/irq.h            |    0
 .../mvme3100/include/bsp}/mpc8540_i2c_busdrv.h     |    0
 .../powerpc/mvme3100}/include/tm27.h               |    0
 bsps/powerpc/mvme5500/headers.am                   |   21 +
 .../libbsp => bsps}/powerpc/mvme5500/include/bsp.h |    0
 .../powerpc/mvme5500/include/bsp}/GT64260TWSI.h    |    0
 .../powerpc/mvme5500/include/bsp}/GT64260eth.h     |    0
 .../powerpc/mvme5500/include/bsp}/GT64260ethreg.h  |    0
 .../powerpc/mvme5500/include/bsp}/VMEConfig.h      |    0
 .../powerpc/mvme5500/include/bsp}/VPD.h            |    0
 .../powerpc/mvme5500/include/bsp}/bspException.h   |    0
 .../powerpc/mvme5500/include/bsp}/bspMvme5500.h    |    0
 .../powerpc/mvme5500/include/bsp}/gtpcireg.h       |    0
 .../powerpc/mvme5500/include/bsp}/gtreg.h          |    0
 .../powerpc/mvme5500/include/bsp}/if_wmreg.h       |    0
 .../powerpc/mvme5500/include/bsp}/irq.h            |    0
 .../powerpc/mvme5500/include/bsp}/pcireg.h         |    0
 .../powerpc/mvme5500/include/tm27.h                |    0
 bsps/powerpc/psim/headers.am                       |   11 +
 .../lib/libbsp => bsps}/powerpc/psim/include/bsp.h |    0
 .../irq => bsps/powerpc/psim/include/bsp}/irq.h    |    0
 .../libbsp => bsps}/powerpc/psim/include/psim.h    |    0
 .../libbsp => bsps}/powerpc/psim/include/tm27.h    |    0
 bsps/powerpc/qemuppc/headers.am                    |   10 +
 .../libbsp => bsps}/powerpc/qemuppc/include/bsp.h  |    0
 .../irq => bsps/powerpc/qemuppc/include/bsp}/irq.h |    0
 .../powerpc/qemuppc}/include/tm27.h                |    0
 bsps/powerpc/qoriq/headers.am                      |   24 +
 .../powerpc/qoriq/include/asm/epapr_hcalls.h       |    0
 .../powerpc/qoriq/include/asm/fsl_hcalls.h         |    0
 .../libbsp => bsps}/powerpc/qoriq/include/bsp.h    |    0
 .../powerpc/qoriq/include/bsp}/intercom.h          |    0
 .../powerpc/qoriq/include/bsp}/irq.h               |    0
 .../powerpc/qoriq/include/bsp}/mmu.h               |    0
 .../powerpc/qoriq/include/bsp}/qoriq.h             |    0
 .../powerpc/qoriq/include/bsp}/tsec-config.h       |    0
 .../powerpc/qoriq/include/bsp}/uart-bridge.h       |    0
 .../libbsp => bsps}/powerpc/qoriq/include/tm27.h   |    0
 .../powerpc/qoriq/include/uapi/asm/epapr_hcalls.h  |    0
 bsps/powerpc/ss555/headers.am                      |   10 +
 .../libbsp => bsps}/powerpc/ss555/include/bsp.h    |    0
 .../irq => bsps/powerpc/ss555/include/bsp}/irq.h   |    0
 .../libbsp => bsps}/powerpc/ss555/include/tm27.h   |    0
 bsps/powerpc/t32mppc/headers.am                    |   10 +
 .../libbsp => bsps}/powerpc/t32mppc/include/bsp.h  |    0
 .../powerpc/t32mppc/include/bsp}/irq.h             |    0
 .../powerpc/t32mppc}/include/tm27.h                |    0
 bsps/powerpc/tqm8xx/headers.am                     |   13 +
 .../libbsp => bsps}/powerpc/tqm8xx/include/bsp.h   |    0
 .../powerpc/tqm8xx/include/bsp}/8xx_immap.h        |    0
 .../powerpc/tqm8xx/include/bsp}/irq.h              |    0
 .../spi => bsps/powerpc/tqm8xx/include/bsp}/spi.h  |    0
 .../powerpc/tqm8xx/include/bsp}/tqm.h              |    0
 .../powerpc/tqm8xx}/include/tm27.h                 |    0
 bsps/powerpc/virtex/headers.am                     |   13 +
 .../libbsp => bsps}/powerpc/virtex/include/bsp.h   |    0
 .../irq => bsps/powerpc/virtex/include/bsp}/irq.h  |    0
 .../powerpc/virtex/include/bsp}/opbintctrl.h       |    0
 .../lpc24xx => bsps/powerpc/virtex}/include/tm27.h |    0
 .../powerpc/virtex/include}/xiltemac.h             |    0
 .../powerpc/virtex/include/xparameters_dflt.h      |    0
 bsps/powerpc/virtex4/headers.am                    |   11 +
 .../libbsp => bsps}/powerpc/virtex4/include/bsp.h  |    0
 .../powerpc/virtex4/include/bsp}/irq.h             |    0
 .../powerpc/virtex4/include/bsp}/mmu.h             |    0
 .../powerpc/virtex4}/include/tm27.h                |    0
 bsps/powerpc/virtex5/headers.am                    |   11 +
 .../libbsp => bsps}/powerpc/virtex5/include/bsp.h  |    0
 .../powerpc/virtex5/include/bsp}/irq.h             |    0
 .../powerpc/virtex5/include/bsp}/mmu.h             |    0
 .../powerpc/virtex5}/include/tm27.h                |    0
 bsps/riscv/headers.am                              |    5 +
 .../riscv/include/bsp}/linker-symbols.h            |    0
 bsps/riscv/riscv_generic/headers.am                |   10 +
 .../riscv/riscv_generic/include/bsp.h              |    0
 .../riscv/riscv_generic/include/bsp}/irq.h         |    0
 .../riscv/riscv_generic}/include/tm27.h            |    0
 bsps/sh/gensh1/headers.am                          |   17 +
 {c/src/lib/libbsp => bsps}/sh/gensh1/include/bsp.h |    0
 .../sh/gensh1/include/rtems/score/iosh7032.h       |    0
 .../sh/gensh1/include/rtems/score/ispsh7032.h      |    0
 .../lib/libbsp => bsps}/sh/gensh1/include/sh/sci.h |    0
 .../libbsp => bsps}/sh/gensh1/include/sh/sh7_pfc.h |    0
 .../libbsp => bsps}/sh/gensh1/include/sh/sh7_sci.h |    0
 .../gdbarmsim => bsps/sh/gensh1}/include/tm27.h    |    0
 bsps/sh/gensh2/headers.am                          |   19 +
 {c/src/lib/libbsp => bsps}/sh/gensh2/include/bsp.h |    0
 .../sh/gensh2/include/rtems/score/iosh7045.h       |    0
 .../sh/gensh2/include/rtems/score/ispsh7045.h      |    0
 .../sh/gensh2/include/sh/io_types.h                |    0
 .../lib/libbsp => bsps}/sh/gensh2/include/sh/sci.h |    0
 .../sh/gensh2/include/sh/sci_termios.h             |    0
 .../libbsp => bsps}/sh/gensh2/include/sh/sh7_pfc.h |    0
 .../libbsp => bsps}/sh/gensh2/include/sh/sh7_sci.h |    0
 .../arm/edb7312 => bsps/sh/gensh2}/include/tm27.h  |    0
 bsps/sh/gensh4/headers.am                          |   19 +
 {c/src/lib/libbsp => bsps}/sh/gensh4/include/bsp.h |    0
 .../sh/gensh4/include/rtems/score/iosh7750.h       |    0
 .../sh/gensh4/include/rtems/score/ipl.h            |    0
 .../sh/gensh4/include/rtems/score/ispsh7750.h      |    0
 .../sh/gensh4/include/rtems/score/sh4_regs.h       |    0
 .../sh/gensh4/include/rtems/score/sh7750_regs.h    |    0
 .../lib/libbsp => bsps}/sh/gensh4/include/sdram.h  |    0
 .../libbsp => bsps}/sh/gensh4/include/sh/sh4uart.h |    0
 .../lib/libbsp => bsps}/sh/gensh4/include/tm27.h   |    0
 bsps/sh/shsim/headers.am                           |   10 +
 {c/src/lib/libbsp => bsps}/sh/shsim/include/bsp.h  |    0
 .../sh/shsim/include/bsp}/syscall.h                |    0
 .../arm/csb337 => bsps/sh/shsim}/include/tm27.h    |    0
 bsps/sparc/erc32/headers.am                        |   11 +
 .../lib/libbsp => bsps}/sparc/erc32/include/bsp.h  |    0
 .../libbsp => bsps}/sparc/erc32/include/bsp/irq.h  |    0
 .../libbsp => bsps}/sparc/erc32/include/erc32.h    |    0
 .../lib/libbsp => bsps}/sparc/erc32/include/tm27.h |    0
 bsps/sparc/headers.am                              |   75 ++
 .../sparc/shared => bsps/sparc}/include/ambapp.h   |    0
 .../shared => bsps/sparc}/include/ambapp_ids.h     |    0
 .../include => bsps/sparc/include/bsp}/ahbstat.h   |    0
 .../include => bsps/sparc/include/bsp}/apbuart.h   |    0
 .../sparc/include/bsp}/apbuart_cons.h              |    0
 .../sparc/include/bsp}/apbuart_termios.h           |    0
 .../include => bsps/sparc/include/bsp}/b1553brm.h  |    0
 .../include => bsps/sparc/include/bsp}/b1553rt.h   |    0
 .../include => bsps/sparc/include/bsp}/canmux.h    |    0
 .../include => bsps/sparc/include/bsp}/cons.h      |    0
 .../sparc/include/bsp}/debug_defs.h                |    0
 .../include => bsps/sparc/include/bsp}/genirq.h    |    0
 .../sparc/include/bsp}/gnatcommon.h                |    0
 .../include => bsps/sparc/include/bsp}/gpiolib.h   |    0
 .../include => bsps/sparc/include/bsp}/gptimer.h   |    0
 .../include => bsps/sparc/include/bsp}/gr1553b.h   |    0
 .../include => bsps/sparc/include/bsp}/gr1553bc.h  |    0
 .../sparc/include/bsp}/gr1553bc_list.h             |    0
 .../include => bsps/sparc/include/bsp}/gr1553bm.h  |    0
 .../include => bsps/sparc/include/bsp}/gr1553rt.h  |    0
 .../include => bsps/sparc/include/bsp}/gr_701.h    |    0
 .../sparc/include/bsp}/gr_cpci_gr740.h             |    0
 .../sparc/include/bsp}/gr_leon4_n2x.h              |    0
 .../sparc/include/bsp}/gr_rasta_adcdac.h           |    0
 .../sparc/include/bsp}/gr_rasta_io.h               |    0
 .../sparc/include/bsp}/gr_rasta_spw_router.h       |    0
 .../sparc/include/bsp}/gr_rasta_tmtc.h             |    0
 .../sparc/include/bsp}/gr_tmtc_1553.h              |    0
 .../include => bsps/sparc/include/bsp}/gradcdac.h  |    0
 .../include => bsps/sparc/include/bsp}/grascs.h    |    0
 .../include => bsps/sparc/include/bsp}/grcan.h     |    0
 .../include => bsps/sparc/include/bsp}/grctm.h     |    0
 .../include => bsps/sparc/include/bsp}/greth.h     |    0
 .../include => bsps/sparc/include/bsp}/grgpio.h    |    0
 .../include => bsps/sparc/include/bsp}/griommu.h   |    0
 .../include => bsps/sparc/include/bsp}/grpci.h     |    0
 .../include => bsps/sparc/include/bsp}/grpci2.h    |    0
 .../include => bsps/sparc/include/bsp}/grpci2dma.h |    0
 .../include => bsps/sparc/include/bsp}/grpwm.h     |    0
 .../include => bsps/sparc/include/bsp}/grslink.h   |    0
 .../include => bsps/sparc/include/bsp}/grspw.h     |    0
 .../include => bsps/sparc/include/bsp}/grspw_pkt.h |    0
 .../sparc/include/bsp}/grspw_router.h              |    0
 .../include => bsps/sparc/include/bsp}/grtc.h      |    0
 .../include => bsps/sparc/include/bsp}/grtm.h      |    0
 .../include => bsps/sparc/include/bsp}/i2cmst.h    |    0
 .../include => bsps/sparc/include/bsp}/l2c.h       |    0
 .../include => bsps/sparc/include/bsp}/l4stat.h    |    0
 .../include => bsps/sparc/include/bsp}/mctrl.h     |    0
 .../include => bsps/sparc/include/bsp}/memscrub.h  |    0
 .../sparc/include/bsp}/network_interface_add.h     |    0
 .../include => bsps/sparc/include/bsp}/occan.h     |    0
 .../include => bsps/sparc/include/bsp}/pcif.h      |    0
 .../include => bsps/sparc/include/bsp}/satcan.h    |    0
 .../include => bsps/sparc/include/bsp}/spictrl.h   |    0
 .../include => bsps/sparc/include/bsp}/spwcuc.h    |    0
 .../include => bsps/sparc/include/bsp}/tlib.h      |    0
 .../sparc}/include/drvmgr/ambapp_bus.h             |    0
 .../sparc}/include/drvmgr/ambapp_bus_grlib.h       |    0
 .../sparc}/include/drvmgr/bspcommon.h              |    0
 .../sparc}/include/drvmgr/leon2_amba_bus.h         |    0
 .../sparc/shared => bsps/sparc}/include/grlib.h    |    0
 .../libcpu => bsps}/sparc/include/libcpu/access.h  |    0
 bsps/sparc/leon2/headers.am                        |   12 +
 .../lib/libbsp => bsps}/sparc/leon2/include/bsp.h  |    0
 .../sparc/leon2/include/bsp}/at697_pci.h           |    0
 .../libbsp => bsps}/sparc/leon2/include/bsp/irq.h  |    0
 .../lib/libbsp => bsps}/sparc/leon2/include/leon.h |    0
 .../lib/libbsp => bsps}/sparc/leon2/include/tm27.h |    0
 bsps/sparc/leon3/headers.am                        |   13 +
 .../lib/libbsp => bsps}/sparc/leon3/include/amba.h |    0
 .../lib/libbsp => bsps}/sparc/leon3/include/bsp.h  |    0
 .../libbsp => bsps}/sparc/leon3/include/bsp/irq.h  |    0
 .../sparc/leon3/include/bsp}/watchdog.h            |    0
 .../lib/libbsp => bsps}/sparc/leon3/include/leon.h |    0
 .../lib/libbsp => bsps}/sparc/leon3/include/tm27.h |    0
 bsps/sparc64/headers.am                            |   54 +
 .../include => bsps/sparc64/include/arch}/arch.h   |    0
 .../include => bsps/sparc64/include/arch}/boot.h   |    0
 .../sparc64/include/arch}/mm/cache_spec.h          |    0
 .../sparc64/include/arch}/mm/frame.h               |    0
 .../include => bsps/sparc64/include/arch}/mm/mmu.h |    0
 .../sun4u => bsps/sparc64/include/arch/mm}/page.h  |    0
 .../sparc64/include/arch}/mm/sun4u/frame.h         |    0
 .../sparc64/include/arch}/mm/sun4u/mmu.h           |    0
 .../sparc64/include/arch/mm/sun4u}/page.h          |    0
 .../sparc64/include/arch}/mm/sun4u/tlb.h           |    0
 .../sparc64/include/arch}/mm/sun4u/tte.h           |    0
 .../include => bsps/sparc64/include/arch}/mm/tlb.h |    0
 .../include => bsps/sparc64/include/arch}/mm/tte.h |    0
 .../include => bsps/sparc64/include/arch}/regdef.h |    0
 .../include => bsps/sparc64/include/arch}/stack.h  |    0
 .../sparc64/include/arch}/sun4u/arch.h             |    0
 .../sparc64/shared => bsps/sparc64}/include/asm.h  |    0
 .../include => bsps/sparc64/include/boot}/align.h  |    0
 .../include => bsps/sparc64/include/boot}/balloc.h |    0
 .../sparc64/include/boot}/gentypes.h               |    0
 .../include => bsps/sparc64/include/boot}/main.h   |    0
 .../include => bsps/sparc64/include/boot}/ofw.h    |    0
 .../sparc64/include/boot}/ofw_tree.h               |    0
 .../sparc64/include/boot}/ofwarch.h                |    0
 .../sparc64/include/boot}/register.h               |    0
 .../include => bsps/sparc64/include/boot}/stack.h  |    0
 .../include => bsps/sparc64/include/boot}/types.h  |    0
 .../sparc64/include/genarch}/ofw/ofw_tree.h        |    0
 .../sparc64/include/kernel}/align.h                |    0
 .../shared => bsps/sparc64}/include/traptable.h    |    0
 bsps/sparc64/niagara/headers.am                    |    6 +
 .../libbsp => bsps}/sparc64/niagara/include/bsp.h  |    0
 .../csb336 => bsps/sparc64/niagara}/include/tm27.h |    0
 bsps/sparc64/usiii/headers.am                      |    6 +
 .../libbsp => bsps}/sparc64/usiii/include/bsp.h    |    0
 .../beagle => bsps/sparc64/usiii}/include/tm27.h   |    0
 bsps/v850/gdbv850sim/headers.am                    |   10 +
 .../libbsp => bsps}/v850/gdbv850sim/include/bsp.h  |    0
 .../v850/gdbv850sim/include/bsp}/syscall.h         |    0
 .../atsam => bsps/v850/gdbv850sim}/include/tm27.h  |    0
 c/Makefile.am                                      |    1 -
 c/configure.ac                                     |    6 +-
 c/src/Makefile.am                                  |   15 +-
 c/src/aclocal/bsp-configure.m4                     |    2 +-
 c/src/aclocal/bsp-linkcmds.m4                      |    2 +-
 c/src/aclocal/check-networking.m4                  |    2 +
 c/src/aclocal/prog-cc.m4                           |   11 +-
 c/src/aclocal/rtems-bsp-includes.m4                |   13 +
 c/src/aclocal/rtems-build-top.m4                   |   12 +
 c/src/aclocal/rtems-includes.m4                    |   23 +
 c/src/aclocal/rtems-source-top.m4                  |    8 +
 c/src/automake/compile.am                          |   12 +-
 c/src/automake/host.am                             |    3 -
 c/src/automake/local.am                            |    6 +-
 c/src/automake/subdirs.am                          |   24 +-
 c/src/configure.ac                                 |   25 +-
 c/src/lib/libbsp/Makefile.am                       |   10 -
 c/src/lib/libbsp/arm/Makefile.am                   |    5 +-
 c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am  |   79 +-
 c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac |    4 +-
 .../lib/libbsp/arm/altera-cyclone-v/preinstall.am  |  276 -----
 .../startup}/bsp_specs                             |    0
 c/src/lib/libbsp/arm/atsam/Makefile.am             |  316 +-----
 c/src/lib/libbsp/arm/atsam/configure.ac            |    5 +-
 c/src/lib/libbsp/arm/atsam/preinstall.am           | 1086 --------------------
 .../arm/{stm32f4 => atsam/startup}/bsp_specs       |    0
 c/src/lib/libbsp/arm/beagle/Makefile.am            |   44 +-
 c/src/lib/libbsp/arm/beagle/configure.ac           |    4 +-
 c/src/lib/libbsp/arm/beagle/preinstall.am          |  144 ---
 .../arm/{smdk2410 => beagle/startup}/bsp_specs     |    0
 c/src/lib/libbsp/arm/configure.ac                  |    2 +
 c/src/lib/libbsp/arm/csb336/Makefile.am            |   18 +-
 c/src/lib/libbsp/arm/csb336/configure.ac           |    3 +
 c/src/lib/libbsp/arm/csb336/preinstall.am          |   79 --
 .../arm/{rtl22xx => csb336/startup}/bsp_specs      |    0
 c/src/lib/libbsp/arm/csb337/Makefile.am            |   42 +-
 c/src/lib/libbsp/arm/csb337/configure.ac           |    4 +-
 c/src/lib/libbsp/arm/csb337/preinstall.am          |  148 ---
 .../{realview-pbx-a9 => csb337/startup}/bsp_specs  |    0
 c/src/lib/libbsp/arm/edb7312/Makefile.am           |   21 +-
 c/src/lib/libbsp/arm/edb7312/configure.ac          |    3 +
 c/src/lib/libbsp/arm/edb7312/preinstall.am         |   83 --
 .../arm/{raspberrypi => edb7312/startup}/bsp_specs |    0
 c/src/lib/libbsp/arm/gdbarmsim/Makefile.am         |   19 +-
 c/src/lib/libbsp/arm/gdbarmsim/configure.ac        |    3 +
 c/src/lib/libbsp/arm/gdbarmsim/preinstall.am       |   87 --
 .../arm/{lpc32xx => gdbarmsim/startup}/bsp_specs   |    0
 c/src/lib/libbsp/arm/gumstix/Makefile.am           |   20 +-
 c/src/lib/libbsp/arm/gumstix/configure.ac          |    3 +
 c/src/lib/libbsp/arm/gumstix/preinstall.am         |   87 --
 .../arm/{lpc24xx => gumstix/startup}/bsp_specs     |    0
 c/src/lib/libbsp/arm/imx/Makefile.am               |   48 +-
 c/src/lib/libbsp/arm/imx/configure.ac              |    4 +-
 c/src/lib/libbsp/arm/imx/preinstall.am             |  168 ---
 .../libbsp/arm/{lpc176x => imx/startup}/bsp_specs  |    0
 c/src/lib/libbsp/arm/lm3s69xx/Makefile.am          |   39 +-
 c/src/lib/libbsp/arm/lm3s69xx/configure.ac         |    4 +-
 c/src/lib/libbsp/arm/lm3s69xx/preinstall.am        |  111 --
 .../libbsp/arm/lm3s69xx/{ => startup}/bsp_specs    |    0
 c/src/lib/libbsp/arm/lpc176x/Makefile.am           |   58 +-
 c/src/lib/libbsp/arm/lpc176x/configure.ac          |    4 +-
 c/src/lib/libbsp/arm/lpc176x/preinstall.am         |  187 ----
 .../libbsp/arm/{imx => lpc176x/startup}/bsp_specs  |    0
 c/src/lib/libbsp/arm/lpc24xx/Makefile.am           |   74 +-
 c/src/lib/libbsp/arm/lpc24xx/configure.ac          |    4 +-
 c/src/lib/libbsp/arm/lpc24xx/preinstall.am         |  223 ----
 .../arm/{gumstix => lpc24xx/startup}/bsp_specs     |    0
 c/src/lib/libbsp/arm/lpc32xx/Makefile.am           |   54 +-
 c/src/lib/libbsp/arm/lpc32xx/configure.ac          |    4 +-
 c/src/lib/libbsp/arm/lpc32xx/preinstall.am         |  163 ---
 .../arm/{gdbarmsim => lpc32xx/startup}/bsp_specs   |    0
 c/src/lib/libbsp/arm/preinstall.am                 |   41 -
 c/src/lib/libbsp/arm/raspberrypi/Makefile.am       |   45 +-
 c/src/lib/libbsp/arm/raspberrypi/configure.ac      |    4 +-
 c/src/lib/libbsp/arm/raspberrypi/preinstall.am     |  167 ---
 .../arm/{edb7312 => raspberrypi/startup}/bsp_specs |    0
 c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am   |   46 +-
 c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac  |    4 +-
 c/src/lib/libbsp/arm/realview-pbx-a9/preinstall.am |  163 ---
 .../{csb337 => realview-pbx-a9/startup}/bsp_specs  |    0
 c/src/lib/libbsp/arm/rtl22xx/Makefile.am           |   20 +-
 c/src/lib/libbsp/arm/rtl22xx/configure.ac          |    3 +
 c/src/lib/libbsp/arm/rtl22xx/preinstall.am         |   83 --
 .../arm/{csb336 => rtl22xx/startup}/bsp_specs      |    0
 c/src/lib/libbsp/arm/smdk2410/Makefile.am          |   23 +-
 c/src/lib/libbsp/arm/smdk2410/configure.ac         |    3 +
 c/src/lib/libbsp/arm/smdk2410/preinstall.am        |   91 --
 .../arm/{beagle => smdk2410/startup}/bsp_specs     |    0
 c/src/lib/libbsp/arm/stm32f4/Makefile.am           |   53 +-
 c/src/lib/libbsp/arm/stm32f4/configure.ac          |    4 +-
 c/src/lib/libbsp/arm/stm32f4/preinstall.am         |  167 ---
 .../arm/{atsam => stm32f4/startup}/bsp_specs       |    0
 c/src/lib/libbsp/arm/tms570/Makefile.am            |   90 +-
 c/src/lib/libbsp/arm/tms570/configure.ac           |    4 +-
 c/src/lib/libbsp/arm/tms570/preinstall.am          |  297 ------
 .../lib/libbsp/arm/tms570/{ => startup}/bsp_specs  |    0
 c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am       |   41 +-
 c/src/lib/libbsp/arm/xilinx-zynq/configure.ac      |    4 +-
 c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am     |  151 ---
 .../startup}/bsp_specs                             |    0
 c/src/lib/libbsp/bfin/Makefile.am                  |    1 +
 c/src/lib/libbsp/bfin/TLL6527M/Makefile.am         |   14 +-
 c/src/lib/libbsp/bfin/TLL6527M/configure.ac        |    3 +
 c/src/lib/libbsp/bfin/TLL6527M/preinstall.am       |   67 --
 .../leon3 => bfin/TLL6527M/startup}/bsp_specs      |    0
 c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am       |   13 +-
 c/src/lib/libbsp/bfin/bf537Stamp/configure.ac      |    3 +
 c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am     |   63 --
 .../leon2 => bfin/bf537Stamp/startup}/bsp_specs    |    0
 c/src/lib/libbsp/bfin/configure.ac                 |    2 +
 c/src/lib/libbsp/bfin/eZKit533/Makefile.am         |   14 +-
 c/src/lib/libbsp/bfin/eZKit533/configure.ac        |    3 +
 c/src/lib/libbsp/bfin/eZKit533/preinstall.am       |   67 --
 .../erc32 => bfin/eZKit533/startup}/bsp_specs      |    0
 c/src/lib/libbsp/epiphany/Makefile.am              |    2 +-
 c/src/lib/libbsp/epiphany/configure.ac             |    2 +
 c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am |   25 +-
 .../lib/libbsp/epiphany/epiphany_sim/configure.ac  |    4 +-
 .../libbsp/epiphany/epiphany_sim/include/bspopts.h |  117 ---
 .../lib/libbsp/epiphany/epiphany_sim/preinstall.am |  100 --
 .../epiphany_sim/startup}/bsp_specs                |    0
 c/src/lib/libbsp/epiphany/preinstall.am            |    7 -
 c/src/lib/libbsp/i386/Makefile.am                  |    1 +
 c/src/lib/libbsp/i386/configure.ac                 |    2 +
 c/src/lib/libbsp/i386/pc386/Makefile.am            |   48 +-
 c/src/lib/libbsp/i386/pc386/configure.ac           |    3 +
 c/src/lib/libbsp/i386/pc386/preinstall.am          |  173 ----
 .../{sh/gensh4 => i386/pc386/startup}/bsp_specs    |    0
 c/src/lib/libbsp/i386/pc386/tools/configure.ac     |    2 +
 c/src/lib/libbsp/lm32/Makefile.am                  |    1 +
 c/src/lib/libbsp/lm32/configure.ac                 |    2 +
 c/src/lib/libbsp/lm32/lm32_evr/Makefile.am         |   14 +-
 c/src/lib/libbsp/lm32/lm32_evr/configure.ac        |    3 +
 c/src/lib/libbsp/lm32/lm32_evr/preinstall.am       |   67 --
 .../{sh/gensh2 => lm32/lm32_evr/startup}/bsp_specs |    0
 c/src/lib/libbsp/lm32/milkymist/Makefile.am        |   32 +-
 c/src/lib/libbsp/lm32/milkymist/configure.ac       |    3 +
 c/src/lib/libbsp/lm32/milkymist/preinstall.am      |  127 ---
 .../gensh1 => lm32/milkymist/startup}/bsp_specs    |    0
 c/src/lib/libbsp/m32c/configure.ac                 |    2 +
 c/src/lib/libbsp/m32c/m32cbsp/Makefile.am          |   14 +-
 c/src/lib/libbsp/m32c/m32cbsp/configure.ac         |    3 +
 c/src/lib/libbsp/m32c/m32cbsp/preinstall.am        |   67 --
 .../moxiesim => m32c/m32cbsp/startup}/bsp_specs    |    0
 c/src/lib/libbsp/m68k/Makefile.am                  |    7 +-
 c/src/lib/libbsp/m68k/av5282/Makefile.am           |   13 +-
 c/src/lib/libbsp/m68k/av5282/configure.ac          |    3 +
 c/src/lib/libbsp/m68k/av5282/preinstall.am         |   63 --
 .../av5282/startup}/bsp_specs                      |    0
 c/src/lib/libbsp/m68k/configure.ac                 |    2 +
 c/src/lib/libbsp/m68k/csb360/Makefile.am           |   14 +-
 c/src/lib/libbsp/m68k/csb360/configure.ac          |    3 +
 c/src/lib/libbsp/m68k/csb360/preinstall.am         |   67 --
 .../generic_or1k => m68k/csb360/startup}/bsp_specs |    0
 c/src/lib/libbsp/m68k/gen68340/Makefile.am         |   18 +-
 c/src/lib/libbsp/m68k/gen68340/configure.ac        |    3 +
 c/src/lib/libbsp/m68k/gen68340/preinstall.am       |   83 --
 .../m68k/{uC5282 => gen68340/startup}/bsp_specs    |    0
 c/src/lib/libbsp/m68k/gen68360/Makefile.am         |   16 +-
 c/src/lib/libbsp/m68k/gen68360/configure.ac        |    3 +
 c/src/lib/libbsp/m68k/gen68360/preinstall.am       |   71 --
 .../nios2_iss => m68k/gen68360/startup}/bsp_specs  |    0
 c/src/lib/libbsp/m68k/genmcf548x/Makefile.am       |   23 +-
 c/src/lib/libbsp/m68k/genmcf548x/configure.ac      |    4 +-
 c/src/lib/libbsp/m68k/genmcf548x/preinstall.am     |   87 --
 .../{mvme147s => genmcf548x/startup}/bsp_specs     |    0
 c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am     |   21 +-
 c/src/lib/libbsp/m68k/mcf5206elite/configure.ac    |    3 +
 c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am   |   87 --
 .../mcf5206elite/startup}/bsp_specs                |    0
 .../libbsp/m68k/mcf5206elite/tools/configure.ac    |    2 +
 c/src/lib/libbsp/m68k/mcf52235/Makefile.am         |   13 +-
 c/src/lib/libbsp/m68k/mcf52235/configure.ac        |    3 +
 c/src/lib/libbsp/m68k/mcf52235/preinstall.am       |   63 --
 .../m68k/{mvme147 => mcf52235/startup}/bsp_specs   |    0
 c/src/lib/libbsp/m68k/mcf5225x/Makefile.am         |   13 +-
 c/src/lib/libbsp/m68k/mcf5225x/configure.ac        |    3 +
 c/src/lib/libbsp/m68k/mcf5225x/preinstall.am       |   63 --
 .../m68k/{mcf5235 => mcf5225x/startup}/bsp_specs   |    0
 c/src/lib/libbsp/m68k/mcf5235/Makefile.am          |   19 +-
 c/src/lib/libbsp/m68k/mcf5235/configure.ac         |    3 +
 c/src/lib/libbsp/m68k/mcf5235/preinstall.am        |   71 --
 .../m68k/{mcf5225x => mcf5235/startup}/bsp_specs   |    0
 c/src/lib/libbsp/m68k/mcf5329/Makefile.am          |   14 +-
 c/src/lib/libbsp/m68k/mcf5329/configure.ac         |    3 +
 c/src/lib/libbsp/m68k/mcf5329/preinstall.am        |   67 --
 .../rbtx4925 => m68k/mcf5329/startup}/bsp_specs    |    0
 c/src/lib/libbsp/m68k/mrm332/Makefile.am           |   15 +-
 c/src/lib/libbsp/m68k/mrm332/configure.ac          |    3 +
 c/src/lib/libbsp/m68k/mrm332/preinstall.am         |   67 --
 .../{mips/malta => m68k/mrm332/startup}/bsp_specs  |    0
 c/src/lib/libbsp/m68k/mvme147/Makefile.am          |   15 +-
 c/src/lib/libbsp/m68k/mvme147/configure.ac         |    3 +
 c/src/lib/libbsp/m68k/mvme147/preinstall.am        |   72 --
 .../m68k/{mcf52235 => mvme147/startup}/bsp_specs   |    0
 c/src/lib/libbsp/m68k/mvme147s/Makefile.am         |   15 +-
 c/src/lib/libbsp/m68k/mvme147s/configure.ac        |    3 +
 c/src/lib/libbsp/m68k/mvme147s/preinstall.am       |   72 --
 .../{genmcf548x => mvme147s/startup}/bsp_specs     |    0
 c/src/lib/libbsp/m68k/mvme162/Makefile.am          |   17 +-
 c/src/lib/libbsp/m68k/mvme162/configure.ac         |    3 +
 c/src/lib/libbsp/m68k/mvme162/preinstall.am        |   76 --
 .../jmr3904 => m68k/mvme162/startup}/bsp_specs     |    0
 c/src/lib/libbsp/m68k/mvme167/Makefile.am          |   14 +-
 c/src/lib/libbsp/m68k/mvme167/configure.ac         |    3 +
 c/src/lib/libbsp/m68k/mvme167/preinstall.am        |   67 --
 .../hurricane => m68k/mvme167/startup}/bsp_specs   |    0
 c/src/lib/libbsp/m68k/preinstall.am                |   42 -
 c/src/lib/libbsp/m68k/uC5282/Makefile.am           |   13 +-
 c/src/lib/libbsp/m68k/uC5282/configure.ac          |    3 +
 c/src/lib/libbsp/m68k/uC5282/preinstall.am         |   63 --
 .../m68k/{gen68340 => uC5282/startup}/bsp_specs    |    0
 c/src/lib/libbsp/mips/Makefile.am                  |    1 +
 c/src/lib/libbsp/mips/configure.ac                 |    2 +
 c/src/lib/libbsp/mips/csb350/Makefile.am           |   18 +-
 c/src/lib/libbsp/mips/csb350/configure.ac          |    3 +
 c/src/lib/libbsp/mips/csb350/preinstall.am         |   83 --
 .../lib/libbsp/mips/csb350/{ => startup}/bsp_specs |    0
 c/src/lib/libbsp/mips/hurricane/Makefile.am        |   18 +-
 c/src/lib/libbsp/mips/hurricane/configure.ac       |    3 +
 c/src/lib/libbsp/mips/hurricane/preinstall.am      |   83 --
 .../mvme167 => mips/hurricane/startup}/bsp_specs   |    0
 c/src/lib/libbsp/mips/jmr3904/Makefile.am          |   18 +-
 c/src/lib/libbsp/mips/jmr3904/configure.ac         |    3 +
 c/src/lib/libbsp/mips/jmr3904/preinstall.am        |   83 --
 .../mvme162 => mips/jmr3904/startup}/bsp_specs     |    0
 c/src/lib/libbsp/mips/malta/Makefile.am            |   18 +-
 c/src/lib/libbsp/mips/malta/configure.ac           |    3 +
 c/src/lib/libbsp/mips/malta/preinstall.am          |   87 --
 .../{m68k/mrm332 => mips/malta/startup}/bsp_specs  |    0
 c/src/lib/libbsp/mips/rbtx4925/Makefile.am         |   17 +-
 c/src/lib/libbsp/mips/rbtx4925/configure.ac        |    3 +
 c/src/lib/libbsp/mips/rbtx4925/preinstall.am       |   79 --
 .../mcf5329 => mips/rbtx4925/startup}/bsp_specs    |    0
 c/src/lib/libbsp/mips/rbtx4938/Makefile.am         |   17 +-
 c/src/lib/libbsp/mips/rbtx4938/configure.ac        |    3 +
 c/src/lib/libbsp/mips/rbtx4938/preinstall.am       |   79 --
 .../rbtx4938/startup}/bsp_specs                    |    0
 c/src/lib/libbsp/moxie/configure.ac                |    2 +
 c/src/lib/libbsp/moxie/moxiesim/Makefile.am        |   14 +-
 c/src/lib/libbsp/moxie/moxiesim/configure.ac       |    3 +
 c/src/lib/libbsp/moxie/moxiesim/preinstall.am      |   67 --
 .../m32cbsp => moxie/moxiesim/startup}/bsp_specs   |    0
 c/src/lib/libbsp/nios2/configure.ac                |    2 +
 c/src/lib/libbsp/nios2/nios2_iss/Makefile.am       |   16 +-
 c/src/lib/libbsp/nios2/nios2_iss/configure.ac      |    3 +
 c/src/lib/libbsp/nios2/nios2_iss/preinstall.am     |   71 --
 .../gen68360 => nios2/nios2_iss/startup}/bsp_specs |    0
 c/src/lib/libbsp/no_cpu/configure.ac               |    2 +
 c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am         |   14 +-
 c/src/lib/libbsp/no_cpu/no_bsp/configure.ac        |    3 +
 c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am       |   54 -
 .../libbsp/no_cpu/no_bsp/{ => startup}/bsp_specs   |    0
 c/src/lib/libbsp/or1k/Makefile.am                  |    2 +-
 c/src/lib/libbsp/or1k/configure.ac                 |    2 +
 c/src/lib/libbsp/or1k/generic_or1k/Makefile.am     |   32 +-
 c/src/lib/libbsp/or1k/generic_or1k/configure.ac    |    4 +-
 c/src/lib/libbsp/or1k/generic_or1k/preinstall.am   |  116 ---
 .../csb360 => or1k/generic_or1k/startup}/bsp_specs |    0
 c/src/lib/libbsp/or1k/preinstall.am                |    7 -
 c/src/lib/libbsp/powerpc/Makefile.am               |    1 +
 c/src/lib/libbsp/powerpc/beatnik/Makefile.am       |   49 +-
 c/src/lib/libbsp/powerpc/beatnik/configure.ac      |    3 +
 c/src/lib/libbsp/powerpc/beatnik/preinstall.am     |  180 ----
 .../libbsp/powerpc/beatnik/{ => startup}/bsp_specs |    0
 c/src/lib/libbsp/powerpc/configure.ac              |    2 +
 c/src/lib/libbsp/powerpc/gen5200/Makefile.am       |   61 +-
 c/src/lib/libbsp/powerpc/gen5200/configure.ac      |    4 +-
 c/src/lib/libbsp/powerpc/gen5200/preinstall.am     |  207 ----
 .../powerpc/{ss555 => gen5200/startup}/bsp_specs   |    0
 c/src/lib/libbsp/powerpc/gen83xx/Makefile.am       |   41 +-
 c/src/lib/libbsp/powerpc/gen83xx/configure.ac      |    4 +-
 c/src/lib/libbsp/powerpc/gen83xx/preinstall.am     |  143 ---
 .../libbsp/powerpc/gen83xx/{ => startup}/bsp_specs |    0
 c/src/lib/libbsp/powerpc/haleakala/Makefile.am     |   18 +-
 c/src/lib/libbsp/powerpc/haleakala/configure.ac    |    3 +
 c/src/lib/libbsp/powerpc/haleakala/preinstall.am   |   79 --
 .../powerpc/haleakala/{ => startup}/bsp_specs      |    0
 .../libbsp/powerpc/motorola_powerpc/Makefile.am    |   31 +-
 .../motorola_powerpc/bootloader/Makefile.am        |    6 +-
 .../libbsp/powerpc/motorola_powerpc/configure.ac   |    3 +
 .../libbsp/powerpc/motorola_powerpc/preinstall.am  |  143 ---
 .../startup}/bsp_specs                             |    0
 c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am    |   42 +-
 c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac   |    4 +-
 c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am  |  183 ----
 .../powerpc/{psim => mpc55xxevb/startup}/bsp_specs |    0
 c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am    |   20 +-
 c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac   |    3 +
 c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am  |   79 --
 .../{mvme5500 => mpc8260ads/startup}/bsp_specs     |    0
 c/src/lib/libbsp/powerpc/mvme3100/Makefile.am      |   30 +-
 c/src/lib/libbsp/powerpc/mvme3100/configure.ac     |    3 +
 c/src/lib/libbsp/powerpc/mvme3100/preinstall.am    |  136 ---
 .../powerpc/mvme3100/{ => startup}/bsp_specs       |    0
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am      |   36 +-
 c/src/lib/libbsp/powerpc/mvme5500/configure.ac     |    3 +
 c/src/lib/libbsp/powerpc/mvme5500/preinstall.am    |  156 ---
 .../{mpc8260ads => mvme5500/startup}/bsp_specs     |    0
 c/src/lib/libbsp/powerpc/psim/Makefile.am          |   19 +-
 c/src/lib/libbsp/powerpc/psim/configure.ac         |    3 +
 c/src/lib/libbsp/powerpc/psim/preinstall.am        |   95 --
 .../powerpc/{mpc55xxevb => psim/startup}/bsp_specs |    0
 c/src/lib/libbsp/powerpc/qemuppc/Makefile.am       |   17 +-
 c/src/lib/libbsp/powerpc/qemuppc/configure.ac      |    3 +
 c/src/lib/libbsp/powerpc/qemuppc/preinstall.am     |   83 --
 .../startup}/bsp_specs                             |    0
 c/src/lib/libbsp/powerpc/qoriq/Makefile.am         |   47 +-
 c/src/lib/libbsp/powerpc/qoriq/configure.ac        |    4 +-
 c/src/lib/libbsp/powerpc/qoriq/preinstall.am       |  165 ---
 .../libbsp/powerpc/qoriq/{ => startup}/bsp_specs   |    0
 c/src/lib/libbsp/powerpc/ss555/Makefile.am         |   17 +-
 c/src/lib/libbsp/powerpc/ss555/configure.ac        |    3 +
 c/src/lib/libbsp/powerpc/ss555/preinstall.am       |   67 --
 .../powerpc/{gen5200 => ss555/startup}/bsp_specs   |    0
 c/src/lib/libbsp/powerpc/t32mppc/Makefile.am       |   25 +-
 c/src/lib/libbsp/powerpc/t32mppc/configure.ac      |    4 +-
 c/src/lib/libbsp/powerpc/t32mppc/preinstall.am     |  103 --
 .../libbsp/powerpc/t32mppc/{ => startup}/bsp_specs |    0
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am        |   20 +-
 c/src/lib/libbsp/powerpc/tqm8xx/configure.ac       |    4 +-
 c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am      |   95 --
 .../libbsp/powerpc/tqm8xx/{ => startup}/bsp_specs  |    0
 c/src/lib/libbsp/powerpc/virtex/Makefile.am        |   23 +-
 c/src/lib/libbsp/powerpc/virtex/configure.ac       |    4 +-
 c/src/lib/libbsp/powerpc/virtex/preinstall.am      |  100 --
 .../libbsp/powerpc/virtex/{ => startup}/bsp_specs  |    0
 c/src/lib/libbsp/powerpc/virtex4/Makefile.am       |   17 +-
 c/src/lib/libbsp/powerpc/virtex4/configure.ac      |    3 +
 c/src/lib/libbsp/powerpc/virtex4/preinstall.am     |   71 --
 .../powerpc/{virtex5 => virtex4/startup}/bsp_specs |    0
 c/src/lib/libbsp/powerpc/virtex5/Makefile.am       |   17 +-
 c/src/lib/libbsp/powerpc/virtex5/configure.ac      |    3 +
 c/src/lib/libbsp/powerpc/virtex5/preinstall.am     |   71 --
 .../powerpc/{virtex4 => virtex5/startup}/bsp_specs |    0
 c/src/lib/libbsp/preinstall.am                     |   40 -
 c/src/lib/libbsp/riscv/Makefile.am                 |    5 +-
 c/src/lib/libbsp/riscv/configure.ac                |    2 +
 c/src/lib/libbsp/riscv/preinstall.am               |   24 -
 c/src/lib/libbsp/riscv/riscv_generic/Makefile.am   |   25 +-
 c/src/lib/libbsp/riscv/riscv_generic/configure.ac  |    4 +-
 .../libbsp/riscv/riscv_generic/include/bspopts.h   |   68 --
 c/src/lib/libbsp/riscv/riscv_generic/preinstall.am |  100 --
 .../riscv_generic/startup}/bsp_specs               |    0
 c/src/lib/libbsp/sh/configure.ac                   |    2 +
 c/src/lib/libbsp/sh/gensh1/Makefile.am             |   22 +-
 c/src/lib/libbsp/sh/gensh1/configure.ac            |    3 +
 c/src/lib/libbsp/sh/gensh1/preinstall.am           |   93 --
 .../milkymist => sh/gensh1/startup}/bsp_specs      |    0
 c/src/lib/libbsp/sh/gensh2/Makefile.am             |   27 +-
 c/src/lib/libbsp/sh/gensh2/configure.ac            |    3 +
 c/src/lib/libbsp/sh/gensh2/preinstall.am           |  109 --
 .../{lm32/lm32_evr => sh/gensh2/startup}/bsp_specs |    0
 c/src/lib/libbsp/sh/gensh4/Makefile.am             |   28 +-
 c/src/lib/libbsp/sh/gensh4/configure.ac            |    3 +
 c/src/lib/libbsp/sh/gensh4/preinstall.am           |  109 --
 .../{i386/pc386 => sh/gensh4/startup}/bsp_specs    |    0
 c/src/lib/libbsp/sh/shsim/Makefile.am              |   15 +-
 c/src/lib/libbsp/sh/shsim/configure.ac             |    3 +
 c/src/lib/libbsp/sh/shsim/preinstall.am            |   71 --
 .../epiphany_sim => sh/shsim/startup}/bsp_specs    |    0
 c/src/lib/libbsp/sparc/Makefile.am                 |    1 +
 c/src/lib/libbsp/sparc/configure.ac                |    4 +
 c/src/lib/libbsp/sparc/erc32/Makefile.am           |   20 +-
 c/src/lib/libbsp/sparc/erc32/configure.ac          |    3 +
 c/src/lib/libbsp/sparc/erc32/preinstall.am         |   87 --
 .../eZKit533 => sparc/erc32/startup}/bsp_specs     |    0
 c/src/lib/libbsp/sparc/leon2/Makefile.am           |   81 +-
 c/src/lib/libbsp/sparc/leon2/configure.ac          |    4 +-
 c/src/lib/libbsp/sparc/leon2/preinstall.am         |  314 ------
 .../bf537Stamp => sparc/leon2/startup}/bsp_specs   |    0
 c/src/lib/libbsp/sparc/leon3/Makefile.am           |   92 +-
 c/src/lib/libbsp/sparc/leon3/configure.ac          |    4 +-
 c/src/lib/libbsp/sparc/leon3/preinstall.am         |  363 -------
 .../TLL6527M => sparc/leon3/startup}/bsp_specs     |    0
 c/src/lib/libbsp/sparc64/Makefile.am               |    1 +
 c/src/lib/libbsp/sparc64/configure.ac              |    2 +
 c/src/lib/libbsp/sparc64/niagara/Makefile.am       |   24 +-
 c/src/lib/libbsp/sparc64/niagara/configure.ac      |    2 +
 c/src/lib/libbsp/sparc64/niagara/preinstall.am     |  112 --
 .../sparc64/{usiii => niagara/startup}/bsp_specs   |    0
 c/src/lib/libbsp/sparc64/usiii/Makefile.am         |   66 +-
 c/src/lib/libbsp/sparc64/usiii/configure.ac        |    2 +
 c/src/lib/libbsp/sparc64/usiii/preinstall.am       |  218 ----
 .../sparc64/{niagara => usiii/startup}/bsp_specs   |    0
 c/src/lib/libbsp/v850/Makefile.am                  |    1 -
 c/src/lib/libbsp/v850/configure.ac                 |    2 +
 c/src/lib/libbsp/v850/gdbv850sim/Makefile.am       |   15 +-
 c/src/lib/libbsp/v850/gdbv850sim/configure.ac      |    3 +
 c/src/lib/libbsp/v850/gdbv850sim/preinstall.am     |   71 --
 .../libbsp/v850/gdbv850sim/{ => startup}/bsp_specs |    0
 c/src/lib/libbsp/v850/preinstall.am                |    7 -
 c/src/lib/libcpu/Makefile.am                       |    2 -
 c/src/lib/libcpu/arm/Makefile.am                   |    9 -
 c/src/lib/libcpu/arm/configure.ac                  |    2 +
 c/src/lib/libcpu/arm/preinstall.am                 |   30 -
 c/src/lib/libcpu/bfin/Makefile.am                  |   37 -
 c/src/lib/libcpu/bfin/configure.ac                 |    2 +
 c/src/lib/libcpu/bfin/preinstall.am                |  146 ---
 c/src/lib/libcpu/i386/Makefile.am                  |    6 -
 c/src/lib/libcpu/i386/configure.ac                 |    2 +
 c/src/lib/libcpu/i386/preinstall.am                |   32 -
 c/src/lib/libcpu/lm32/Makefile.am                  |    1 -
 c/src/lib/libcpu/lm32/configure.ac                 |    2 +
 c/src/lib/libcpu/lm32/preinstall.am                |    7 -
 c/src/lib/libcpu/m68k/Makefile.am                  |   29 -
 c/src/lib/libcpu/m68k/configure.ac                 |    2 +
 c/src/lib/libcpu/m68k/preinstall.am                |  127 ---
 c/src/lib/libcpu/mips/Makefile.am                  |   14 -
 c/src/lib/libcpu/mips/configure.ac                 |    2 +
 c/src/lib/libcpu/mips/preinstall.am                |   48 -
 c/src/lib/libcpu/nios2/Makefile.am                 |    1 -
 c/src/lib/libcpu/nios2/configure.ac                |    2 +
 c/src/lib/libcpu/nios2/preinstall.am               |    7 -
 c/src/lib/libcpu/or1k/Makefile.am                  |    1 -
 c/src/lib/libcpu/or1k/configure.ac                 |    2 +
 c/src/lib/libcpu/or1k/preinstall.am                |    7 -
 c/src/lib/libcpu/powerpc/Makefile.am               |  104 --
 c/src/lib/libcpu/powerpc/configure.ac              |    2 +
 c/src/lib/libcpu/powerpc/preinstall.am             |  320 ------
 c/src/lib/libcpu/sparc/Makefile.am                 |    5 -
 c/src/lib/libcpu/sparc/configure.ac                |    2 +
 c/src/lib/libcpu/sparc/preinstall.am               |   24 -
 c/src/lib/libcpu/sparc64/Makefile.am               |    1 -
 c/src/lib/libcpu/sparc64/configure.ac              |    2 +
 c/src/lib/libcpu/sparc64/preinstall.am             |    7 -
 c/src/libchip/Makefile.am                          |   33 -
 c/src/libchip/preinstall.am                        |  190 ----
 c/src/make/configure.ac                            |    2 +
 c/src/wrapup/Makefile.am                           |    6 +-
 c/src/wrapup/preinstall.am                         |   24 -
 configure.ac                                       |    6 +-
 cpukit/Makefile.am                                 |  227 +---
 cpukit/acinclude.m4                                |   21 +-
 cpukit/aclocal/check-networking.m4                 |    4 +-
 cpukit/aclocal/prog-cc.m4                          |    5 +-
 cpukit/aclocal/rtems-bsp-includes.m4               |   13 +
 cpukit/aclocal/rtems-build-top.m4                  |   12 +
 cpukit/aclocal/rtems-includes.m4                   |   23 +
 cpukit/aclocal/rtems-source-top.m4                 |    8 +
 cpukit/automake/compile.am                         |    2 +
 cpukit/automake/local.am                           |    5 +-
 cpukit/automake/subdirs.am                         |   24 +-
 cpukit/configure.ac                                |    8 +-
 cpukit/dev/Makefile.am                             |   34 -
 cpukit/dev/preinstall.am                           |  105 --
 cpukit/dtc/libfdt/Makefile.am                      |    3 -
 cpukit/dtc/libfdt/preinstall.am                    |   32 -
 cpukit/ftpd/Makefile.am                            |    6 +-
 cpukit/ftpd/preinstall.am                          |   25 -
 cpukit/headers.am                                  |  474 +++++++++
 cpukit/include/adainclude/preinstall.am            |  177 ----
 cpukit/{posix => }/include/aio.h                   |    0
 cpukit/{dev => }/include/dev/i2c/eeprom.h          |    0
 cpukit/{dev => }/include/dev/i2c/fpga-i2c-slave.h  |    0
 .../{dev => }/include/dev/i2c/gpio-nxp-pca9535.h   |    0
 cpukit/{dev => }/include/dev/i2c/i2c.h             |    0
 cpukit/{dev => }/include/dev/i2c/sensor-lm75a.h    |    0
 .../include/dev/i2c/switch-nxp-pca9548a.h          |    0
 .../{dev => }/include/dev/i2c/ti-ads-16bit-adc.h   |    0
 cpukit/{dev => }/include/dev/i2c/ti-lm25066a.h     |    0
 cpukit/{dev => }/include/dev/i2c/ti-tmp112.h       |    0
 cpukit/{dev => }/include/dev/i2c/xilinx-axi-i2c.h  |    0
 cpukit/{dev => }/include/dev/serial/sc16is752.h    |    0
 cpukit/{dev => }/include/dev/spi/spi.h             |    0
 cpukit/{libdl => include}/dlfcn.h                  |    0
 cpukit/{libdrvmgr => include/drvmgr}/drvmgr.h      |    0
 .../drvmgr}/drvmgr_confdefs.h                      |    0
 cpukit/{libdrvmgr => include/drvmgr}/drvmgr_list.h |    0
 cpukit/{libpci => include/drvmgr}/pci_bus.h        |    0
 cpukit/{dtc/libfdt => include}/fdt.h               |    0
 cpukit/{dtc/libfdt => include}/libfdt.h            |    0
 cpukit/{dtc/libfdt => include}/libfdt_env.h        |    0
 .../src/nfsclient/src => include}/librtemsNfs.h    |    0
 cpukit/{libdl => }/include/link.h                  |    0
 cpukit/{libdl => }/include/link_elf.h              |    0
 cpukit/{dev => }/include/linux/i2c-dev.h           |    0
 cpukit/{dev => }/include/linux/i2c.h               |    0
 cpukit/{dev => }/include/linux/spi/spidev.h        |    0
 .../include/machine/_kernel_cpuset.h               |    0
 .../include/machine/_kernel_param.h                |    0
 .../include/machine/_kernel_time.h                 |    0
 .../include/machine/_kernel_types.h                |    0
 .../include/machine/_timecounter.h                 |    0
 cpukit/{libmd => include}/md4.h                    |    0
 cpukit/{libmd => include}/md5.h                    |    0
 cpukit/{ => include}/mghttpd/mongoose.h            |    0
 cpukit/{posix => }/include/mqueue.h                |    0
 cpukit/{libpci => include}/pci.h                   |    0
 cpukit/{libpci => include}/pci/access.h            |    0
 cpukit/{libpci => include}/pci/cfg.h               |    0
 cpukit/{libpci => include}/pci/cfg_auto.h          |    0
 cpukit/{libpci => include}/pci/cfg_peripheral.h    |    0
 cpukit/{libpci => include}/pci/cfg_read.h          |    0
 cpukit/{libpci => include}/pci/cfg_static.h        |    0
 cpukit/{libpci => include}/pci/ids.h               |    0
 cpukit/{libpci => include}/pci/ids_extra.h         |    0
 cpukit/{libpci => include}/pci/irq.h               |    0
 cpukit/{libpci => include}/pci/pcireg.h            |    0
 cpukit/{librpc => }/include/rpc/auth.h             |    0
 cpukit/{librpc => }/include/rpc/auth_unix.h        |    0
 cpukit/{librpc => }/include/rpc/clnt.h             |    0
 cpukit/{librpc => }/include/rpc/clnt_soc.h         |    0
 cpukit/{librpc => }/include/rpc/clnt_stat.h        |    0
 cpukit/{librpc => }/include/rpc/pmap_clnt.h        |    0
 cpukit/{librpc => }/include/rpc/pmap_prot.h        |    0
 cpukit/{librpc => }/include/rpc/pmap_rmt.h         |    0
 cpukit/{librpc => }/include/rpc/rpc.h              |    0
 cpukit/{librpc => }/include/rpc/rpc_com.h          |    0
 cpukit/{librpc => }/include/rpc/rpc_msg.h          |    0
 cpukit/{librpc => }/include/rpc/rpcent.h           |    0
 cpukit/{librpc => }/include/rpc/svc.h              |    0
 cpukit/{librpc => }/include/rpc/svc_auth.h         |    0
 cpukit/{librpc => }/include/rpc/svc_soc.h          |    0
 cpukit/{librpc => }/include/rpc/types.h            |    0
 cpukit/{librpc => }/include/rpc/xdr.h              |    0
 cpukit/{rtems => }/include/rtems.h                 |    0
 cpukit/{libcsupport => }/include/rtems/assoc.h     |    0
 cpukit/{libblock => }/include/rtems/bdbuf.h        |    0
 cpukit/{libblock => }/include/rtems/bdpart.h       |    0
 cpukit/{libblock => }/include/rtems/blkdev.h       |    0
 cpukit/{sapi => }/include/rtems/bsd.h              |    0
 .../bspcmdline => include/rtems}/bspcmdline.h      |    0
 .../capture => include/rtems}/capture-cli.h        |    0
 .../{libmisc/capture => include/rtems}/capture.h   |    0
 .../capture => include/rtems}/captureimpl.h        |    0
 cpukit/{sapi => }/include/rtems/cbs.h              |    0
 cpukit/{sapi => }/include/rtems/chain.h            |    0
 cpukit/{sapi/include => include/rtems}/confdefs.h  |    0
 cpukit/{sapi => }/include/rtems/config.h           |    0
 cpukit/{sapi => }/include/rtems/counter.h          |    0
 cpukit/{libmisc/cpuuse => include/rtems}/cpuuse.h  |    0
 .../rtems/debugger}/rtems-debugger-remote.h        |    0
 .../rtems/debugger}/rtems-debugger-server.h        |    0
 cpukit/{libfs/src/devfs => include/rtems}/devfs.h  |    0
 cpukit/{libcsupport => }/include/rtems/deviceio.h  |    0
 .../{libmisc/devnull => include/rtems}/devnull.h   |    0
 .../{libmisc/devnull => include/rtems}/devzero.h   |    0
 cpukit/{libblock => }/include/rtems/diskdevs.h     |    0
 cpukit/{libfs/src/dosfs => include/rtems}/dosfs.h  |    0
 .../{libmisc/dumpbuf => include/rtems}/dumpbuf.h   |    0
 cpukit/{libcsupport => }/include/rtems/error.h     |    0
 cpukit/{sapi => }/include/rtems/extension.h        |    0
 cpukit/{sapi => }/include/rtems/extensionimpl.h    |    0
 cpukit/{sapi => }/include/rtems/fatal.h            |    0
 cpukit/{libmisc/fb => include/rtems}/fb.h          |    0
 cpukit/{libblock => }/include/rtems/flashdisk.h    |    0
 .../{libmisc/fsmount => include/rtems}/fsmount.h   |    0
 cpukit/{ftpd => include/rtems}/ftpd.h              |    0
 .../{libcsupport => }/include/rtems/gxx_wrappers.h |    0
 .../{libblock => }/include/rtems/ide_part_table.h  |    0
 cpukit/{libfs/src/imfs => include/rtems}/imfs.h    |    0
 cpukit/{sapi => }/include/rtems/init.h             |    0
 cpukit/{sapi => }/include/rtems/io.h               |    0
 cpukit/{sapi => }/include/rtems/ioimpl.h           |    0
 .../include => include/rtems}/iosupp.h             |    0
 cpukit/{libfs/src/jffs2 => }/include/rtems/jffs2.h |    0
 .../{libcsupport => }/include/rtems/libcsupport.h  |    0
 cpukit/{libi2c => include/rtems}/libi2c.h          |    0
 cpukit/{libcsupport => }/include/rtems/libio.h     |    0
 cpukit/{libcsupport => }/include/rtems/libio_.h    |    0
 cpukit/{score => }/include/rtems/linkersets.h      |    0
 cpukit/{libcsupport => }/include/rtems/malloc.h    |    0
 cpukit/{libblock => }/include/rtems/media.h        |    0
 .../{libmisc/monitor => include/rtems}/monitor.h   |    0
 .../mouse => include/rtems}/mouse_parser.h         |    0
 cpukit/{sapi => }/include/rtems/mptables.h         |    0
 cpukit/{libmisc/fb => include/rtems}/mw_uid.h      |    0
 cpukit/{libblock => }/include/rtems/nvdisk-sram.h  |    0
 cpukit/{libblock => }/include/rtems/nvdisk.h       |    0
 cpukit/{telnetd => include/rtems}/passwd.h         |    0
 cpukit/{libfs/src/pipe => include/rtems}/pipe.h    |    0
 cpukit/{posix => }/include/rtems/posix/aio_misc.h  |    0
 .../{posix => }/include/rtems/posix/barrierimpl.h  |    0
 cpukit/{posix => }/include/rtems/posix/condimpl.h  |    0
 cpukit/{posix => }/include/rtems/posix/config.h    |    0
 cpukit/{posix => }/include/rtems/posix/key.h       |    0
 cpukit/{posix => }/include/rtems/posix/keyimpl.h   |    0
 cpukit/{posix => }/include/rtems/posix/mmanimpl.h  |    0
 cpukit/{posix => }/include/rtems/posix/mqueue.h    |    0
 .../{posix => }/include/rtems/posix/mqueueimpl.h   |    0
 cpukit/{posix => }/include/rtems/posix/muteximpl.h |    0
 cpukit/{posix => }/include/rtems/posix/posixapi.h  |    0
 .../{posix => }/include/rtems/posix/priorityimpl.h |    0
 cpukit/{posix => }/include/rtems/posix/psignal.h   |    0
 .../{posix => }/include/rtems/posix/psignalimpl.h  |    0
 cpukit/{posix => }/include/rtems/posix/pthread.h   |    0
 .../include/rtems/posix/pthreadattrimpl.h          |    0
 .../{posix => }/include/rtems/posix/pthreadimpl.h  |    0
 cpukit/{posix => }/include/rtems/posix/ptimer.h    |    0
 .../{posix => }/include/rtems/posix/rwlockimpl.h   |    0
 cpukit/{posix => }/include/rtems/posix/semaphore.h |    0
 .../include/rtems/posix/semaphoreimpl.h            |    0
 cpukit/{posix => }/include/rtems/posix/shm.h       |    0
 cpukit/{posix => }/include/rtems/posix/shmimpl.h   |    0
 cpukit/{posix => }/include/rtems/posix/sigset.h    |    0
 .../{posix => }/include/rtems/posix/spinlockimpl.h |    0
 cpukit/{posix => }/include/rtems/posix/threadsup.h |    0
 cpukit/{posix => }/include/rtems/posix/timer.h     |    0
 cpukit/{posix => }/include/rtems/posix/timerimpl.h |    0
 cpukit/{sapi => }/include/rtems/profiling.h        |    0
 cpukit/{telnetd => include/rtems}/pty.h            |    0
 cpukit/{libqos => include/rtems}/qreslib.h         |    0
 cpukit/{libblock => }/include/rtems/ramdisk.h      |    0
 cpukit/{sapi => }/include/rtems/rbheap.h           |    0
 cpukit/{sapi => }/include/rtems/rbtree.h           |    0
 .../src => include/rtems}/rfs/rtems-rfs-bitmaps.h  |    0
 .../rtems}/rfs/rtems-rfs-block-pos.h               |    0
 .../src => include/rtems}/rfs/rtems-rfs-block.h    |    0
 .../src => include/rtems}/rfs/rtems-rfs-buffer.h   |    0
 .../src => include/rtems}/rfs/rtems-rfs-data.h     |    0
 .../src => include/rtems}/rfs/rtems-rfs-dir-hash.h |    0
 .../src => include/rtems}/rfs/rtems-rfs-dir.h      |    0
 .../rtems}/rfs/rtems-rfs-file-system-fwd.h         |    0
 .../rtems}/rfs/rtems-rfs-file-system.h             |    0
 .../src => include/rtems}/rfs/rtems-rfs-file.h     |    0
 .../src => include/rtems}/rfs/rtems-rfs-group.h    |    0
 .../src => include/rtems}/rfs/rtems-rfs-inode.h    |    0
 .../src => include/rtems}/rfs/rtems-rfs-link.h     |    0
 .../src => include/rtems}/rfs/rtems-rfs-mutex.h    |    0
 .../src => include/rtems}/rfs/rtems-rfs-trace.h    |    0
 .../include => include/rtems}/ringbuf.h            |    0
 .../rtems}/rtems-debugger.h                        |    0
 .../rtems-fdt => include/rtems}/rtems-fdt-shell.h  |    0
 .../rtems-fdt => include/rtems}/rtems-fdt.h        |    0
 .../src/rfs => include/rtems}/rtems-rfs-format.h   |    0
 .../src/rfs => include/rtems}/rtems-rfs-shell.h    |    0
 .../{libfs/src/rfs => include/rtems}/rtems-rfs.h   |    0
 cpukit/{rtems => }/include/rtems/rtems/asr.h       |    0
 cpukit/{rtems => }/include/rtems/rtems/asrimpl.h   |    0
 cpukit/{rtems => }/include/rtems/rtems/attr.h      |    0
 cpukit/{rtems => }/include/rtems/rtems/attrimpl.h  |    0
 cpukit/{rtems => }/include/rtems/rtems/barrier.h   |    0
 .../{rtems => }/include/rtems/rtems/barrierimpl.h  |    0
 cpukit/{rtems => }/include/rtems/rtems/cache.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/clock.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/config.h    |    0
 cpukit/{rtems => }/include/rtems/rtems/dpmem.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/dpmemimpl.h |    0
 cpukit/{rtems => }/include/rtems/rtems/event.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/eventimpl.h |    0
 cpukit/{rtems => }/include/rtems/rtems/eventmp.h   |    0
 cpukit/{rtems => }/include/rtems/rtems/intr.h      |    0
 cpukit/{ => include/rtems}/rtems/mainpage.h        |    0
 cpukit/{rtems => }/include/rtems/rtems/message.h   |    0
 .../{rtems => }/include/rtems/rtems/messageimpl.h  |    0
 cpukit/{rtems => }/include/rtems/rtems/modes.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/modesimpl.h |    0
 cpukit/{rtems => }/include/rtems/rtems/mp.h        |    0
 cpukit/{rtems => }/include/rtems/rtems/msgmp.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/object.h    |    0
 cpukit/{rtems => }/include/rtems/rtems/options.h   |    0
 .../{rtems => }/include/rtems/rtems/optionsimpl.h  |    0
 cpukit/{rtems => }/include/rtems/rtems/part.h      |    0
 cpukit/{rtems => }/include/rtems/rtems/partimpl.h  |    0
 cpukit/{rtems => }/include/rtems/rtems/partmp.h    |    0
 cpukit/{rtems => }/include/rtems/rtems/ratemon.h   |    0
 .../{rtems => }/include/rtems/rtems/ratemonimpl.h  |    0
 cpukit/{rtems => }/include/rtems/rtems/region.h    |    0
 .../{rtems => }/include/rtems/rtems/regionimpl.h   |    0
 cpukit/{rtems => }/include/rtems/rtems/sem.h       |    0
 cpukit/{rtems => }/include/rtems/rtems/semimpl.h   |    0
 cpukit/{rtems => }/include/rtems/rtems/semmp.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/signal.h    |    0
 .../{rtems => }/include/rtems/rtems/signalimpl.h   |    0
 cpukit/{rtems => }/include/rtems/rtems/signalmp.h  |    0
 cpukit/{rtems => }/include/rtems/rtems/smp.h       |    0
 cpukit/{rtems => }/include/rtems/rtems/status.h    |    0
 .../{rtems => }/include/rtems/rtems/statusimpl.h   |    0
 cpukit/{rtems => }/include/rtems/rtems/support.h   |    0
 cpukit/{rtems => }/include/rtems/rtems/taskmp.h    |    0
 cpukit/{rtems => }/include/rtems/rtems/tasks.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/tasksimpl.h |    0
 cpukit/{rtems => }/include/rtems/rtems/timer.h     |    0
 cpukit/{rtems => }/include/rtems/rtems/timerimpl.h |    0
 cpukit/{rtems => }/include/rtems/rtems/types.h     |    0
 cpukit/{pppd => include/rtems}/rtemsdialer.h       |    0
 cpukit/{pppd => include/rtems}/rtemspppd.h         |    0
 cpukit/{libdl => include/rtems/rtl}/dlfcn-shell.h  |    0
 cpukit/{libdl => include/rtems/rtl}/rap-shell.h    |    0
 cpukit/{libdl => include/rtems/rtl}/rap.h          |    0
 .../{libdl => include/rtems/rtl}/rtl-allocator.h   |    0
 cpukit/{libdl => include/rtems/rtl}/rtl-fwd.h      |    0
 .../rtems/rtl}/rtl-indirect-ptr.h                  |    0
 .../{libdl => include/rtems/rtl}/rtl-obj-cache.h   |    0
 cpukit/{libdl => include/rtems/rtl}/rtl-obj-comp.h |    0
 cpukit/{libdl => include/rtems/rtl}/rtl-obj-fwd.h  |    0
 cpukit/{libdl => include/rtems/rtl}/rtl-obj.h      |    0
 cpukit/{libdl => include/rtems/rtl}/rtl-sym.h      |    0
 cpukit/{libdl => include/rtems/rtl}/rtl-trace.h    |    0
 .../{libdl => include/rtems/rtl}/rtl-unresolved.h  |    0
 cpukit/{libdl => include/rtems/rtl}/rtl.h          |    0
 cpukit/{sapi => }/include/rtems/scheduler.h        |    0
 cpukit/{score => }/include/rtems/score/address.h   |    0
 cpukit/{score => }/include/rtems/score/apimutex.h  |    0
 cpukit/{score => }/include/rtems/score/assert.h    |    0
 cpukit/{score => }/include/rtems/score/atomic.h    |    0
 cpukit/{score => }/include/rtems/score/basedefs.h  |    0
 cpukit/{score => }/include/rtems/score/chain.h     |    0
 cpukit/{score => }/include/rtems/score/chainimpl.h |    0
 cpukit/{score => }/include/rtems/score/context.h   |    0
 cpukit/{score => }/include/rtems/score/copyrt.h    |    0
 .../{score => }/include/rtems/score/corebarrier.h  |    0
 .../include/rtems/score/corebarrierimpl.h          |    0
 cpukit/{score => }/include/rtems/score/coremsg.h   |    0
 .../{score => }/include/rtems/score/coremsgimpl.h  |    0
 cpukit/{score => }/include/rtems/score/coremutex.h |    0
 .../include/rtems/score/coremuteximpl.h            |    0
 .../include/rtems/score/corerwlockimpl.h           |    0
 cpukit/{score => }/include/rtems/score/coresem.h   |    0
 .../{score => }/include/rtems/score/coresemimpl.h  |    0
 .../{score => }/include/rtems/score/cpustdatomic.h |    0
 cpukit/{score => }/include/rtems/score/freechain.h |    0
 cpukit/{score => }/include/rtems/score/heap.h      |    0
 cpukit/{score => }/include/rtems/score/heapimpl.h  |    0
 cpukit/{score => }/include/rtems/score/interr.h    |    0
 cpukit/{score => }/include/rtems/score/io.h        |    0
 cpukit/{score => }/include/rtems/score/isr.h       |    0
 cpukit/{score => }/include/rtems/score/isrlevel.h  |    0
 cpukit/{score => }/include/rtems/score/isrlock.h   |    0
 cpukit/{score => }/include/rtems/score/mpci.h      |    0
 cpukit/{score => }/include/rtems/score/mpciimpl.h  |    0
 cpukit/{score => }/include/rtems/score/mppkt.h     |    0
 cpukit/{score => }/include/rtems/score/mrsp.h      |    0
 cpukit/{score => }/include/rtems/score/mrspimpl.h  |    0
 cpukit/{score => }/include/rtems/score/muteximpl.h |    0
 cpukit/{score => }/include/rtems/score/object.h    |    0
 .../{score => }/include/rtems/score/objectimpl.h   |    0
 cpukit/{score => }/include/rtems/score/objectmp.h  |    0
 cpukit/{score => }/include/rtems/score/onceimpl.h  |    0
 cpukit/{score => }/include/rtems/score/percpu.h    |    0
 cpukit/{score => }/include/rtems/score/priority.h  |    0
 .../include/rtems/score/prioritybitmap.h           |    0
 .../include/rtems/score/prioritybitmapimpl.h       |    0
 .../{score => }/include/rtems/score/priorityimpl.h |    0
 .../include/rtems/score/processormask.h            |    0
 cpukit/{score => }/include/rtems/score/profiling.h |    0
 .../include/rtems/score/protectedheap.h            |    0
 cpukit/{score => }/include/rtems/score/rbtree.h    |    0
 .../{score => }/include/rtems/score/rbtreeimpl.h   |    0
 cpukit/{score => }/include/rtems/score/scheduler.h |    0
 .../{score => }/include/rtems/score/schedulercbs.h |    0
 .../include/rtems/score/schedulercbsimpl.h         |    0
 .../{score => }/include/rtems/score/scheduleredf.h |    0
 .../include/rtems/score/scheduleredfimpl.h         |    0
 .../include/rtems/score/scheduleredfsmp.h          |    0
 .../include/rtems/score/schedulerimpl.h            |    0
 .../include/rtems/score/schedulernode.h            |    0
 .../include/rtems/score/schedulernodeimpl.h        |    0
 .../include/rtems/score/schedulerpriority.h        |    0
 .../rtems/score/schedulerpriorityaffinitysmp.h     |    0
 .../include/rtems/score/schedulerpriorityimpl.h    |    0
 .../include/rtems/score/schedulerprioritysmp.h     |    0
 .../include/rtems/score/schedulerprioritysmpimpl.h |    0
 .../include/rtems/score/schedulersimple.h          |    0
 .../include/rtems/score/schedulersimpleimpl.h      |    0
 .../include/rtems/score/schedulersimplesmp.h       |    0
 .../{score => }/include/rtems/score/schedulersmp.h |    0
 .../include/rtems/score/schedulersmpimpl.h         |    0
 .../include/rtems/score/schedulerstrongapa.h       |    0
 .../include/rtems/score/semaphoreimpl.h            |    0
 cpukit/{score => }/include/rtems/score/smp.h       |    0
 .../{score => }/include/rtems/score/smpbarrier.h   |    0
 cpukit/{score => }/include/rtems/score/smpimpl.h   |    0
 cpukit/{score => }/include/rtems/score/smplock.h   |    0
 .../{score => }/include/rtems/score/smplockmcs.h   |    0
 .../{score => }/include/rtems/score/smplockseq.h   |    0
 .../{score => }/include/rtems/score/smplockstats.h |    0
 .../include/rtems/score/smplockticket.h            |    0
 cpukit/{score => }/include/rtems/score/stack.h     |    0
 cpukit/{score => }/include/rtems/score/stackimpl.h |    0
 cpukit/{score => }/include/rtems/score/states.h    |    0
 .../{score => }/include/rtems/score/statesimpl.h   |    0
 cpukit/{score => }/include/rtems/score/status.h    |    0
 cpukit/{score => }/include/rtems/score/sysstate.h  |    0
 cpukit/{score => }/include/rtems/score/thread.h    |    0
 .../include/rtems/score/threaddispatch.h           |    0
 .../{score => }/include/rtems/score/threadimpl.h   |    0
 cpukit/{score => }/include/rtems/score/threadmp.h  |    0
 cpukit/{score => }/include/rtems/score/threadq.h   |    0
 .../{score => }/include/rtems/score/threadqimpl.h  |    0
 .../{score => }/include/rtems/score/timecounter.h  |    0
 .../include/rtems/score/timecounterimpl.h          |    0
 cpukit/{score => }/include/rtems/score/timespec.h  |    0
 cpukit/{score => }/include/rtems/score/timestamp.h |    0
 cpukit/{score => }/include/rtems/score/tls.h       |    0
 cpukit/{score => }/include/rtems/score/tod.h       |    0
 cpukit/{score => }/include/rtems/score/todimpl.h   |    0
 cpukit/{score => }/include/rtems/score/userext.h   |    0
 .../{score => }/include/rtems/score/userextimpl.h  |    0
 cpukit/{score => }/include/rtems/score/watchdog.h  |    0
 .../{score => }/include/rtems/score/watchdogimpl.h |    0
 cpukit/{score => }/include/rtems/score/wkspace.h   |    0
 cpukit/{libmisc/serdbg => include/rtems}/serdbg.h  |    0
 .../{libmisc/serdbg => include/rtems}/serdbgcnf.h  |    0
 .../mouse => include/rtems}/serial_mouse.h         |    0
 cpukit/{score => }/include/rtems/seterr.h          |    0
 cpukit/{libmisc/shell => include/rtems}/shell.h    |    0
 .../{libmisc/shell => include/rtems}/shellconfig.h |    0
 cpukit/{libblock => }/include/rtems/sparse-disk.h  |    0
 .../include => include/rtems}/spurious.h           |    0
 .../{libmisc/stackchk => include/rtems}/stackchk.h |    0
 .../redirector => include/rtems}/stdio-redirect.h  |    0
 .../{libmisc/stringto => include/rtems}/stringto.h |    0
 cpukit/{score => }/include/rtems/sysinit.h         |    0
 cpukit/{score => }/include/rtems/system.h          |    0
 cpukit/{telnetd => include/rtems}/telnetd.h        |    0
 .../serdbg => include/rtems}/termios_printk.h      |    0
 .../serdbg => include/rtems}/termios_printk_cnf.h  |    0
 .../{libcsupport => }/include/rtems/termiostypes.h |    0
 .../{libmisc/testsupport => include/rtems}/test.h  |    0
 cpukit/{sapi => }/include/rtems/timecounter.h      |    0
 cpukit/{sapi => }/include/rtems/timespec.h         |    0
 cpukit/{libcsupport => }/include/rtems/tod.h       |    0
 .../rtems/trace}/rtems-trace-buffer-vars.h         |    0
 cpukit/{libmisc/untar => include/rtems}/untar.h    |    0
 cpukit/{sapi => }/include/rtems/version.h          |    0
 .../include => include/rtems}/vmeintr.h            |    0
 cpukit/{libmd => include}/sha256.h                 |    0
 cpukit/{libmd => include}/sha512.h                 |    0
 cpukit/{score => }/include/sys/_ffcounter.h        |    0
 cpukit/{libdl => }/include/sys/cdefs_elf.h         |    0
 cpukit/{libcsupport => }/include/sys/event.h       |    0
 cpukit/{libdl => }/include/sys/exec_elf.h          |    0
 cpukit/{libcsupport => }/include/sys/poll.h        |    0
 cpukit/{libcsupport => }/include/sys/statvfs.h     |    0
 cpukit/{score => }/include/sys/timeffc.h           |    0
 cpukit/{score => }/include/sys/timepps.h           |    0
 cpukit/{score => }/include/sys/timetc.h            |    0
 cpukit/{score => }/include/sys/timex.h             |    0
 cpukit/{libcsupport => }/include/sys/utsname.h     |    0
 cpukit/{libmisc => include}/utf8proc/utf8proc.h    |    0
 cpukit/{libmisc => include}/uuid/uuid.h            |    0
 cpukit/{libmisc/xz => include}/xz.h                |    0
 cpukit/{zlib => include}/zlib.h                    |    0
 cpukit/libcrypt/Makefile.am                        |    3 -
 cpukit/libcrypt/preinstall.am                      |   15 -
 cpukit/libcsupport/Makefile.am                     |   26 -
 cpukit/libcsupport/preinstall.am                   |  101 --
 cpukit/libdebugger/Makefile.am                     |    5 +-
 cpukit/libdebugger/preinstall.am                   |    9 -
 cpukit/libdl/Makefile.am                           |    5 +-
 cpukit/libdl/preinstall.am                         |    7 -
 cpukit/libfs/Makefile.am                           |    6 +-
 cpukit/libfs/preinstall.am                         |   24 -
 cpukit/libfs/src/nfsclient/Makefile.am             |    8 +-
 cpukit/libfs/src/nfsclient/preinstall.am           |   51 -
 cpukit/libmd/Makefile.am                           |    7 -
 cpukit/libmd/preinstall.am                         |   38 -
 cpukit/libmisc/Makefile.am                         |    1 -
 cpukit/libmisc/preinstall.am                       |    9 -
 cpukit/libnetworking/Makefile.am                   |  124 +--
 cpukit/libnetworking/headers.am                    |  131 +++
 cpukit/libnetworking/preinstall.am                 |  424 --------
 cpukit/libnetworking/sys/poll.h                    |  104 --
 cpukit/libpci/Makefile.am                          |   12 -
 cpukit/libpci/preinstall.am                        |   79 --
 cpukit/librpc/Makefile.am                          |   21 -
 cpukit/librpc/preinstall.am                        |   89 --
 cpukit/libstdthreads/Makefile.am                   |    2 -
 cpukit/mghttpd/Makefile.am                         |    9 +-
 cpukit/mghttpd/preinstall.am                       |   41 -
 cpukit/posix/Makefile.am                           |   37 -
 cpukit/posix/preinstall.am                         |  146 ---
 cpukit/pppd/Makefile.am                            |    9 +-
 cpukit/pppd/preinstall.am                          |   43 -
 cpukit/preinstall.am                               |  751 --------------
 cpukit/rtems/Makefile.am                           |   55 -
 cpukit/rtems/preinstall.am                         |  222 ----
 cpukit/sapi/Makefile.am                            |   24 -
 cpukit/sapi/preinstall.am                          |  100 --
 cpukit/score/Makefile.am                           |  127 +--
 cpukit/score/cpu/arm/Makefile.am                   |   18 +-
 cpukit/score/cpu/arm/headers.am                    |   24 +
 .../cpu/arm/include}/machine/elf_machdep.h         |    0
 cpukit/score/cpu/arm/{ => include}/rtems/asm.h     |    0
 .../score/cpu/arm/{ => include}/rtems/score/arm.h  |    0
 .../cpu/arm/{ => include}/rtems/score/armv4.h      |    0
 .../cpu/arm/{ => include}/rtems/score/armv7m.h     |    0
 .../score/cpu/arm/{ => include}/rtems/score/cpu.h  |    0
 .../cpu/arm/{ => include}/rtems/score/cpu_asm.h    |    0
 .../{v850 => arm/include}/rtems/score/cpuatomic.h  |    0
 .../cpu/arm/{ => include}/rtems/score/cpuimpl.h    |    0
 .../cpu/arm/{ => include}/rtems/score/types.h      |    0
 cpukit/score/cpu/arm/preinstall.am                 |   70 --
 cpukit/score/cpu/bfin/Makefile.am                  |   18 +-
 cpukit/score/cpu/bfin/headers.am                   |   24 +
 .../cpu/bfin/include}/machine/elf_machdep.h        |    0
 cpukit/score/cpu/bfin/{ => include}/rtems/asm.h    |    0
 .../cpu/bfin/{ => include}/rtems/bfin/bf52x.h      |    0
 .../cpu/bfin/{ => include}/rtems/bfin/bf533.h      |    0
 .../score/cpu/bfin/{ => include}/rtems/bfin/bfin.h |    0
 .../cpu/bfin/{ => include}/rtems/score/bfin.h      |    0
 .../score/cpu/bfin/{ => include}/rtems/score/cpu.h |    0
 .../cpu/bfin/{ => include}/rtems/score/cpu_asm.h   |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../{v850 => bfin/include}/rtems/score/cpuimpl.h   |    0
 .../cpu/bfin/{ => include}/rtems/score/types.h     |    0
 cpukit/score/cpu/bfin/preinstall.am                |   70 --
 cpukit/score/cpu/epiphany/Makefile.am              |   17 +-
 cpukit/score/cpu/epiphany/headers.am               |   15 +
 .../score/cpu/epiphany/{ => include}/rtems/asm.h   |    0
 .../cpu/epiphany/{ => include}/rtems/score/cpu.h   |    0
 .../epiphany/{ => include}/rtems/score/cpu_asm.h   |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../include}/rtems/score/cpuimpl.h                 |    0
 .../{ => include}/rtems/score/epiphany-utility.h   |    0
 .../epiphany/{ => include}/rtems/score/epiphany.h  |    0
 .../cpu/epiphany/{ => include}/rtems/score/types.h |    0
 cpukit/score/cpu/epiphany/preinstall.am            |   57 -
 cpukit/score/cpu/h8300/headers.am                  |    5 +
 .../cpu/h8300/include}/machine/elf_machdep.h       |    0
 cpukit/score/cpu/i386/Makefile.am                  |   15 +-
 cpukit/score/cpu/i386/headers.am                   |   20 +
 .../cpu/i386/include}/machine/elf_machdep.h        |    0
 cpukit/score/cpu/i386/{ => include}/rtems/asm.h    |    0
 .../score/cpu/i386/{ => include}/rtems/score/cpu.h |    0
 .../{sh => i386/include}/rtems/score/cpuatomic.h   |    0
 .../cpu/{sh => i386/include}/rtems/score/cpuimpl.h |    0
 .../cpu/i386/{ => include}/rtems/score/i386.h      |    0
 .../cpu/i386/{ => include}/rtems/score/idtr.h      |    0
 .../i386/{ => include}/rtems/score/interrupts.h    |    0
 .../cpu/i386/{ => include}/rtems/score/registers.h |    0
 .../cpu/i386/{ => include}/rtems/score/types.h     |    0
 cpukit/score/cpu/i386/preinstall.am                |   61 --
 cpukit/score/cpu/lm32/Makefile.am                  |   13 +-
 cpukit/score/cpu/lm32/headers.am                   |   18 +
 .../cpu/lm32/include}/machine/elf_machdep.h        |    0
 cpukit/score/cpu/lm32/{ => include}/rtems/asm.h    |    0
 .../score/cpu/lm32/{ => include}/rtems/score/cpu.h |    0
 .../cpu/lm32/{ => include}/rtems/score/cpu_asm.h   |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../{or1k => lm32/include}/rtems/score/cpuimpl.h   |    0
 .../cpu/lm32/{ => include}/rtems/score/lm32.h      |    0
 .../cpu/lm32/{ => include}/rtems/score/types.h     |    0
 cpukit/score/cpu/lm32/preinstall.am                |   53 -
 cpukit/score/cpu/m32c/Makefile.am                  |   15 +-
 cpukit/score/cpu/m32c/headers.am                   |   17 +
 cpukit/score/cpu/m32c/{ => include}/rtems/asm.h    |    0
 .../score/cpu/m32c/{ => include}/rtems/score/cpu.h |    0
 .../cpu/m32c/{ => include}/rtems/score/cpu_asm.h   |    0
 .../{or1k => m32c/include}/rtems/score/cpuatomic.h |    0
 .../{nios2 => m32c/include}/rtems/score/cpuimpl.h  |    0
 .../cpu/m32c/{ => include}/rtems/score/m32c.h      |    0
 .../cpu/m32c/{ => include}/rtems/score/types.h     |    0
 cpukit/score/cpu/m32c/{ => include}/varvects.h     |    0
 cpukit/score/cpu/m32c/preinstall.am                |   62 --
 cpukit/score/cpu/m68k/Makefile.am                  |   18 +-
 cpukit/score/cpu/m68k/headers.am                   |   24 +
 .../cpu/m68k/include}/machine/elf_machdep.h        |    0
 cpukit/score/cpu/m68k/{ => include}/rtems/asm.h    |    0
 .../cpu/m68k/{ => include}/rtems/m68k/m68302.h     |    0
 .../cpu/m68k/{ => include}/rtems/m68k/m68360.h     |    0
 .../score/cpu/m68k/{ => include}/rtems/m68k/qsm.h  |    0
 .../score/cpu/m68k/{ => include}/rtems/m68k/sim.h  |    0
 .../score/cpu/m68k/{ => include}/rtems/score/cpu.h |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../{moxie => m68k/include}/rtems/score/cpuimpl.h  |    0
 .../cpu/m68k/{ => include}/rtems/score/m68k.h      |    0
 .../cpu/m68k/{ => include}/rtems/score/types.h     |    0
 cpukit/score/cpu/m68k/preinstall.am                |   70 --
 cpukit/score/cpu/mips/Makefile.am                  |   16 +-
 cpukit/score/cpu/mips/headers.am                   |   22 +
 .../cpu/mips/include}/machine/elf_machdep.h        |    0
 cpukit/score/cpu/mips/{ => include}/rtems/asm.h    |    0
 .../cpu/mips/{ => include}/rtems/mips/idtcpu.h     |    0
 .../cpu/mips/{ => include}/rtems/mips/iregdef.h    |    0
 .../score/cpu/mips/{ => include}/rtems/score/cpu.h |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../cpu/mips/{ => include}/rtems/score/cpuimpl.h   |    0
 .../cpu/mips/{ => include}/rtems/score/mips.h      |    0
 .../cpu/mips/{ => include}/rtems/score/types.h     |    0
 cpukit/score/cpu/mips/preinstall.am                |   62 --
 cpukit/score/cpu/moxie/Makefile.am                 |   11 +-
 cpukit/score/cpu/moxie/headers.am                  |   17 +
 .../cpu/moxie/include}/machine/elf_machdep.h       |    0
 cpukit/score/cpu/moxie/{ => include}/rtems/asm.h   |    0
 .../cpu/moxie/{ => include}/rtems/score/cpu.h      |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../{m68k => moxie/include}/rtems/score/cpuimpl.h  |    0
 .../cpu/moxie/{ => include}/rtems/score/moxie.h    |    0
 .../cpu/moxie/{ => include}/rtems/score/types.h    |    0
 cpukit/score/cpu/moxie/preinstall.am               |   49 -
 cpukit/score/cpu/nios2/Makefile.am                 |   18 +-
 cpukit/score/cpu/nios2/headers.am                  |   20 +
 .../cpu/nios2/include}/machine/elf_machdep.h       |    0
 cpukit/score/cpu/nios2/{ => include}/rtems/asm.h   |    0
 .../cpu/nios2/{ => include}/rtems/score/cpu.h      |    0
 .../cpu/nios2/{ => include}/rtems/score/cpu_asm.h  |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../{m32c => nios2/include}/rtems/score/cpuimpl.h  |    0
 .../{ => include}/rtems/score/nios2-count-zeros.h  |    0
 .../{ => include}/rtems/score/nios2-utility.h      |    0
 .../cpu/nios2/{ => include}/rtems/score/nios2.h    |    0
 .../cpu/nios2/{ => include}/rtems/score/types.h    |    0
 cpukit/score/cpu/nios2/preinstall.am               |   61 --
 cpukit/score/cpu/no_cpu/Makefile.am                |   12 +-
 cpukit/score/cpu/no_cpu/headers.am                 |   13 +
 cpukit/score/cpu/no_cpu/{ => include}/rtems/asm.h  |    0
 .../cpu/no_cpu/{ => include}/rtems/score/cpu.h     |    0
 .../cpu/no_cpu/{ => include}/rtems/score/cpu_asm.h |    0
 .../cpu/no_cpu/{ => include}/rtems/score/cpuimpl.h |    0
 .../cpu/no_cpu/{ => include}/rtems/score/no_cpu.h  |    0
 .../cpu/no_cpu/{ => include}/rtems/score/types.h   |    0
 cpukit/score/cpu/no_cpu/preinstall.am              |   49 -
 cpukit/score/cpu/or1k/Makefile.am                  |   17 +-
 cpukit/score/cpu/or1k/headers.am                   |   15 +
 cpukit/score/cpu/or1k/{ => include}/rtems/asm.h    |    0
 .../score/cpu/or1k/{ => include}/rtems/score/cpu.h |    0
 .../cpu/or1k/{ => include}/rtems/score/cpu_asm.h   |    0
 .../{m32c => or1k/include}/rtems/score/cpuatomic.h |    0
 .../{lm32 => or1k/include}/rtems/score/cpuimpl.h   |    0
 .../or1k/{ => include}/rtems/score/or1k-utility.h  |    0
 .../cpu/or1k/{ => include}/rtems/score/or1k.h      |    0
 .../cpu/or1k/{ => include}/rtems/score/types.h     |    0
 cpukit/score/cpu/or1k/preinstall.am                |   57 -
 cpukit/score/cpu/powerpc/Makefile.am               |   15 +-
 cpukit/score/cpu/powerpc/headers.am                |   21 +
 .../cpu/powerpc/include}/machine/elf_machdep.h     |    0
 cpukit/score/cpu/powerpc/{ => include}/rtems/asm.h |    0
 .../{ => include}/rtems/powerpc/registers.h        |    0
 .../cpu/powerpc/{ => include}/rtems/score/cpu.h    |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../powerpc/{ => include}/rtems/score/cpuimpl.h    |    0
 .../powerpc/{ => include}/rtems/score/powerpc.h    |    0
 .../cpu/powerpc/{ => include}/rtems/score/types.h  |    0
 cpukit/score/cpu/powerpc/preinstall.am             |   58 --
 cpukit/score/cpu/riscv/Makefile.am                 |   14 +-
 cpukit/score/cpu/riscv/headers.am                  |   15 +
 cpukit/score/cpu/riscv/{ => include}/rtems/asm.h   |    0
 .../cpu/riscv/{ => include}/rtems/score/cpu.h      |    0
 .../cpu/riscv/{ => include}/rtems/score/cpu_asm.h  |    0
 .../riscv/{ => include}/rtems/score/cpuatomic.h    |    0
 .../cpu/riscv/{ => include}/rtems/score/cpuimpl.h  |    0
 .../{ => include}/rtems/score/riscv-utility.h      |    0
 .../cpu/riscv/{ => include}/rtems/score/riscv.h    |    0
 .../cpu/riscv/{ => include}/rtems/score/types.h    |    0
 cpukit/score/cpu/riscv/preinstall.am               |   57 -
 cpukit/score/cpu/sh/Makefile.am                    |   13 +-
 cpukit/score/cpu/sh/headers.am                     |   14 +
 cpukit/score/cpu/sh/{ => include}/rtems/asm.h      |    0
 .../score/cpu/sh/{ => include}/rtems/score/cpu.h   |    0
 .../{i386 => sh/include}/rtems/score/cpuatomic.h   |    0
 .../cpu/{i386 => sh/include}/rtems/score/cpuimpl.h |    0
 cpukit/score/cpu/sh/{ => include}/rtems/score/sh.h |    0
 .../score/cpu/sh/{ => include}/rtems/score/sh_io.h |    0
 .../score/cpu/sh/{ => include}/rtems/score/types.h |    0
 cpukit/score/cpu/sh/preinstall.am                  |   53 -
 cpukit/score/cpu/sparc/Makefile.am                 |   16 +-
 cpukit/score/cpu/sparc/headers.am                  |   22 +
 .../cpu/sparc/include}/machine/elf_machdep.h       |    0
 cpukit/score/cpu/sparc/{ => include}/rtems/asm.h   |    0
 .../cpu/sparc/{ => include}/rtems/score/cpu.h      |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../cpu/sparc/{ => include}/rtems/score/cpuimpl.h  |    0
 .../cpu/sparc/{ => include}/rtems/score/sparc.h    |    0
 .../sparc/{ => include}/rtems/score/sparcimpl.h    |    0
 .../cpu/sparc/{ => include}/rtems/score/types.h    |    0
 cpukit/score/cpu/sparc/preinstall.am               |   62 --
 cpukit/score/cpu/sparc64/Makefile.am               |   12 +-
 cpukit/score/cpu/sparc64/headers.am                |   13 +
 cpukit/score/cpu/sparc64/{ => include}/rtems/asm.h |    0
 .../cpu/sparc64/{ => include}/rtems/score/cpu.h    |    0
 .../include}/rtems/score/cpuatomic.h               |    0
 .../include}/rtems/score/cpuimpl.h                 |    0
 .../sparc64/{ => include}/rtems/score/sparc64.h    |    0
 .../cpu/sparc64/{ => include}/rtems/score/types.h  |    0
 cpukit/score/cpu/sparc64/preinstall.am             |   49 -
 cpukit/score/cpu/v850/Makefile.am                  |   12 +-
 cpukit/score/cpu/v850/headers.am                   |   18 +
 .../cpu/v850/include}/machine/elf_machdep.h        |    0
 cpukit/score/cpu/v850/{ => include}/rtems/asm.h    |    0
 .../score/cpu/v850/{ => include}/rtems/score/cpu.h |    0
 .../cpu/v850/{ => include}/rtems/score/cpu_asm.h   |    0
 .../{arm => v850/include}/rtems/score/cpuatomic.h  |    0
 .../{bfin => v850/include}/rtems/score/cpuimpl.h   |    0
 .../cpu/v850/{ => include}/rtems/score/types.h     |    0
 .../cpu/v850/{ => include}/rtems/score/v850.h      |    0
 cpukit/score/cpu/v850/preinstall.am                |   53 -
 cpukit/score/preinstall.am                         |  472 ---------
 cpukit/telnetd/Makefile.am                         |    9 +-
 cpukit/telnetd/preinstall.am                       |   49 -
 cpukit/wrapup/Makefile.am                          |    6 +-
 cpukit/wrapup/preinstall.am                        |   24 -
 cpukit/zlib/Makefile.am                            |    8 +-
 cpukit/zlib/preinstall.am                          |   38 -
 testsuites/aclocal/check-cpuopts.m4                |   10 +-
 testsuites/aclocal/prog-cc.m4                      |    9 +-
 testsuites/aclocal/rtems-bsp-includes.m4           |   13 +
 testsuites/aclocal/rtems-bsp-linkcmds.m4           |   25 +
 testsuites/aclocal/rtems-build-top.m4              |   12 +
 testsuites/aclocal/rtems-includes.m4               |   23 +
 testsuites/aclocal/rtems-source-top.m4             |    8 +
 testsuites/ada/ada.am                              |    8 +-
 testsuites/ada/configure.ac                        |    2 +
 testsuites/ada/samples/base_mp/node1/Makefile.am   |    2 +-
 testsuites/ada/samples/base_mp/node2/Makefile.am   |    2 +-
 testsuites/ada/samples/base_sp/Makefile.am         |    2 +-
 testsuites/ada/samples/hello/Makefile.am           |    2 +-
 testsuites/ada/samples/nsecs/Makefile.am           |    2 +-
 testsuites/ada/samples/ticker/Makefile.am          |    2 +-
 testsuites/ada/sptests/spname01/Makefile.am        |    2 +-
 testsuites/automake/compile.am                     |   13 +-
 testsuites/automake/host.am                        |    3 -
 testsuites/automake/local.am                       |    5 +-
 testsuites/benchmarks/configure.ac                 |    2 +
 testsuites/configure.ac                            |    2 +
 testsuites/fstests/configure.ac                    |    2 +
 testsuites/libtests/POSIX/Makefile.am              |    2 +-
 testsuites/libtests/configure.ac                   |    2 +
 testsuites/libtests/ftp01/Makefile.am              |    2 +-
 testsuites/libtests/mghttpd01/Makefile.am          |    1 +
 testsuites/libtests/networking01/Makefile.am       |    2 +-
 testsuites/libtests/syscall01/Makefile.am          |    1 +
 testsuites/mptests/configure.ac                    |    2 +
 testsuites/psxtests/configure.ac                   |    2 +
 testsuites/psxtmtests/configure.ac                 |    2 +
 testsuites/rhealstone/configure.ac                 |    2 +
 testsuites/samples/configure.ac                    |    2 +
 testsuites/samples/loopback/Makefile.am            |    1 +
 testsuites/samples/pppd/Makefile.am                |    1 +
 testsuites/smptests/configure.ac                   |    2 +
 testsuites/sptests/configure.ac                    |    2 +
 testsuites/tmtests/configure.ac                    |    2 +
 testsuites/tools/configure.ac                      |    2 +
 testsuites/tools/generic/configure.ac              |    2 +
 tools/build/configure.ac                           |    2 +
 tools/cpu/configure.ac                             |    2 +
 tools/cpu/generic/configure.ac                     |    2 +
 tools/cpu/nios2/configure.ac                       |    2 +
 tools/cpu/sh/configure.ac                          |    2 +
 2356 files changed, 4035 insertions(+), 19791 deletions(-)

diff --git a/aclocal/rtems-bsp-includes.m4 b/aclocal/rtems-bsp-includes.m4
new file mode 100644
index 0000000..2248211
--- /dev/null
+++ b/aclocal/rtems-bsp-includes.m4
@@ -0,0 +1,13 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_BSP_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+RTEMS_BSP_CPPFLAGS="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include"
+AC_SUBST([RTEMS_BSP_CPPFLAGS])
+])
diff --git a/aclocal/rtems-build-top.m4 b/aclocal/rtems-build-top.m4
new file mode 100644
index 0000000..5708119
--- /dev/null
+++ b/aclocal/rtems-build-top.m4
@@ -0,0 +1,12 @@
+dnl
+dnl RTEMS_BUILD_TOP($1)
+dnl
+AC_DEFUN([RTEMS_BUILD_TOP],
+[dnl
+#
+# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to
+# copy it that attempt to clean this crap up.
+#
+RTEMS_BUILD_ROOT="${with_rtems_build_top}"
+AC_SUBST([RTEMS_BUILD_ROOT])
+])dnl
diff --git a/aclocal/rtems-includes.m4 b/aclocal/rtems-includes.m4
new file mode 100644
index 0000000..ca4ebed
--- /dev/null
+++ b/aclocal/rtems-includes.m4
@@ -0,0 +1,23 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+
+# Was CFLAGS set?
+rtems_cv_CFLAGS_set="${CFLAGS+set}"
+
+RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include"
+RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include"
+
+RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}"
+RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include"
+
+RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}"
+
+RTEMS_CPPFLAGS="${RTEMS_INCLUDE}"
+
+AC_SUBST([RTEMS_CPPFLAGS])
+])
diff --git a/aclocal/rtems-source-top.m4 b/aclocal/rtems-source-top.m4
new file mode 100644
index 0000000..d1460ae
--- /dev/null
+++ b/aclocal/rtems-source-top.m4
@@ -0,0 +1,8 @@
+dnl
+dnl RTEMS_SOURCE_TOP
+dnl
+AC_DEFUN([RTEMS_SOURCE_TOP],
+[dnl
+RTEMS_SOURCE_ROOT="${with_rtems_source_top}"
+AC_SUBST([RTEMS_SOURCE_ROOT])
+])dnl
diff --git a/automake/host.am b/automake/host.am
index 7367d00..f999b83 100644
--- a/automake/host.am
+++ b/automake/host.am
@@ -3,6 +3,3 @@
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
diff --git a/automake/local.am b/automake/local.am
index 4de51e5..8068b4c 100644
--- a/automake/local.am
+++ b/automake/local.am
@@ -1,5 +1,3 @@
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
-
 PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
+
+all-local: $(TMPINSTALL_FILES)
diff --git a/automake/subdirs.am b/automake/subdirs.am
index 7ebc65a..37617e0 100644
--- a/automake/subdirs.am
+++ b/automake/subdirs.am
@@ -5,26 +5,3 @@
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
-preinstall-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-## This trick allows "-k" to keep its natural meaning when running a
-## recursive rule.
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-preinstall: preinstall-recursive
-.PHONY: preinstall-recursive
diff --git a/bootstrap b/bootstrap
index 4db57e0..eb6d4fc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -13,6 +13,9 @@
 progname=`basename $0`
 top_srcdir=`dirname $0`
 
+LC_ALL=C
+export LC_ALL
+
 verbose=""
 quiet="false"
 mode="autoreconf"
@@ -26,7 +29,7 @@ usage()
   echo "options:"
   echo "	-c .. clean, remove all aclocal/autoconf/automake generated files"
   echo "	-h .. display this message and exit"
-  echo "	-p .. regenerate preinstall.am files"
+  echo "	-H .. regenerate headers.am files"
   echo "	-q .. quiet, don't display directories"
   echo "	-v .. verbose, pass -v to autotools"
   echo
@@ -85,8 +88,8 @@ case $1 in
 -f|--fo|--for|--forc|--force)
   force=`expr $force + 1`
   shift;;
--p|--pr|--pre|--prei|--prein|--preins|--preinst)
-  mode="preinstall"
+-H|--headers)
+  mode="headers"
   shift;;
 -r|--re|--rec|--reco|--recon|--reconf)
   mode="autoreconf"
@@ -102,13 +105,70 @@ esac
 done
 
 case $mode in
-preinstall)
-  confs=`find . -name Makefile.am -exec grep -l 'include .*/preinstall\.am' {} \;`
-  for i in $confs; do
-    dir=$(dirname $i)
-    test "$quite" = "true" || echo "Generating $dir/preinstall.am"
-    ${top_srcdir}/ampolish3 "$dir/Makefile.am" > "$dir/preinstall.am"
+headers)
+  if test "." != "$top_srcdir"; then
+    echo "To generate the headers.am you must call the script via \"./$progname -H\""
+    exit 1
+  fi
+  base="$PWD"
+  tmp="$base/headers.am.new"
+  for i in cpukit/include cpukit/score/cpu/*/include bsps/include bsps/*/include bsps/*/*/include ; do
+    dir=""
+    am_dir=""
+    echo '## This file was generated by "./boostrap -H".' > "$tmp"
+    case $i in
+      cpukit/include)
+        hdr="../"
+        inc="include/"
+        ;;
+      cpukit/score/cpu/*/include)
+        hdr="../"
+        inc=`echo $i | cut -d'/' -f5-`
+        inc="$inc/"
+        ;;
+      bsps/*/*/include)
+        hdr="../"
+        inc="../../../../../../$i/"
+        ;;
+      bsps/*/include)
+        hdr="../"
+        inc="../../../../../$i/"
+        ;;
+      bsps/include)
+        hdr="../"
+        inc="../../$i/"
+        ;;
+      *)
+        hdr=""
+        inc=""
+        ;;
+    esac
+    cd $i
+    for b in `find -type d | sort` ; do
+      for j in `find $b -mindepth 1 -maxdepth 1 -name '*.h' -or -name '*.inc' | sed 's%^\.%%' | sed 's%^/%%' | sort` ; do
+        d=`dirname $j`
+        if test x$d != x$dir ; then
+          dir=$d
+          if test x$d != x. ; then
+            am_dir=`echo $dir | sed 's%[/-]%_%g'`
+            am_dir="_$am_dir"
+            echo -e "\ninclude${am_dir}dir = \$(includedir)/$dir" >> "$tmp"
+          else
+            am_dir=""
+            echo "" >> "$tmp"
+          fi
+          echo "include${am_dir}_HEADERS =" >> "$tmp"
+        fi
+        echo "include${am_dir}_HEADERS += $inc$j" >> "$tmp"
+        if test $j = bsp.h ; then
+          echo -e "include_HEADERS += include/bspopts.h" >> "$tmp"
+        fi
+      done
+    done
+    cd "$base"
+    diff -q "$tmp" "$i/${hdr}headers.am" || mv "$tmp" "$i/${hdr}headers.am"
   done
+  rm -f "$tmp"
   ;;
 
 generate)
diff --git a/bsps/arm/altera-cyclone-v/headers.am b/bsps/arm/altera-cyclone-v/headers.am
new file mode 100644
index 0000000..f63ee38
--- /dev/null
+++ b/bsps/arm/altera-cyclone-v/headers.am
@@ -0,0 +1,45 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_16550_uart.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_address_space.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_cache.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_clock_group.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_clock_manager.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma_common.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_dma_program.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_generalpurpose_io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_hwlibs_ver.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_interrupt_common.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_mpu_registers.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_qspi_private.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/alt_reset_manager.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/hwlib.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/i2cdrv.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/irq.h
+
+include_bsp_socaldir = $(includedir)/bsp/socal
+include_bsp_socal_HEADERS =
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_acpidmap.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_clkmgr.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmanonsecure.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmasecure.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_gpio.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_i2c.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_l3.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspi.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspidata.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_rstmgr.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sdr.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sysmgr.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/alt_uart.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/hps.h
+include_bsp_socal_HEADERS += ../../../../../../bsps/arm/altera-cyclone-v/include/bsp/socal/socal.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/bsp.h b/bsps/arm/altera-cyclone-v/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/include/bsp.h
rename to bsps/arm/altera-cyclone-v/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_16550_uart.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_16550_uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_16550_uart.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_16550_uart.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_address_space.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_address_space.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_address_space.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_address_space.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_cache.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_cache.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_cache.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_cache.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_group.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_clock_group.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_group.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_clock_group.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_manager.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_clock_manager.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_clock_manager.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_clock_manager.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_dma.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_common.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma_common.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_common.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_dma_common.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_program.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_dma_program.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_dma_program.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_dma_program.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_generalpurpose_io.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_generalpurpose_io.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_generalpurpose_io.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_generalpurpose_io.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_hwlibs_ver.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_hwlibs_ver.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_hwlibs_ver.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_hwlibs_ver.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_i2c.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_i2c.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_i2c.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_interrupt_common.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_interrupt_common.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_interrupt_common.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_interrupt_common.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_mpu_registers.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_mpu_registers.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_mpu_registers.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_mpu_registers.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi_private.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_qspi_private.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi_private.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_qspi_private.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_reset_manager.h b/bsps/arm/altera-cyclone-v/include/bsp/alt_reset_manager.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_reset_manager.h
rename to bsps/arm/altera-cyclone-v/include/bsp/alt_reset_manager.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/hwlib.h b/bsps/arm/altera-cyclone-v/include/bsp/hwlib.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/hwlib.h
rename to bsps/arm/altera-cyclone-v/include/bsp/hwlib.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/i2cdrv.h b/bsps/arm/altera-cyclone-v/include/bsp/i2cdrv.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/include/i2cdrv.h
rename to bsps/arm/altera-cyclone-v/include/bsp/i2cdrv.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/irq.h b/bsps/arm/altera-cyclone-v/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/include/irq.h
rename to bsps/arm/altera-cyclone-v/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_acpidmap.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_acpidmap.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_acpidmap.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_acpidmap.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_clkmgr.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_clkmgr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_clkmgr.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_clkmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmanonsecure.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmanonsecure.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmanonsecure.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmanonsecure.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmasecure.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmasecure.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_dmasecure.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_dmasecure.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_gpio.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_gpio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_gpio.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_gpio.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_i2c.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_i2c.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_i2c.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_l3.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_l3.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_l3.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_l3.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspi.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspi.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspi.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspidata.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspidata.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_qspidata.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_qspidata.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_rstmgr.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_rstmgr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_rstmgr.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_rstmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sdr.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sdr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sdr.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sdr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sysmgr.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sysmgr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_sysmgr.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_sysmgr.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_uart.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/alt_uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/alt_uart.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/alt_uart.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/hps.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/hps.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/hps.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/hps.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/socal.h b/bsps/arm/altera-cyclone-v/include/bsp/socal/socal.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/socal/socal.h
rename to bsps/arm/altera-cyclone-v/include/bsp/socal/socal.h
diff --git a/c/src/lib/libbsp/arm/imx/include/tm27.h b/bsps/arm/altera-cyclone-v/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/tm27.h
rename to bsps/arm/altera-cyclone-v/include/tm27.h
diff --git a/bsps/arm/atsam/headers.am b/bsps/arm/atsam/headers.am
new file mode 100644
index 0000000..1ec34a2
--- /dev/null
+++ b/bsps/arm/atsam/headers.am
@@ -0,0 +1,269 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/atsam/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/atsam-clock-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/atsam-i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/atsam-spi.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/pin-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/power.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/sc16is752.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/atsam/include/bsp/spi.h
+
+include_libchipdir = $(includedir)/libchip
+include_libchip_HEADERS =
+include_libchip_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/chip.h
+include_libchip_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/compiler.h
+
+include_libchip_includedir = $(includedir)/libchip/include
+include_libchip_include_HEADERS =
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/acc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/adc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/aes.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/afe_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/afec.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/chip.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/dac_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/efc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/exceptions.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/flashd.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/gmac.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/gmacd.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/hsmci.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/icm.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/isi.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/iso7816_4.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/mcan.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/mcid.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/mediaLB.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/mpu.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pio.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pio_capture.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pio_it.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pmc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/pwmc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/qspi.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/qspi_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/rstc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/rtc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/rtt.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sdramc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/smc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/spi.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/spi_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/ssc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/supc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/tc.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/timetick.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/trace.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/trng.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/twi.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/twid.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/uart.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/uart_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/usart.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/usart_dma.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/usbhs.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/video.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/wdt.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/xdma_hardware_interface.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/xdmac.h
+include_libchip_include_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/xdmad.h
+
+include_libchip_include_same70dir = $(includedir)/libchip/include/same70
+include_libchip_include_same70_HEADERS =
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70j19.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70j20.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70j21.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70n19.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70n20.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70n21.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70q19.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70q20.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/same70q21.h
+include_libchip_include_same70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/system_same70.h
+
+include_libchip_include_same70_componentdir = $(includedir)/libchip/include/same70/component
+include_libchip_include_same70_component_HEADERS =
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_acc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_aes.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_afec.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_chipid.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_dacc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_efc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_gmac.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_gpbr.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_hsmci.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_icm.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_isi.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_matrix.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_mcan.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_pio.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_pmc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_pwm.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_qspi.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_rstc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_rswdt.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_rtc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_rtt.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_sdramc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_smc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_spi.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_ssc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_supc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_tc.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_trng.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_twihs.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_uart.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_usart.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_usbhs.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_utmi.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_wdt.h
+include_libchip_include_same70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/component/component_xdmac.h
+
+include_libchip_include_same70_piodir = $(includedir)/libchip/include/same70/pio
+include_libchip_include_same70_pio_HEADERS =
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j19.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j20.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j21.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n19.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n20.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n21.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q19.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q20.h
+include_libchip_include_same70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q21.h
+
+include_libchip_include_sams70dir = $(includedir)/libchip/include/sams70
+include_libchip_include_sams70_HEADERS =
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70j19.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70j20.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70j21.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70n19.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70n20.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70n21.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70q19.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70q20.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/sams70q21.h
+include_libchip_include_sams70_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/system_sams70.h
+
+include_libchip_include_sams70_componentdir = $(includedir)/libchip/include/sams70/component
+include_libchip_include_sams70_component_HEADERS =
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_acc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_aes.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_afec.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_chipid.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_dacc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_efc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_gpbr.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_hsmci.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_icm.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_isi.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_matrix.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_pio.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_pmc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_pwm.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_qspi.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_rstc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_rswdt.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_rtc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_rtt.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_sdramc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_smc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_spi.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_ssc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_supc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_tc.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_trng.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_twihs.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_uart.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_usart.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_usbhs.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_utmi.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_wdt.h
+include_libchip_include_sams70_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/component/component_xdmac.h
+
+include_libchip_include_sams70_piodir = $(includedir)/libchip/include/sams70/pio
+include_libchip_include_sams70_pio_HEADERS =
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j19.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j20.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j21.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n19.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n20.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n21.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q19.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q20.h
+include_libchip_include_sams70_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q21.h
+
+include_libchip_include_samv71dir = $(includedir)/libchip/include/samv71
+include_libchip_include_samv71_HEADERS =
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71j19.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71j20.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71j21.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71n19.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71n20.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71n21.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71q19.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71q20.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/samv71q21.h
+include_libchip_include_samv71_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/system_samv71.h
+
+include_libchip_include_samv71_componentdir = $(includedir)/libchip/include/samv71/component
+include_libchip_include_samv71_component_HEADERS =
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_acc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_aes.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_afec.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_chipid.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_dacc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_efc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_gmac.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_gpbr.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_hsmci.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_icm.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_isi.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_matrix.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_mcan.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_mlb.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_pio.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_pmc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_pwm.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_qspi.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_rstc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_rswdt.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_rtc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_rtt.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_sdramc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_smc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_spi.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_ssc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_supc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_tc.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_trng.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_twihs.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_uart.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_usart.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_usbhs.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_utmi.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_wdt.h
+include_libchip_include_samv71_component_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/component/component_xdmac.h
+
+include_libchip_include_samv71_piodir = $(includedir)/libchip/include/samv71/pio
+include_libchip_include_samv71_pio_HEADERS =
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j19.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j20.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j21.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n19.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n20.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n21.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q19.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q20.h
+include_libchip_include_samv71_pio_HEADERS += ../../../../../../bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/bsp.h b/bsps/arm/atsam/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/bsp.h
rename to bsps/arm/atsam/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/atsam-clock-config.h b/bsps/arm/atsam/include/bsp/atsam-clock-config.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/atsam-clock-config.h
rename to bsps/arm/atsam/include/bsp/atsam-clock-config.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/atsam-i2c.h b/bsps/arm/atsam/include/bsp/atsam-i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/atsam-i2c.h
rename to bsps/arm/atsam/include/bsp/atsam-i2c.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/atsam-spi.h b/bsps/arm/atsam/include/bsp/atsam-spi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/atsam-spi.h
rename to bsps/arm/atsam/include/bsp/atsam-spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/i2c.h b/bsps/arm/atsam/include/bsp/i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/i2c.h
rename to bsps/arm/atsam/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/irq.h b/bsps/arm/atsam/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/irq.h
rename to bsps/arm/atsam/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/pin-config.h b/bsps/arm/atsam/include/bsp/pin-config.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/pin-config.h
rename to bsps/arm/atsam/include/bsp/pin-config.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/power.h b/bsps/arm/atsam/include/bsp/power.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/power.h
rename to bsps/arm/atsam/include/bsp/power.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/sc16is752.h b/bsps/arm/atsam/include/bsp/sc16is752.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/sc16is752.h
rename to bsps/arm/atsam/include/bsp/sc16is752.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/spi.h b/bsps/arm/atsam/include/bsp/spi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/spi.h
rename to bsps/arm/atsam/include/bsp/spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/chip.h b/bsps/arm/atsam/include/libchip/chip.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/chip.h
rename to bsps/arm/atsam/include/libchip/chip.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/compiler.h b/bsps/arm/atsam/include/libchip/compiler.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/compiler.h
rename to bsps/arm/atsam/include/libchip/compiler.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/acc.h b/bsps/arm/atsam/include/libchip/include/acc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/acc.h
rename to bsps/arm/atsam/include/libchip/include/acc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/adc.h b/bsps/arm/atsam/include/libchip/include/adc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/adc.h
rename to bsps/arm/atsam/include/libchip/include/adc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/aes.h b/bsps/arm/atsam/include/libchip/include/aes.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/aes.h
rename to bsps/arm/atsam/include/libchip/include/aes.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/afe_dma.h b/bsps/arm/atsam/include/libchip/include/afe_dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/afe_dma.h
rename to bsps/arm/atsam/include/libchip/include/afe_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/afec.h b/bsps/arm/atsam/include/libchip/include/afec.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/afec.h
rename to bsps/arm/atsam/include/libchip/include/afec.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/chip.h b/bsps/arm/atsam/include/libchip/include/chip.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/chip.h
rename to bsps/arm/atsam/include/libchip/include/chip.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/dac_dma.h b/bsps/arm/atsam/include/libchip/include/dac_dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/dac_dma.h
rename to bsps/arm/atsam/include/libchip/include/dac_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/efc.h b/bsps/arm/atsam/include/libchip/include/efc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/efc.h
rename to bsps/arm/atsam/include/libchip/include/efc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/exceptions.h b/bsps/arm/atsam/include/libchip/include/exceptions.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/exceptions.h
rename to bsps/arm/atsam/include/libchip/include/exceptions.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/flashd.h b/bsps/arm/atsam/include/libchip/include/flashd.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/flashd.h
rename to bsps/arm/atsam/include/libchip/include/flashd.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/gmac.h b/bsps/arm/atsam/include/libchip/include/gmac.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/gmac.h
rename to bsps/arm/atsam/include/libchip/include/gmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/gmacd.h b/bsps/arm/atsam/include/libchip/include/gmacd.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/gmacd.h
rename to bsps/arm/atsam/include/libchip/include/gmacd.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/hsmci.h b/bsps/arm/atsam/include/libchip/include/hsmci.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/hsmci.h
rename to bsps/arm/atsam/include/libchip/include/hsmci.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/icm.h b/bsps/arm/atsam/include/libchip/include/icm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/icm.h
rename to bsps/arm/atsam/include/libchip/include/icm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/isi.h b/bsps/arm/atsam/include/libchip/include/isi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/isi.h
rename to bsps/arm/atsam/include/libchip/include/isi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/iso7816_4.h b/bsps/arm/atsam/include/libchip/include/iso7816_4.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/iso7816_4.h
rename to bsps/arm/atsam/include/libchip/include/iso7816_4.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mcan.h b/bsps/arm/atsam/include/libchip/include/mcan.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mcan.h
rename to bsps/arm/atsam/include/libchip/include/mcan.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mcid.h b/bsps/arm/atsam/include/libchip/include/mcid.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mcid.h
rename to bsps/arm/atsam/include/libchip/include/mcid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mediaLB.h b/bsps/arm/atsam/include/libchip/include/mediaLB.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mediaLB.h
rename to bsps/arm/atsam/include/libchip/include/mediaLB.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mpu.h b/bsps/arm/atsam/include/libchip/include/mpu.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/mpu.h
rename to bsps/arm/atsam/include/libchip/include/mpu.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio.h b/bsps/arm/atsam/include/libchip/include/pio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio.h
rename to bsps/arm/atsam/include/libchip/include/pio.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio_capture.h b/bsps/arm/atsam/include/libchip/include/pio_capture.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio_capture.h
rename to bsps/arm/atsam/include/libchip/include/pio_capture.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio_it.h b/bsps/arm/atsam/include/libchip/include/pio_it.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pio_it.h
rename to bsps/arm/atsam/include/libchip/include/pio_it.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pmc.h b/bsps/arm/atsam/include/libchip/include/pmc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pmc.h
rename to bsps/arm/atsam/include/libchip/include/pmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pwmc.h b/bsps/arm/atsam/include/libchip/include/pwmc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/pwmc.h
rename to bsps/arm/atsam/include/libchip/include/pwmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi.h b/bsps/arm/atsam/include/libchip/include/qspi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi.h
rename to bsps/arm/atsam/include/libchip/include/qspi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi_dma.h b/bsps/arm/atsam/include/libchip/include/qspi_dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi_dma.h
rename to bsps/arm/atsam/include/libchip/include/qspi_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rstc.h b/bsps/arm/atsam/include/libchip/include/rstc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rstc.h
rename to bsps/arm/atsam/include/libchip/include/rstc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rtc.h b/bsps/arm/atsam/include/libchip/include/rtc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rtc.h
rename to bsps/arm/atsam/include/libchip/include/rtc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rtt.h b/bsps/arm/atsam/include/libchip/include/rtt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/rtt.h
rename to bsps/arm/atsam/include/libchip/include/rtt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_acc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_acc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_acc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_acc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_aes.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_aes.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_aes.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_aes.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_afec.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_afec.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_afec.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_afec.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_chipid.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_chipid.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_chipid.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_chipid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_dacc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_dacc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_dacc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_dacc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_efc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_efc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_efc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_efc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_gmac.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_gmac.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_gmac.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_gmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_gpbr.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_gpbr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_gpbr.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_gpbr.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_hsmci.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_hsmci.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_hsmci.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_hsmci.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_icm.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_icm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_icm.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_icm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_isi.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_isi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_isi.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_isi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_matrix.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_matrix.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_matrix.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_matrix.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_mcan.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_mcan.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_mcan.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_mcan.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pio.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_pio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pio.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_pio.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pmc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_pmc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pmc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_pmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pwm.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_pwm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_pwm.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_pwm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_qspi.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_qspi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_qspi.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_qspi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rstc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_rstc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rstc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_rstc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rswdt.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_rswdt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rswdt.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_rswdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rtc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_rtc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rtc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_rtc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rtt.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_rtt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_rtt.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_rtt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_sdramc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_sdramc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_sdramc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_sdramc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_smc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_smc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_smc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_smc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_spi.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_spi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_spi.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_ssc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_ssc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_ssc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_ssc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_supc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_supc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_supc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_supc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_tc.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_tc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_tc.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_tc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_trng.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_trng.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_trng.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_trng.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_twihs.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_twihs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_twihs.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_twihs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_uart.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_uart.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_uart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_usart.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_usart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_usart.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_usart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_usbhs.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_usbhs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_usbhs.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_usbhs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_utmi.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_utmi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_utmi.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_utmi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_wdt.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_wdt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_wdt.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_wdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_xdmac.h b/bsps/arm/atsam/include/libchip/include/same70/component/component_xdmac.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/component/component_xdmac.h
rename to bsps/arm/atsam/include/libchip/include/same70/component/component_xdmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j19.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j19.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j20.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j20.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j21.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70j21.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n19.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n19.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n20.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n20.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n21.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70n21.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q19.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q19.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q20.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q20.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q21.h b/bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/pio/pio_same70q21.h
rename to bsps/arm/atsam/include/libchip/include/same70/pio/pio_same70q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70.h b/bsps/arm/atsam/include/libchip/include/same70/same70.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j19.h b/bsps/arm/atsam/include/libchip/include/same70/same70j19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j19.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j20.h b/bsps/arm/atsam/include/libchip/include/same70/same70j20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j20.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j21.h b/bsps/arm/atsam/include/libchip/include/same70/same70j21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j21.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n19.h b/bsps/arm/atsam/include/libchip/include/same70/same70n19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n19.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n20.h b/bsps/arm/atsam/include/libchip/include/same70/same70n20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n20.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n21.h b/bsps/arm/atsam/include/libchip/include/same70/same70n21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n21.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q19.h b/bsps/arm/atsam/include/libchip/include/same70/same70q19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q19.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q20.h b/bsps/arm/atsam/include/libchip/include/same70/same70q20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q20.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q21.h b/bsps/arm/atsam/include/libchip/include/same70/same70q21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q21.h
rename to bsps/arm/atsam/include/libchip/include/same70/same70q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/system_same70.h b/bsps/arm/atsam/include/libchip/include/same70/system_same70.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/system_same70.h
rename to bsps/arm/atsam/include/libchip/include/same70/system_same70.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_acc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_acc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_acc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_acc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_aes.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_aes.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_aes.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_aes.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_afec.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_afec.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_afec.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_afec.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_chipid.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_chipid.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_chipid.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_chipid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_dacc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_dacc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_dacc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_dacc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_efc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_efc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_efc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_efc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_gpbr.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_gpbr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_gpbr.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_gpbr.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_hsmci.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_hsmci.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_hsmci.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_hsmci.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_icm.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_icm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_icm.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_icm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_isi.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_isi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_isi.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_isi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_matrix.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_matrix.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_matrix.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_matrix.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pio.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pio.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_pio.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pmc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pmc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pmc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_pmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pwm.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_pwm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_pwm.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_pwm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_qspi.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_qspi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_qspi.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_qspi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rstc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rstc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rstc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_rstc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rswdt.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rswdt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rswdt.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_rswdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rtc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rtc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rtc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_rtc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rtt.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_rtt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_rtt.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_rtt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_sdramc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_sdramc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_sdramc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_sdramc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_smc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_smc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_smc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_smc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_spi.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_spi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_spi.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_ssc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_ssc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_ssc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_ssc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_supc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_supc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_supc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_supc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_tc.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_tc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_tc.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_tc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_trng.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_trng.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_trng.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_trng.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_twihs.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_twihs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_twihs.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_twihs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_uart.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_uart.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_uart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_usart.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_usart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_usart.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_usart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_usbhs.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_usbhs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_usbhs.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_usbhs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_utmi.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_utmi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_utmi.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_utmi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_wdt.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_wdt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_wdt.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_wdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_xdmac.h b/bsps/arm/atsam/include/libchip/include/sams70/component/component_xdmac.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/component/component_xdmac.h
rename to bsps/arm/atsam/include/libchip/include/sams70/component/component_xdmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j19.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j19.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j20.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j20.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j21.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70j21.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n19.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n19.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n20.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n20.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n21.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70n21.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q19.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q19.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q20.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q20.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q21.h b/bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/pio/pio_sams70q21.h
rename to bsps/arm/atsam/include/libchip/include/sams70/pio/pio_sams70q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j19.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70j19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j19.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j20.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70j20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j20.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j21.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70j21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j21.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n19.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70n19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n19.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n20.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70n20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n20.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n21.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70n21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n21.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q19.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70q19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q19.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q20.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70q20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q20.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q21.h b/bsps/arm/atsam/include/libchip/include/sams70/sams70q21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q21.h
rename to bsps/arm/atsam/include/libchip/include/sams70/sams70q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/system_sams70.h b/bsps/arm/atsam/include/libchip/include/sams70/system_sams70.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/system_sams70.h
rename to bsps/arm/atsam/include/libchip/include/sams70/system_sams70.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_acc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_acc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_acc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_acc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_aes.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_aes.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_aes.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_aes.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_afec.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_afec.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_afec.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_afec.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_chipid.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_chipid.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_chipid.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_chipid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_dacc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_dacc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_dacc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_dacc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_efc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_efc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_efc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_efc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_gmac.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_gmac.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_gmac.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_gmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_gpbr.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_gpbr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_gpbr.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_gpbr.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_hsmci.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_hsmci.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_hsmci.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_hsmci.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_icm.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_icm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_icm.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_icm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_isi.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_isi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_isi.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_isi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_matrix.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_matrix.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_matrix.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_matrix.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_mcan.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_mcan.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_mcan.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_mcan.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_mlb.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_mlb.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_mlb.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_mlb.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pio.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pio.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_pio.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pmc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pmc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pmc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_pmc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pwm.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_pwm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_pwm.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_pwm.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_qspi.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_qspi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_qspi.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_qspi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rstc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rstc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rstc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_rstc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rswdt.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rswdt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rswdt.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_rswdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rtc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rtc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rtc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_rtc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rtt.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_rtt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_rtt.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_rtt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_sdramc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_sdramc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_sdramc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_sdramc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_smc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_smc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_smc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_smc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_spi.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_spi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_spi.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_ssc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_ssc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_ssc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_ssc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_supc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_supc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_supc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_supc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_tc.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_tc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_tc.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_tc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_trng.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_trng.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_trng.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_trng.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_twihs.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_twihs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_twihs.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_twihs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_uart.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_uart.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_uart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_usart.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_usart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_usart.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_usart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_usbhs.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_usbhs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_usbhs.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_usbhs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_utmi.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_utmi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_utmi.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_utmi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_wdt.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_wdt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_wdt.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_wdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_xdmac.h b/bsps/arm/atsam/include/libchip/include/samv71/component/component_xdmac.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/component/component_xdmac.h
rename to bsps/arm/atsam/include/libchip/include/samv71/component/component_xdmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j19.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j19.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j20.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j20.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j21.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71j21.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n19.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n19.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n20.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n20.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n21.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71n21.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q19.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q19.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q20.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q20.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q21.h b/bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/pio/pio_samv71q21.h
rename to bsps/arm/atsam/include/libchip/include/samv71/pio/pio_samv71q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j19.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71j19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j19.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71j19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j20.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71j20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j20.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71j20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j21.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71j21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j21.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71j21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n19.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71n19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n19.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71n19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n20.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71n20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n20.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71n20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n21.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71n21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n21.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71n21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q19.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71q19.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q19.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71q19.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q20.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71q20.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q20.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71q20.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q21.h b/bsps/arm/atsam/include/libchip/include/samv71/samv71q21.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q21.h
rename to bsps/arm/atsam/include/libchip/include/samv71/samv71q21.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/system_samv71.h b/bsps/arm/atsam/include/libchip/include/samv71/system_samv71.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/system_samv71.h
rename to bsps/arm/atsam/include/libchip/include/samv71/system_samv71.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sdramc.h b/bsps/arm/atsam/include/libchip/include/sdramc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sdramc.h
rename to bsps/arm/atsam/include/libchip/include/sdramc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/smc.h b/bsps/arm/atsam/include/libchip/include/smc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/smc.h
rename to bsps/arm/atsam/include/libchip/include/smc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/spi.h b/bsps/arm/atsam/include/libchip/include/spi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/spi.h
rename to bsps/arm/atsam/include/libchip/include/spi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/spi_dma.h b/bsps/arm/atsam/include/libchip/include/spi_dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/spi_dma.h
rename to bsps/arm/atsam/include/libchip/include/spi_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/ssc.h b/bsps/arm/atsam/include/libchip/include/ssc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/ssc.h
rename to bsps/arm/atsam/include/libchip/include/ssc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/supc.h b/bsps/arm/atsam/include/libchip/include/supc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/supc.h
rename to bsps/arm/atsam/include/libchip/include/supc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/tc.h b/bsps/arm/atsam/include/libchip/include/tc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/tc.h
rename to bsps/arm/atsam/include/libchip/include/tc.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/timetick.h b/bsps/arm/atsam/include/libchip/include/timetick.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/timetick.h
rename to bsps/arm/atsam/include/libchip/include/timetick.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/trace.h b/bsps/arm/atsam/include/libchip/include/trace.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/trace.h
rename to bsps/arm/atsam/include/libchip/include/trace.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/trng.h b/bsps/arm/atsam/include/libchip/include/trng.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/trng.h
rename to bsps/arm/atsam/include/libchip/include/trng.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/twi.h b/bsps/arm/atsam/include/libchip/include/twi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/twi.h
rename to bsps/arm/atsam/include/libchip/include/twi.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/twid.h b/bsps/arm/atsam/include/libchip/include/twid.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/twid.h
rename to bsps/arm/atsam/include/libchip/include/twid.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/uart.h b/bsps/arm/atsam/include/libchip/include/uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/uart.h
rename to bsps/arm/atsam/include/libchip/include/uart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/uart_dma.h b/bsps/arm/atsam/include/libchip/include/uart_dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/uart_dma.h
rename to bsps/arm/atsam/include/libchip/include/uart_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usart.h b/bsps/arm/atsam/include/libchip/include/usart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usart.h
rename to bsps/arm/atsam/include/libchip/include/usart.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usart_dma.h b/bsps/arm/atsam/include/libchip/include/usart_dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usart_dma.h
rename to bsps/arm/atsam/include/libchip/include/usart_dma.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usbhs.h b/bsps/arm/atsam/include/libchip/include/usbhs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/usbhs.h
rename to bsps/arm/atsam/include/libchip/include/usbhs.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/video.h b/bsps/arm/atsam/include/libchip/include/video.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/video.h
rename to bsps/arm/atsam/include/libchip/include/video.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/wdt.h b/bsps/arm/atsam/include/libchip/include/wdt.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/wdt.h
rename to bsps/arm/atsam/include/libchip/include/wdt.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdma_hardware_interface.h b/bsps/arm/atsam/include/libchip/include/xdma_hardware_interface.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdma_hardware_interface.h
rename to bsps/arm/atsam/include/libchip/include/xdma_hardware_interface.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmac.h b/bsps/arm/atsam/include/libchip/include/xdmac.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmac.h
rename to bsps/arm/atsam/include/libchip/include/xdmac.h
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmad.h b/bsps/arm/atsam/include/libchip/include/xdmad.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmad.h
rename to bsps/arm/atsam/include/libchip/include/xdmad.h
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/tm27.h b/bsps/arm/atsam/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/v850/gdbv850sim/include/tm27.h
rename to bsps/arm/atsam/include/tm27.h
diff --git a/bsps/arm/beagle/headers.am b/bsps/arm/beagle/headers.am
new file mode 100644
index 0000000..6692d0b
--- /dev/null
+++ b/bsps/arm/beagle/headers.am
@@ -0,0 +1,14 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/beagle/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/bbb-gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/bbb-pwm.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/beagleboneblack.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/beagle/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/bsp.h b/bsps/arm/beagle/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/include/bsp.h
rename to bsps/arm/beagle/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/bbb-gpio.h b/bsps/arm/beagle/include/bsp/bbb-gpio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/include/bbb-gpio.h
rename to bsps/arm/beagle/include/bsp/bbb-gpio.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/bbb-pwm.h b/bsps/arm/beagle/include/bsp/bbb-pwm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/include/bbb-pwm.h
rename to bsps/arm/beagle/include/bsp/bbb-pwm.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/beagleboneblack.h b/bsps/arm/beagle/include/bsp/beagleboneblack.h
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/include/beagleboneblack.h
rename to bsps/arm/beagle/include/bsp/beagleboneblack.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/i2c.h b/bsps/arm/beagle/include/bsp/i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/include/i2c.h
rename to bsps/arm/beagle/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/irq.h b/bsps/arm/beagle/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/include/irq.h
rename to bsps/arm/beagle/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h b/bsps/arm/beagle/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/usiii/include/tm27.h
rename to bsps/arm/beagle/include/tm27.h
diff --git a/bsps/arm/csb336/headers.am b/bsps/arm/csb336/headers.am
new file mode 100644
index 0000000..911de17
--- /dev/null
+++ b/bsps/arm/csb336/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/csb336/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/csb336/include/mc9328mxl.h
+include_HEADERS += ../../../../../../bsps/arm/csb336/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/csb336/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp.h b/bsps/arm/csb336/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/csb336/include/bsp.h
rename to bsps/arm/csb336/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp/irq.h b/bsps/arm/csb336/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/csb336/include/bsp/irq.h
rename to bsps/arm/csb336/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/csb336/include/mc9328mxl.h b/bsps/arm/csb336/include/mc9328mxl.h
similarity index 100%
rename from c/src/lib/libbsp/arm/csb336/include/mc9328mxl.h
rename to bsps/arm/csb336/include/mc9328mxl.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h b/bsps/arm/csb336/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/niagara/include/tm27.h
rename to bsps/arm/csb336/include/tm27.h
diff --git a/bsps/arm/csb337/headers.am b/bsps/arm/csb337/headers.am
new file mode 100644
index 0000000..4fff8ad
--- /dev/null
+++ b/bsps/arm/csb337/headers.am
@@ -0,0 +1,21 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_dbgu.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_emac.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_gpio.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_mem.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_pmc.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/at91rm9200_usart.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/bits.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/font8x16.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/sed1356.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/sed1356_16bit.h
+include_HEADERS += ../../../../../../bsps/arm/csb337/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/csb337/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/at91rm9200.h b/bsps/arm/csb337/include/at91rm9200.h
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/at91rm9200.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/at91rm9200_dbgu.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/at91rm9200_emac.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/at91rm9200_gpio.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/at91rm9200_mem.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/at91rm9200_pmc.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/at91rm9200_usart.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/bits.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/bsp.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/bsp/irq.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/console/font8x16.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/sed1356.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/console/sed1356_16bit.h
rename to bsps/arm/csb337/include/sed1356_16bit.h
diff --git a/c/src/lib/libbsp/sh/shsim/include/tm27.h b/bsps/arm/csb337/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sh/shsim/include/tm27.h
rename to bsps/arm/csb337/include/tm27.h
diff --git a/bsps/arm/edb7312/headers.am b/bsps/arm/edb7312/headers.am
new file mode 100644
index 0000000..706c1e1
--- /dev/null
+++ b/bsps/arm/edb7312/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/edb7312/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/edb7312/include/ep7312.h
+include_HEADERS += ../../../../../../bsps/arm/edb7312/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/edb7312/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/bsps/arm/edb7312/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/edb7312/include/bsp.h
rename to bsps/arm/edb7312/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/edb7312/irq/irq.h b/bsps/arm/edb7312/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/edb7312/irq/irq.h
rename to bsps/arm/edb7312/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h b/bsps/arm/edb7312/include/ep7312.h
similarity index 100%
rename from c/src/lib/libbsp/arm/edb7312/include/ep7312.h
rename to bsps/arm/edb7312/include/ep7312.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/tm27.h b/bsps/arm/edb7312/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/tm27.h
rename to bsps/arm/edb7312/include/tm27.h
diff --git a/bsps/arm/gdbarmsim/headers.am b/bsps/arm/gdbarmsim/headers.am
new file mode 100644
index 0000000..25e9fca
--- /dev/null
+++ b/bsps/arm/gdbarmsim/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/gdbarmsim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/gdbarmsim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/gdbarmsim/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/gdbarmsim/include/bsp/swi.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h b/bsps/arm/gdbarmsim/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gdbarmsim/include/bsp.h
rename to bsps/arm/gdbarmsim/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/irq.h b/bsps/arm/gdbarmsim/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gdbarmsim/include/irq.h
rename to bsps/arm/gdbarmsim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/swi.h b/bsps/arm/gdbarmsim/include/bsp/swi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gdbarmsim/include/swi.h
rename to bsps/arm/gdbarmsim/include/bsp/swi.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/tm27.h b/bsps/arm/gdbarmsim/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/include/tm27.h
rename to bsps/arm/gdbarmsim/include/tm27.h
diff --git a/bsps/arm/gumstix/headers.am b/bsps/arm/gumstix/headers.am
new file mode 100644
index 0000000..410ad6c
--- /dev/null
+++ b/bsps/arm/gumstix/headers.am
@@ -0,0 +1,12 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/gumstix/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/gumstix/include/ffuart.h
+include_HEADERS += ../../../../../../bsps/arm/gumstix/include/pxa255.h
+include_HEADERS += ../../../../../../bsps/arm/gumstix/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/gumstix/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/bsps/arm/gumstix/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/include/bsp.h
rename to bsps/arm/gumstix/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp/irq.h b/bsps/arm/gumstix/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/include/bsp/irq.h
rename to bsps/arm/gumstix/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/ffuart.h b/bsps/arm/gumstix/include/ffuart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/include/ffuart.h
rename to bsps/arm/gumstix/include/ffuart.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/pxa255.h b/bsps/arm/gumstix/include/pxa255.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/include/pxa255.h
rename to bsps/arm/gumstix/include/pxa255.h
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/include/tm27.h b/bsps/arm/gumstix/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/riscv/riscv_generic/include/tm27.h
rename to bsps/arm/gumstix/include/tm27.h
diff --git a/bsps/arm/headers.am b/bsps/arm/headers.am
new file mode 100644
index 0000000..764a085
--- /dev/null
+++ b/bsps/arm/headers.am
@@ -0,0 +1,45 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/arm/include/cmsis_gcc.h
+include_HEADERS += ../../../../../bsps/arm/include/core_cm7.h
+include_HEADERS += ../../../../../bsps/arm/include/core_cmFunc.h
+include_HEADERS += ../../../../../bsps/arm/include/core_cmInstr.h
+include_HEADERS += ../../../../../bsps/arm/include/core_cmSimd.h
+include_HEADERS += ../../../../../bsps/arm/include/uart.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a8core-start.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a9mpcore-clock.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a9mpcore-irq.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a9mpcore-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-a9mpcore-start.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-cp15-start.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-errata.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-gic-irq.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-gic-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-gic-tm27.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-gic.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl011-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl011.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl050-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl050.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl111-fb.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-pl111-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/arm-release-id.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/armv7m-irq.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/linker-symbols.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-dma.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-emc.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-i2s.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-lcd.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-timer.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/start.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/arm/include/libcpu/am335x.h
+include_libcpu_HEADERS += ../../../../../bsps/arm/include/libcpu/mmu.h
+include_libcpu_HEADERS += ../../../../../bsps/arm/include/libcpu/omap3.h
+include_libcpu_HEADERS += ../../../../../bsps/arm/include/libcpu/omap_timer.h
diff --git a/bsps/arm/imx/headers.am b/bsps/arm/imx/headers.am
new file mode 100644
index 0000000..dd18164
--- /dev/null
+++ b/bsps/arm/imx/headers.am
@@ -0,0 +1,22 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/imx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/imx/include/tm27.h
+
+include_arm_freescale_imxdir = $(includedir)/arm/freescale/imx
+include_arm_freescale_imx_HEADERS =
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_i2creg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_srcreg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_uartreg.h
+include_arm_freescale_imx_HEADERS += ../../../../../../bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/imx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_ccmvar.h b/bsps/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_ccmvar.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_ecspireg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_gpcreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_i2creg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_i2creg.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_i2creg.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_i2creg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_iomuxreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h b/bsps/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_iomuxvar.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_srcreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_srcreg.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_srcreg.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_srcreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_uartreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_uartreg.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_uartreg.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_uartreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_wdogreg.h b/bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
rename to bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
diff --git a/c/src/lib/libbsp/arm/imx/include/bsp.h b/bsps/arm/imx/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/bsp.h
rename to bsps/arm/imx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/imx/include/irq.h b/bsps/arm/imx/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/include/irq.h
rename to bsps/arm/imx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/include/tm27.h b/bsps/arm/imx/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/include/tm27.h
rename to bsps/arm/imx/include/tm27.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a8core-start.h b/bsps/arm/include/bsp/arm-a8core-start.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-a8core-start.h
rename to bsps/arm/include/bsp/arm-a8core-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-clock.h b/bsps/arm/include/bsp/arm-a9mpcore-clock.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-clock.h
rename to bsps/arm/include/bsp/arm-a9mpcore-clock.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-irq.h b/bsps/arm/include/bsp/arm-a9mpcore-irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-irq.h
rename to bsps/arm/include/bsp/arm-a9mpcore-irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-regs.h b/bsps/arm/include/bsp/arm-a9mpcore-regs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-regs.h
rename to bsps/arm/include/bsp/arm-a9mpcore-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h b/bsps/arm/include/bsp/arm-a9mpcore-start.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h
rename to bsps/arm/include/bsp/arm-a9mpcore-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h b/bsps/arm/include/bsp/arm-cp15-start.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-cp15-start.h
rename to bsps/arm/include/bsp/arm-cp15-start.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-errata.h b/bsps/arm/include/bsp/arm-errata.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-errata.h
rename to bsps/arm/include/bsp/arm-errata.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-irq.h b/bsps/arm/include/bsp/arm-gic-irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-gic-irq.h
rename to bsps/arm/include/bsp/arm-gic-irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-regs.h b/bsps/arm/include/bsp/arm-gic-regs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-gic-regs.h
rename to bsps/arm/include/bsp/arm-gic-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic-tm27.h b/bsps/arm/include/bsp/arm-gic-tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-gic-tm27.h
rename to bsps/arm/include/bsp/arm-gic-tm27.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-gic.h b/bsps/arm/include/bsp/arm-gic.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-gic.h
rename to bsps/arm/include/bsp/arm-gic.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl011-regs.h b/bsps/arm/include/bsp/arm-pl011-regs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-pl011-regs.h
rename to bsps/arm/include/bsp/arm-pl011-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl011.h b/bsps/arm/include/bsp/arm-pl011.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-pl011.h
rename to bsps/arm/include/bsp/arm-pl011.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl050-regs.h b/bsps/arm/include/bsp/arm-pl050-regs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-pl050-regs.h
rename to bsps/arm/include/bsp/arm-pl050-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl050.h b/bsps/arm/include/bsp/arm-pl050.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-pl050.h
rename to bsps/arm/include/bsp/arm-pl050.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl111-fb.h b/bsps/arm/include/bsp/arm-pl111-fb.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-pl111-fb.h
rename to bsps/arm/include/bsp/arm-pl111-fb.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-pl111-regs.h b/bsps/arm/include/bsp/arm-pl111-regs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-pl111-regs.h
rename to bsps/arm/include/bsp/arm-pl111-regs.h
diff --git a/c/src/lib/libbsp/arm/shared/include/arm-release-id.h b/bsps/arm/include/bsp/arm-release-id.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/arm-release-id.h
rename to bsps/arm/include/bsp/arm-release-id.h
diff --git a/c/src/lib/libbsp/arm/shared/armv7m/include/armv7m-irq.h b/bsps/arm/include/bsp/armv7m-irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/armv7m/include/armv7m-irq.h
rename to bsps/arm/include/bsp/armv7m-irq.h
diff --git a/c/src/lib/libbsp/arm/shared/include/linker-symbols.h b/bsps/arm/include/bsp/linker-symbols.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/linker-symbols.h
rename to bsps/arm/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h b/bsps/arm/include/bsp/lpc-dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/lpc/include/lpc-dma.h
rename to bsps/arm/include/bsp/lpc-dma.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-emc.h b/bsps/arm/include/bsp/lpc-emc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/lpc/include/lpc-emc.h
rename to bsps/arm/include/bsp/lpc-emc.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-i2s.h b/bsps/arm/include/bsp/lpc-i2s.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/lpc/include/lpc-i2s.h
rename to bsps/arm/include/bsp/lpc-i2s.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-lcd.h b/bsps/arm/include/bsp/lpc-lcd.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/lpc/include/lpc-lcd.h
rename to bsps/arm/include/bsp/lpc-lcd.h
diff --git a/c/src/lib/libbsp/arm/shared/lpc/include/lpc-timer.h b/bsps/arm/include/bsp/lpc-timer.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/lpc/include/lpc-timer.h
rename to bsps/arm/include/bsp/lpc-timer.h
diff --git a/c/src/lib/libbsp/arm/shared/include/start.h b/bsps/arm/include/bsp/start.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/include/start.h
rename to bsps/arm/include/bsp/start.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/cmsis_gcc.h b/bsps/arm/include/cmsis_gcc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/CMSIS/Include/cmsis_gcc.h
rename to bsps/arm/include/cmsis_gcc.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cm7.h b/bsps/arm/include/core_cm7.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cm7.h
rename to bsps/arm/include/core_cm7.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmFunc.h b/bsps/arm/include/core_cmFunc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmFunc.h
rename to bsps/arm/include/core_cmFunc.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmInstr.h b/bsps/arm/include/core_cmInstr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmInstr.h
rename to bsps/arm/include/core_cmInstr.h
diff --git a/c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmSimd.h b/bsps/arm/include/core_cmSimd.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/CMSIS/Include/core_cmSimd.h
rename to bsps/arm/include/core_cmSimd.h
diff --git a/c/src/lib/libcpu/arm/shared/include/am335x.h b/bsps/arm/include/libcpu/am335x.h
similarity index 100%
rename from c/src/lib/libcpu/arm/shared/include/am335x.h
rename to bsps/arm/include/libcpu/am335x.h
diff --git a/c/src/lib/libcpu/arm/shared/include/mmu.h b/bsps/arm/include/libcpu/mmu.h
similarity index 100%
rename from c/src/lib/libcpu/arm/shared/include/mmu.h
rename to bsps/arm/include/libcpu/mmu.h
diff --git a/c/src/lib/libcpu/arm/shared/include/omap3.h b/bsps/arm/include/libcpu/omap3.h
similarity index 100%
rename from c/src/lib/libcpu/arm/shared/include/omap3.h
rename to bsps/arm/include/libcpu/omap3.h
diff --git a/c/src/lib/libcpu/arm/shared/include/omap_timer.h b/bsps/arm/include/libcpu/omap_timer.h
similarity index 100%
rename from c/src/lib/libcpu/arm/shared/include/omap_timer.h
rename to bsps/arm/include/libcpu/omap_timer.h
diff --git a/c/src/lib/libbsp/arm/shared/comm/uart.h b/bsps/arm/include/uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/shared/comm/uart.h
rename to bsps/arm/include/uart.h
diff --git a/bsps/arm/lm3s69xx/headers.am b/bsps/arm/lm3s69xx/headers.am
new file mode 100644
index 0000000..2572e1a
--- /dev/null
+++ b/bsps/arm/lm3s69xx/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/lm3s69xx.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/ssi.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/syscon.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lm3s69xx/include/bsp/uart.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/bsp.h b/bsps/arm/lm3s69xx/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/include/bsp.h
rename to bsps/arm/lm3s69xx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/io.h b/bsps/arm/lm3s69xx/include/bsp/io.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/include/io.h
rename to bsps/arm/lm3s69xx/include/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/irq.h b/bsps/arm/lm3s69xx/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/include/irq.h
rename to bsps/arm/lm3s69xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/lm3s69xx.h b/bsps/arm/lm3s69xx/include/bsp/lm3s69xx.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/include/lm3s69xx.h
rename to bsps/arm/lm3s69xx/include/bsp/lm3s69xx.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/ssi.h b/bsps/arm/lm3s69xx/include/bsp/ssi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/include/ssi.h
rename to bsps/arm/lm3s69xx/include/bsp/ssi.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/syscon.h b/bsps/arm/lm3s69xx/include/bsp/syscon.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/include/syscon.h
rename to bsps/arm/lm3s69xx/include/bsp/syscon.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/uart.h b/bsps/arm/lm3s69xx/include/bsp/uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/include/uart.h
rename to bsps/arm/lm3s69xx/include/bsp/uart.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/tm27.h b/bsps/arm/lm3s69xx/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex5/include/tm27.h
rename to bsps/arm/lm3s69xx/include/tm27.h
diff --git a/bsps/arm/lpc176x/headers.am b/bsps/arm/lpc176x/headers.am
new file mode 100644
index 0000000..aceb1c4
--- /dev/null
+++ b/bsps/arm/lpc176x/headers.am
@@ -0,0 +1,30 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/lpc176x/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/adc-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/adc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/can-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/can.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/common-types.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/dma.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/gpio-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/io-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/lpc-clock-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/lpc-gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/lpc176x.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/mbed-pinmap.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/pwmout-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/pwmout.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/system-clocks.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/timer-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/timer.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/watchdog-defs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc176x/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/bsp.h b/bsps/arm/lpc176x/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/bsp.h
rename to bsps/arm/lpc176x/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/adc-defs.h b/bsps/arm/lpc176x/include/bsp/adc-defs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/adc-defs.h
rename to bsps/arm/lpc176x/include/bsp/adc-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/adc.h b/bsps/arm/lpc176x/include/bsp/adc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/adc.h
rename to bsps/arm/lpc176x/include/bsp/adc.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/can-defs.h b/bsps/arm/lpc176x/include/bsp/can-defs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/can-defs.h
rename to bsps/arm/lpc176x/include/bsp/can-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/can.h b/bsps/arm/lpc176x/include/bsp/can.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/can.h
rename to bsps/arm/lpc176x/include/bsp/can.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/common-types.h b/bsps/arm/lpc176x/include/bsp/common-types.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/common-types.h
rename to bsps/arm/lpc176x/include/bsp/common-types.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/dma.h b/bsps/arm/lpc176x/include/bsp/dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/dma.h
rename to bsps/arm/lpc176x/include/bsp/dma.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/gpio-defs.h b/bsps/arm/lpc176x/include/bsp/gpio-defs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/gpio-defs.h
rename to bsps/arm/lpc176x/include/bsp/gpio-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/io-defs.h b/bsps/arm/lpc176x/include/bsp/io-defs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/io-defs.h
rename to bsps/arm/lpc176x/include/bsp/io-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/io.h b/bsps/arm/lpc176x/include/bsp/io.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/io.h
rename to bsps/arm/lpc176x/include/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/irq.h b/bsps/arm/lpc176x/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/irq.h
rename to bsps/arm/lpc176x/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/lpc-clock-config.h b/bsps/arm/lpc176x/include/bsp/lpc-clock-config.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/lpc-clock-config.h
rename to bsps/arm/lpc176x/include/bsp/lpc-clock-config.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h b/bsps/arm/lpc176x/include/bsp/lpc-gpio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/lpc-gpio.h
rename to bsps/arm/lpc176x/include/bsp/lpc-gpio.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/lpc176x.h b/bsps/arm/lpc176x/include/bsp/lpc176x.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/lpc176x.h
rename to bsps/arm/lpc176x/include/bsp/lpc176x.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/mbed-pinmap.h b/bsps/arm/lpc176x/include/bsp/mbed-pinmap.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/mbed-pinmap.h
rename to bsps/arm/lpc176x/include/bsp/mbed-pinmap.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/pwmout-defs.h b/bsps/arm/lpc176x/include/bsp/pwmout-defs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/pwmout-defs.h
rename to bsps/arm/lpc176x/include/bsp/pwmout-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/pwmout.h b/bsps/arm/lpc176x/include/bsp/pwmout.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/pwmout.h
rename to bsps/arm/lpc176x/include/bsp/pwmout.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/system-clocks.h b/bsps/arm/lpc176x/include/bsp/system-clocks.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/system-clocks.h
rename to bsps/arm/lpc176x/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/timer-defs.h b/bsps/arm/lpc176x/include/bsp/timer-defs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/timer-defs.h
rename to bsps/arm/lpc176x/include/bsp/timer-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/timer.h b/bsps/arm/lpc176x/include/bsp/timer.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/timer.h
rename to bsps/arm/lpc176x/include/bsp/timer.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/watchdog-defs.h b/bsps/arm/lpc176x/include/bsp/watchdog-defs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/watchdog-defs.h
rename to bsps/arm/lpc176x/include/bsp/watchdog-defs.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/watchdog.h b/bsps/arm/lpc176x/include/bsp/watchdog.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/watchdog.h
rename to bsps/arm/lpc176x/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/tm27.h b/bsps/arm/lpc176x/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex4/include/tm27.h
rename to bsps/arm/lpc176x/include/tm27.h
diff --git a/bsps/arm/lpc24xx/headers.am b/bsps/arm/lpc24xx/headers.am
new file mode 100644
index 0000000..e2f4d26
--- /dev/null
+++ b/bsps/arm/lpc24xx/headers.am
@@ -0,0 +1,21 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/dma.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lcd.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lpc-clock-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lpc-ethernet-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lpc17xx.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/lpc24xx.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/ssp.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/start-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc24xx/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h b/bsps/arm/lpc24xx/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
rename to bsps/arm/lpc24xx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/dma.h b/bsps/arm/lpc24xx/include/bsp/dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/dma.h
rename to bsps/arm/lpc24xx/include/bsp/dma.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/i2c.h b/bsps/arm/lpc24xx/include/bsp/i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/i2c.h
rename to bsps/arm/lpc24xx/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/io.h b/bsps/arm/lpc24xx/include/bsp/io.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/io.h
rename to bsps/arm/lpc24xx/include/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/irq.h b/bsps/arm/lpc24xx/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/irq.h
rename to bsps/arm/lpc24xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lcd.h b/bsps/arm/lpc24xx/include/bsp/lcd.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/lcd.h
rename to bsps/arm/lpc24xx/include/bsp/lcd.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-clock-config.h b/bsps/arm/lpc24xx/include/bsp/lpc-clock-config.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/lpc-clock-config.h
rename to bsps/arm/lpc24xx/include/bsp/lpc-clock-config.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc-ethernet-config.h b/bsps/arm/lpc24xx/include/bsp/lpc-ethernet-config.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/lpc-ethernet-config.h
rename to bsps/arm/lpc24xx/include/bsp/lpc-ethernet-config.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc17xx.h b/bsps/arm/lpc24xx/include/bsp/lpc17xx.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/lpc17xx.h
rename to bsps/arm/lpc24xx/include/bsp/lpc17xx.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h b/bsps/arm/lpc24xx/include/bsp/lpc24xx.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h
rename to bsps/arm/lpc24xx/include/bsp/lpc24xx.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/ssp.h b/bsps/arm/lpc24xx/include/bsp/ssp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/ssp.h
rename to bsps/arm/lpc24xx/include/bsp/ssp.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/start-config.h b/bsps/arm/lpc24xx/include/bsp/start-config.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/start-config.h
rename to bsps/arm/lpc24xx/include/bsp/start-config.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/system-clocks.h b/bsps/arm/lpc24xx/include/bsp/system-clocks.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/system-clocks.h
rename to bsps/arm/lpc24xx/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/tm27.h b/bsps/arm/lpc24xx/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/include/tm27.h
rename to bsps/arm/lpc24xx/include/tm27.h
diff --git a/bsps/arm/lpc32xx/headers.am b/bsps/arm/lpc32xx/headers.am
new file mode 100644
index 0000000..40c0cfd
--- /dev/null
+++ b/bsps/arm/lpc32xx/headers.am
@@ -0,0 +1,19 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/boot.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/emc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/hsu.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/lpc32xx.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/mmu.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/lpc32xx/include/bsp/nand-mlc.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/bsp.h b/bsps/arm/lpc32xx/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/bsp.h
rename to bsps/arm/lpc32xx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/boot.h b/bsps/arm/lpc32xx/include/bsp/boot.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/boot.h
rename to bsps/arm/lpc32xx/include/bsp/boot.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/emc.h b/bsps/arm/lpc32xx/include/bsp/emc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/emc.h
rename to bsps/arm/lpc32xx/include/bsp/emc.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/hsu.h b/bsps/arm/lpc32xx/include/bsp/hsu.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/hsu.h
rename to bsps/arm/lpc32xx/include/bsp/hsu.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/i2c.h b/bsps/arm/lpc32xx/include/bsp/i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/i2c.h
rename to bsps/arm/lpc32xx/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/irq.h b/bsps/arm/lpc32xx/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/irq.h
rename to bsps/arm/lpc32xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-clock-config.h b/bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/lpc-clock-config.h
rename to bsps/arm/lpc32xx/include/bsp/lpc-clock-config.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc-ethernet-config.h b/bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/lpc-ethernet-config.h
rename to bsps/arm/lpc32xx/include/bsp/lpc-ethernet-config.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h b/bsps/arm/lpc32xx/include/bsp/lpc32xx.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h
rename to bsps/arm/lpc32xx/include/bsp/lpc32xx.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/mmu.h b/bsps/arm/lpc32xx/include/bsp/mmu.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/mmu.h
rename to bsps/arm/lpc32xx/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h b/bsps/arm/lpc32xx/include/bsp/nand-mlc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h
rename to bsps/arm/lpc32xx/include/bsp/nand-mlc.h
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/tm27.h b/bsps/arm/lpc32xx/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/include/tm27.h
rename to bsps/arm/lpc32xx/include/tm27.h
diff --git a/bsps/arm/raspberrypi/headers.am b/bsps/arm/raspberrypi/headers.am
new file mode 100644
index 0000000..91cd18c
--- /dev/null
+++ b/bsps/arm/raspberrypi/headers.am
@@ -0,0 +1,20 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/fbcons.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/mailbox.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/mmu.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/raspberrypi.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/rpi-fb.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/rpi-gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/spi.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/usart.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/raspberrypi/include/bsp/vc.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/bsp.h b/bsps/arm/raspberrypi/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/bsp.h
rename to bsps/arm/raspberrypi/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/fbcons.h b/bsps/arm/raspberrypi/include/bsp/fbcons.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/console/fbcons.h
rename to bsps/arm/raspberrypi/include/bsp/fbcons.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/i2c.h b/bsps/arm/raspberrypi/include/bsp/i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/i2c.h
rename to bsps/arm/raspberrypi/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/irq.h b/bsps/arm/raspberrypi/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/irq.h
rename to bsps/arm/raspberrypi/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/mailbox.h b/bsps/arm/raspberrypi/include/bsp/mailbox.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/mailbox.h
rename to bsps/arm/raspberrypi/include/bsp/mailbox.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/mmu.h b/bsps/arm/raspberrypi/include/bsp/mmu.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/mmu.h
rename to bsps/arm/raspberrypi/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h b/bsps/arm/raspberrypi/include/bsp/raspberrypi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/raspberrypi.h
rename to bsps/arm/raspberrypi/include/bsp/raspberrypi.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/rpi-fb.h b/bsps/arm/raspberrypi/include/bsp/rpi-fb.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/rpi-fb.h
rename to bsps/arm/raspberrypi/include/bsp/rpi-fb.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/rpi-gpio.h b/bsps/arm/raspberrypi/include/bsp/rpi-gpio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/rpi-gpio.h
rename to bsps/arm/raspberrypi/include/bsp/rpi-gpio.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/spi.h b/bsps/arm/raspberrypi/include/bsp/spi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/spi.h
rename to bsps/arm/raspberrypi/include/bsp/spi.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/usart.h b/bsps/arm/raspberrypi/include/bsp/usart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/usart.h
rename to bsps/arm/raspberrypi/include/bsp/usart.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/vc.h b/bsps/arm/raspberrypi/include/bsp/vc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/vc.h
rename to bsps/arm/raspberrypi/include/bsp/vc.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/tm27.h b/bsps/arm/raspberrypi/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/include/tm27.h
rename to bsps/arm/raspberrypi/include/tm27.h
diff --git a/bsps/arm/realview-pbx-a9/headers.am b/bsps/arm/realview-pbx-a9/headers.am
new file mode 100644
index 0000000..be4dc1a
--- /dev/null
+++ b/bsps/arm/realview-pbx-a9/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/realview-pbx-a9/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/realview-pbx-a9/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/realview-pbx-a9/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h b/bsps/arm/realview-pbx-a9/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h
rename to bsps/arm/realview-pbx-a9/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/irq.h b/bsps/arm/realview-pbx-a9/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/realview-pbx-a9/include/irq.h
rename to bsps/arm/realview-pbx-a9/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/tm27.h b/bsps/arm/realview-pbx-a9/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/realview-pbx-a9/include/tm27.h
rename to bsps/arm/realview-pbx-a9/include/tm27.h
diff --git a/bsps/arm/rtl22xx/headers.am b/bsps/arm/rtl22xx/headers.am
new file mode 100644
index 0000000..70f14bf
--- /dev/null
+++ b/bsps/arm/rtl22xx/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/rtl22xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/rtl22xx/include/lpc22xx.h
+include_HEADERS += ../../../../../../bsps/arm/rtl22xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/rtl22xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/bsps/arm/rtl22xx/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
rename to bsps/arm/rtl22xx/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp/irq.h b/bsps/arm/rtl22xx/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/rtl22xx/include/bsp/irq.h
rename to bsps/arm/rtl22xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/lpc22xx.h b/bsps/arm/rtl22xx/include/lpc22xx.h
similarity index 100%
rename from c/src/lib/libbsp/arm/rtl22xx/include/lpc22xx.h
rename to bsps/arm/rtl22xx/include/lpc22xx.h
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/tm27.h b/bsps/arm/rtl22xx/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/t32mppc/include/tm27.h
rename to bsps/arm/rtl22xx/include/tm27.h
diff --git a/bsps/arm/smdk2410/headers.am b/bsps/arm/smdk2410/headers.am
new file mode 100644
index 0000000..25d2eb7
--- /dev/null
+++ b/bsps/arm/smdk2410/headers.am
@@ -0,0 +1,14 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/s3c2400.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/s3c2410.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/s3c24xx.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/smc.h
+include_HEADERS += ../../../../../../bsps/arm/smdk2410/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/smdk2410/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/bsp.h b/bsps/arm/smdk2410/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/include/bsp.h
rename to bsps/arm/smdk2410/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/bsp/irq.h b/bsps/arm/smdk2410/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/include/bsp/irq.h
rename to bsps/arm/smdk2410/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/s3c2400.h b/bsps/arm/smdk2410/include/s3c2400.h
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/include/s3c2400.h
rename to bsps/arm/smdk2410/include/s3c2400.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/s3c2410.h b/bsps/arm/smdk2410/include/s3c2410.h
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/include/s3c2410.h
rename to bsps/arm/smdk2410/include/s3c2410.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/s3c24xx.h b/bsps/arm/smdk2410/include/s3c24xx.h
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/include/s3c24xx.h
rename to bsps/arm/smdk2410/include/s3c24xx.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/smc/smc.h b/bsps/arm/smdk2410/include/smc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/smc/smc.h
rename to bsps/arm/smdk2410/include/smc.h
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/include/tm27.h b/bsps/arm/smdk2410/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qemuppc/include/tm27.h
rename to bsps/arm/smdk2410/include/tm27.h
diff --git a/bsps/arm/stm32f4/headers.am b/bsps/arm/stm32f4/headers.am
new file mode 100644
index 0000000..f1270b5
--- /dev/null
+++ b/bsps/arm/stm32f4/headers.am
@@ -0,0 +1,29 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/stm32f4/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/io.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/rcc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32_i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32_usart.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f10xxx_gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f10xxx_rcc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_adc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_exti.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_flash.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_gpio.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_otgfs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_pwr.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_rcc.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_syscfg.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/stm32f4xxxx_tim.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/stm32f4/include/bsp/usart.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/bsp.h b/bsps/arm/stm32f4/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/bsp.h
rename to bsps/arm/stm32f4/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/i2c.h b/bsps/arm/stm32f4/include/bsp/i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/i2c.h
rename to bsps/arm/stm32f4/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/io.h b/bsps/arm/stm32f4/include/bsp/io.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/io.h
rename to bsps/arm/stm32f4/include/bsp/io.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/irq.h b/bsps/arm/stm32f4/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/irq.h
rename to bsps/arm/stm32f4/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/rcc.h b/bsps/arm/stm32f4/include/bsp/rcc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/rcc.h
rename to bsps/arm/stm32f4/include/bsp/rcc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32_i2c.h b/bsps/arm/stm32f4/include/bsp/stm32_i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32_i2c.h
rename to bsps/arm/stm32f4/include/bsp/stm32_i2c.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32_usart.h b/bsps/arm/stm32f4/include/bsp/stm32_usart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32_usart.h
rename to bsps/arm/stm32f4/include/bsp/stm32_usart.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_exti.h b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_exti.h
rename to bsps/arm/stm32f4/include/bsp/stm32f10xxx_exti.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_gpio.h b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_gpio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_gpio.h
rename to bsps/arm/stm32f4/include/bsp/stm32f10xxx_gpio.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_rcc.h b/bsps/arm/stm32f4/include/bsp/stm32f10xxx_rcc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f10xxx_rcc.h
rename to bsps/arm/stm32f4/include/bsp/stm32f10xxx_rcc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4.h b/bsps/arm/stm32f4/include/bsp/stm32f4.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_adc.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_adc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_adc.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_adc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_exti.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_exti.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_exti.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_exti.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_flash.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_flash.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_flash.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_flash.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_gpio.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_gpio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_gpio.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_gpio.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_otgfs.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_otgfs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_otgfs.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_otgfs.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_pwr.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_pwr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_pwr.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_pwr.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_rcc.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_rcc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_rcc.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_rcc.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_syscfg.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_syscfg.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_syscfg.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_syscfg.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_tim.h b/bsps/arm/stm32f4/include/bsp/stm32f4xxxx_tim.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/stm32f4xxxx_tim.h
rename to bsps/arm/stm32f4/include/bsp/stm32f4xxxx_tim.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/usart.h b/bsps/arm/stm32f4/include/bsp/usart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/usart.h
rename to bsps/arm/stm32f4/include/bsp/usart.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/tm27.h b/bsps/arm/stm32f4/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/include/tm27.h
rename to bsps/arm/stm32f4/include/tm27.h
diff --git a/bsps/arm/tms570/headers.am b/bsps/arm/tms570/headers.am
new file mode 100644
index 0000000..4dd455e
--- /dev/null
+++ b/bsps/arm/tms570/headers.am
@@ -0,0 +1,63 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/tms570/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/system-clocks.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-pinmux.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-pins.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-pom.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-rti.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-sci-driver.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-sci.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570-vim.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570_hwinit.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570_selftest.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570_selftest_parity.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570lc4357-pins.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/tms570ls3137zwt-pins.h
+
+include_bsp_ti_hercdir = $(includedir)/bsp/ti_herc
+include_bsp_ti_herc_HEADERS =
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_adc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_ccmsr.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_crc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_dcan.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_dcc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_dma.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_dmm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_efuse.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_emacc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_emacm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_emif.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_esm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_flash.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_flex_ray.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_gio.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_htu.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_i2c.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_iomm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_lin.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_mdio.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_n2het.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pbist.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pcr.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pll.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pmm.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_pom.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_rti.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_rtp.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_sci.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_spi.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_stc.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_sys.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_sys2.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_tcr.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_tcram.h
+include_bsp_ti_herc_HEADERS += ../../../../../../bsps/arm/tms570/include/bsp/ti_herc/reg_vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/bsp.h b/bsps/arm/tms570/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/bsp.h
rename to bsps/arm/tms570/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/irq.h b/bsps/arm/tms570/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/irq.h
rename to bsps/arm/tms570/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/system-clocks.h b/bsps/arm/tms570/include/bsp/system-clocks.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/system-clocks.h
rename to bsps/arm/tms570/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_adc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_adc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_adc.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_adc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_ccmsr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_ccmsr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_ccmsr.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_ccmsr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_crc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_crc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_crc.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_crc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcan.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcan.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcan.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_dcan.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcc.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_dcc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dma.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dma.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dma.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_dma.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dmm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dmm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dmm.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_dmm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_efuse.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_efuse.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_efuse.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_efuse.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacc.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_emacc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacm.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_emacm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emif.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emif.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emif.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_emif.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_esm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_esm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_esm.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_esm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flash.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_flash.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flash.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_flash.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flex_ray.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_flex_ray.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flex_ray.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_flex_ray.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_gio.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_gio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_gio.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_gio.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_htu.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_htu.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_htu.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_htu.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_i2c.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_i2c.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_i2c.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_iomm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_iomm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_iomm.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_iomm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_lin.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_lin.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_lin.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_lin.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_mdio.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_mdio.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_mdio.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_mdio.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_n2het.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_n2het.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_n2het.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_n2het.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pbist.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pbist.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pbist.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_pbist.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pcr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pcr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pcr.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_pcr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pll.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pll.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pll.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_pll.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pmm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pmm.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pmm.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_pmm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pom.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pom.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pom.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_pom.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rti.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_rti.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rti.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_rti.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rtp.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_rtp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rtp.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_rtp.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sci.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sci.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sci.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_sci.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_spi.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_spi.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_spi.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_spi.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_stc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_stc.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_stc.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_stc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_sys.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys2.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys2.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys2.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_sys2.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcr.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcr.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_tcr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcram.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcram.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcram.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_tcram.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_vim.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_vim.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_vim.h
rename to bsps/arm/tms570/include/bsp/ti_herc/reg_vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h b/bsps/arm/tms570/include/bsp/tms570-pinmux.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h
rename to bsps/arm/tms570/include/bsp/tms570-pinmux.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pins.h b/bsps/arm/tms570/include/bsp/tms570-pins.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570-pins.h
rename to bsps/arm/tms570/include/bsp/tms570-pins.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pom.h b/bsps/arm/tms570/include/bsp/tms570-pom.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570-pom.h
rename to bsps/arm/tms570/include/bsp/tms570-pom.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-rti.h b/bsps/arm/tms570/include/bsp/tms570-rti.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570-rti.h
rename to bsps/arm/tms570/include/bsp/tms570-rti.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-sci-driver.h b/bsps/arm/tms570/include/bsp/tms570-sci-driver.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570-sci-driver.h
rename to bsps/arm/tms570/include/bsp/tms570-sci-driver.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-sci.h b/bsps/arm/tms570/include/bsp/tms570-sci.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570-sci.h
rename to bsps/arm/tms570/include/bsp/tms570-sci.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-vim.h b/bsps/arm/tms570/include/bsp/tms570-vim.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570-vim.h
rename to bsps/arm/tms570/include/bsp/tms570-vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570.h b/bsps/arm/tms570/include/bsp/tms570.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570.h
rename to bsps/arm/tms570/include/bsp/tms570.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_hwinit.h b/bsps/arm/tms570/include/bsp/tms570_hwinit.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/hwinit/tms570_hwinit.h
rename to bsps/arm/tms570/include/bsp/tms570_hwinit.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest.h b/bsps/arm/tms570/include/bsp/tms570_selftest.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest.h
rename to bsps/arm/tms570/include/bsp/tms570_selftest.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest_parity.h b/bsps/arm/tms570/include/bsp/tms570_selftest_parity.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest_parity.h
rename to bsps/arm/tms570/include/bsp/tms570_selftest_parity.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570lc4357-pins.h b/bsps/arm/tms570/include/bsp/tms570lc4357-pins.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570lc4357-pins.h
rename to bsps/arm/tms570/include/bsp/tms570lc4357-pins.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570ls3137zwt-pins.h b/bsps/arm/tms570/include/bsp/tms570ls3137zwt-pins.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tms570ls3137zwt-pins.h
rename to bsps/arm/tms570/include/bsp/tms570ls3137zwt-pins.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h b/bsps/arm/tms570/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h
rename to bsps/arm/tms570/include/tm27.h
diff --git a/bsps/arm/xilinx-zynq/headers.am b/bsps/arm/xilinx-zynq/headers.am
new file mode 100644
index 0000000..708bd64
--- /dev/null
+++ b/bsps/arm/xilinx-zynq/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h
+include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h b/bsps/arm/xilinx-zynq/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h
rename to bsps/arm/xilinx-zynq/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c-regs.h
rename to bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h b/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/include/cadence-i2c.h
rename to bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h b/bsps/arm/xilinx-zynq/include/bsp/i2c.h
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/include/i2c.h
rename to bsps/arm/xilinx-zynq/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h b/bsps/arm/xilinx-zynq/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/include/irq.h
rename to bsps/arm/xilinx-zynq/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart-regs.h
rename to bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/include/zynq-uart.h
rename to bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h b/bsps/arm/xilinx-zynq/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/include/tm27.h
rename to bsps/arm/xilinx-zynq/include/tm27.h
diff --git a/bsps/bfin/TLL6527M/headers.am b/bsps/bfin/TLL6527M/headers.am
new file mode 100644
index 0000000..1ee1316
--- /dev/null
+++ b/bsps/bfin/TLL6527M/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/bfin/TLL6527M/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/bfin/TLL6527M/include/cplb.h
+include_HEADERS += ../../../../../../bsps/bfin/TLL6527M/include/tm27.h
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h b/bsps/bfin/TLL6527M/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h
rename to bsps/bfin/TLL6527M/include/bsp.h
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/cplb.h b/bsps/bfin/TLL6527M/include/cplb.h
similarity index 100%
rename from c/src/lib/libbsp/bfin/TLL6527M/include/cplb.h
rename to bsps/bfin/TLL6527M/include/cplb.h
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/tm27.h b/bsps/bfin/TLL6527M/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/bfin/TLL6527M/include/tm27.h
rename to bsps/bfin/TLL6527M/include/tm27.h
diff --git a/bsps/bfin/bf537Stamp/headers.am b/bsps/bfin/bf537Stamp/headers.am
new file mode 100644
index 0000000..ae18fe2
--- /dev/null
+++ b/bsps/bfin/bf537Stamp/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/bfin/bf537Stamp/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/bfin/bf537Stamp/include/tm27.h
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h b/bsps/bfin/bf537Stamp/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h
rename to bsps/bfin/bf537Stamp/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/tm27.h b/bsps/bfin/bf537Stamp/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/haleakala/include/tm27.h
rename to bsps/bfin/bf537Stamp/include/tm27.h
diff --git a/bsps/bfin/eZKit533/headers.am b/bsps/bfin/eZKit533/headers.am
new file mode 100644
index 0000000..0a6e170
--- /dev/null
+++ b/bsps/bfin/eZKit533/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/bfin/eZKit533/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/bfin/eZKit533/include/cplb.h
+include_HEADERS += ../../../../../../bsps/bfin/eZKit533/include/tm27.h
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/bsps/bfin/eZKit533/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/bfin/eZKit533/include/bsp.h
rename to bsps/bfin/eZKit533/include/bsp.h
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/cplb.h b/bsps/bfin/eZKit533/include/cplb.h
similarity index 100%
rename from c/src/lib/libbsp/bfin/eZKit533/include/cplb.h
rename to bsps/bfin/eZKit533/include/cplb.h
diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/tm27.h b/bsps/bfin/eZKit533/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/bfin/eZKit533/include/tm27.h
rename to bsps/bfin/eZKit533/include/tm27.h
diff --git a/bsps/bfin/headers.am b/bsps/bfin/headers.am
new file mode 100644
index 0000000..67f3f02
--- /dev/null
+++ b/bsps/bfin/headers.am
@@ -0,0 +1,37 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/bfin/include/bf52x.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/bfin/include/bsp/interrupt.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/bf533.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/bf537.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/cecRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/coreTimerRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/dmaRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/ebiuRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/ethernet.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/ethernetRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/gpioRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/interrupt.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/memoryRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/mmu.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/mmuRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/ppiRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/rtcRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/sicRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/spi.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/spiRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/sport.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/sportRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/timerRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/twi.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/twiRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/uart.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/uartRegs.h
+include_libcpu_HEADERS += ../../../../../bsps/bfin/include/libcpu/wdogRegs.h
diff --git a/c/src/lib/libcpu/bfin/bf52x/include/bf52x.h b/bsps/bfin/include/bf52x.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/bf52x/include/bf52x.h
rename to bsps/bfin/include/bf52x.h
diff --git a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h b/bsps/bfin/include/bsp/interrupt.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.h
rename to bsps/bfin/include/bsp/interrupt.h
diff --git a/c/src/lib/libcpu/bfin/include/bf533.h b/bsps/bfin/include/libcpu/bf533.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/bf533.h
rename to bsps/bfin/include/libcpu/bf533.h
diff --git a/c/src/lib/libcpu/bfin/include/bf537.h b/bsps/bfin/include/libcpu/bf537.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/bf537.h
rename to bsps/bfin/include/libcpu/bf537.h
diff --git a/c/src/lib/libcpu/bfin/include/cecRegs.h b/bsps/bfin/include/libcpu/cecRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/cecRegs.h
rename to bsps/bfin/include/libcpu/cecRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/coreTimerRegs.h b/bsps/bfin/include/libcpu/coreTimerRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/coreTimerRegs.h
rename to bsps/bfin/include/libcpu/coreTimerRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/dmaRegs.h b/bsps/bfin/include/libcpu/dmaRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/dmaRegs.h
rename to bsps/bfin/include/libcpu/dmaRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/ebiuRegs.h b/bsps/bfin/include/libcpu/ebiuRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/ebiuRegs.h
rename to bsps/bfin/include/libcpu/ebiuRegs.h
diff --git a/c/src/lib/libcpu/bfin/network/ethernet.h b/bsps/bfin/include/libcpu/ethernet.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/network/ethernet.h
rename to bsps/bfin/include/libcpu/ethernet.h
diff --git a/c/src/lib/libcpu/bfin/include/ethernetRegs.h b/bsps/bfin/include/libcpu/ethernetRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/ethernetRegs.h
rename to bsps/bfin/include/libcpu/ethernetRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/gpioRegs.h b/bsps/bfin/include/libcpu/gpioRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/gpioRegs.h
rename to bsps/bfin/include/libcpu/gpioRegs.h
diff --git a/c/src/lib/libcpu/bfin/interrupt/interrupt.h b/bsps/bfin/include/libcpu/interrupt.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/interrupt/interrupt.h
rename to bsps/bfin/include/libcpu/interrupt.h
diff --git a/c/src/lib/libcpu/bfin/include/memoryRegs.h b/bsps/bfin/include/libcpu/memoryRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/memoryRegs.h
rename to bsps/bfin/include/libcpu/memoryRegs.h
diff --git a/c/src/lib/libcpu/bfin/mmu/mmu.h b/bsps/bfin/include/libcpu/mmu.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/mmu/mmu.h
rename to bsps/bfin/include/libcpu/mmu.h
diff --git a/c/src/lib/libcpu/bfin/include/mmuRegs.h b/bsps/bfin/include/libcpu/mmuRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/mmuRegs.h
rename to bsps/bfin/include/libcpu/mmuRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/ppiRegs.h b/bsps/bfin/include/libcpu/ppiRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/ppiRegs.h
rename to bsps/bfin/include/libcpu/ppiRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/rtcRegs.h b/bsps/bfin/include/libcpu/rtcRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/rtcRegs.h
rename to bsps/bfin/include/libcpu/rtcRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/sicRegs.h b/bsps/bfin/include/libcpu/sicRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/sicRegs.h
rename to bsps/bfin/include/libcpu/sicRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/spi.h b/bsps/bfin/include/libcpu/spi.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/serial/spi.h
rename to bsps/bfin/include/libcpu/spi.h
diff --git a/c/src/lib/libcpu/bfin/include/spiRegs.h b/bsps/bfin/include/libcpu/spiRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/spiRegs.h
rename to bsps/bfin/include/libcpu/spiRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/sport.h b/bsps/bfin/include/libcpu/sport.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/serial/sport.h
rename to bsps/bfin/include/libcpu/sport.h
diff --git a/c/src/lib/libcpu/bfin/include/sportRegs.h b/bsps/bfin/include/libcpu/sportRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/sportRegs.h
rename to bsps/bfin/include/libcpu/sportRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/timerRegs.h b/bsps/bfin/include/libcpu/timerRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/timerRegs.h
rename to bsps/bfin/include/libcpu/timerRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/twi.h b/bsps/bfin/include/libcpu/twi.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/serial/twi.h
rename to bsps/bfin/include/libcpu/twi.h
diff --git a/c/src/lib/libcpu/bfin/include/twiRegs.h b/bsps/bfin/include/libcpu/twiRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/twiRegs.h
rename to bsps/bfin/include/libcpu/twiRegs.h
diff --git a/c/src/lib/libcpu/bfin/serial/uart.h b/bsps/bfin/include/libcpu/uart.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/serial/uart.h
rename to bsps/bfin/include/libcpu/uart.h
diff --git a/c/src/lib/libcpu/bfin/include/uartRegs.h b/bsps/bfin/include/libcpu/uartRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/uartRegs.h
rename to bsps/bfin/include/libcpu/uartRegs.h
diff --git a/c/src/lib/libcpu/bfin/include/wdogRegs.h b/bsps/bfin/include/libcpu/wdogRegs.h
similarity index 100%
rename from c/src/lib/libcpu/bfin/include/wdogRegs.h
rename to bsps/bfin/include/libcpu/wdogRegs.h
diff --git a/bsps/epiphany/epiphany_sim/headers.am b/bsps/epiphany/epiphany_sim/headers.am
new file mode 100644
index 0000000..bbe2514
--- /dev/null
+++ b/bsps/epiphany/epiphany_sim/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/epiphany/epiphany_sim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/epiphany/epiphany_sim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/epiphany/epiphany_sim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bsp.h b/bsps/epiphany/epiphany_sim/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/epiphany/epiphany_sim/include/bsp.h
rename to bsps/epiphany/epiphany_sim/include/bsp.h
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/irq.h b/bsps/epiphany/epiphany_sim/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/epiphany/epiphany_sim/include/irq.h
rename to bsps/epiphany/epiphany_sim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/include/tm27.h b/bsps/epiphany/epiphany_sim/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/include/tm27.h
rename to bsps/epiphany/epiphany_sim/include/tm27.h
diff --git a/bsps/epiphany/headers.am b/bsps/epiphany/headers.am
new file mode 100644
index 0000000..0ce8fb8
--- /dev/null
+++ b/bsps/epiphany/headers.am
@@ -0,0 +1,5 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/epiphany/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/epiphany/shared/include/linker-symbols.h b/bsps/epiphany/include/bsp/linker-symbols.h
similarity index 100%
rename from c/src/lib/libbsp/epiphany/shared/include/linker-symbols.h
rename to bsps/epiphany/include/bsp/linker-symbols.h
diff --git a/bsps/headers.am b/bsps/headers.am
new file mode 100644
index 0000000..ab7fa34
--- /dev/null
+++ b/bsps/headers.am
@@ -0,0 +1,83 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../bsps/include/mpci.h
+include_HEADERS += ../../bsps/include/shm_driver.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../bsps/include/bsp/VME.h
+include_bsp_HEADERS += ../../bsps/include/bsp/VMEDMA.h
+include_bsp_HEADERS += ../../bsps/include/bsp/bootcard.h
+include_bsp_HEADERS += ../../bsps/include/bsp/bspVmeDmaList.h
+include_bsp_HEADERS += ../../bsps/include/bsp/console-polled.h
+include_bsp_HEADERS += ../../bsps/include/bsp/console-termios.h
+include_bsp_HEADERS += ../../bsps/include/bsp/default-initial-extension.h
+include_bsp_HEADERS += ../../bsps/include/bsp/fatal.h
+include_bsp_HEADERS += ../../bsps/include/bsp/fdt.h
+include_bsp_HEADERS += ../../bsps/include/bsp/gpio.h
+include_bsp_HEADERS += ../../bsps/include/bsp/irq-generic.h
+include_bsp_HEADERS += ../../bsps/include/bsp/irq-info.h
+include_bsp_HEADERS += ../../bsps/include/bsp/mm.h
+include_bsp_HEADERS += ../../bsps/include/bsp/stackalloc.h
+include_bsp_HEADERS += ../../bsps/include/bsp/u-boot.h
+include_bsp_HEADERS += ../../bsps/include/bsp/uart-output-char.h
+include_bsp_HEADERS += ../../bsps/include/bsp/utility.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vmeTsi148.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vmeTsi148DMA.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vmeUniverse.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vmeUniverseDMA.h
+include_bsp_HEADERS += ../../bsps/include/bsp/vme_am_defs.h
+
+include_libchipdir = $(includedir)/libchip
+include_libchip_HEADERS =
+include_libchip_HEADERS += ../../bsps/include/libchip/am29lv160.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ata.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ata_internal.h
+include_libchip_HEADERS += ../../bsps/include/libchip/cs8900.h
+include_libchip_HEADERS += ../../bsps/include/libchip/disp_hcms29xx.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ds1375-rtc.h
+include_libchip_HEADERS += ../../bsps/include/libchip/greth.h
+include_libchip_HEADERS += ../../bsps/include/libchip/i2c-2b-eeprom.h
+include_libchip_HEADERS += ../../bsps/include/libchip/i2c-ds1621.h
+include_libchip_HEADERS += ../../bsps/include/libchip/i2c-sc620.h
+include_libchip_HEADERS += ../../bsps/include/libchip/i82586var.h
+include_libchip_HEADERS += ../../bsps/include/libchip/icm7170.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ide_ctrl.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ide_ctrl_cfg.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ide_ctrl_io.h
+include_libchip_HEADERS += ../../bsps/include/libchip/if_dcreg.h
+include_libchip_HEADERS += ../../bsps/include/libchip/if_fxpvar.h
+include_libchip_HEADERS += ../../bsps/include/libchip/m48t08.h
+include_libchip_HEADERS += ../../bsps/include/libchip/mc146818a.h
+include_libchip_HEADERS += ../../bsps/include/libchip/mc68681.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ns16550.h
+include_libchip_HEADERS += ../../bsps/include/libchip/ns16550_p.h
+include_libchip_HEADERS += ../../bsps/include/libchip/open_eth.h
+include_libchip_HEADERS += ../../bsps/include/libchip/rtc.h
+include_libchip_HEADERS += ../../bsps/include/libchip/serial.h
+include_libchip_HEADERS += ../../bsps/include/libchip/sersupp.h
+include_libchip_HEADERS += ../../bsps/include/libchip/smc91111.h
+include_libchip_HEADERS += ../../bsps/include/libchip/smc91111exp.h
+include_libchip_HEADERS += ../../bsps/include/libchip/sonic.h
+include_libchip_HEADERS += ../../bsps/include/libchip/spi-flash-m25p40.h
+include_libchip_HEADERS += ../../bsps/include/libchip/spi-fram-fm25l256.h
+include_libchip_HEADERS += ../../bsps/include/libchip/spi-memdrv.h
+include_libchip_HEADERS += ../../bsps/include/libchip/spi-sd-card.h
+include_libchip_HEADERS += ../../bsps/include/libchip/wd80x3.h
+include_libchip_HEADERS += ../../bsps/include/libchip/z85c30.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += ../../bsps/include/rtems/umon.h
+
+include_rtems_zilogdir = $(includedir)/rtems/zilog
+include_rtems_zilog_HEADERS =
+include_rtems_zilog_HEADERS += ../../bsps/include/rtems/zilog/z8036.h
+include_rtems_zilog_HEADERS += ../../bsps/include/rtems/zilog/z8530.h
+
+include_umondir = $(includedir)/umon
+include_umon_HEADERS =
+include_umon_HEADERS += ../../bsps/include/umon/cli.h
+include_umon_HEADERS += ../../bsps/include/umon/monlib.h
+include_umon_HEADERS += ../../bsps/include/umon/tfs.h
diff --git a/bsps/i386/headers.am b/bsps/i386/headers.am
new file mode 100644
index 0000000..8a3d39c
--- /dev/null
+++ b/bsps/i386/headers.am
@@ -0,0 +1,20 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/i386/include/i386_io.h
+include_HEADERS += ../../../../../bsps/i386/include/uart.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/apic.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/irq_asm.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/realmode_int.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/smp-imps.h
+include_bsp_HEADERS += ../../../../../bsps/i386/include/bsp/tty_drv.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/i386/include/libcpu/byteorder.h
+include_libcpu_HEADERS += ../../../../../bsps/i386/include/libcpu/cpuModel.h
+include_libcpu_HEADERS += ../../../../../bsps/i386/include/libcpu/page.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/apic.h b/bsps/i386/include/bsp/apic.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/apic.h
rename to bsps/i386/include/bsp/apic.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq.h b/bsps/i386/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/irq.h
rename to bsps/i386/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/i386/shared/irq/irq_asm.h b/bsps/i386/include/bsp/irq_asm.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/irq/irq_asm.h
rename to bsps/i386/include/bsp/irq_asm.h
diff --git a/c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h b/bsps/i386/include/bsp/realmode_int.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h
rename to bsps/i386/include/bsp/realmode_int.h
diff --git a/c/src/lib/libbsp/i386/shared/smp/smp-imps.h b/bsps/i386/include/bsp/smp-imps.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/smp/smp-imps.h
rename to bsps/i386/include/bsp/smp-imps.h
diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h b/bsps/i386/include/bsp/tty_drv.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/comm/tty_drv.h
rename to bsps/i386/include/bsp/tty_drv.h
diff --git a/c/src/lib/libbsp/i386/shared/comm/i386_io.h b/bsps/i386/include/i386_io.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/comm/i386_io.h
rename to bsps/i386/include/i386_io.h
diff --git a/c/src/lib/libcpu/i386/byteorder.h b/bsps/i386/include/libcpu/byteorder.h
similarity index 100%
rename from c/src/lib/libcpu/i386/byteorder.h
rename to bsps/i386/include/libcpu/byteorder.h
diff --git a/c/src/lib/libcpu/i386/cpuModel.h b/bsps/i386/include/libcpu/cpuModel.h
similarity index 100%
rename from c/src/lib/libcpu/i386/cpuModel.h
rename to bsps/i386/include/libcpu/cpuModel.h
diff --git a/c/src/lib/libcpu/i386/page.h b/bsps/i386/include/libcpu/page.h
similarity index 100%
rename from c/src/lib/libcpu/i386/page.h
rename to bsps/i386/include/libcpu/page.h
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.h b/bsps/i386/include/uart.h
similarity index 100%
rename from c/src/lib/libbsp/i386/shared/comm/uart.h
rename to bsps/i386/include/uart.h
diff --git a/bsps/i386/pc386/headers.am b/bsps/i386/pc386/headers.am
new file mode 100644
index 0000000..0109c11
--- /dev/null
+++ b/bsps/i386/pc386/headers.am
@@ -0,0 +1,25 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/i386/pc386/include/crt.h
+include_HEADERS += ../../../../../../bsps/i386/pc386/include/edid.h
+include_HEADERS += ../../../../../../bsps/i386/pc386/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/bspimpl.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/exar17d15x.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/fb_default_mode.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/fb_vesa.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/rtd316.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/tblsizes.h
+include_bsp_HEADERS += ../../../../../../bsps/i386/pc386/include/bsp/vbe3.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += ../../../../../../bsps/i386/pc386/include/rtems/kd.h
+include_rtems_HEADERS += ../../../../../../bsps/i386/pc386/include/rtems/keyboard.h
+include_rtems_HEADERS += ../../../../../../bsps/i386/pc386/include/rtems/ps2_drv.h
+include_rtems_HEADERS += ../../../../../../bsps/i386/pc386/include/rtems/vgacons.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/bsps/i386/pc386/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/include/bsp.h
rename to bsps/i386/pc386/include/bsp.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/bspimpl.h b/bsps/i386/pc386/include/bsp/bspimpl.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/include/bspimpl.h
rename to bsps/i386/pc386/include/bsp/bspimpl.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/exar17d15x.h b/bsps/i386/pc386/include/bsp/exar17d15x.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/exar17d15x.h
rename to bsps/i386/pc386/include/bsp/exar17d15x.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_default_mode.h b/bsps/i386/pc386/include/bsp/fb_default_mode.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/fb_default_mode.h
rename to bsps/i386/pc386/include/bsp/fb_default_mode.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/fb_vesa.h b/bsps/i386/pc386/include/bsp/fb_vesa.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/include/fb_vesa.h
rename to bsps/i386/pc386/include/bsp/fb_vesa.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/rtd316.h b/bsps/i386/pc386/include/bsp/rtd316.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/rtd316.h
rename to bsps/i386/pc386/include/bsp/rtd316.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/tblsizes.h b/bsps/i386/pc386/include/bsp/tblsizes.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/include/tblsizes.h
rename to bsps/i386/pc386/include/bsp/tblsizes.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/vbe3.h b/bsps/i386/pc386/include/bsp/vbe3.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/include/vbe3.h
rename to bsps/i386/pc386/include/bsp/vbe3.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/crt.h b/bsps/i386/pc386/include/crt.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/include/crt.h
rename to bsps/i386/pc386/include/crt.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/edid.h b/bsps/i386/pc386/include/edid.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/include/edid.h
rename to bsps/i386/pc386/include/edid.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/kd.h b/bsps/i386/pc386/include/rtems/kd.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/kd.h
rename to bsps/i386/pc386/include/rtems/kd.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/keyboard.h b/bsps/i386/pc386/include/rtems/keyboard.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/keyboard.h
rename to bsps/i386/pc386/include/rtems/keyboard.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_drv.h b/bsps/i386/pc386/include/rtems/ps2_drv.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/ps2_drv.h
rename to bsps/i386/pc386/include/rtems/ps2_drv.h
diff --git a/c/src/lib/libbsp/i386/pc386/console/vgacons.h b/bsps/i386/pc386/include/rtems/vgacons.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/console/vgacons.h
rename to bsps/i386/pc386/include/rtems/vgacons.h
diff --git a/c/src/lib/libbsp/i386/pc386/include/tm27.h b/bsps/i386/pc386/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/include/tm27.h
rename to bsps/i386/pc386/include/tm27.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VME.h b/bsps/include/bsp/VME.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/VME.h
rename to bsps/include/bsp/VME.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h b/bsps/include/bsp/VMEDMA.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h
rename to bsps/include/bsp/VMEDMA.h
diff --git a/c/src/lib/libbsp/shared/include/bootcard.h b/bsps/include/bsp/bootcard.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/bootcard.h
rename to bsps/include/bsp/bootcard.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h b/bsps/include/bsp/bspVmeDmaList.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h
rename to bsps/include/bsp/bspVmeDmaList.h
diff --git a/c/src/lib/libbsp/shared/include/console-polled.h b/bsps/include/bsp/console-polled.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/console-polled.h
rename to bsps/include/bsp/console-polled.h
diff --git a/c/src/lib/libbsp/shared/include/console-termios.h b/bsps/include/bsp/console-termios.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/console-termios.h
rename to bsps/include/bsp/console-termios.h
diff --git a/c/src/lib/libbsp/shared/include/default-initial-extension.h b/bsps/include/bsp/default-initial-extension.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/default-initial-extension.h
rename to bsps/include/bsp/default-initial-extension.h
diff --git a/c/src/lib/libbsp/shared/include/fatal.h b/bsps/include/bsp/fatal.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/fatal.h
rename to bsps/include/bsp/fatal.h
diff --git a/c/src/lib/libbsp/shared/include/fdt.h b/bsps/include/bsp/fdt.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/fdt.h
rename to bsps/include/bsp/fdt.h
diff --git a/c/src/lib/libbsp/shared/include/gpio.h b/bsps/include/bsp/gpio.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/gpio.h
rename to bsps/include/bsp/gpio.h
diff --git a/c/src/lib/libbsp/shared/include/irq-generic.h b/bsps/include/bsp/irq-generic.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/irq-generic.h
rename to bsps/include/bsp/irq-generic.h
diff --git a/c/src/lib/libbsp/shared/include/irq-info.h b/bsps/include/bsp/irq-info.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/irq-info.h
rename to bsps/include/bsp/irq-info.h
diff --git a/c/src/lib/libbsp/shared/include/mm.h b/bsps/include/bsp/mm.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/mm.h
rename to bsps/include/bsp/mm.h
diff --git a/c/src/lib/libbsp/shared/include/stackalloc.h b/bsps/include/bsp/stackalloc.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/stackalloc.h
rename to bsps/include/bsp/stackalloc.h
diff --git a/c/src/lib/libbsp/shared/include/u-boot.h b/bsps/include/bsp/u-boot.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/u-boot.h
rename to bsps/include/bsp/u-boot.h
diff --git a/c/src/lib/libbsp/shared/include/uart-output-char.h b/bsps/include/bsp/uart-output-char.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/uart-output-char.h
rename to bsps/include/bsp/uart-output-char.h
diff --git a/c/src/lib/libbsp/shared/include/utility.h b/bsps/include/bsp/utility.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/utility.h
rename to bsps/include/bsp/utility.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h b/bsps/include/bsp/vmeTsi148.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h
rename to bsps/include/bsp/vmeTsi148.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h b/bsps/include/bsp/vmeTsi148DMA.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h
rename to bsps/include/bsp/vmeTsi148DMA.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h b/bsps/include/bsp/vmeUniverse.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h
rename to bsps/include/bsp/vmeUniverse.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h b/bsps/include/bsp/vmeUniverseDMA.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h
rename to bsps/include/bsp/vmeUniverseDMA.h
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h b/bsps/include/bsp/vme_am_defs.h
similarity index 100%
rename from c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h
rename to bsps/include/bsp/vme_am_defs.h
diff --git a/c/src/libchip/flash/am29lv160.h b/bsps/include/libchip/am29lv160.h
similarity index 100%
rename from c/src/libchip/flash/am29lv160.h
rename to bsps/include/libchip/am29lv160.h
diff --git a/c/src/libchip/ide/ata.h b/bsps/include/libchip/ata.h
similarity index 100%
rename from c/src/libchip/ide/ata.h
rename to bsps/include/libchip/ata.h
diff --git a/c/src/libchip/ide/ata_internal.h b/bsps/include/libchip/ata_internal.h
similarity index 100%
rename from c/src/libchip/ide/ata_internal.h
rename to bsps/include/libchip/ata_internal.h
diff --git a/c/src/libchip/network/cs8900.h b/bsps/include/libchip/cs8900.h
similarity index 100%
rename from c/src/libchip/network/cs8900.h
rename to bsps/include/libchip/cs8900.h
diff --git a/c/src/libchip/display/disp_hcms29xx.h b/bsps/include/libchip/disp_hcms29xx.h
similarity index 100%
rename from c/src/libchip/display/disp_hcms29xx.h
rename to bsps/include/libchip/disp_hcms29xx.h
diff --git a/c/src/libchip/rtc/ds1375-rtc.h b/bsps/include/libchip/ds1375-rtc.h
similarity index 100%
rename from c/src/libchip/rtc/ds1375-rtc.h
rename to bsps/include/libchip/ds1375-rtc.h
diff --git a/c/src/libchip/network/greth.h b/bsps/include/libchip/greth.h
similarity index 100%
rename from c/src/libchip/network/greth.h
rename to bsps/include/libchip/greth.h
diff --git a/c/src/libchip/i2c/i2c-2b-eeprom.h b/bsps/include/libchip/i2c-2b-eeprom.h
similarity index 100%
rename from c/src/libchip/i2c/i2c-2b-eeprom.h
rename to bsps/include/libchip/i2c-2b-eeprom.h
diff --git a/c/src/libchip/i2c/i2c-ds1621.h b/bsps/include/libchip/i2c-ds1621.h
similarity index 100%
rename from c/src/libchip/i2c/i2c-ds1621.h
rename to bsps/include/libchip/i2c-ds1621.h
diff --git a/c/src/libchip/i2c/i2c-sc620.h b/bsps/include/libchip/i2c-sc620.h
similarity index 100%
rename from c/src/libchip/i2c/i2c-sc620.h
rename to bsps/include/libchip/i2c-sc620.h
diff --git a/c/src/libchip/network/i82586var.h b/bsps/include/libchip/i82586var.h
similarity index 100%
rename from c/src/libchip/network/i82586var.h
rename to bsps/include/libchip/i82586var.h
diff --git a/c/src/libchip/rtc/icm7170.h b/bsps/include/libchip/icm7170.h
similarity index 100%
rename from c/src/libchip/rtc/icm7170.h
rename to bsps/include/libchip/icm7170.h
diff --git a/c/src/libchip/ide/ide_ctrl.h b/bsps/include/libchip/ide_ctrl.h
similarity index 100%
rename from c/src/libchip/ide/ide_ctrl.h
rename to bsps/include/libchip/ide_ctrl.h
diff --git a/c/src/libchip/ide/ide_ctrl_cfg.h b/bsps/include/libchip/ide_ctrl_cfg.h
similarity index 100%
rename from c/src/libchip/ide/ide_ctrl_cfg.h
rename to bsps/include/libchip/ide_ctrl_cfg.h
diff --git a/c/src/libchip/ide/ide_ctrl_io.h b/bsps/include/libchip/ide_ctrl_io.h
similarity index 100%
rename from c/src/libchip/ide/ide_ctrl_io.h
rename to bsps/include/libchip/ide_ctrl_io.h
diff --git a/c/src/libchip/network/if_dcreg.h b/bsps/include/libchip/if_dcreg.h
similarity index 100%
rename from c/src/libchip/network/if_dcreg.h
rename to bsps/include/libchip/if_dcreg.h
diff --git a/c/src/libchip/network/if_fxpvar.h b/bsps/include/libchip/if_fxpvar.h
similarity index 100%
rename from c/src/libchip/network/if_fxpvar.h
rename to bsps/include/libchip/if_fxpvar.h
diff --git a/c/src/libchip/rtc/m48t08.h b/bsps/include/libchip/m48t08.h
similarity index 100%
rename from c/src/libchip/rtc/m48t08.h
rename to bsps/include/libchip/m48t08.h
diff --git a/c/src/libchip/rtc/mc146818a.h b/bsps/include/libchip/mc146818a.h
similarity index 100%
rename from c/src/libchip/rtc/mc146818a.h
rename to bsps/include/libchip/mc146818a.h
diff --git a/c/src/libchip/serial/mc68681.h b/bsps/include/libchip/mc68681.h
similarity index 100%
rename from c/src/libchip/serial/mc68681.h
rename to bsps/include/libchip/mc68681.h
diff --git a/c/src/libchip/serial/ns16550.h b/bsps/include/libchip/ns16550.h
similarity index 100%
rename from c/src/libchip/serial/ns16550.h
rename to bsps/include/libchip/ns16550.h
diff --git a/c/src/libchip/serial/ns16550_p.h b/bsps/include/libchip/ns16550_p.h
similarity index 100%
rename from c/src/libchip/serial/ns16550_p.h
rename to bsps/include/libchip/ns16550_p.h
diff --git a/c/src/libchip/network/open_eth.h b/bsps/include/libchip/open_eth.h
similarity index 100%
rename from c/src/libchip/network/open_eth.h
rename to bsps/include/libchip/open_eth.h
diff --git a/c/src/libchip/rtc/rtc.h b/bsps/include/libchip/rtc.h
similarity index 100%
rename from c/src/libchip/rtc/rtc.h
rename to bsps/include/libchip/rtc.h
diff --git a/c/src/libchip/serial/serial.h b/bsps/include/libchip/serial.h
similarity index 100%
rename from c/src/libchip/serial/serial.h
rename to bsps/include/libchip/serial.h
diff --git a/c/src/libchip/serial/sersupp.h b/bsps/include/libchip/sersupp.h
similarity index 100%
rename from c/src/libchip/serial/sersupp.h
rename to bsps/include/libchip/sersupp.h
diff --git a/c/src/libchip/network/smc91111.h b/bsps/include/libchip/smc91111.h
similarity index 100%
rename from c/src/libchip/network/smc91111.h
rename to bsps/include/libchip/smc91111.h
diff --git a/c/src/libchip/network/smc91111exp.h b/bsps/include/libchip/smc91111exp.h
similarity index 100%
rename from c/src/libchip/network/smc91111exp.h
rename to bsps/include/libchip/smc91111exp.h
diff --git a/c/src/libchip/network/sonic.h b/bsps/include/libchip/sonic.h
similarity index 100%
rename from c/src/libchip/network/sonic.h
rename to bsps/include/libchip/sonic.h
diff --git a/c/src/libchip/i2c/spi-flash-m25p40.h b/bsps/include/libchip/spi-flash-m25p40.h
similarity index 100%
rename from c/src/libchip/i2c/spi-flash-m25p40.h
rename to bsps/include/libchip/spi-flash-m25p40.h
diff --git a/c/src/libchip/i2c/spi-fram-fm25l256.h b/bsps/include/libchip/spi-fram-fm25l256.h
similarity index 100%
rename from c/src/libchip/i2c/spi-fram-fm25l256.h
rename to bsps/include/libchip/spi-fram-fm25l256.h
diff --git a/c/src/libchip/i2c/spi-memdrv.h b/bsps/include/libchip/spi-memdrv.h
similarity index 100%
rename from c/src/libchip/i2c/spi-memdrv.h
rename to bsps/include/libchip/spi-memdrv.h
diff --git a/c/src/libchip/i2c/spi-sd-card.h b/bsps/include/libchip/spi-sd-card.h
similarity index 100%
rename from c/src/libchip/i2c/spi-sd-card.h
rename to bsps/include/libchip/spi-sd-card.h
diff --git a/c/src/libchip/network/wd80x3.h b/bsps/include/libchip/wd80x3.h
similarity index 100%
rename from c/src/libchip/network/wd80x3.h
rename to bsps/include/libchip/wd80x3.h
diff --git a/c/src/libchip/serial/z85c30.h b/bsps/include/libchip/z85c30.h
similarity index 100%
rename from c/src/libchip/serial/z85c30.h
rename to bsps/include/libchip/z85c30.h
diff --git a/c/src/libchip/shmdr/mpci.h b/bsps/include/mpci.h
similarity index 100%
rename from c/src/libchip/shmdr/mpci.h
rename to bsps/include/mpci.h
diff --git a/c/src/lib/libbsp/shared/umon/umon.h b/bsps/include/rtems/umon.h
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/umon.h
rename to bsps/include/rtems/umon.h
diff --git a/c/src/lib/libbsp/shared/include/zilog/z8036.h b/bsps/include/rtems/zilog/z8036.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/zilog/z8036.h
rename to bsps/include/rtems/zilog/z8036.h
diff --git a/c/src/lib/libbsp/shared/include/zilog/z8530.h b/bsps/include/rtems/zilog/z8530.h
similarity index 100%
rename from c/src/lib/libbsp/shared/include/zilog/z8530.h
rename to bsps/include/rtems/zilog/z8530.h
diff --git a/c/src/libchip/shmdr/shm_driver.h b/bsps/include/shm_driver.h
similarity index 100%
rename from c/src/libchip/shmdr/shm_driver.h
rename to bsps/include/shm_driver.h
diff --git a/c/src/lib/libbsp/shared/umon/cli.h b/bsps/include/umon/cli.h
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/cli.h
rename to bsps/include/umon/cli.h
diff --git a/c/src/lib/libbsp/shared/umon/monlib.h b/bsps/include/umon/monlib.h
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/monlib.h
rename to bsps/include/umon/monlib.h
diff --git a/c/src/lib/libbsp/shared/umon/tfs.h b/bsps/include/umon/tfs.h
similarity index 100%
rename from c/src/lib/libbsp/shared/umon/tfs.h
rename to bsps/include/umon/tfs.h
diff --git a/bsps/lm32/headers.am b/bsps/lm32/headers.am
new file mode 100644
index 0000000..e44184d
--- /dev/null
+++ b/bsps/lm32/headers.am
@@ -0,0 +1,18 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_ac97.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_buttons.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_dmx.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_flash.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_gpio.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_ir.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_memcard.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_midi.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_pfpu.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_tmu.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_usbinput.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_versions.h
+include_bsp_HEADERS += ../../../../../bsps/lm32/include/bsp/milkymist_video.h
diff --git a/c/src/lib/libbsp/lm32/shared/include/irq.h b/bsps/lm32/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/include/irq.h
rename to bsps/lm32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h b/bsps/lm32/include/bsp/milkymist_ac97.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h
rename to bsps/lm32/include/bsp/milkymist_ac97.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h b/bsps/lm32/include/bsp/milkymist_buttons.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h
rename to bsps/lm32/include/bsp/milkymist_buttons.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h b/bsps/lm32/include/bsp/milkymist_dmx.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h
rename to bsps/lm32/include/bsp/milkymist_dmx.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h b/bsps/lm32/include/bsp/milkymist_flash.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h
rename to bsps/lm32/include/bsp/milkymist_flash.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h b/bsps/lm32/include/bsp/milkymist_gpio.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h
rename to bsps/lm32/include/bsp/milkymist_gpio.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h b/bsps/lm32/include/bsp/milkymist_ir.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h
rename to bsps/lm32/include/bsp/milkymist_ir.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h b/bsps/lm32/include/bsp/milkymist_memcard.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h
rename to bsps/lm32/include/bsp/milkymist_memcard.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h b/bsps/lm32/include/bsp/milkymist_midi.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h
rename to bsps/lm32/include/bsp/milkymist_midi.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h b/bsps/lm32/include/bsp/milkymist_pfpu.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h
rename to bsps/lm32/include/bsp/milkymist_pfpu.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h b/bsps/lm32/include/bsp/milkymist_tmu.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h
rename to bsps/lm32/include/bsp/milkymist_tmu.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h b/bsps/lm32/include/bsp/milkymist_usbinput.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h
rename to bsps/lm32/include/bsp/milkymist_usbinput.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h b/bsps/lm32/include/bsp/milkymist_versions.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h
rename to bsps/lm32/include/bsp/milkymist_versions.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h b/bsps/lm32/include/bsp/milkymist_video.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h
rename to bsps/lm32/include/bsp/milkymist_video.h
diff --git a/bsps/lm32/lm32_evr/headers.am b/bsps/lm32/lm32_evr/headers.am
new file mode 100644
index 0000000..213b66e
--- /dev/null
+++ b/bsps/lm32/lm32_evr/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/lm32/lm32_evr/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/lm32/lm32_evr/include/system_conf.h
+include_HEADERS += ../../../../../../bsps/lm32/lm32_evr/include/tm27.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h b/bsps/lm32/lm32_evr/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h
rename to bsps/lm32/lm32_evr/include/bsp.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h b/bsps/lm32/lm32_evr/include/system_conf.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h
rename to bsps/lm32/lm32_evr/include/system_conf.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h b/bsps/lm32/lm32_evr/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h
rename to bsps/lm32/lm32_evr/include/tm27.h
diff --git a/bsps/lm32/milkymist/headers.am b/bsps/lm32/milkymist/headers.am
new file mode 100644
index 0000000..1bd114f
--- /dev/null
+++ b/bsps/lm32/milkymist/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/lm32/milkymist/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/lm32/milkymist/include/system_conf.h
+include_HEADERS += ../../../../../../bsps/lm32/milkymist/include/tm27.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/bsp.h b/bsps/lm32/milkymist/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/milkymist/include/bsp.h
rename to bsps/lm32/milkymist/include/bsp.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/system_conf.h b/bsps/lm32/milkymist/include/system_conf.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/milkymist/include/system_conf.h
rename to bsps/lm32/milkymist/include/system_conf.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/tm27.h b/bsps/lm32/milkymist/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/include/tm27.h
rename to bsps/lm32/milkymist/include/tm27.h
diff --git a/bsps/m32c/m32cbsp/headers.am b/bsps/m32c/m32cbsp/headers.am
new file mode 100644
index 0000000..463baae
--- /dev/null
+++ b/bsps/m32c/m32cbsp/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m32c/m32cbsp/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m32c/m32cbsp/include/tm27.h
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h b/bsps/m32c/m32cbsp/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m32c/m32cbsp/include/bsp.h
rename to bsps/m32c/m32cbsp/include/bsp.h
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/tm27.h b/bsps/m32c/m32cbsp/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/no_cpu/no_bsp/include/tm27.h
rename to bsps/m32c/m32cbsp/include/tm27.h
diff --git a/bsps/m68k/av5282/headers.am b/bsps/m68k/av5282/headers.am
new file mode 100644
index 0000000..a6a9154
--- /dev/null
+++ b/bsps/m68k/av5282/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/av5282/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/av5282/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/bsps/m68k/av5282/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/av5282/include/bsp.h
rename to bsps/m68k/av5282/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/av5282/include/tm27.h b/bsps/m68k/av5282/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/av5282/include/tm27.h
rename to bsps/m68k/av5282/include/tm27.h
diff --git a/bsps/m68k/csb360/headers.am b/bsps/m68k/csb360/headers.am
new file mode 100644
index 0000000..5c713a2
--- /dev/null
+++ b/bsps/m68k/csb360/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/csb360/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/csb360/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/bsps/m68k/csb360/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/csb360/include/bsp.h
rename to bsps/m68k/csb360/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/csb360/include/tm27.h b/bsps/m68k/csb360/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/csb360/include/tm27.h
rename to bsps/m68k/csb360/include/tm27.h
diff --git a/bsps/m68k/gen68340/headers.am b/bsps/m68k/gen68340/headers.am
new file mode 100644
index 0000000..ca3dba2
--- /dev/null
+++ b/bsps/m68k/gen68340/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m340timer.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m340uart.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m68340.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m68340.inc
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/m68349.inc
+include_HEADERS += ../../../../../../bsps/m68k/gen68340/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/bsps/m68k/gen68340/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/include/bsp.h
rename to bsps/m68k/gen68340/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h b/bsps/m68k/gen68340/include/m340timer.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/include/m340timer.h
rename to bsps/m68k/gen68340/include/m340timer.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h b/bsps/m68k/gen68340/include/m340uart.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/include/m340uart.h
rename to bsps/m68k/gen68340/include/m340uart.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68340.h b/bsps/m68k/gen68340/include/m68340.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/include/m68340.h
rename to bsps/m68k/gen68340/include/m68340.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68340.inc b/bsps/m68k/gen68340/include/m68340.inc
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/include/m68340.inc
rename to bsps/m68k/gen68340/include/m68340.inc
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m68349.inc b/bsps/m68k/gen68340/include/m68349.inc
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/include/m68349.inc
rename to bsps/m68k/gen68340/include/m68349.inc
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/tm27.h b/bsps/m68k/gen68340/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/nios2/nios2_iss/include/tm27.h
rename to bsps/m68k/gen68340/include/tm27.h
diff --git a/bsps/m68k/gen68360/headers.am b/bsps/m68k/gen68360/headers.am
new file mode 100644
index 0000000..be0ec17
--- /dev/null
+++ b/bsps/m68k/gen68360/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/gen68360/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/gen68360/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/bsps/m68k/gen68360/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68360/include/bsp.h
rename to bsps/m68k/gen68360/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/tm27.h b/bsps/m68k/gen68360/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68360/include/tm27.h
rename to bsps/m68k/gen68360/include/tm27.h
diff --git a/bsps/m68k/genmcf548x/headers.am b/bsps/m68k/genmcf548x/headers.am
new file mode 100644
index 0000000..80752c5
--- /dev/null
+++ b/bsps/m68k/genmcf548x/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/genmcf548x/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/genmcf548x/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/m68k/genmcf548x/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/bsps/m68k/genmcf548x/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
rename to bsps/m68k/genmcf548x/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h b/bsps/m68k/genmcf548x/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/genmcf548x/include/irq.h
rename to bsps/m68k/genmcf548x/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h b/bsps/m68k/genmcf548x/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h
rename to bsps/m68k/genmcf548x/include/tm27.h
diff --git a/bsps/m68k/headers.am b/bsps/m68k/headers.am
new file mode 100644
index 0000000..526fa77
--- /dev/null
+++ b/bsps/m68k/headers.am
@@ -0,0 +1,47 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/m68k/include/mvme16x_hw.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/m68k/include/bsp/linker-symbols.h
+
+include_mcf5206dir = $(includedir)/mcf5206
+include_mcf5206_HEADERS =
+include_mcf5206_HEADERS += ../../../../../bsps/m68k/include/mcf5206/mcf5206e.h
+include_mcf5206_HEADERS += ../../../../../bsps/m68k/include/mcf5206/mcfmbus.h
+include_mcf5206_HEADERS += ../../../../../bsps/m68k/include/mcf5206/mcfuart.h
+
+include_mcf5223xdir = $(includedir)/mcf5223x
+include_mcf5223x_HEADERS =
+include_mcf5223x_HEADERS += ../../../../../bsps/m68k/include/mcf5223x/mcf5223x.h
+
+include_mcf5225xdir = $(includedir)/mcf5225x
+include_mcf5225x_HEADERS =
+include_mcf5225x_HEADERS += ../../../../../bsps/m68k/include/mcf5225x/fec.h
+include_mcf5225x_HEADERS += ../../../../../bsps/m68k/include/mcf5225x/mcf5225x.h
+
+include_mcf5235dir = $(includedir)/mcf5235
+include_mcf5235_HEADERS =
+include_mcf5235_HEADERS += ../../../../../bsps/m68k/include/mcf5235/mcf5235.h
+
+include_mcf5272dir = $(includedir)/mcf5272
+include_mcf5272_HEADERS =
+include_mcf5272_HEADERS += ../../../../../bsps/m68k/include/mcf5272/mcf5272.h
+
+include_mcf5282dir = $(includedir)/mcf5282
+include_mcf5282_HEADERS =
+include_mcf5282_HEADERS += ../../../../../bsps/m68k/include/mcf5282/mcf5282.h
+
+include_mcf532xdir = $(includedir)/mcf532x
+include_mcf532x_HEADERS =
+include_mcf532x_HEADERS += ../../../../../bsps/m68k/include/mcf532x/mcf532x.h
+
+include_mcf548xdir = $(includedir)/mcf548x
+include_mcf548x_HEADERS =
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/MCD_dma.h
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/MCD_progCheck.h
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/MCD_tasksInit.h
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/mcdma_glue.h
+include_mcf548x_HEADERS += ../../../../../bsps/m68k/include/mcf548x/mcf548x.h
diff --git a/c/src/lib/libbsp/m68k/shared/include/linker-symbols.h b/bsps/m68k/include/bsp/linker-symbols.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/shared/include/linker-symbols.h
rename to bsps/m68k/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h b/bsps/m68k/include/mcf5206/mcf5206e.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h
rename to bsps/m68k/include/mcf5206/mcf5206e.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h b/bsps/m68k/include/mcf5206/mcfmbus.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
rename to bsps/m68k/include/mcf5206/mcfmbus.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h b/bsps/m68k/include/mcf5206/mcfuart.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
rename to bsps/m68k/include/mcf5206/mcfuart.h
diff --git a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h b/bsps/m68k/include/mcf5223x/mcf5223x.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h
rename to bsps/m68k/include/mcf5223x/mcf5223x.h
diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h b/bsps/m68k/include/mcf5225x/fec.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5225x/include/fec.h
rename to bsps/m68k/include/mcf5225x/fec.h
diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h b/bsps/m68k/include/mcf5225x/mcf5225x.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h
rename to bsps/m68k/include/mcf5225x/mcf5225x.h
diff --git a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h b/bsps/m68k/include/mcf5235/mcf5235.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h
rename to bsps/m68k/include/mcf5235/mcf5235.h
diff --git a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h b/bsps/m68k/include/mcf5272/mcf5272.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h
rename to bsps/m68k/include/mcf5272/mcf5272.h
diff --git a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h b/bsps/m68k/include/mcf5282/mcf5282.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h
rename to bsps/m68k/include/mcf5282/mcf5282.h
diff --git a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h b/bsps/m68k/include/mcf532x/mcf532x.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h
rename to bsps/m68k/include/mcf532x/mcf532x.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h b/bsps/m68k/include/mcf548x/MCD_dma.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h
rename to bsps/m68k/include/mcf548x/MCD_dma.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h b/bsps/m68k/include/mcf548x/MCD_progCheck.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h
rename to bsps/m68k/include/mcf548x/MCD_progCheck.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h b/bsps/m68k/include/mcf548x/MCD_tasksInit.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h
rename to bsps/m68k/include/mcf548x/MCD_tasksInit.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h b/bsps/m68k/include/mcf548x/mcdma_glue.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h
rename to bsps/m68k/include/mcf548x/mcdma_glue.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h b/bsps/m68k/include/mcf548x/mcf548x.h
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h
rename to bsps/m68k/include/mcf548x/mcf548x.h
diff --git a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h b/bsps/m68k/include/mvme16x_hw.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h
rename to bsps/m68k/include/mvme16x_hw.h
diff --git a/bsps/m68k/mcf5206elite/headers.am b/bsps/m68k/mcf5206elite/headers.am
new file mode 100644
index 0000000..1faf694
--- /dev/null
+++ b/bsps/m68k/mcf5206elite/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/ds1307.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/i2c.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/i2cdrv.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/nvram.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5206elite/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/bsps/m68k/mcf5206elite/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
rename to bsps/m68k/mcf5206elite/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h b/bsps/m68k/mcf5206elite/include/ds1307.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/include/ds1307.h
rename to bsps/m68k/mcf5206elite/include/ds1307.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h b/bsps/m68k/mcf5206elite/include/i2c.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h
rename to bsps/m68k/mcf5206elite/include/i2c.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h b/bsps/m68k/mcf5206elite/include/i2cdrv.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h
rename to bsps/m68k/mcf5206elite/include/i2cdrv.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h b/bsps/m68k/mcf5206elite/include/nvram.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/include/nvram.h
rename to bsps/m68k/mcf5206elite/include/nvram.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h b/bsps/m68k/mcf5206elite/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/include/tm27.h
rename to bsps/m68k/mcf5206elite/include/tm27.h
diff --git a/bsps/m68k/mcf52235/headers.am b/bsps/m68k/mcf52235/headers.am
new file mode 100644
index 0000000..b536b21
--- /dev/null
+++ b/bsps/m68k/mcf52235/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf52235/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf52235/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h b/bsps/m68k/mcf52235/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf52235/include/bsp.h
rename to bsps/m68k/mcf52235/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/tm27.h b/bsps/m68k/mcf52235/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf52235/include/tm27.h
rename to bsps/m68k/mcf52235/include/tm27.h
diff --git a/bsps/m68k/mcf5225x/headers.am b/bsps/m68k/mcf5225x/headers.am
new file mode 100644
index 0000000..200bebf
--- /dev/null
+++ b/bsps/m68k/mcf5225x/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf5225x/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5225x/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/bsps/m68k/mcf5225x/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
rename to bsps/m68k/mcf5225x/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h b/bsps/m68k/mcf5225x/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5225x/include/tm27.h
rename to bsps/m68k/mcf5225x/include/tm27.h
diff --git a/bsps/m68k/mcf5235/headers.am b/bsps/m68k/mcf5235/headers.am
new file mode 100644
index 0000000..e00b25f
--- /dev/null
+++ b/bsps/m68k/mcf5235/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf5235/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5235/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/bsps/m68k/mcf5235/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5235/include/bsp.h
rename to bsps/m68k/mcf5235/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/tm27.h b/bsps/m68k/mcf5235/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5235/include/tm27.h
rename to bsps/m68k/mcf5235/include/tm27.h
diff --git a/bsps/m68k/mcf5329/headers.am b/bsps/m68k/mcf5329/headers.am
new file mode 100644
index 0000000..c1ee57a
--- /dev/null
+++ b/bsps/m68k/mcf5329/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mcf5329/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mcf5329/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/bsps/m68k/mcf5329/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
rename to bsps/m68k/mcf5329/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/tm27.h b/bsps/m68k/mcf5329/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5329/include/tm27.h
rename to bsps/m68k/mcf5329/include/tm27.h
diff --git a/bsps/m68k/mrm332/headers.am b/bsps/m68k/mrm332/headers.am
new file mode 100644
index 0000000..84ad4ec
--- /dev/null
+++ b/bsps/m68k/mrm332/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mrm332/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mrm332/include/mrm332.h
+include_HEADERS += ../../../../../../bsps/m68k/mrm332/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/bsps/m68k/mrm332/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mrm332/include/bsp.h
rename to bsps/m68k/mrm332/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/bsps/m68k/mrm332/include/mrm332.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mrm332/include/mrm332.h
rename to bsps/m68k/mrm332/include/mrm332.h
diff --git a/c/src/lib/libbsp/moxie/moxiesim/include/tm27.h b/bsps/m68k/mrm332/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/moxie/moxiesim/include/tm27.h
rename to bsps/m68k/mrm332/include/tm27.h
diff --git a/bsps/m68k/mvme147/headers.am b/bsps/m68k/mvme147/headers.am
new file mode 100644
index 0000000..c6b61dd
--- /dev/null
+++ b/bsps/m68k/mvme147/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mvme147/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme147/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/bsps/m68k/mvme147/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147/include/bsp.h
rename to bsps/m68k/mvme147/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/tm27.h b/bsps/m68k/mvme147/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147/include/tm27.h
rename to bsps/m68k/mvme147/include/tm27.h
diff --git a/bsps/m68k/mvme147s/headers.am b/bsps/m68k/mvme147s/headers.am
new file mode 100644
index 0000000..d42fd64
--- /dev/null
+++ b/bsps/m68k/mvme147s/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mvme147s/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme147s/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/bsps/m68k/mvme147s/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
rename to bsps/m68k/mvme147s/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h b/bsps/m68k/mvme147s/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147s/include/tm27.h
rename to bsps/m68k/mvme147s/include/tm27.h
diff --git a/bsps/m68k/mvme162/headers.am b/bsps/m68k/mvme162/headers.am
new file mode 100644
index 0000000..5456150
--- /dev/null
+++ b/bsps/m68k/mvme162/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mvme162/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme162/include/page_table.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme162/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/bsps/m68k/mvme162/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme162/include/bsp.h
rename to bsps/m68k/mvme162/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h b/bsps/m68k/mvme162/include/page_table.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme162/include/page_table.h
rename to bsps/m68k/mvme162/include/page_table.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/include/tm27.h b/bsps/m68k/mvme162/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme162/include/tm27.h
rename to bsps/m68k/mvme162/include/tm27.h
diff --git a/bsps/m68k/mvme167/headers.am b/bsps/m68k/mvme167/headers.am
new file mode 100644
index 0000000..23b9370
--- /dev/null
+++ b/bsps/m68k/mvme167/headers.am
@@ -0,0 +1,7 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/mvme167/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme167/include/page_table.h
+include_HEADERS += ../../../../../../bsps/m68k/mvme167/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/bsps/m68k/mvme167/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme167/include/bsp.h
rename to bsps/m68k/mvme167/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/page_table.h b/bsps/m68k/mvme167/include/page_table.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme167/include/page_table.h
rename to bsps/m68k/mvme167/include/page_table.h
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/tm27.h b/bsps/m68k/mvme167/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme167/include/tm27.h
rename to bsps/m68k/mvme167/include/tm27.h
diff --git a/bsps/m68k/uC5282/headers.am b/bsps/m68k/uC5282/headers.am
new file mode 100644
index 0000000..5757c0d
--- /dev/null
+++ b/bsps/m68k/uC5282/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/m68k/uC5282/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/m68k/uC5282/include/tm27.h
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/bsps/m68k/uC5282/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/uC5282/include/bsp.h
rename to bsps/m68k/uC5282/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/uC5282/include/tm27.h b/bsps/m68k/uC5282/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/uC5282/include/tm27.h
rename to bsps/m68k/uC5282/include/tm27.h
diff --git a/bsps/mips/csb350/headers.am b/bsps/mips/csb350/headers.am
new file mode 100644
index 0000000..47c143c
--- /dev/null
+++ b/bsps/mips/csb350/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/csb350/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/csb350/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/csb350/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/bsp.h b/bsps/mips/csb350/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/mips/csb350/include/bsp.h
rename to bsps/mips/csb350/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/irq.h b/bsps/mips/csb350/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/mips/csb350/include/irq.h
rename to bsps/mips/csb350/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/csb350/include/tm27.h b/bsps/mips/csb350/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/mips/csb350/include/tm27.h
rename to bsps/mips/csb350/include/tm27.h
diff --git a/bsps/mips/headers.am b/bsps/mips/headers.am
new file mode 100644
index 0000000..c9aece5
--- /dev/null
+++ b/bsps/mips/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/mips/include/bsp/i8259.h
+include_bsp_HEADERS += ../../../../../bsps/mips/include/bsp/regs.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/au1x00.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/isr_entries.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/rm5231.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/tx3904.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/tx4925.h
+include_libcpu_HEADERS += ../../../../../bsps/mips/include/libcpu/tx4938.h
diff --git a/bsps/mips/hurricane/headers.am b/bsps/mips/hurricane/headers.am
new file mode 100644
index 0000000..d9713d1
--- /dev/null
+++ b/bsps/mips/hurricane/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/hurricane/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/hurricane/include/tm27.h
+include_HEADERS += ../../../../../../bsps/mips/hurricane/include/usc.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/hurricane/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/bsp.h b/bsps/mips/hurricane/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/include/bsp.h
rename to bsps/mips/hurricane/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/irq.h b/bsps/mips/hurricane/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/include/irq.h
rename to bsps/mips/hurricane/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/tm27.h b/bsps/mips/hurricane/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4938/include/tm27.h
rename to bsps/mips/hurricane/include/tm27.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/usc.h b/bsps/mips/hurricane/include/usc.h
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/include/usc.h
rename to bsps/mips/hurricane/include/usc.h
diff --git a/c/src/lib/libbsp/mips/shared/irq/i8259.h b/bsps/mips/include/bsp/i8259.h
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/irq/i8259.h
rename to bsps/mips/include/bsp/i8259.h
diff --git a/c/src/lib/libbsp/mips/shared/liblnk/regs.h b/bsps/mips/include/bsp/regs.h
similarity index 100%
rename from c/src/lib/libbsp/mips/shared/liblnk/regs.h
rename to bsps/mips/include/bsp/regs.h
diff --git a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h b/bsps/mips/include/libcpu/au1x00.h
similarity index 100%
rename from c/src/lib/libcpu/mips/au1x00/include/au1x00.h
rename to bsps/mips/include/libcpu/au1x00.h
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h b/bsps/mips/include/libcpu/isr_entries.h
similarity index 100%
rename from c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h
rename to bsps/mips/include/libcpu/isr_entries.h
diff --git a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h b/bsps/mips/include/libcpu/rm5231.h
similarity index 100%
rename from c/src/lib/libcpu/mips/rm52xx/include/rm5231.h
rename to bsps/mips/include/libcpu/rm5231.h
diff --git a/c/src/lib/libcpu/mips/tx39/include/tx3904.h b/bsps/mips/include/libcpu/tx3904.h
similarity index 100%
rename from c/src/lib/libcpu/mips/tx39/include/tx3904.h
rename to bsps/mips/include/libcpu/tx3904.h
diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4925.h b/bsps/mips/include/libcpu/tx4925.h
similarity index 100%
rename from c/src/lib/libcpu/mips/tx49/include/tx4925.h
rename to bsps/mips/include/libcpu/tx4925.h
diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4938.h b/bsps/mips/include/libcpu/tx4938.h
similarity index 100%
rename from c/src/lib/libcpu/mips/tx49/include/tx4938.h
rename to bsps/mips/include/libcpu/tx4938.h
diff --git a/bsps/mips/jmr3904/headers.am b/bsps/mips/jmr3904/headers.am
new file mode 100644
index 0000000..b7adec7
--- /dev/null
+++ b/bsps/mips/jmr3904/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/jmr3904/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/jmr3904/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/jmr3904/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h b/bsps/mips/jmr3904/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/mips/jmr3904/include/bsp.h
rename to bsps/mips/jmr3904/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/irq.h b/bsps/mips/jmr3904/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/mips/jmr3904/include/irq.h
rename to bsps/mips/jmr3904/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/include/tm27.h b/bsps/mips/jmr3904/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/mips/jmr3904/include/tm27.h
rename to bsps/mips/jmr3904/include/tm27.h
diff --git a/bsps/mips/malta/headers.am b/bsps/mips/malta/headers.am
new file mode 100644
index 0000000..35d8bb7
--- /dev/null
+++ b/bsps/mips/malta/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/malta/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/malta/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/malta/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/mips/malta/include/bsp/pci.h
diff --git a/c/src/lib/libbsp/mips/malta/include/bsp.h b/bsps/mips/malta/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/include/bsp.h
rename to bsps/mips/malta/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/malta/include/irq.h b/bsps/mips/malta/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/include/irq.h
rename to bsps/mips/malta/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/malta/include/pci.h b/bsps/mips/malta/include/bsp/pci.h
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/include/pci.h
rename to bsps/mips/malta/include/bsp/pci.h
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/tm27.h b/bsps/mips/malta/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4925/include/tm27.h
rename to bsps/mips/malta/include/tm27.h
diff --git a/bsps/mips/rbtx4925/headers.am b/bsps/mips/rbtx4925/headers.am
new file mode 100644
index 0000000..eaffa3e
--- /dev/null
+++ b/bsps/mips/rbtx4925/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/rbtx4925/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/rbtx4925/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/rbtx4925/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h b/bsps/mips/rbtx4925/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4925/include/bsp.h
rename to bsps/mips/rbtx4925/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/irq.h b/bsps/mips/rbtx4925/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4925/include/irq.h
rename to bsps/mips/rbtx4925/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/malta/include/tm27.h b/bsps/mips/rbtx4925/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/include/tm27.h
rename to bsps/mips/rbtx4925/include/tm27.h
diff --git a/bsps/mips/rbtx4938/headers.am b/bsps/mips/rbtx4938/headers.am
new file mode 100644
index 0000000..51360cf
--- /dev/null
+++ b/bsps/mips/rbtx4938/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/mips/rbtx4938/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/mips/rbtx4938/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/mips/rbtx4938/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h b/bsps/mips/rbtx4938/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4938/include/bsp.h
rename to bsps/mips/rbtx4938/include/bsp.h
diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/irq.h b/bsps/mips/rbtx4938/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4938/include/irq.h
rename to bsps/mips/rbtx4938/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/mips/hurricane/include/tm27.h b/bsps/mips/rbtx4938/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/include/tm27.h
rename to bsps/mips/rbtx4938/include/tm27.h
diff --git a/bsps/moxie/moxiesim/headers.am b/bsps/moxie/moxiesim/headers.am
new file mode 100644
index 0000000..5f900bd
--- /dev/null
+++ b/bsps/moxie/moxiesim/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/moxie/moxiesim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/moxie/moxiesim/include/tm27.h
diff --git a/c/src/lib/libbsp/moxie/moxiesim/include/bsp.h b/bsps/moxie/moxiesim/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/moxie/moxiesim/include/bsp.h
rename to bsps/moxie/moxiesim/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/tm27.h b/bsps/moxie/moxiesim/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mrm332/include/tm27.h
rename to bsps/moxie/moxiesim/include/tm27.h
diff --git a/bsps/nios2/nios2_iss/headers.am b/bsps/nios2/nios2_iss/headers.am
new file mode 100644
index 0000000..522f74c
--- /dev/null
+++ b/bsps/nios2/nios2_iss/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/nios2/nios2_iss/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/nios2/nios2_iss/include/tm27.h
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/bsps/nios2/nios2_iss/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h
rename to bsps/nios2/nios2_iss/include/bsp.h
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/tm27.h b/bsps/nios2/nios2_iss/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/include/tm27.h
rename to bsps/nios2/nios2_iss/include/tm27.h
diff --git a/bsps/no_cpu/no_bsp/headers.am b/bsps/no_cpu/no_bsp/headers.am
new file mode 100644
index 0000000..33b3f81
--- /dev/null
+++ b/bsps/no_cpu/no_bsp/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/no_cpu/no_bsp/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/no_cpu/no_bsp/include/tm27.h
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/bsps/no_cpu/no_bsp/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h
rename to bsps/no_cpu/no_bsp/include/bsp.h
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/include/tm27.h b/bsps/no_cpu/no_bsp/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/m32c/m32cbsp/include/tm27.h
rename to bsps/no_cpu/no_bsp/include/tm27.h
diff --git a/bsps/or1k/generic_or1k/headers.am b/bsps/or1k/generic_or1k/headers.am
new file mode 100644
index 0000000..3576c64
--- /dev/null
+++ b/bsps/or1k/generic_or1k/headers.am
@@ -0,0 +1,12 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
+include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/uart.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h b/bsps/or1k/generic_or1k/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h
rename to bsps/or1k/generic_or1k/include/bsp.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/generic_or1k.h b/bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/include/generic_or1k.h
rename to bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/irq.h b/bsps/or1k/generic_or1k/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/include/irq.h
rename to bsps/or1k/generic_or1k/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/uart.h b/bsps/or1k/generic_or1k/include/bsp/uart.h
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/include/uart.h
rename to bsps/or1k/generic_or1k/include/bsp/uart.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/tm27.h b/bsps/or1k/generic_or1k/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/lm32/milkymist/include/tm27.h
rename to bsps/or1k/generic_or1k/include/tm27.h
diff --git a/bsps/or1k/headers.am b/bsps/or1k/headers.am
new file mode 100644
index 0000000..7729a76
--- /dev/null
+++ b/bsps/or1k/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/or1k/include/bsp/cache_.h
+include_bsp_HEADERS += ../../../../../bsps/or1k/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/or1k/shared/include/cache_.h b/bsps/or1k/include/bsp/cache_.h
similarity index 100%
rename from c/src/lib/libbsp/or1k/shared/include/cache_.h
rename to bsps/or1k/include/bsp/cache_.h
diff --git a/c/src/lib/libbsp/or1k/shared/include/linker-symbols.h b/bsps/or1k/include/bsp/linker-symbols.h
similarity index 100%
rename from c/src/lib/libbsp/or1k/shared/include/linker-symbols.h
rename to bsps/or1k/include/bsp/linker-symbols.h
diff --git a/bsps/powerpc/beatnik/headers.am b/bsps/powerpc/beatnik/headers.am
new file mode 100644
index 0000000..36df3cd
--- /dev/null
+++ b/bsps/powerpc/beatnik/headers.am
@@ -0,0 +1,22 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/VMEConfig.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/bsp_bsdnet_attach.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/early_enet_link_status.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gt_timer.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gti2c_busdrv.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gti2creg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gtintrreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gtpcireg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/gtreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/if_em_pub.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/if_gfe_pub.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/if_mve_pub.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/beatnik/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h b/bsps/powerpc/beatnik/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/include/bsp.h
rename to bsps/powerpc/beatnik/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/vme/VMEConfig.h b/bsps/powerpc/beatnik/include/bsp/VMEConfig.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/vme/VMEConfig.h
rename to bsps/powerpc/beatnik/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_bsdnet_attach.h b/bsps/powerpc/beatnik/include/bsp/bsp_bsdnet_attach.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_bsdnet_attach.h
rename to bsps/powerpc/beatnik/include/bsp/bsp_bsdnet_attach.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/support/early_enet_link_status.h b/bsps/powerpc/beatnik/include/bsp/early_enet_link_status.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/network/support/early_enet_link_status.h
rename to bsps/powerpc/beatnik/include/bsp/early_enet_link_status.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h b/bsps/powerpc/beatnik/include/bsp/gt_timer.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h
rename to bsps/powerpc/beatnik/include/bsp/gt_timer.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2c_busdrv.h b/bsps/powerpc/beatnik/include/bsp/gti2c_busdrv.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/marvell/gti2c_busdrv.h
rename to bsps/powerpc/beatnik/include/bsp/gti2c_busdrv.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2creg.h b/bsps/powerpc/beatnik/include/bsp/gti2creg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/marvell/gti2creg.h
rename to bsps/powerpc/beatnik/include/bsp/gti2creg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtintrreg.h b/bsps/powerpc/beatnik/include/bsp/gtintrreg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/marvell/gtintrreg.h
rename to bsps/powerpc/beatnik/include/bsp/gtintrreg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtpcireg.h b/bsps/powerpc/beatnik/include/bsp/gtpcireg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/marvell/gtpcireg.h
rename to bsps/powerpc/beatnik/include/bsp/gtpcireg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtreg.h b/bsps/powerpc/beatnik/include/bsp/gtreg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/marvell/gtreg.h
rename to bsps/powerpc/beatnik/include/bsp/gtreg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_pub.h b/bsps/powerpc/beatnik/include/bsp/if_em_pub.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_pub.h
rename to bsps/powerpc/beatnik/include/bsp/if_em_pub.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_pub.h b/bsps/powerpc/beatnik/include/bsp/if_gfe_pub.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_pub.h
rename to bsps/powerpc/beatnik/include/bsp/if_gfe_pub.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/if_mve_pub.h b/bsps/powerpc/beatnik/include/bsp/if_mve_pub.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/network/if_mve/if_mve_pub.h
rename to bsps/powerpc/beatnik/include/bsp/if_mve_pub.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/irq.h b/bsps/powerpc/beatnik/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/irq/irq.h
rename to bsps/powerpc/beatnik/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h b/bsps/powerpc/beatnik/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h
rename to bsps/powerpc/beatnik/include/tm27.h
diff --git a/bsps/powerpc/gen5200/headers.am b/bsps/powerpc/gen5200/headers.am
new file mode 100644
index 0000000..7a98ad9
--- /dev/null
+++ b/bsps/powerpc/gen5200/headers.am
@@ -0,0 +1,45 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/ata.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/i2c.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/i2cdrv.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/mpc5200.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/mscan-base.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/mscan.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/nvram.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/slicetimer.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/u-boot-config.h
+
+include_bsp_bestcommdir = $(includedir)/bsp/bestcomm
+include_bsp_bestcomm_HEADERS =
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h
+include_bsp_bestcomm_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h
+
+include_bsp_bestcomm_includedir = $(includedir)/bsp/bestcomm/include
+include_bsp_bestcomm_include_HEADERS =
+include_bsp_bestcomm_include_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h
+
+include_bsp_bestcomm_include_mgt5200dir = $(includedir)/bsp/bestcomm/include/mgt5200
+include_bsp_bestcomm_include_mgt5200_HEADERS =
+include_bsp_bestcomm_include_mgt5200_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h
+include_bsp_bestcomm_include_mgt5200_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h
+
+include_bsp_bestcomm_task_apidir = $(includedir)/bsp/bestcomm/task_api
+include_bsp_bestcomm_task_api_HEADERS =
+include_bsp_bestcomm_task_api_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h
+include_bsp_bestcomm_task_api_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h
+include_bsp_bestcomm_task_api_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h
+include_bsp_bestcomm_task_api_HEADERS += ../../../../../../bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/bsps/powerpc/gen5200/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/ata.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/i2c.h
rename to bsps/powerpc/gen5200/include/bsp/i2c.h
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h b/bsps/powerpc/gen5200/include/bsp/i2cdrv.h
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/irq.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/include/tm27.h
rename to bsps/powerpc/gen5200/include/tm27.h
diff --git a/bsps/powerpc/gen83xx/headers.am b/bsps/powerpc/gen83xx/headers.am
new file mode 100644
index 0000000..39d4333
--- /dev/null
+++ b/bsps/powerpc/gen83xx/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp/tsec-config.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h b/bsps/powerpc/gen83xx/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h
rename to bsps/powerpc/gen83xx/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h b/bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h
rename to bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h b/bsps/powerpc/gen83xx/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/include/irq.h
rename to bsps/powerpc/gen83xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h b/bsps/powerpc/gen83xx/include/bsp/tsec-config.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h
rename to bsps/powerpc/gen83xx/include/bsp/tsec-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h b/bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h
rename to bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h b/bsps/powerpc/gen83xx/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
rename to bsps/powerpc/gen83xx/include/tm27.h
diff --git a/bsps/powerpc/haleakala/headers.am b/bsps/powerpc/haleakala/headers.am
new file mode 100644
index 0000000..ed8becd
--- /dev/null
+++ b/bsps/powerpc/haleakala/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/haleakala/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/haleakala/include/mmu_405.h
+include_HEADERS += ../../../../../../bsps/powerpc/haleakala/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/haleakala/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h b/bsps/powerpc/haleakala/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/haleakala/include/bsp.h
rename to bsps/powerpc/haleakala/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/irq/irq.h b/bsps/powerpc/haleakala/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/haleakala/irq/irq.h
rename to bsps/powerpc/haleakala/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/mmu_405.h b/bsps/powerpc/haleakala/include/mmu_405.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/haleakala/include/mmu_405.h
rename to bsps/powerpc/haleakala/include/mmu_405.h
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/include/tm27.h b/bsps/powerpc/haleakala/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/bfin/bf537Stamp/include/tm27.h
rename to bsps/powerpc/haleakala/include/tm27.h
diff --git a/bsps/powerpc/headers.am b/bsps/powerpc/headers.am
new file mode 100644
index 0000000..5033d8a
--- /dev/null
+++ b/bsps/powerpc/headers.am
@@ -0,0 +1,101 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/powerpc/include/ictrl.h
+include_HEADERS += ../../../../../bsps/powerpc/include/mpc5xx.h
+include_HEADERS += ../../../../../bsps/powerpc/include/mpc8260.h
+include_HEADERS += ../../../../../bsps/powerpc/include/mpc8xx.h
+include_HEADERS += ../../../../../bsps/powerpc/include/nvram.h
+include_HEADERS += ../../../../../bsps/powerpc/include/tty_drv.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/consoleIo.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/flashPgm.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/flashPgmPvt.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/irq_supp.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/linker-symbols.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/motorola.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/openpic.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/pci.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/pnp.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/residual.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/start.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/tictac.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/tsec.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/u-boot-board-info.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/uart.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vectors.h
+include_bsp_HEADERS += ../../../../../bsps/powerpc/include/bsp/vpd.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/bat.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/byteorder.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/c_clock.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/cpuIdent.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/e500_mmu.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/io.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/irq.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/mmu.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/page.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/pgtable.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/powerpc-utility.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/pte121.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/raw_exception.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/spr.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/stackTrace.h
+include_libcpu_HEADERS += ../../../../../bsps/powerpc/include/libcpu/vectors.h
+
+include_mpc55xxdir = $(includedir)/mpc55xx
+include_mpc55xx_HEADERS =
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/dspi.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/edma.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/emios.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc551x.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc555x.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc556x.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc5668.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/fsl-mpc567x.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/mpc55xx.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/reg-defs.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs-edma.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs-mmu.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/regs.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/siu.h
+include_mpc55xx_HEADERS += ../../../../../bsps/powerpc/include/mpc55xx/watchdog.h
+
+include_mpc5xxdir = $(includedir)/mpc5xx
+include_mpc5xx_HEADERS =
+include_mpc5xx_HEADERS += ../../../../../bsps/powerpc/include/mpc5xx/console.h
+
+include_mpc8260dir = $(includedir)/mpc8260
+include_mpc8260_HEADERS =
+include_mpc8260_HEADERS += ../../../../../bsps/powerpc/include/mpc8260/console.h
+include_mpc8260_HEADERS += ../../../../../bsps/powerpc/include/mpc8260/cpm.h
+include_mpc8260_HEADERS += ../../../../../bsps/powerpc/include/mpc8260/mmu.h
+
+include_mpc83xxdir = $(includedir)/mpc83xx
+include_mpc83xx_HEADERS =
+include_mpc83xx_HEADERS += ../../../../../bsps/powerpc/include/mpc83xx/gtm.h
+include_mpc83xx_HEADERS += ../../../../../bsps/powerpc/include/mpc83xx/mpc83xx.h
+include_mpc83xx_HEADERS += ../../../../../bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
+include_mpc83xx_HEADERS += ../../../../../bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
+
+include_mpc8xxdir = $(includedir)/mpc8xx
+include_mpc8xx_HEADERS =
+include_mpc8xx_HEADERS += ../../../../../bsps/powerpc/include/mpc8xx/console.h
+include_mpc8xx_HEADERS += ../../../../../bsps/powerpc/include/mpc8xx/cpm.h
+include_mpc8xx_HEADERS += ../../../../../bsps/powerpc/include/mpc8xx/mmu.h
+
+include_ppc4xxdir = $(includedir)/ppc4xx
+include_ppc4xx_HEADERS =
+include_ppc4xx_HEADERS += ../../../../../bsps/powerpc/include/ppc4xx/ppc405ex.h
+include_ppc4xx_HEADERS += ../../../../../bsps/powerpc/include/ppc4xx/ppc405gp.h
+
+include_rtems_powerpcdir = $(includedir)/rtems/powerpc
+include_rtems_powerpc_HEADERS =
+include_rtems_powerpc_HEADERS += ../../../../../bsps/powerpc/include/rtems/powerpc/cache.h
+include_rtems_powerpc_HEADERS += ../../../../../bsps/powerpc/include/rtems/powerpc/debugmod.h
+include_rtems_powerpc_HEADERS += ../../../../../bsps/powerpc/include/rtems/powerpc/powerpc.h
diff --git a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h b/bsps/powerpc/include/bsp/consoleIo.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/console/consoleIo.h
rename to bsps/powerpc/include/bsp/consoleIo.h
diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h b/bsps/powerpc/include/bsp/flashPgm.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h
rename to bsps/powerpc/include/bsp/flashPgm.h
diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h b/bsps/powerpc/include/bsp/flashPgmPvt.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h
rename to bsps/powerpc/include/bsp/flashPgmPvt.h
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h b/bsps/powerpc/include/bsp/irq_supp.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq_supp.h
rename to bsps/powerpc/include/bsp/irq_supp.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h b/bsps/powerpc/include/bsp/linker-symbols.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h
rename to bsps/powerpc/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h b/bsps/powerpc/include/bsp/motorola.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/motorola/motorola.h
rename to bsps/powerpc/include/bsp/motorola.h
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h b/bsps/powerpc/include/bsp/openpic.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/openpic/openpic.h
rename to bsps/powerpc/include/bsp/openpic.h
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.h b/bsps/powerpc/include/bsp/pci.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/pci/pci.h
rename to bsps/powerpc/include/bsp/pci.h
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/pnp.h b/bsps/powerpc/include/bsp/pnp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/residual/pnp.h
rename to bsps/powerpc/include/bsp/pnp.h
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/residual.h b/bsps/powerpc/include/bsp/residual.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/residual/residual.h
rename to bsps/powerpc/include/bsp/residual.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/start.h b/bsps/powerpc/include/bsp/start.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/include/start.h
rename to bsps/powerpc/include/bsp/start.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/tictac.h b/bsps/powerpc/include/bsp/tictac.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/include/tictac.h
rename to bsps/powerpc/include/bsp/tictac.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h b/bsps/powerpc/include/bsp/tsec.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.h
rename to bsps/powerpc/include/bsp/tsec.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h b/bsps/powerpc/include/bsp/u-boot-board-info.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h
rename to bsps/powerpc/include/bsp/u-boot-board-info.h
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.h b/bsps/powerpc/include/bsp/uart.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/console/uart.h
rename to bsps/powerpc/include/bsp/uart.h
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h b/bsps/powerpc/include/bsp/vectors.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h
rename to bsps/powerpc/include/bsp/vectors.h
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h b/bsps/powerpc/include/bsp/vpd.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/motorola/vpd.h
rename to bsps/powerpc/include/bsp/vpd.h
diff --git a/c/src/lib/libcpu/powerpc/mpc505/ictrl/ictrl.h b/bsps/powerpc/include/ictrl.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc505/ictrl/ictrl.h
rename to bsps/powerpc/include/ictrl.h
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h b/bsps/powerpc/include/libcpu/bat.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h
rename to bsps/powerpc/include/libcpu/bat.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h b/bsps/powerpc/include/libcpu/byteorder.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/include/byteorder.h
rename to bsps/powerpc/include/libcpu/byteorder.h
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h b/bsps/powerpc/include/libcpu/c_clock.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
rename to bsps/powerpc/include/libcpu/c_clock.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h b/bsps/powerpc/include/libcpu/cpuIdent.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
rename to bsps/powerpc/include/libcpu/cpuIdent.h
diff --git a/c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h b/bsps/powerpc/include/libcpu/e500_mmu.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/e500/mmu/e500_mmu.h
rename to bsps/powerpc/include/libcpu/e500_mmu.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/io.h b/bsps/powerpc/include/libcpu/io.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/include/io.h
rename to bsps/powerpc/include/libcpu/io.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h b/bsps/powerpc/include/libcpu/irq.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h
rename to bsps/powerpc/include/libcpu/irq.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/mmu.h b/bsps/powerpc/include/libcpu/mmu.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/include/mmu.h
rename to bsps/powerpc/include/libcpu/mmu.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/page.h b/bsps/powerpc/include/libcpu/page.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/include/page.h
rename to bsps/powerpc/include/libcpu/page.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h b/bsps/powerpc/include/libcpu/pgtable.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/include/pgtable.h
rename to bsps/powerpc/include/libcpu/pgtable.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h b/bsps/powerpc/include/libcpu/powerpc-utility.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h
rename to bsps/powerpc/include/libcpu/powerpc-utility.h
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h b/bsps/powerpc/include/libcpu/pte121.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h
rename to bsps/powerpc/include/libcpu/pte121.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h b/bsps/powerpc/include/libcpu/raw_exception.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h
rename to bsps/powerpc/include/libcpu/raw_exception.h
diff --git a/c/src/lib/libcpu/powerpc/shared/include/spr.h b/bsps/powerpc/include/libcpu/spr.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/include/spr.h
rename to bsps/powerpc/include/libcpu/spr.h
diff --git a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h b/bsps/powerpc/include/libcpu/stackTrace.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/shared/src/stackTrace.h
rename to bsps/powerpc/include/libcpu/stackTrace.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h b/bsps/powerpc/include/libcpu/vectors.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h
rename to bsps/powerpc/include/libcpu/vectors.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h b/bsps/powerpc/include/mpc55xx/dspi.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/dspi.h
rename to bsps/powerpc/include/mpc55xx/dspi.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h b/bsps/powerpc/include/mpc55xx/edma.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/edma.h
rename to bsps/powerpc/include/mpc55xx/edma.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h b/bsps/powerpc/include/mpc55xx/emios.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h
rename to bsps/powerpc/include/mpc55xx/emios.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc551x.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h
rename to bsps/powerpc/include/mpc55xx/fsl-mpc551x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc555x.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h
rename to bsps/powerpc/include/mpc55xx/fsl-mpc555x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc556x.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h
rename to bsps/powerpc/include/mpc55xx/fsl-mpc556x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h b/bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc564xL.h
rename to bsps/powerpc/include/mpc55xx/fsl-mpc564xL.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h b/bsps/powerpc/include/mpc55xx/fsl-mpc5668.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc5668.h
rename to bsps/powerpc/include/mpc55xx/fsl-mpc5668.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h b/bsps/powerpc/include/mpc55xx/fsl-mpc567x.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h
rename to bsps/powerpc/include/mpc55xx/fsl-mpc567x.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h b/bsps/powerpc/include/mpc55xx/mpc55xx.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/mpc55xx.h
rename to bsps/powerpc/include/mpc55xx/mpc55xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h b/bsps/powerpc/include/mpc55xx/reg-defs.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h
rename to bsps/powerpc/include/mpc55xx/reg-defs.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h b/bsps/powerpc/include/mpc55xx/regs-edma.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h
rename to bsps/powerpc/include/mpc55xx/regs-edma.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h b/bsps/powerpc/include/mpc55xx/regs-mmu.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/regs-mmu.h
rename to bsps/powerpc/include/mpc55xx/regs-mmu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h b/bsps/powerpc/include/mpc55xx/regs.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h
rename to bsps/powerpc/include/mpc55xx/regs.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h b/bsps/powerpc/include/mpc55xx/siu.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/siu.h
rename to bsps/powerpc/include/mpc55xx/siu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h b/bsps/powerpc/include/mpc55xx/watchdog.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc55xx/include/watchdog.h
rename to bsps/powerpc/include/mpc55xx/watchdog.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h b/bsps/powerpc/include/mpc5xx.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h
rename to bsps/powerpc/include/mpc5xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h b/bsps/powerpc/include/mpc5xx/console.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
rename to bsps/powerpc/include/mpc5xx/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h b/bsps/powerpc/include/mpc8260.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h
rename to bsps/powerpc/include/mpc8260.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h b/bsps/powerpc/include/mpc8260/console.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8260/include/console.h
rename to bsps/powerpc/include/mpc8260/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h b/bsps/powerpc/include/mpc8260/cpm.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h
rename to bsps/powerpc/include/mpc8260/cpm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h b/bsps/powerpc/include/mpc8260/mmu.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h
rename to bsps/powerpc/include/mpc8260/mmu.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h b/bsps/powerpc/include/mpc83xx/gtm.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/include/gtm.h
rename to bsps/powerpc/include/mpc83xx/gtm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h b/bsps/powerpc/include/mpc83xx/mpc83xx.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h
rename to bsps/powerpc/include/mpc83xx/mpc83xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h b/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h
rename to bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h b/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc83xx/spi/mpc83xx_spidrv.h
rename to bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h b/bsps/powerpc/include/mpc8xx.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h
rename to bsps/powerpc/include/mpc8xx.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h b/bsps/powerpc/include/mpc8xx/console.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/include/console.h
rename to bsps/powerpc/include/mpc8xx/console.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h b/bsps/powerpc/include/mpc8xx/cpm.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h
rename to bsps/powerpc/include/mpc8xx/cpm.h
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h b/bsps/powerpc/include/mpc8xx/mmu.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h
rename to bsps/powerpc/include/mpc8xx/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/shared/include/nvram.h b/bsps/powerpc/include/nvram.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/include/nvram.h
rename to bsps/powerpc/include/nvram.h
diff --git a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h b/bsps/powerpc/include/ppc4xx/ppc405ex.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/ppc403/include/ppc405ex.h
rename to bsps/powerpc/include/ppc4xx/ppc405ex.h
diff --git a/c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h b/bsps/powerpc/include/ppc4xx/ppc405gp.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/ppc403/include/ppc405gp.h
rename to bsps/powerpc/include/ppc4xx/ppc405gp.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h b/bsps/powerpc/include/rtems/powerpc/cache.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h
rename to bsps/powerpc/include/rtems/powerpc/cache.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h b/bsps/powerpc/include/rtems/powerpc/debugmod.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/rtems/powerpc/debugmod.h
rename to bsps/powerpc/include/rtems/powerpc/debugmod.h
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h b/bsps/powerpc/include/rtems/powerpc/powerpc.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h
rename to bsps/powerpc/include/rtems/powerpc/powerpc.h
diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h b/bsps/powerpc/include/tty_drv.h
similarity index 100%
rename from c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.h
rename to bsps/powerpc/include/tty_drv.h
diff --git a/bsps/powerpc/motorola_powerpc/headers.am b/bsps/powerpc/motorola_powerpc/headers.am
new file mode 100644
index 0000000..b577b15
--- /dev/null
+++ b/bsps/powerpc/motorola_powerpc/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/motorola_powerpc/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/motorola_powerpc/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/motorola_powerpc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/bsps/powerpc/motorola_powerpc/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
rename to bsps/powerpc/motorola_powerpc/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/VMEConfig.h b/bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
rename to bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h b/bsps/powerpc/motorola_powerpc/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h
rename to bsps/powerpc/motorola_powerpc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/tm27.h b/bsps/powerpc/motorola_powerpc/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/motorola_powerpc/include/tm27.h
rename to bsps/powerpc/motorola_powerpc/include/tm27.h
diff --git a/bsps/powerpc/mpc55xxevb/headers.am b/bsps/powerpc/mpc55xxevb/headers.am
new file mode 100644
index 0000000..6dffbe0
--- /dev/null
+++ b/bsps/powerpc/mpc55xxevb/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h b/bsps/powerpc/mpc55xxevb/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
rename to bsps/powerpc/mpc55xxevb/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-esci.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-esci.h
rename to bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-generic.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-generic.h
rename to bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-linflex.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-linflex.h
rename to bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp/irq.h b/bsps/powerpc/mpc55xxevb/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp/irq.h
rename to bsps/powerpc/mpc55xxevb/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h b/bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h
rename to bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/smsc9218i.h b/bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/include/smsc9218i.h
rename to bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tm27.h b/bsps/powerpc/mpc55xxevb/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/include/tm27.h
rename to bsps/powerpc/mpc55xxevb/include/tm27.h
diff --git a/bsps/powerpc/mpc8260ads/headers.am b/bsps/powerpc/mpc8260ads/headers.am
new file mode 100644
index 0000000..10c6e42
--- /dev/null
+++ b/bsps/powerpc/mpc8260ads/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/mpc8260ads/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/mpc8260ads/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mpc8260ads/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/bsps/powerpc/mpc8260ads/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
rename to bsps/powerpc/mpc8260ads/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h b/bsps/powerpc/mpc8260ads/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h
rename to bsps/powerpc/mpc8260ads/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/tm27.h b/bsps/powerpc/mpc8260ads/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc8260ads/include/tm27.h
rename to bsps/powerpc/mpc8260ads/include/tm27.h
diff --git a/bsps/powerpc/mvme3100/headers.am b/bsps/powerpc/mvme3100/headers.am
new file mode 100644
index 0000000..3a24235
--- /dev/null
+++ b/bsps/powerpc/mvme3100/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp/VMEConfig.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp/if_tsec_pub.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme3100/include/bsp/mpc8540_i2c_busdrv.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/bsps/powerpc/mvme3100/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
rename to bsps/powerpc/mvme3100/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/vme/VMEConfig.h b/bsps/powerpc/mvme3100/include/bsp/VMEConfig.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/vme/VMEConfig.h
rename to bsps/powerpc/mvme3100/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/network/if_tsec_pub.h b/bsps/powerpc/mvme3100/include/bsp/if_tsec_pub.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/network/if_tsec_pub.h
rename to bsps/powerpc/mvme3100/include/bsp/if_tsec_pub.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq.h b/bsps/powerpc/mvme3100/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/irq/irq.h
rename to bsps/powerpc/mvme3100/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c_busdrv.h b/bsps/powerpc/mvme3100/include/bsp/mpc8540_i2c_busdrv.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c_busdrv.h
rename to bsps/powerpc/mvme3100/include/bsp/mpc8540_i2c_busdrv.h
diff --git a/c/src/lib/libbsp/arm/stm32f4/include/tm27.h b/bsps/powerpc/mvme3100/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/include/tm27.h
rename to bsps/powerpc/mvme3100/include/tm27.h
diff --git a/bsps/powerpc/mvme5500/headers.am b/bsps/powerpc/mvme5500/headers.am
new file mode 100644
index 0000000..94c03a6
--- /dev/null
+++ b/bsps/powerpc/mvme5500/headers.am
@@ -0,0 +1,21 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/GT64260TWSI.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/GT64260eth.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/GT64260ethreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/VMEConfig.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/VPD.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/bspException.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/bspMvme5500.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/gtpcireg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/gtreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/if_wmreg.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/mvme5500/include/bsp/pcireg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/bsps/powerpc/mvme5500/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
rename to bsps/powerpc/mvme5500/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/GT64260TWSI.h b/bsps/powerpc/mvme5500/include/bsp/GT64260TWSI.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/GT64260/GT64260TWSI.h
rename to bsps/powerpc/mvme5500/include/bsp/GT64260TWSI.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.h b/bsps/powerpc/mvme5500/include/bsp/GT64260eth.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.h
rename to bsps/powerpc/mvme5500/include/bsp/GT64260eth.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260ethreg.h b/bsps/powerpc/mvme5500/include/bsp/GT64260ethreg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260ethreg.h
rename to bsps/powerpc/mvme5500/include/bsp/GT64260ethreg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h b/bsps/powerpc/mvme5500/include/bsp/VMEConfig.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h
rename to bsps/powerpc/mvme5500/include/bsp/VMEConfig.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/VPD.h b/bsps/powerpc/mvme5500/include/bsp/VPD.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/GT64260/VPD.h
rename to bsps/powerpc/mvme5500/include/bsp/VPD.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vectors/bspException.h b/bsps/powerpc/mvme5500/include/bsp/bspException.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/vectors/bspException.h
rename to bsps/powerpc/mvme5500/include/bsp/bspException.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/bspMvme5500.h b/bsps/powerpc/mvme5500/include/bsp/bspMvme5500.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/GT64260/bspMvme5500.h
rename to bsps/powerpc/mvme5500/include/bsp/bspMvme5500.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/gtpcireg.h b/bsps/powerpc/mvme5500/include/bsp/gtpcireg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/pci/gtpcireg.h
rename to bsps/powerpc/mvme5500/include/bsp/gtpcireg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/gtreg.h b/bsps/powerpc/mvme5500/include/bsp/gtreg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/GT64260/gtreg.h
rename to bsps/powerpc/mvme5500/include/bsp/gtreg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wmreg.h b/bsps/powerpc/mvme5500/include/bsp/if_wmreg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wmreg.h
rename to bsps/powerpc/mvme5500/include/bsp/if_wmreg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h b/bsps/powerpc/mvme5500/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h
rename to bsps/powerpc/mvme5500/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pcireg.h b/bsps/powerpc/mvme5500/include/bsp/pcireg.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pcireg.h
rename to bsps/powerpc/mvme5500/include/bsp/pcireg.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/tm27.h b/bsps/powerpc/mvme5500/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/include/tm27.h
rename to bsps/powerpc/mvme5500/include/tm27.h
diff --git a/bsps/powerpc/psim/headers.am b/bsps/powerpc/psim/headers.am
new file mode 100644
index 0000000..a1f49d3
--- /dev/null
+++ b/bsps/powerpc/psim/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/psim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/psim/include/psim.h
+include_HEADERS += ../../../../../../bsps/powerpc/psim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/psim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/bsps/powerpc/psim/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/include/bsp.h
rename to bsps/powerpc/psim/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq.h b/bsps/powerpc/psim/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/irq/irq.h
rename to bsps/powerpc/psim/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/psim/include/psim.h b/bsps/powerpc/psim/include/psim.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/include/psim.h
rename to bsps/powerpc/psim/include/psim.h
diff --git a/c/src/lib/libbsp/powerpc/psim/include/tm27.h b/bsps/powerpc/psim/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/include/tm27.h
rename to bsps/powerpc/psim/include/tm27.h
diff --git a/bsps/powerpc/qemuppc/headers.am b/bsps/powerpc/qemuppc/headers.am
new file mode 100644
index 0000000..21ab838
--- /dev/null
+++ b/bsps/powerpc/qemuppc/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/qemuppc/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/qemuppc/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qemuppc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h b/bsps/powerpc/qemuppc/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h
rename to bsps/powerpc/qemuppc/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h b/bsps/powerpc/qemuppc/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h
rename to bsps/powerpc/qemuppc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/smdk2410/include/tm27.h b/bsps/powerpc/qemuppc/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/include/tm27.h
rename to bsps/powerpc/qemuppc/include/tm27.h
diff --git a/bsps/powerpc/qoriq/headers.am b/bsps/powerpc/qoriq/headers.am
new file mode 100644
index 0000000..9d23263
--- /dev/null
+++ b/bsps/powerpc/qoriq/headers.am
@@ -0,0 +1,24 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/tm27.h
+
+include_asmdir = $(includedir)/asm
+include_asm_HEADERS =
+include_asm_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/asm/epapr_hcalls.h
+include_asm_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/asm/fsl_hcalls.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/intercom.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/mmu.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/qoriq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/tsec-config.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/bsp/uart-bridge.h
+
+include_uapi_asmdir = $(includedir)/uapi/asm
+include_uapi_asm_HEADERS =
+include_uapi_asm_HEADERS += ../../../../../../bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h b/bsps/powerpc/qoriq/include/asm/epapr_hcalls.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/asm/fsl_hcalls.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/bsp.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/intercom.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/irq.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/mmu.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/tm27.h
rename to 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
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
rename to bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h
diff --git a/bsps/powerpc/ss555/headers.am b/bsps/powerpc/ss555/headers.am
new file mode 100644
index 0000000..f53a4bd
--- /dev/null
+++ b/bsps/powerpc/ss555/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/ss555/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/ss555/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/ss555/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/bsps/powerpc/ss555/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/ss555/include/bsp.h
rename to bsps/powerpc/ss555/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h b/bsps/powerpc/ss555/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/ss555/irq/irq.h
rename to bsps/powerpc/ss555/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/tm27.h b/bsps/powerpc/ss555/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/ss555/include/tm27.h
rename to bsps/powerpc/ss555/include/tm27.h
diff --git a/bsps/powerpc/t32mppc/headers.am b/bsps/powerpc/t32mppc/headers.am
new file mode 100644
index 0000000..57d3bd9
--- /dev/null
+++ b/bsps/powerpc/t32mppc/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/t32mppc/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/t32mppc/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/t32mppc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h b/bsps/powerpc/t32mppc/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h
rename to bsps/powerpc/t32mppc/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/irq.h b/bsps/powerpc/t32mppc/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/t32mppc/include/irq.h
rename to bsps/powerpc/t32mppc/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/tm27.h b/bsps/powerpc/t32mppc/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/rtl22xx/include/tm27.h
rename to bsps/powerpc/t32mppc/include/tm27.h
diff --git a/bsps/powerpc/tqm8xx/headers.am b/bsps/powerpc/tqm8xx/headers.am
new file mode 100644
index 0000000..a3c97f5
--- /dev/null
+++ b/bsps/powerpc/tqm8xx/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp/spi.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/tqm8xx/include/bsp/tqm.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h b/bsps/powerpc/tqm8xx/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
rename to bsps/powerpc/tqm8xx/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/8xx_immap.h b/bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/include/8xx_immap.h
rename to bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h b/bsps/powerpc/tqm8xx/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h
rename to bsps/powerpc/tqm8xx/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.h b/bsps/powerpc/tqm8xx/include/bsp/spi.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.h
rename to bsps/powerpc/tqm8xx/include/bsp/spi.h
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h b/bsps/powerpc/tqm8xx/include/bsp/tqm.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h
rename to bsps/powerpc/tqm8xx/include/bsp/tqm.h
diff --git a/c/src/lib/libbsp/arm/raspberrypi/include/tm27.h b/bsps/powerpc/tqm8xx/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/include/tm27.h
rename to bsps/powerpc/tqm8xx/include/tm27.h
diff --git a/bsps/powerpc/virtex/headers.am b/bsps/powerpc/virtex/headers.am
new file mode 100644
index 0000000..9feceaf
--- /dev/null
+++ b/bsps/powerpc/virtex/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/tm27.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/xiltemac.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/xparameters_dflt.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp/opbintctrl.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/bsps/powerpc/virtex/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/include/bsp.h
rename to bsps/powerpc/virtex/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h b/bsps/powerpc/virtex/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/irq/irq.h
rename to bsps/powerpc/virtex/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h b/bsps/powerpc/virtex/include/bsp/opbintctrl.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h
rename to bsps/powerpc/virtex/include/bsp/opbintctrl.h
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/tm27.h b/bsps/powerpc/virtex/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/include/tm27.h
rename to bsps/powerpc/virtex/include/tm27.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h b/bsps/powerpc/virtex/include/xiltemac.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h
rename to bsps/powerpc/virtex/include/xiltemac.h
diff --git a/c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h b/bsps/powerpc/virtex/include/xparameters_dflt.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h
rename to bsps/powerpc/virtex/include/xparameters_dflt.h
diff --git a/bsps/powerpc/virtex4/headers.am b/bsps/powerpc/virtex4/headers.am
new file mode 100644
index 0000000..9ea2ab1
--- /dev/null
+++ b/bsps/powerpc/virtex4/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/virtex4/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex4/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex4/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex4/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h b/bsps/powerpc/virtex4/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
rename to bsps/powerpc/virtex4/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/irq.h b/bsps/powerpc/virtex4/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex4/include/irq.h
rename to bsps/powerpc/virtex4/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/mmu.h b/bsps/powerpc/virtex4/include/bsp/mmu.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex4/include/mmu.h
rename to bsps/powerpc/virtex4/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/arm/lpc176x/include/tm27.h b/bsps/powerpc/virtex4/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/include/tm27.h
rename to bsps/powerpc/virtex4/include/tm27.h
diff --git a/bsps/powerpc/virtex5/headers.am b/bsps/powerpc/virtex5/headers.am
new file mode 100644
index 0000000..4a5dff7
--- /dev/null
+++ b/bsps/powerpc/virtex5/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h b/bsps/powerpc/virtex5/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
rename to bsps/powerpc/virtex5/include/bsp.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/irq.h b/bsps/powerpc/virtex5/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex5/include/irq.h
rename to bsps/powerpc/virtex5/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/mmu.h b/bsps/powerpc/virtex5/include/bsp/mmu.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex5/include/mmu.h
rename to bsps/powerpc/virtex5/include/bsp/mmu.h
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/include/tm27.h b/bsps/powerpc/virtex5/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/include/tm27.h
rename to bsps/powerpc/virtex5/include/tm27.h
diff --git a/bsps/riscv/headers.am b/bsps/riscv/headers.am
new file mode 100644
index 0000000..2fd6c88
--- /dev/null
+++ b/bsps/riscv/headers.am
@@ -0,0 +1,5 @@
+## This file was generated by "./boostrap -H".
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/riscv/include/bsp/linker-symbols.h
diff --git a/c/src/lib/libbsp/riscv/shared/include/linker-symbols.h b/bsps/riscv/include/bsp/linker-symbols.h
similarity index 100%
rename from c/src/lib/libbsp/riscv/shared/include/linker-symbols.h
rename to bsps/riscv/include/bsp/linker-symbols.h
diff --git a/bsps/riscv/riscv_generic/headers.am b/bsps/riscv/riscv_generic/headers.am
new file mode 100644
index 0000000..6993fe8
--- /dev/null
+++ b/bsps/riscv/riscv_generic/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/include/bsp.h b/bsps/riscv/riscv_generic/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/riscv/riscv_generic/include/bsp.h
rename to bsps/riscv/riscv_generic/include/bsp.h
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/include/irq.h b/bsps/riscv/riscv_generic/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/riscv/riscv_generic/include/irq.h
rename to bsps/riscv/riscv_generic/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/gumstix/include/tm27.h b/bsps/riscv/riscv_generic/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/include/tm27.h
rename to bsps/riscv/riscv_generic/include/tm27.h
diff --git a/bsps/sh/gensh1/headers.am b/bsps/sh/gensh1/headers.am
new file mode 100644
index 0000000..5118d28
--- /dev/null
+++ b/bsps/sh/gensh1/headers.am
@@ -0,0 +1,17 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh1/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh1/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh1/include/rtems/score/iosh7032.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh1/include/rtems/score/ispsh7032.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sci.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sh7_pfc.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/bsps/sh/gensh1/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/include/bsp.h
rename to bsps/sh/gensh1/include/bsp.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h b/bsps/sh/gensh1/include/rtems/score/iosh7032.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h
rename to bsps/sh/gensh1/include/rtems/score/iosh7032.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h b/bsps/sh/gensh1/include/rtems/score/ispsh7032.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h
rename to bsps/sh/gensh1/include/rtems/score/ispsh7032.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sci.h b/bsps/sh/gensh1/include/sh/sci.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/include/sh/sci.h
rename to bsps/sh/gensh1/include/sh/sci.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h b/bsps/sh/gensh1/include/sh/sh7_pfc.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h
rename to bsps/sh/gensh1/include/sh/sh7_pfc.h
diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h b/bsps/sh/gensh1/include/sh/sh7_sci.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h
rename to bsps/sh/gensh1/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/include/tm27.h b/bsps/sh/gensh1/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/gdbarmsim/include/tm27.h
rename to bsps/sh/gensh1/include/tm27.h
diff --git a/bsps/sh/gensh2/headers.am b/bsps/sh/gensh2/headers.am
new file mode 100644
index 0000000..7062397
--- /dev/null
+++ b/bsps/sh/gensh2/headers.am
@@ -0,0 +1,19 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh2/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh2/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh2/include/rtems/score/iosh7045.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh2/include/rtems/score/ispsh7045.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/io_types.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sci.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sci_termios.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sh7_pfc.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/bsps/sh/gensh2/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/bsp.h
rename to bsps/sh/gensh2/include/bsp.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h b/bsps/sh/gensh2/include/rtems/score/iosh7045.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h
rename to bsps/sh/gensh2/include/rtems/score/iosh7045.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h b/bsps/sh/gensh2/include/rtems/score/ispsh7045.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h
rename to bsps/sh/gensh2/include/rtems/score/ispsh7045.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h b/bsps/sh/gensh2/include/sh/io_types.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h
rename to bsps/sh/gensh2/include/sh/io_types.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h b/bsps/sh/gensh2/include/sh/sci.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/sh/sci.h
rename to bsps/sh/gensh2/include/sh/sci.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h b/bsps/sh/gensh2/include/sh/sci_termios.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h
rename to bsps/sh/gensh2/include/sh/sci_termios.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h b/bsps/sh/gensh2/include/sh/sh7_pfc.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h
rename to bsps/sh/gensh2/include/sh/sh7_pfc.h
diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h b/bsps/sh/gensh2/include/sh/sh7_sci.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h
rename to bsps/sh/gensh2/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/arm/edb7312/include/tm27.h b/bsps/sh/gensh2/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/edb7312/include/tm27.h
rename to bsps/sh/gensh2/include/tm27.h
diff --git a/bsps/sh/gensh4/headers.am b/bsps/sh/gensh4/headers.am
new file mode 100644
index 0000000..d3bb5ad
--- /dev/null
+++ b/bsps/sh/gensh4/headers.am
@@ -0,0 +1,19 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/sdram.h
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/iosh7750.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/ipl.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/ispsh7750.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/sh4_regs.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/sh7750_regs.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh4/include/sh/sh4uart.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/bsps/sh/gensh4/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/bsp.h
rename to bsps/sh/gensh4/include/bsp.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h b/bsps/sh/gensh4/include/rtems/score/iosh7750.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h
rename to bsps/sh/gensh4/include/rtems/score/iosh7750.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h b/bsps/sh/gensh4/include/rtems/score/ipl.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h
rename to bsps/sh/gensh4/include/rtems/score/ipl.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h b/bsps/sh/gensh4/include/rtems/score/ispsh7750.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h
rename to bsps/sh/gensh4/include/rtems/score/ispsh7750.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h b/bsps/sh/gensh4/include/rtems/score/sh4_regs.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h
rename to bsps/sh/gensh4/include/rtems/score/sh4_regs.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h b/bsps/sh/gensh4/include/rtems/score/sh7750_regs.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h
rename to bsps/sh/gensh4/include/rtems/score/sh7750_regs.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/sdram.h b/bsps/sh/gensh4/include/sdram.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/sdram.h
rename to bsps/sh/gensh4/include/sdram.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h b/bsps/sh/gensh4/include/sh/sh4uart.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h
rename to bsps/sh/gensh4/include/sh/sh4uart.h
diff --git a/c/src/lib/libbsp/sh/gensh4/include/tm27.h b/bsps/sh/gensh4/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/include/tm27.h
rename to bsps/sh/gensh4/include/tm27.h
diff --git a/bsps/sh/shsim/headers.am b/bsps/sh/shsim/headers.am
new file mode 100644
index 0000000..d221f41
--- /dev/null
+++ b/bsps/sh/shsim/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/shsim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/shsim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sh/shsim/include/bsp/syscall.h
diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/bsps/sh/shsim/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sh/shsim/include/bsp.h
rename to bsps/sh/shsim/include/bsp.h
diff --git a/c/src/lib/libbsp/sh/shsim/include/syscall.h b/bsps/sh/shsim/include/bsp/syscall.h
similarity index 100%
rename from c/src/lib/libbsp/sh/shsim/include/syscall.h
rename to bsps/sh/shsim/include/bsp/syscall.h
diff --git a/c/src/lib/libbsp/arm/csb337/include/tm27.h b/bsps/sh/shsim/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/include/tm27.h
rename to bsps/sh/shsim/include/tm27.h
diff --git a/bsps/sparc/erc32/headers.am b/bsps/sparc/erc32/headers.am
new file mode 100644
index 0000000..00ad61f
--- /dev/null
+++ b/bsps/sparc/erc32/headers.am
@@ -0,0 +1,11 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/erc32.h
+include_HEADERS += ../../../../../../bsps/sparc/erc32/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/erc32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/bsps/sparc/erc32/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/erc32/include/bsp.h
rename to bsps/sparc/erc32/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h b/bsps/sparc/erc32/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h
rename to bsps/sparc/erc32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/erc32.h b/bsps/sparc/erc32/include/erc32.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/erc32/include/erc32.h
rename to bsps/sparc/erc32/include/erc32.h
diff --git a/c/src/lib/libbsp/sparc/erc32/include/tm27.h b/bsps/sparc/erc32/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/erc32/include/tm27.h
rename to bsps/sparc/erc32/include/tm27.h
diff --git a/bsps/sparc/headers.am b/bsps/sparc/headers.am
new file mode 100644
index 0000000..c561e0c
--- /dev/null
+++ b/bsps/sparc/headers.am
@@ -0,0 +1,75 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/sparc/include/ambapp.h
+include_HEADERS += ../../../../../bsps/sparc/include/ambapp_ids.h
+include_HEADERS += ../../../../../bsps/sparc/include/grlib.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/ahbstat.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart_cons.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart_termios.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/b1553brm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/b1553rt.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/canmux.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/cons.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/debug_defs.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/genirq.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gnatcommon.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gpiolib.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gptimer.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553b.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bc.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bc_list.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553rt.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_701.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_cpci_gr740.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_leon4_n2x.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_adcdac.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_io.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_spw_router.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_tmtc.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_tmtc_1553.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gradcdac.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grascs.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grcan.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grctm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/greth.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grgpio.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/griommu.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci2.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci2dma.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpwm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grslink.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw_pkt.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw_router.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grtc.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grtm.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/i2cmst.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/l2c.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/l4stat.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/mctrl.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/memscrub.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/network_interface_add.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/occan.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/pcif.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/satcan.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spictrl.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spwcuc.h
+include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/tlib.h
+
+include_drvmgrdir = $(includedir)/drvmgr
+include_drvmgr_HEADERS =
+include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus.h
+include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
+include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/bspcommon.h
+include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/leon2_amba_bus.h
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += ../../../../../bsps/sparc/include/libcpu/access.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/bsps/sparc/include/ambapp.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/ambapp.h
rename to bsps/sparc/include/ambapp.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h b/bsps/sparc/include/ambapp_ids.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h
rename to bsps/sparc/include/ambapp_ids.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/ahbstat.h b/bsps/sparc/include/bsp/ahbstat.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/ahbstat.h
rename to bsps/sparc/include/bsp/ahbstat.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart.h b/bsps/sparc/include/bsp/apbuart.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/apbuart.h
rename to bsps/sparc/include/bsp/apbuart.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h b/bsps/sparc/include/bsp/apbuart_cons.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h
rename to bsps/sparc/include/bsp/apbuart_cons.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h b/bsps/sparc/include/bsp/apbuart_termios.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h
rename to bsps/sparc/include/bsp/apbuart_termios.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h b/bsps/sparc/include/bsp/b1553brm.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/b1553brm.h
rename to bsps/sparc/include/bsp/b1553brm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553rt.h b/bsps/sparc/include/bsp/b1553rt.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/b1553rt.h
rename to bsps/sparc/include/bsp/b1553rt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/canmux.h b/bsps/sparc/include/bsp/canmux.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/canmux.h
rename to bsps/sparc/include/bsp/canmux.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/cons.h b/bsps/sparc/include/bsp/cons.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/cons.h
rename to bsps/sparc/include/bsp/cons.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h b/bsps/sparc/include/bsp/debug_defs.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/debug_defs.h
rename to bsps/sparc/include/bsp/debug_defs.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/genirq.h b/bsps/sparc/include/bsp/genirq.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/genirq.h
rename to bsps/sparc/include/bsp/genirq.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h b/bsps/sparc/include/bsp/gnatcommon.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gnatcommon.h
rename to bsps/sparc/include/bsp/gnatcommon.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gpiolib.h b/bsps/sparc/include/bsp/gpiolib.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gpiolib.h
rename to bsps/sparc/include/bsp/gpiolib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gptimer.h b/bsps/sparc/include/bsp/gptimer.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gptimer.h
rename to bsps/sparc/include/bsp/gptimer.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553b.h b/bsps/sparc/include/bsp/gr1553b.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr1553b.h
rename to bsps/sparc/include/bsp/gr1553b.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h b/bsps/sparc/include/bsp/gr1553bc.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr1553bc.h
rename to bsps/sparc/include/bsp/gr1553bc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h b/bsps/sparc/include/bsp/gr1553bc_list.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h
rename to bsps/sparc/include/bsp/gr1553bc_list.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bm.h b/bsps/sparc/include/bsp/gr1553bm.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr1553bm.h
rename to bsps/sparc/include/bsp/gr1553bm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553rt.h b/bsps/sparc/include/bsp/gr1553rt.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr1553rt.h
rename to bsps/sparc/include/bsp/gr1553rt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_701.h b/bsps/sparc/include/bsp/gr_701.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr_701.h
rename to bsps/sparc/include/bsp/gr_701.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h b/bsps/sparc/include/bsp/gr_cpci_gr740.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h
rename to bsps/sparc/include/bsp/gr_cpci_gr740.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h b/bsps/sparc/include/bsp/gr_leon4_n2x.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h
rename to bsps/sparc/include/bsp/gr_leon4_n2x.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h b/bsps/sparc/include/bsp/gr_rasta_adcdac.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h
rename to bsps/sparc/include/bsp/gr_rasta_adcdac.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h b/bsps/sparc/include/bsp/gr_rasta_io.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h
rename to bsps/sparc/include/bsp/gr_rasta_io.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h b/bsps/sparc/include/bsp/gr_rasta_spw_router.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h
rename to bsps/sparc/include/bsp/gr_rasta_spw_router.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h b/bsps/sparc/include/bsp/gr_rasta_tmtc.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h
rename to bsps/sparc/include/bsp/gr_rasta_tmtc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h b/bsps/sparc/include/bsp/gr_tmtc_1553.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h
rename to bsps/sparc/include/bsp/gr_tmtc_1553.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/gradcdac.h b/bsps/sparc/include/bsp/gradcdac.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/gradcdac.h
rename to bsps/sparc/include/bsp/gradcdac.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grascs.h b/bsps/sparc/include/bsp/grascs.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grascs.h
rename to bsps/sparc/include/bsp/grascs.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan.h b/bsps/sparc/include/bsp/grcan.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grcan.h
rename to bsps/sparc/include/bsp/grcan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grctm.h b/bsps/sparc/include/bsp/grctm.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grctm.h
rename to bsps/sparc/include/bsp/grctm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/greth.h b/bsps/sparc/include/bsp/greth.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/greth.h
rename to bsps/sparc/include/bsp/greth.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grgpio.h b/bsps/sparc/include/bsp/grgpio.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grgpio.h
rename to bsps/sparc/include/bsp/grgpio.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/griommu.h b/bsps/sparc/include/bsp/griommu.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/griommu.h
rename to bsps/sparc/include/bsp/griommu.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci.h b/bsps/sparc/include/bsp/grpci.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grpci.h
rename to bsps/sparc/include/bsp/grpci.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci2.h b/bsps/sparc/include/bsp/grpci2.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grpci2.h
rename to bsps/sparc/include/bsp/grpci2.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci2dma.h b/bsps/sparc/include/bsp/grpci2dma.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grpci2dma.h
rename to bsps/sparc/include/bsp/grpci2dma.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grpwm.h b/bsps/sparc/include/bsp/grpwm.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grpwm.h
rename to bsps/sparc/include/bsp/grpwm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grslink.h b/bsps/sparc/include/bsp/grslink.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grslink.h
rename to bsps/sparc/include/bsp/grslink.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw.h b/bsps/sparc/include/bsp/grspw.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grspw.h
rename to bsps/sparc/include/bsp/grspw.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h b/bsps/sparc/include/bsp/grspw_pkt.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h
rename to bsps/sparc/include/bsp/grspw_pkt.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_router.h b/bsps/sparc/include/bsp/grspw_router.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grspw_router.h
rename to bsps/sparc/include/bsp/grspw_router.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grtc.h b/bsps/sparc/include/bsp/grtc.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grtc.h
rename to bsps/sparc/include/bsp/grtc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grtm.h b/bsps/sparc/include/bsp/grtm.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grtm.h
rename to bsps/sparc/include/bsp/grtm.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h b/bsps/sparc/include/bsp/i2cmst.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/i2cmst.h
rename to bsps/sparc/include/bsp/i2cmst.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/l2c.h b/bsps/sparc/include/bsp/l2c.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/l2c.h
rename to bsps/sparc/include/bsp/l2c.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/l4stat.h b/bsps/sparc/include/bsp/l4stat.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/l4stat.h
rename to bsps/sparc/include/bsp/l4stat.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/mctrl.h b/bsps/sparc/include/bsp/mctrl.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/mctrl.h
rename to bsps/sparc/include/bsp/mctrl.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/memscrub.h b/bsps/sparc/include/bsp/memscrub.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/memscrub.h
rename to bsps/sparc/include/bsp/memscrub.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/network_interface_add.h b/bsps/sparc/include/bsp/network_interface_add.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/network_interface_add.h
rename to bsps/sparc/include/bsp/network_interface_add.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/occan.h b/bsps/sparc/include/bsp/occan.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/occan.h
rename to bsps/sparc/include/bsp/occan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/pcif.h b/bsps/sparc/include/bsp/pcif.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/pcif.h
rename to bsps/sparc/include/bsp/pcif.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/satcan.h b/bsps/sparc/include/bsp/satcan.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/satcan.h
rename to bsps/sparc/include/bsp/satcan.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/spictrl.h b/bsps/sparc/include/bsp/spictrl.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/spictrl.h
rename to bsps/sparc/include/bsp/spictrl.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/spwcuc.h b/bsps/sparc/include/bsp/spwcuc.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/spwcuc.h
rename to bsps/sparc/include/bsp/spwcuc.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/tlib.h b/bsps/sparc/include/bsp/tlib.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/tlib.h
rename to bsps/sparc/include/bsp/tlib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h b/bsps/sparc/include/drvmgr/ambapp_bus.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h
rename to bsps/sparc/include/drvmgr/ambapp_bus.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h b/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h
rename to bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h b/bsps/sparc/include/drvmgr/bspcommon.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h
rename to bsps/sparc/include/drvmgr/bspcommon.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h b/bsps/sparc/include/drvmgr/leon2_amba_bus.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h
rename to bsps/sparc/include/drvmgr/leon2_amba_bus.h
diff --git a/c/src/lib/libbsp/sparc/shared/include/grlib.h b/bsps/sparc/include/grlib.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/shared/include/grlib.h
rename to bsps/sparc/include/grlib.h
diff --git a/c/src/lib/libcpu/sparc/include/libcpu/access.h b/bsps/sparc/include/libcpu/access.h
similarity index 100%
rename from c/src/lib/libcpu/sparc/include/libcpu/access.h
rename to bsps/sparc/include/libcpu/access.h
diff --git a/bsps/sparc/leon2/headers.am b/bsps/sparc/leon2/headers.am
new file mode 100644
index 0000000..73ae163
--- /dev/null
+++ b/bsps/sparc/leon2/headers.am
@@ -0,0 +1,12 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/leon.h
+include_HEADERS += ../../../../../../bsps/sparc/leon2/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp/at697_pci.h
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon2/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/bsps/sparc/leon2/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon2/include/bsp.h
rename to bsps/sparc/leon2/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/at697_pci.h b/bsps/sparc/leon2/include/bsp/at697_pci.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon2/include/at697_pci.h
rename to bsps/sparc/leon2/include/bsp/at697_pci.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h b/bsps/sparc/leon2/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h
rename to bsps/sparc/leon2/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/leon.h b/bsps/sparc/leon2/include/leon.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon2/include/leon.h
rename to bsps/sparc/leon2/include/leon.h
diff --git a/c/src/lib/libbsp/sparc/leon2/include/tm27.h b/bsps/sparc/leon2/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon2/include/tm27.h
rename to bsps/sparc/leon2/include/tm27.h
diff --git a/bsps/sparc/leon3/headers.am b/bsps/sparc/leon3/headers.am
new file mode 100644
index 0000000..755a896
--- /dev/null
+++ b/bsps/sparc/leon3/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/amba.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/leon.h
+include_HEADERS += ../../../../../../bsps/sparc/leon3/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp/irq.h
+include_bsp_HEADERS += ../../../../../../bsps/sparc/leon3/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/bsps/sparc/leon3/include/amba.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/include/amba.h
rename to bsps/sparc/leon3/include/amba.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/bsps/sparc/leon3/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/include/bsp.h
rename to bsps/sparc/leon3/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h b/bsps/sparc/leon3/include/bsp/irq.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h
rename to bsps/sparc/leon3/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/watchdog.h b/bsps/sparc/leon3/include/bsp/watchdog.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/include/watchdog.h
rename to bsps/sparc/leon3/include/bsp/watchdog.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/bsps/sparc/leon3/include/leon.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/include/leon.h
rename to bsps/sparc/leon3/include/leon.h
diff --git a/c/src/lib/libbsp/sparc/leon3/include/tm27.h b/bsps/sparc/leon3/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/include/tm27.h
rename to bsps/sparc/leon3/include/tm27.h
diff --git a/bsps/sparc64/headers.am b/bsps/sparc64/headers.am
new file mode 100644
index 0000000..1a04025
--- /dev/null
+++ b/bsps/sparc64/headers.am
@@ -0,0 +1,54 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../bsps/sparc64/include/asm.h
+include_HEADERS += ../../../../../bsps/sparc64/include/traptable.h
+
+include_archdir = $(includedir)/arch
+include_arch_HEADERS =
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/arch.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/boot.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/regdef.h
+include_arch_HEADERS += ../../../../../bsps/sparc64/include/arch/stack.h
+
+include_arch_mmdir = $(includedir)/arch/mm
+include_arch_mm_HEADERS =
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/cache_spec.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/frame.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/mmu.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/page.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/tlb.h
+include_arch_mm_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/tte.h
+
+include_arch_mm_sun4udir = $(includedir)/arch/mm/sun4u
+include_arch_mm_sun4u_HEADERS =
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/frame.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/mmu.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/page.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/tlb.h
+include_arch_mm_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/mm/sun4u/tte.h
+
+include_arch_sun4udir = $(includedir)/arch/sun4u
+include_arch_sun4u_HEADERS =
+include_arch_sun4u_HEADERS += ../../../../../bsps/sparc64/include/arch/sun4u/arch.h
+
+include_bootdir = $(includedir)/boot
+include_boot_HEADERS =
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/align.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/balloc.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/gentypes.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/main.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofw.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofw_tree.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofwarch.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/register.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/stack.h
+include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/types.h
+
+include_genarch_ofwdir = $(includedir)/genarch/ofw
+include_genarch_ofw_HEADERS =
+include_genarch_ofw_HEADERS += ../../../../../bsps/sparc64/include/genarch/ofw/ofw_tree.h
+
+include_kerneldir = $(includedir)/kernel
+include_kernel_HEADERS =
+include_kernel_HEADERS += ../../../../../bsps/sparc64/include/kernel/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h b/bsps/sparc64/include/arch/arch.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h
rename to bsps/sparc64/include/arch/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h b/bsps/sparc64/include/arch/boot.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h
rename to bsps/sparc64/include/arch/boot.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h b/bsps/sparc64/include/arch/mm/cache_spec.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h
rename to bsps/sparc64/include/arch/mm/cache_spec.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h b/bsps/sparc64/include/arch/mm/frame.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h
rename to bsps/sparc64/include/arch/mm/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h b/bsps/sparc64/include/arch/mm/mmu.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h
rename to bsps/sparc64/include/arch/mm/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h b/bsps/sparc64/include/arch/mm/page.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h
rename to bsps/sparc64/include/arch/mm/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h b/bsps/sparc64/include/arch/mm/sun4u/frame.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h
rename to bsps/sparc64/include/arch/mm/sun4u/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h b/bsps/sparc64/include/arch/mm/sun4u/mmu.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h
rename to bsps/sparc64/include/arch/mm/sun4u/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h b/bsps/sparc64/include/arch/mm/sun4u/page.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h
rename to bsps/sparc64/include/arch/mm/sun4u/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h b/bsps/sparc64/include/arch/mm/sun4u/tlb.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h
rename to bsps/sparc64/include/arch/mm/sun4u/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h b/bsps/sparc64/include/arch/mm/sun4u/tte.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h
rename to bsps/sparc64/include/arch/mm/sun4u/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h b/bsps/sparc64/include/arch/mm/tlb.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h
rename to bsps/sparc64/include/arch/mm/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h b/bsps/sparc64/include/arch/mm/tte.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h
rename to bsps/sparc64/include/arch/mm/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h b/bsps/sparc64/include/arch/regdef.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h
rename to bsps/sparc64/include/arch/regdef.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h b/bsps/sparc64/include/arch/stack.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h
rename to bsps/sparc64/include/arch/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h b/bsps/sparc64/include/arch/sun4u/arch.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h
rename to bsps/sparc64/include/arch/sun4u/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/asm.h b/bsps/sparc64/include/asm.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/include/asm.h
rename to bsps/sparc64/include/asm.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h b/bsps/sparc64/include/boot/align.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h
rename to bsps/sparc64/include/boot/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h b/bsps/sparc64/include/boot/balloc.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h
rename to bsps/sparc64/include/boot/balloc.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h b/bsps/sparc64/include/boot/gentypes.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h
rename to bsps/sparc64/include/boot/gentypes.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h b/bsps/sparc64/include/boot/main.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h
rename to bsps/sparc64/include/boot/main.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h b/bsps/sparc64/include/boot/ofw.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h
rename to bsps/sparc64/include/boot/ofw.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h b/bsps/sparc64/include/boot/ofw_tree.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h
rename to bsps/sparc64/include/boot/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h b/bsps/sparc64/include/boot/ofwarch.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h
rename to bsps/sparc64/include/boot/ofwarch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h b/bsps/sparc64/include/boot/register.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h
rename to bsps/sparc64/include/boot/register.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h b/bsps/sparc64/include/boot/stack.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h
rename to bsps/sparc64/include/boot/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h b/bsps/sparc64/include/boot/types.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h
rename to bsps/sparc64/include/boot/types.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h b/bsps/sparc64/include/genarch/ofw/ofw_tree.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h
rename to bsps/sparc64/include/genarch/ofw/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h b/bsps/sparc64/include/kernel/align.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h
rename to bsps/sparc64/include/kernel/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/traptable.h b/bsps/sparc64/include/traptable.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/shared/include/traptable.h
rename to bsps/sparc64/include/traptable.h
diff --git a/bsps/sparc64/niagara/headers.am b/bsps/sparc64/niagara/headers.am
new file mode 100644
index 0000000..24d001f
--- /dev/null
+++ b/bsps/sparc64/niagara/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc64/niagara/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc64/niagara/include/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/bsps/sparc64/niagara/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/niagara/include/bsp.h
rename to bsps/sparc64/niagara/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/csb336/include/tm27.h b/bsps/sparc64/niagara/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/csb336/include/tm27.h
rename to bsps/sparc64/niagara/include/tm27.h
diff --git a/bsps/sparc64/usiii/headers.am b/bsps/sparc64/usiii/headers.am
new file mode 100644
index 0000000..06129f2
--- /dev/null
+++ b/bsps/sparc64/usiii/headers.am
@@ -0,0 +1,6 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sparc64/usiii/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sparc64/usiii/include/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/bsps/sparc64/usiii/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/sparc64/usiii/include/bsp.h
rename to bsps/sparc64/usiii/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/beagle/include/tm27.h b/bsps/sparc64/usiii/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/include/tm27.h
rename to bsps/sparc64/usiii/include/tm27.h
diff --git a/bsps/v850/gdbv850sim/headers.am b/bsps/v850/gdbv850sim/headers.am
new file mode 100644
index 0000000..d8acdec
--- /dev/null
+++ b/bsps/v850/gdbv850sim/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/v850/gdbv850sim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/v850/gdbv850sim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/v850/gdbv850sim/include/bsp/syscall.h
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h b/bsps/v850/gdbv850sim/include/bsp.h
similarity index 100%
rename from c/src/lib/libbsp/v850/gdbv850sim/include/bsp.h
rename to bsps/v850/gdbv850sim/include/bsp.h
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/include/syscall.h b/bsps/v850/gdbv850sim/include/bsp/syscall.h
similarity index 100%
rename from c/src/lib/libbsp/v850/gdbv850sim/include/syscall.h
rename to bsps/v850/gdbv850sim/include/bsp/syscall.h
diff --git a/c/src/lib/libbsp/arm/atsam/include/tm27.h b/bsps/v850/gdbv850sim/include/tm27.h
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/include/tm27.h
rename to bsps/v850/gdbv850sim/include/tm27.h
diff --git a/c/Makefile.am b/c/Makefile.am
index 81d8b78..f2ad7d0 100644
--- a/c/Makefile.am
+++ b/c/Makefile.am
@@ -12,7 +12,6 @@ DIST_SUBDIRS = $(RTEMS_BSP)
 
 ## Let all RTEMS' make targets depend on ${RTEMS_BSP}
 all-local: $(RTEMS_BSP)
-preinstall-am: $(RTEMS_BSP)
 
 ## Pull in extra files intro the distribution
 EXTRA_DIST = ACKNOWLEDGEMENTS
diff --git a/c/configure.ac b/c/configure.ac
index 0528915..9ccddcd 100644
--- a/c/configure.ac
+++ b/c/configure.ac
@@ -5,6 +5,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([src])
 RTEMS_TOP(..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
@@ -65,6 +67,7 @@ AC_SUBST(RTEMS_BSP_LIST)
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile],[
 for bsp in : $RTEMS_BSP_LIST; do test "x$bsp" = x: && continue
+rtems_source_top=$(cd ${srcdir}/.. && pwd)
 cat >> Makefile << BSPEOF
 
 $bsp: src/configure
@@ -72,7 +75,8 @@ $bsp: src/configure
 	  echo "Configuring RTEMS_BSP=$bsp"; \\
 	  \$(MKDIR_P) $bsp; \\
 	  ( cd $bsp && \\
-	    CONFIG_SHELL=\$(SHELL) RTEMS_BSP=$bsp \$(rtems_bsp_configure) ) \\
+           CONFIG_SHELL=\$(SHELL) RTEMS_BSP=$bsp \$(rtems_bsp_configure) \\
+           --with-rtems-build-top=\$\${PWD} --with-rtems-source-top=${rtems_source_top} ) \\
 	  || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac;
 BSPEOF
 done
diff --git a/c/src/Makefile.am b/c/src/Makefile.am
index 8fcdd64..f1dd50c 100644
--- a/c/src/Makefile.am
+++ b/c/src/Makefile.am
@@ -3,6 +3,13 @@ ACLOCAL_AMFLAGS = -I aclocal
 _SUBDIRS = . @BSP_SUBDIRS@
 DIST_SUBDIRS = @BSP_SUBDIRS@
 
+$(PROJECT_LIB)/$(dirstamp):
+	@echo "Making project library directory: $(PROJECT_LIB)"
+	@$(MKDIR_P) $(PROJECT_LIB)
+	@: > $(PROJECT_LIB)/$(dirstamp)
+
+all-local: $(PROJECT_LIB)/$(dirstamp)
+
 clean-local:
 	$(RM) -r $(PROJECT_RELEASE)
 
@@ -23,13 +30,6 @@ DISTCLEANFILES += @CUSTOM_CFG_FILES@
 noinst_DATA += make/custom/default.cfg
 DISTCLEANFILES += make/custom/default.cfg
 
-noinst_DATA += preinstall-stamp
-
-preinstall-stamp:
-	$(MAKE) $(AM_MAKEFLAGS) preinstall
-	touch preinstall-stamp
-CLEANFILES = preinstall-stamp
-
 @host_alias at -@RTEMS_BSP at .pc: config.status bsp.pc.in
 	./config.status --file=$@:$(srcdir)/bsp.pc.in
 
@@ -42,3 +42,4 @@ include $(DEPDIR)/cfg.P
 
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
+include $(srcdir)/../../bsps/headers.am
diff --git a/c/src/aclocal/bsp-configure.m4 b/c/src/aclocal/bsp-configure.m4
index c6ff763..6f560fd 100644
--- a/c/src/aclocal/bsp-configure.m4
+++ b/c/src/aclocal/bsp-configure.m4
@@ -8,7 +8,7 @@ AC_DEFUN([RTEMS_BSP_CONFIGURE],
 
   RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-  AC_CONFIG_HEADERS([include/bspopts.tmp:include/bspopts.h.in],[
+  AC_CONFIG_HEADERS([include/bspopts.tmp:bspopts.h.in],[
 echo "/* BSP dependent options file */"         >$tmp/config.h
 echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
 echo                                                  >>$tmp/config.h
diff --git a/c/src/aclocal/bsp-linkcmds.m4 b/c/src/aclocal/bsp-linkcmds.m4
index 397609f..3e40638 100644
--- a/c/src/aclocal/bsp-linkcmds.m4
+++ b/c/src/aclocal/bsp-linkcmds.m4
@@ -13,5 +13,5 @@ done
 AS_IF([test -z "${LINKCMDS}"],[
   AC_MSG_ERROR([can not determine linkcmds])])
 
-AC_CONFIG_LINKS([startup/linkcmds:${LINKCMDS}])
+AC_CONFIG_LINKS([linkcmds:${LINKCMDS}])
 ])
diff --git a/c/src/aclocal/check-networking.m4 b/c/src/aclocal/check-networking.m4
index 250d669..89e53f6 100644
--- a/c/src/aclocal/check-networking.m4
+++ b/c/src/aclocal/check-networking.m4
@@ -2,6 +2,7 @@ AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
+AC_REQUIRE([RTEMS_INCLUDES])dnl
 
 AC_CACHE_CHECK([whether BSP supports networking],
   rtems_cv_HAS_NETWORKING,
@@ -21,6 +22,7 @@ AC_CACHE_CHECK([whether BSP supports networking],
     esac])
 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
   HAS_NETWORKING="yes";
+  RTEMS_CPPFLAGS="${RTEMS_CPPFLAGS} -I${RTEMS_SOURCE_ROOT}/cpukit/libnetworking";
 else
   HAS_NETWORKING="no";
 fi
diff --git a/c/src/aclocal/prog-cc.m4 b/c/src/aclocal/prog-cc.m4
index 44dfd2d..ec33bc9 100644
--- a/c/src/aclocal/prog-cc.m4
+++ b/c/src/aclocal/prog-cc.m4
@@ -29,18 +29,15 @@ dnl check if the compiler supports --specs
 RTEMS_GCC_SPECS
 
 AS_IF([test x"$rtems_cv_gcc_specs" = xyes],[
-GCCSPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
+GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/"
 GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
 AC_SUBST(GCCSPECS)
 
-AS_IF([test x"$rtems_cv_gcc_isystem" = xyes],[
-  RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[
-  RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
-])
-AC_SUBST(RTEMS_CPPFLAGS)
-
 AS_IF([test "$GCC" = yes],[
   RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -r"
 ])
 AC_SUBST(RTEMS_RELLDFLAGS)
+
+RTEMS_INCLUDES
+RTEMS_BSP_INCLUDES
 ])
diff --git a/c/src/aclocal/rtems-bsp-includes.m4 b/c/src/aclocal/rtems-bsp-includes.m4
new file mode 100644
index 0000000..2248211
--- /dev/null
+++ b/c/src/aclocal/rtems-bsp-includes.m4
@@ -0,0 +1,13 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_BSP_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+RTEMS_BSP_CPPFLAGS="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include"
+AC_SUBST([RTEMS_BSP_CPPFLAGS])
+])
diff --git a/c/src/aclocal/rtems-build-top.m4 b/c/src/aclocal/rtems-build-top.m4
new file mode 100644
index 0000000..5708119
--- /dev/null
+++ b/c/src/aclocal/rtems-build-top.m4
@@ -0,0 +1,12 @@
+dnl
+dnl RTEMS_BUILD_TOP($1)
+dnl
+AC_DEFUN([RTEMS_BUILD_TOP],
+[dnl
+#
+# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to
+# copy it that attempt to clean this crap up.
+#
+RTEMS_BUILD_ROOT="${with_rtems_build_top}"
+AC_SUBST([RTEMS_BUILD_ROOT])
+])dnl
diff --git a/c/src/aclocal/rtems-includes.m4 b/c/src/aclocal/rtems-includes.m4
new file mode 100644
index 0000000..ca4ebed
--- /dev/null
+++ b/c/src/aclocal/rtems-includes.m4
@@ -0,0 +1,23 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+
+# Was CFLAGS set?
+rtems_cv_CFLAGS_set="${CFLAGS+set}"
+
+RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include"
+RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include"
+
+RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}"
+RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include"
+
+RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}"
+
+RTEMS_CPPFLAGS="${RTEMS_INCLUDE}"
+
+AC_SUBST([RTEMS_CPPFLAGS])
+])
diff --git a/c/src/aclocal/rtems-source-top.m4 b/c/src/aclocal/rtems-source-top.m4
new file mode 100644
index 0000000..d1460ae
--- /dev/null
+++ b/c/src/aclocal/rtems-source-top.m4
@@ -0,0 +1,8 @@
+dnl
+dnl RTEMS_SOURCE_TOP
+dnl
+AC_DEFUN([RTEMS_SOURCE_TOP],
+[dnl
+RTEMS_SOURCE_ROOT="${with_rtems_source_top}"
+AC_SUBST([RTEMS_SOURCE_ROOT])
+])dnl
diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am
index a42e4f3..2cd9fd5 100644
--- a/c/src/automake/compile.am
+++ b/c/src/automake/compile.am
@@ -1,12 +1,14 @@
 ## -------------------------------------------------------------------------
 
-CC = @CC@ $(GCCSPECS)
-CXX = @CXX@ $(GCCSPECS)
-CPP = @CPP@ $(GCCSPECS)
-CCAS = @CCAS@ $(GCCSPECS)
+CC = @CC@
+CXX = @CXX@
+CPP = @CPP@
+CCAS = @CCAS@
 
 ##
-AM_CPPFLAGS = @RTEMS_CPPFLAGS@
+AM_CPPFLAGS = @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@
 AM_CFLAGS =
 AM_CXXFLAGS =
 AM_CCASFLAGS = @RTEMS_CCASFLAGS@
+
+ARFLAGS = crD
diff --git a/c/src/automake/host.am b/c/src/automake/host.am
index c25c052..2f0bead 100644
--- a/c/src/automake/host.am
+++ b/c/src/automake/host.am
@@ -3,6 +3,3 @@
 ## Once automake is fully integrated these make targets
 ## and this file will probably be removed
 
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
diff --git a/c/src/automake/local.am b/c/src/automake/local.am
index 4de51e5..8068b4c 100644
--- a/c/src/automake/local.am
+++ b/c/src/automake/local.am
@@ -1,5 +1,3 @@
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
-
 PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
+
+all-local: $(TMPINSTALL_FILES)
diff --git a/c/src/automake/subdirs.am b/c/src/automake/subdirs.am
index 2f39d85..6ae7ff0 100644
--- a/c/src/automake/subdirs.am
+++ b/c/src/automake/subdirs.am
@@ -17,29 +17,7 @@ SUBDIRS_no_dot_no_wrapup_no_testsuites = $(filter-out testsuites,$(SUBDIRS_no_do
 SUBDIRS_wrapup                         = $(filter     wrapup,$(SUBDIRS_no_dot))
 SUBDIRS_testsuites                     = $(filter     testsuites,$(SUBDIRS_no_dot))
 
-SUBDIR_TARGET     = $(subst /,-,$1)
-PREINSTALL_TARGET = preinstall-$(call SUBDIR_TARGET,$(1))
-
-preintstall_targets  = $(if "$(SUBDIRS_dot)" ".",preinstall-dot) $(foreach D,$(SUBDIRS_no_dot),$(call PREINSTALL_TARGET,$(D)))
-
-define PREINSTALL_DIR
-.PHONY: $1
-$1:
-	@+set fnord $(MAKEFLAGS); amf=$$$$2; \
-	subdir=$(2); \
-	subdir_label=`echo $(1) | sed -e 's/preinstall-//'`; \
-	target=`echo $$@ | sed -e 's/-recursive//' -e "s/-$$$${subdir_label}//"`$(3); \
-	echo "Making $$$$target in $$$$subdir"; \
-	(cd $$$$subdir && $(MAKE) $(AM_MAKEFLAGS) $$$$target) \
-	 || case "$$$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac;
-endef
-
-$(if "$(SUBDIRS_dot)" ".",$(eval $(call PREINSTALL_DIR,preinstall-dot,.,-am)))
-
-$(foreach D,$(SUBDIRS_no_dot),$(eval $(call PREINSTALL_DIR,$(call PREINSTALL_TARGET,$(D)),$(D))))
-
 preinstall: $(preintstall_targets)
-.PHONY: preinstall
 
 define CPUKITDIR
 .PHONY: $1
@@ -84,4 +62,4 @@ $(if "$(SUBDIRS_testsuites)" "testsuites",testsuites: dot $(SUBDIRS_no_dot_no_te
 #
 # The general build all rule for automake.
 #
-all-local: preinstall $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
+all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
diff --git a/c/src/configure.ac b/c/src/configure.ac
index b55962c..95a2163 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -5,6 +5,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([libchip])
 RTEMS_TOP(../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_ENABLE_CXX
 RTEMS_ENABLE_NETWORKING
@@ -14,14 +16,12 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define subdir-objects no-exeext foreign 1.12.2])
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTILIB
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_CXX
 RTEMS_ENV_RTEMSBSP
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 RTEMS_CHECK_POSIX_API(RTEMS_BSP)
 RTEMS_CHECK_SMP
 
@@ -111,6 +111,7 @@ RTEMS_CHECK_GCC_WEAK
 
 AC_SUBST(CUSTOM_CFG_FILES)
 
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING
 
 BSP_SUBDIRS=
@@ -144,33 +145,17 @@ BSP_SUBDIRS="$BSP_SUBDIRS libchip"
 BSP_SUBDIRS="$BSP_SUBDIRS support"
 BSP_SUBDIRS="$BSP_SUBDIRS wrapup"
 
-# HACK ALERT!
-
-# FIXME: Assume multilib implies in-source-tree multilibs
-# Build testsuites multilibbed
-RTEMS_BSP_CONFIG_SUBDIR(
-  [testsuites],[../../testsuites],
-  ['--enable-rtems-root=../' \
-   '--enable-project-root=${with_project_root}../$RTEMS_BSP' \
-   '--with-project-top=${with_project_top}../' \
-   '--enable-rtemsbsp=$RTEMS_BSP' \
-   '--includedir=${exec_prefix}/${RTEMS_BSP}/lib/include' \
-   '--libdir=${exec_prefix}/${RTEMS_BSP}/lib' \
-  ],
-  [test x"$enable_tests" != x"no" && test x"$multilib" = xno])
-
-# Build testsuites non-multilibbed
+# Build testsuites
 RTEMS_BSP_CONFIG_SUBDIR(
   [testsuites],[../../testsuites],
   ['--enable-rtems-root=../' \
-   '--enable-cpukit-root=${with_project_root}..' \
    '--enable-project-root=${with_project_root}../$RTEMS_BSP' \
    '--with-project-top=${with_project_top}../' \
    '--enable-rtemsbsp=$RTEMS_BSP' \
    '--includedir=${exec_prefix}/${RTEMS_BSP}/lib/include' \
    '--libdir=${exec_prefix}/${RTEMS_BSP}/lib' \
   ],
-  [test x"$enable_tests" != x"no" && test x"$multilib" = xyes])
+  [test x"$enable_tests" != x"no"])
 
 AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS])
 
diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am
index 0071a96..486fbbe 100644
--- a/c/src/lib/libbsp/Makefile.am
+++ b/c/src/lib/libbsp/Makefile.am
@@ -31,15 +31,5 @@ EXTRA_DIST += shared/include/bootcard.h
 EXTRA_DIST += shared/pci/pci_bus_count.c
 EXTRA_DIST += shared/pci/pci_find_device.c
 
-include_bspdir = $(includedir)/bsp
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += shared/include/default-initial-extension.h
-include_bsp_HEADERS += shared/include/fatal.h
-include_bsp_HEADERS += shared/include/fdt.h
-include_bsp_HEADERS += shared/include/console-termios.h
-include_bsp_HEADERS += shared/include/gpio.h
-
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
 include $(top_srcdir)/automake/subdirs.am
diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am
index a8a0178..ed1cf0e 100644
--- a/c/src/lib/libbsp/arm/Makefile.am
+++ b/c/src/lib/libbsp/arm/Makefile.am
@@ -5,9 +5,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## added but it is present in the source tree.
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = shared/include/linker-symbols.h
-
 dist_project_lib_DATA = shared/startup/linkcmds.base
 dist_project_lib_DATA += shared/startup/linkcmds.armv4
 dist_project_lib_DATA += shared/startup/linkcmds.armv7m
@@ -18,6 +15,6 @@ EXTRA_DIST =
 EXTRA_DIST += shared/comm/uart.h
 EXTRA_DIST += shared/comm/uart.c
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/arm/headers.am
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
index 048cb50..cad2171 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -11,60 +11,13 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_bsp_socaldir = $(includedir)/bsp/socal
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_socal_HEADERS =
-
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-gic.h
-include_bsp_HEADERS += ../shared/include/arm-gic-irq.h
-include_bsp_HEADERS += ../shared/include/arm-gic-regs.h
-include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-
 # Altera hwlib
-include_bsp_HEADERS += hwlib/include/alt_16550_uart.h
-include_bsp_HEADERS += hwlib/include/alt_address_space.h
-include_bsp_HEADERS += hwlib/include/alt_cache.h
-include_bsp_HEADERS += hwlib/include/alt_clock_group.h
-include_bsp_HEADERS += hwlib/include/alt_clock_manager.h
-include_bsp_HEADERS += hwlib/include/alt_dma_common.h
-include_bsp_HEADERS += hwlib/include/alt_dma.h
-include_bsp_HEADERS += hwlib/include/alt_dma_program.h
-include_bsp_HEADERS += hwlib/include/alt_generalpurpose_io.h
-include_bsp_HEADERS += hwlib/include/alt_hwlibs_ver.h
-include_bsp_HEADERS += hwlib/include/alt_i2c.h
-include_bsp_HEADERS += hwlib/include/alt_interrupt_common.h
-include_bsp_HEADERS += hwlib/include/alt_mpu_registers.h
-include_bsp_HEADERS += hwlib/include/alt_qspi_private.h
-include_bsp_HEADERS += hwlib/include/alt_reset_manager.h
-include_bsp_HEADERS += hwlib/include/hwlib.h
 #The following Altera hwlib header files have been left out because so far 
 #they are not required:
 #include_bsp_HEADERS += hwlib/include/alt_bridge_manager.h
@@ -77,22 +30,6 @@ include_bsp_HEADERS += hwlib/include/hwlib.h
 #include_bsp_HEADERS += hwlib/include/alt_interrupt.h
 
 # Some of the headers from hwlib need the files from socal. Install them.
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_acpidmap.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_clkmgr.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_dmanonsecure.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_dmasecure.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_gpio.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_i2c.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_l3.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_qspidata.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_qspi.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_rstmgr.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_sdr.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_sysmgr.h
-include_bsp_socal_HEADERS += hwlib/include/socal/alt_uart.h
-include_bsp_socal_HEADERS += hwlib/include/socal/hps.h
-include_bsp_socal_HEADERS += hwlib/include/socal/socal.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -102,10 +39,10 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.altcycv
-project_lib_DATA += startup/linkcmds.altcycv_devkit
-project_lib_DATA += startup/linkcmds.altcycv_devkit_smp
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.altcycv
+dist_project_lib_DATA += startup/linkcmds.altcycv_devkit
+dist_project_lib_DATA += startup/linkcmds.altcycv_devkit_smp
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -114,7 +51,7 @@ project_lib_DATA += startup/linkcmds.altcycv_devkit_smp
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # for the Altera hwlib
@@ -191,8 +128,6 @@ libbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c
 # I2C
 libbsp_a_SOURCES += i2c/i2cdrv.c
 libbsp_a_SOURCES += i2c/i2cdrv-config.c
-include_bsp_HEADERS += include/i2cdrv.h
-
 # RTC
 libbsp_a_SOURCES += ../../shared/tod.c
 libbsp_a_SOURCES += rtc/rtc.c
@@ -209,5 +144,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/arm-l2c-310
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/altera-cyclone-v/headers.am
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac b/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
index 8d0ecad..e05f119 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-xilinx-zynq-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/altcycv_devkit.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])
@@ -79,7 +82,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am b/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am
deleted file mode 100644
index 2f1fc21b..0000000
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/preinstall.am
+++ /dev/null
@@ -1,276 +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/socal/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/socal
-	@: > $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/socal/$(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/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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.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/arm-a9mpcore-clock.h: ../shared/include/arm-a9mpcore-clock.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h: ../shared/include/arm-a9mpcore-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.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/alt_16550_uart.h: hwlib/include/alt_16550_uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_16550_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_16550_uart.h
-
-$(PROJECT_INCLUDE)/bsp/alt_address_space.h: hwlib/include/alt_address_space.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_address_space.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_address_space.h
-
-$(PROJECT_INCLUDE)/bsp/alt_cache.h: hwlib/include/alt_cache.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_cache.h
-
-$(PROJECT_INCLUDE)/bsp/alt_clock_group.h: hwlib/include/alt_clock_group.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_clock_group.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_clock_group.h
-
-$(PROJECT_INCLUDE)/bsp/alt_clock_manager.h: hwlib/include/alt_clock_manager.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_clock_manager.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_clock_manager.h
-
-$(PROJECT_INCLUDE)/bsp/alt_dma_common.h: hwlib/include/alt_dma_common.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_dma_common.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_dma_common.h
-
-$(PROJECT_INCLUDE)/bsp/alt_dma.h: hwlib/include/alt_dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_dma.h
-
-$(PROJECT_INCLUDE)/bsp/alt_dma_program.h: hwlib/include/alt_dma_program.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_dma_program.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_dma_program.h
-
-$(PROJECT_INCLUDE)/bsp/alt_generalpurpose_io.h: hwlib/include/alt_generalpurpose_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_generalpurpose_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_generalpurpose_io.h
-
-$(PROJECT_INCLUDE)/bsp/alt_hwlibs_ver.h: hwlib/include/alt_hwlibs_ver.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_hwlibs_ver.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_hwlibs_ver.h
-
-$(PROJECT_INCLUDE)/bsp/alt_i2c.h: hwlib/include/alt_i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_i2c.h
-
-$(PROJECT_INCLUDE)/bsp/alt_interrupt_common.h: hwlib/include/alt_interrupt_common.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_interrupt_common.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_interrupt_common.h
-
-$(PROJECT_INCLUDE)/bsp/alt_mpu_registers.h: hwlib/include/alt_mpu_registers.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_mpu_registers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_mpu_registers.h
-
-$(PROJECT_INCLUDE)/bsp/alt_qspi_private.h: hwlib/include/alt_qspi_private.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_qspi_private.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_qspi_private.h
-
-$(PROJECT_INCLUDE)/bsp/alt_reset_manager.h: hwlib/include/alt_reset_manager.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/alt_reset_manager.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/alt_reset_manager.h
-
-$(PROJECT_INCLUDE)/bsp/hwlib.h: hwlib/include/hwlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwlib.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_acpidmap.h: hwlib/include/socal/alt_acpidmap.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_acpidmap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_acpidmap.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_clkmgr.h: hwlib/include/socal/alt_clkmgr.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_clkmgr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_clkmgr.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_dmanonsecure.h: hwlib/include/socal/alt_dmanonsecure.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_dmanonsecure.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_dmanonsecure.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_dmasecure.h: hwlib/include/socal/alt_dmasecure.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_dmasecure.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_dmasecure.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_gpio.h: hwlib/include/socal/alt_gpio.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_i2c.h: hwlib/include/socal/alt_i2c.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_i2c.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_l3.h: hwlib/include/socal/alt_l3.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_l3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_l3.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_qspidata.h: hwlib/include/socal/alt_qspidata.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_qspidata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_qspidata.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_qspi.h: hwlib/include/socal/alt_qspi.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_qspi.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_rstmgr.h: hwlib/include/socal/alt_rstmgr.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_rstmgr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_rstmgr.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_sdr.h: hwlib/include/socal/alt_sdr.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_sdr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_sdr.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_sysmgr.h: hwlib/include/socal/alt_sysmgr.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_sysmgr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_sysmgr.h
-
-$(PROJECT_INCLUDE)/bsp/socal/alt_uart.h: hwlib/include/socal/alt_uart.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/alt_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/alt_uart.h
-
-$(PROJECT_INCLUDE)/bsp/socal/hps.h: hwlib/include/socal/hps.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/hps.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/hps.h
-
-$(PROJECT_INCLUDE)/bsp/socal/socal.h: hwlib/include/socal/socal.h $(PROJECT_INCLUDE)/bsp/socal/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/socal/socal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/socal/socal.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.altcycv: startup/linkcmds.altcycv $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.altcycv
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.altcycv
-
-$(PROJECT_LIB)/linkcmds.altcycv_devkit: startup/linkcmds.altcycv_devkit $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.altcycv_devkit
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.altcycv_devkit
-
-$(PROJECT_LIB)/linkcmds.altcycv_devkit_smp: startup/linkcmds.altcycv_devkit_smp $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.altcycv_devkit_smp
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.altcycv_devkit_smp
-
-$(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
-
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs
rename to c/src/lib/libbsp/arm/altera-cyclone-v/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index bc64530..a41931f 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -8,319 +8,23 @@ include $(top_srcdir)/../../bsp.am
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.memory
-project_lib_DATA += startup/linkcmds.intsram
-project_lib_DATA += startup/linkcmds.sdram
-project_lib_DATA += startup/linkcmds.qspiflash
+project_lib_DATA += linkcmds
+project_lib_DATA += linkcmds.memory
+dist_project_lib_DATA += startup/linkcmds.intsram
+dist_project_lib_DATA += startup/linkcmds.sdram
+dist_project_lib_DATA += startup/linkcmds.qspiflash
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS =
-include_HEADERS += include/tm27.h
-include_HEADERS += ../shared/CMSIS/Include/core_cm7.h
-include_HEADERS += ../shared/CMSIS/Include/core_cmInstr.h
-include_HEADERS += ../shared/CMSIS/Include/core_cmFunc.h
-include_HEADERS += ../shared/CMSIS/Include/core_cmSimd.h
-include_HEADERS += ../shared/CMSIS/Include/cmsis_gcc.h
-include_HEADERS += include/bsp.h
-
-nodist_include_HEADERS =
-nodist_include_HEADERS += include/bspopts.h
-
-include_bspdir = $(includedir)/bsp
-
-nodist_include_bsp_HEADERS =
-nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/pin-config.h
-include_bsp_HEADERS += include/atsam-i2c.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/atsam-spi.h
-include_bsp_HEADERS += include/spi.h
-include_bsp_HEADERS += include/sc16is752.h
-include_bsp_HEADERS += include/power.h
-include_bsp_HEADERS += include/atsam-clock-config.h
-
-include_libchipdir = $(includedir)/libchip
-
-include_libchip_HEADERS =
-include_libchip_HEADERS += libraries/libchip/chip.h
-include_libchip_HEADERS += libraries/libchip/compiler.h
-
-include_libchip_includedir = $(includedir)/libchip/include
-
-include_libchip_include_HEADERS =
-include_libchip_include_HEADERS += libraries/libchip/include/acc.h
-include_libchip_include_HEADERS += libraries/libchip/include/adc.h
-include_libchip_include_HEADERS += libraries/libchip/include/aes.h
-include_libchip_include_HEADERS += libraries/libchip/include/afec.h
-include_libchip_include_HEADERS += libraries/libchip/include/afe_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/chip.h
-include_libchip_include_HEADERS += libraries/libchip/include/dac_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/efc.h
-include_libchip_include_HEADERS += libraries/libchip/include/exceptions.h
-include_libchip_include_HEADERS += libraries/libchip/include/flashd.h
-include_libchip_include_HEADERS += libraries/libchip/include/gmacd.h
-include_libchip_include_HEADERS += libraries/libchip/include/gmac.h
-include_libchip_include_HEADERS += libraries/libchip/include/hsmci.h
-include_libchip_include_HEADERS += libraries/libchip/include/icm.h
-include_libchip_include_HEADERS += libraries/libchip/include/isi.h
-include_libchip_include_HEADERS += libraries/libchip/include/iso7816_4.h
-include_libchip_include_HEADERS += libraries/libchip/include/mcan.h
-include_libchip_include_HEADERS += libraries/libchip/include/mcid.h
-include_libchip_include_HEADERS += libraries/libchip/include/mediaLB.h
-include_libchip_include_HEADERS += libraries/libchip/include/mpu.h
-include_libchip_include_HEADERS += libraries/libchip/include/pio_capture.h
-include_libchip_include_HEADERS += libraries/libchip/include/pio.h
-include_libchip_include_HEADERS += libraries/libchip/include/pio_it.h
-include_libchip_include_HEADERS += libraries/libchip/include/pmc.h
-include_libchip_include_HEADERS += libraries/libchip/include/pwmc.h
-include_libchip_include_HEADERS += libraries/libchip/include/qspi_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/qspi.h
-include_libchip_include_HEADERS += libraries/libchip/include/rstc.h
-include_libchip_include_HEADERS += libraries/libchip/include/rtc.h
-include_libchip_include_HEADERS += libraries/libchip/include/rtt.h
-include_libchip_include_HEADERS += libraries/libchip/include/sdramc.h
-include_libchip_include_HEADERS += libraries/libchip/include/smc.h
-include_libchip_include_HEADERS += libraries/libchip/include/spi_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/spi.h
-include_libchip_include_HEADERS += libraries/libchip/include/ssc.h
-include_libchip_include_HEADERS += libraries/libchip/include/supc.h
-include_libchip_include_HEADERS += libraries/libchip/include/tc.h
-include_libchip_include_HEADERS += libraries/libchip/include/timetick.h
-include_libchip_include_HEADERS += libraries/libchip/include/trace.h
-include_libchip_include_HEADERS += libraries/libchip/include/trng.h
-include_libchip_include_HEADERS += libraries/libchip/include/twid.h
-include_libchip_include_HEADERS += libraries/libchip/include/twi.h
-include_libchip_include_HEADERS += libraries/libchip/include/uart_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/uart.h
-include_libchip_include_HEADERS += libraries/libchip/include/usart_dma.h
-include_libchip_include_HEADERS += libraries/libchip/include/usart.h
-include_libchip_include_HEADERS += libraries/libchip/include/usbhs.h
-include_libchip_include_HEADERS += libraries/libchip/include/video.h
-include_libchip_include_HEADERS += libraries/libchip/include/wdt.h
-include_libchip_include_HEADERS += libraries/libchip/include/xdmac.h
-include_libchip_include_HEADERS += libraries/libchip/include/xdmad.h
-include_libchip_include_HEADERS += libraries/libchip/include/xdma_hardware_interface.h
-
-include_libchip_include_same70dir = $(includedir)/libchip/include/same70
-
-include_libchip_include_same70_HEADERS =
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j19.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j20.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70j21.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n19.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n20.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70n21.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q19.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q20.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/same70q21.h
-include_libchip_include_same70_HEADERS += libraries/libchip/include/same70/system_same70.h
-
-include_libchip_include_same70_componentdir = $(includedir)/libchip/include/same70/component
-
-include_libchip_include_same70_component_HEADERS =
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_acc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_aes.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_afec.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_chipid.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_dacc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_efc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_gmac.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_gpbr.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_hsmci.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_icm.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_isi.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_matrix.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_mcan.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pio.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pmc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_pwm.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_qspi.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rstc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rswdt.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rtc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_rtt.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_sdramc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_smc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_spi.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_ssc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_supc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_tc.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_trng.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_twihs.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_uart.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_usart.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_usbhs.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_utmi.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_wdt.h
-include_libchip_include_same70_component_HEADERS += libraries/libchip/include/same70/component/component_xdmac.h
-
-include_libchip_include_same70_piodir = $(includedir)/libchip/include/same70/pio
-
-include_libchip_include_same70_pio_HEADERS =
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70j19.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70j20.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70j21.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n19.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n20.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70n21.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70q19.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70q20.h
-include_libchip_include_same70_pio_HEADERS += libraries/libchip/include/same70/pio/pio_same70q21.h
-
-include_libchip_include_sams70dir = $(includedir)/libchip/include/sams70
-
-include_libchip_include_sams70_HEADERS =
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j19.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j20.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70j21.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n19.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n20.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70n21.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q19.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q20.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/sams70q21.h
-include_libchip_include_sams70_HEADERS += libraries/libchip/include/sams70/system_sams70.h
-
-include_libchip_include_sams70_componentdir = $(includedir)/libchip/include/sams70/component
-
-include_libchip_include_sams70_component_HEADERS =
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_acc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_aes.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_afec.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_chipid.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_dacc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_efc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_gpbr.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_hsmci.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_icm.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_isi.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_matrix.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pio.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pmc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_pwm.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_qspi.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rstc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rswdt.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rtc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_rtt.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_sdramc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_smc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_spi.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_ssc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_supc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_tc.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_trng.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_twihs.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_uart.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_usart.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_usbhs.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_utmi.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_wdt.h
-include_libchip_include_sams70_component_HEADERS += libraries/libchip/include/sams70/component/component_xdmac.h
-
-include_libchip_include_sams70_piodir = $(includedir)/libchip/include/sams70/pio
-
-include_libchip_include_sams70_pio_HEADERS =
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70j19.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70j20.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70j21.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n19.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n20.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70n21.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70q19.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70q20.h
-include_libchip_include_sams70_pio_HEADERS += libraries/libchip/include/sams70/pio/pio_sams70q21.h
-
-include_libchip_include_samv71dir = $(includedir)/libchip/include/samv71
-
-include_libchip_include_samv71_HEADERS =
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j19.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j20.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71j21.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n19.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n20.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71n21.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q19.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q20.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/samv71q21.h
-include_libchip_include_samv71_HEADERS += libraries/libchip/include/samv71/system_samv71.h
-
-include_libchip_include_samv71_componentdir = $(includedir)/libchip/include/samv71/component
-
-include_libchip_include_samv71_component_HEADERS =
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_acc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_aes.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_afec.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_chipid.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_dacc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_efc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_gmac.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_gpbr.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_hsmci.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_icm.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_isi.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_matrix.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_mcan.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_mlb.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pio.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pmc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_pwm.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_qspi.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rstc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rswdt.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rtc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_rtt.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_sdramc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_smc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_spi.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_ssc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_supc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_tc.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_trng.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_twihs.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_uart.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_usart.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_usbhs.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_utmi.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_wdt.h
-include_libchip_include_samv71_component_HEADERS += libraries/libchip/include/samv71/component/component_xdmac.h
-
-include_libchip_include_samv71_piodir = $(includedir)/libchip/include/samv71/pio
-
-include_libchip_include_samv71_pio_HEADERS =
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71j19.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71j20.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71j21.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n19.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n20.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71n21.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q19.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q20.h
-include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/pio/pio_samv71q21.h
-
 ###############################################################################
 #                  LibBSP                                                     #
 ###############################################################################
@@ -328,7 +32,7 @@ include_libchip_include_samv71_pio_HEADERS += libraries/libchip/include/samv71/p
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -461,11 +165,15 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/libraries/libboard/include
 libbsp_a_CPPFLAGS += -I$(srcdir)/libraries/libchip
 libbsp_a_CPPFLAGS += -I$(srcdir)/libraries/libchip/include
 
+# hack to get the BSP to build
+libbsp_a_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/bsps/arm/atsam/include/libchip
+libbsp_a_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/bsps/arm/atsam/include/libchip/include
+
 ###############################################################################
 #                  Special Rules                                              #
 ###############################################################################
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/atsam/headers.am
diff --git a/c/src/lib/libbsp/arm/atsam/configure.ac b/c/src/lib/libbsp/arm/atsam/configure.ac
index 9a68859..519d523 100644
--- a/c/src/lib/libbsp/arm/atsam/configure.ac
+++ b/c/src/lib/libbsp/arm/atsam/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-atsam],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/atsamv.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])
@@ -101,6 +104,6 @@ ATSAM_LINKCMD([ATSAM_MEMORY_NOCACHE_SIZE],[size of NOCACHE section in bytes],[0x
 
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds.memory
+linkcmds.memory:startup/linkcmds.memory.in
 ])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/atsam/preinstall.am b/c/src/lib/libbsp/arm/atsam/preinstall.am
deleted file mode 100644
index ad68cfd..0000000
--- a/c/src/lib/libbsp/arm/atsam/preinstall.am
+++ /dev/null
@@ -1,1086 +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_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(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_LIB)/linkcmds.memory: startup/linkcmds.memory $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.memory
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.memory
-
-$(PROJECT_LIB)/linkcmds.intsram: startup/linkcmds.intsram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.intsram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.intsram
-
-$(PROJECT_LIB)/linkcmds.sdram: startup/linkcmds.sdram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.sdram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.sdram
-
-$(PROJECT_LIB)/linkcmds.qspiflash: startup/linkcmds.qspiflash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qspiflash
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qspiflash
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/core_cm7.h: ../shared/CMSIS/Include/core_cm7.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/core_cm7.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/core_cm7.h
-
-$(PROJECT_INCLUDE)/core_cmInstr.h: ../shared/CMSIS/Include/core_cmInstr.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/core_cmInstr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/core_cmInstr.h
-
-$(PROJECT_INCLUDE)/core_cmFunc.h: ../shared/CMSIS/Include/core_cmFunc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/core_cmFunc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/core_cmFunc.h
-
-$(PROJECT_INCLUDE)/core_cmSimd.h: ../shared/CMSIS/Include/core_cmSimd.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/core_cmSimd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/core_cmSimd.h
-
-$(PROJECT_INCLUDE)/cmsis_gcc.h: ../shared/CMSIS/Include/cmsis_gcc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cmsis_gcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/cmsis_gcc.h
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.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/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.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/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.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/pin-config.h: include/pin-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pin-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pin-config.h
-
-$(PROJECT_INCLUDE)/bsp/atsam-i2c.h: include/atsam-i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/atsam-i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/atsam-i2c.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/atsam-spi.h: include/atsam-spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/atsam-spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/atsam-spi.h
-
-$(PROJECT_INCLUDE)/bsp/spi.h: include/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spi.h
-
-$(PROJECT_INCLUDE)/bsp/sc16is752.h: include/sc16is752.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/sc16is752.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/sc16is752.h
-
-$(PROJECT_INCLUDE)/bsp/power.h: include/power.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/power.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/power.h
-
-$(PROJECT_INCLUDE)/bsp/atsam-clock-config.h: include/atsam-clock-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/atsam-clock-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/atsam-clock-config.h
-
-$(PROJECT_INCLUDE)/libchip/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip
-	@: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/chip.h: libraries/libchip/chip.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/chip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/chip.h
-
-$(PROJECT_INCLUDE)/libchip/compiler.h: libraries/libchip/compiler.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/compiler.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/compiler.h
-
-$(PROJECT_INCLUDE)/libchip/include/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include
-	@: > $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/acc.h: libraries/libchip/include/acc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/acc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/acc.h
-
-$(PROJECT_INCLUDE)/libchip/include/adc.h: libraries/libchip/include/adc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/adc.h
-
-$(PROJECT_INCLUDE)/libchip/include/aes.h: libraries/libchip/include/aes.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/aes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/aes.h
-
-$(PROJECT_INCLUDE)/libchip/include/afec.h: libraries/libchip/include/afec.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/afec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/afec.h
-
-$(PROJECT_INCLUDE)/libchip/include/afe_dma.h: libraries/libchip/include/afe_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/afe_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/afe_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/chip.h: libraries/libchip/include/chip.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/chip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/chip.h
-
-$(PROJECT_INCLUDE)/libchip/include/dac_dma.h: libraries/libchip/include/dac_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/dac_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/dac_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/efc.h: libraries/libchip/include/efc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/efc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/efc.h
-
-$(PROJECT_INCLUDE)/libchip/include/exceptions.h: libraries/libchip/include/exceptions.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/exceptions.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/exceptions.h
-
-$(PROJECT_INCLUDE)/libchip/include/flashd.h: libraries/libchip/include/flashd.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/flashd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/flashd.h
-
-$(PROJECT_INCLUDE)/libchip/include/gmacd.h: libraries/libchip/include/gmacd.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/gmacd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/gmacd.h
-
-$(PROJECT_INCLUDE)/libchip/include/gmac.h: libraries/libchip/include/gmac.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/gmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/gmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/hsmci.h: libraries/libchip/include/hsmci.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/hsmci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/hsmci.h
-
-$(PROJECT_INCLUDE)/libchip/include/icm.h: libraries/libchip/include/icm.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/icm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/icm.h
-
-$(PROJECT_INCLUDE)/libchip/include/isi.h: libraries/libchip/include/isi.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/isi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/isi.h
-
-$(PROJECT_INCLUDE)/libchip/include/iso7816_4.h: libraries/libchip/include/iso7816_4.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/iso7816_4.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/iso7816_4.h
-
-$(PROJECT_INCLUDE)/libchip/include/mcan.h: libraries/libchip/include/mcan.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/mcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/mcan.h
-
-$(PROJECT_INCLUDE)/libchip/include/mcid.h: libraries/libchip/include/mcid.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/mcid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/mcid.h
-
-$(PROJECT_INCLUDE)/libchip/include/mediaLB.h: libraries/libchip/include/mediaLB.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/mediaLB.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/mediaLB.h
-
-$(PROJECT_INCLUDE)/libchip/include/mpu.h: libraries/libchip/include/mpu.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/mpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/mpu.h
-
-$(PROJECT_INCLUDE)/libchip/include/pio_capture.h: libraries/libchip/include/pio_capture.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pio_capture.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pio_capture.h
-
-$(PROJECT_INCLUDE)/libchip/include/pio.h: libraries/libchip/include/pio.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pio.h
-
-$(PROJECT_INCLUDE)/libchip/include/pio_it.h: libraries/libchip/include/pio_it.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pio_it.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pio_it.h
-
-$(PROJECT_INCLUDE)/libchip/include/pmc.h: libraries/libchip/include/pmc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/pwmc.h: libraries/libchip/include/pwmc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/pwmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/pwmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/qspi_dma.h: libraries/libchip/include/qspi_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/qspi_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/qspi_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/qspi.h: libraries/libchip/include/qspi.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/qspi.h
-
-$(PROJECT_INCLUDE)/libchip/include/rstc.h: libraries/libchip/include/rstc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/rstc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/rstc.h
-
-$(PROJECT_INCLUDE)/libchip/include/rtc.h: libraries/libchip/include/rtc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/rtc.h
-
-$(PROJECT_INCLUDE)/libchip/include/rtt.h: libraries/libchip/include/rtt.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/rtt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/rtt.h
-
-$(PROJECT_INCLUDE)/libchip/include/sdramc.h: libraries/libchip/include/sdramc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sdramc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sdramc.h
-
-$(PROJECT_INCLUDE)/libchip/include/smc.h: libraries/libchip/include/smc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/smc.h
-
-$(PROJECT_INCLUDE)/libchip/include/spi_dma.h: libraries/libchip/include/spi_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/spi_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/spi_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/spi.h: libraries/libchip/include/spi.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/spi.h
-
-$(PROJECT_INCLUDE)/libchip/include/ssc.h: libraries/libchip/include/ssc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/ssc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/ssc.h
-
-$(PROJECT_INCLUDE)/libchip/include/supc.h: libraries/libchip/include/supc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/supc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/supc.h
-
-$(PROJECT_INCLUDE)/libchip/include/tc.h: libraries/libchip/include/tc.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/tc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/tc.h
-
-$(PROJECT_INCLUDE)/libchip/include/timetick.h: libraries/libchip/include/timetick.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/timetick.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/timetick.h
-
-$(PROJECT_INCLUDE)/libchip/include/trace.h: libraries/libchip/include/trace.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/trace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/trace.h
-
-$(PROJECT_INCLUDE)/libchip/include/trng.h: libraries/libchip/include/trng.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/trng.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/trng.h
-
-$(PROJECT_INCLUDE)/libchip/include/twid.h: libraries/libchip/include/twid.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/twid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/twid.h
-
-$(PROJECT_INCLUDE)/libchip/include/twi.h: libraries/libchip/include/twi.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/twi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/twi.h
-
-$(PROJECT_INCLUDE)/libchip/include/uart_dma.h: libraries/libchip/include/uart_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/uart_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/uart_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/uart.h: libraries/libchip/include/uart.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/uart.h
-
-$(PROJECT_INCLUDE)/libchip/include/usart_dma.h: libraries/libchip/include/usart_dma.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/usart_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/usart_dma.h
-
-$(PROJECT_INCLUDE)/libchip/include/usart.h: libraries/libchip/include/usart.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/usart.h
-
-$(PROJECT_INCLUDE)/libchip/include/usbhs.h: libraries/libchip/include/usbhs.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/usbhs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/usbhs.h
-
-$(PROJECT_INCLUDE)/libchip/include/video.h: libraries/libchip/include/video.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/video.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/video.h
-
-$(PROJECT_INCLUDE)/libchip/include/wdt.h: libraries/libchip/include/wdt.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/wdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/wdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/xdmac.h: libraries/libchip/include/xdmac.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/xdmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/xdmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/xdmad.h: libraries/libchip/include/xdmad.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/xdmad.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/xdmad.h
-
-$(PROJECT_INCLUDE)/libchip/include/xdma_hardware_interface.h: libraries/libchip/include/xdma_hardware_interface.h $(PROJECT_INCLUDE)/libchip/include/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/xdma_hardware_interface.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/xdma_hardware_interface.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/same70
-	@: > $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70.h: libraries/libchip/include/same70/same70.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70j19.h: libraries/libchip/include/same70/same70j19.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70j20.h: libraries/libchip/include/same70/same70j20.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70j21.h: libraries/libchip/include/same70/same70j21.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70n19.h: libraries/libchip/include/same70/same70n19.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70n20.h: libraries/libchip/include/same70/same70n20.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70n21.h: libraries/libchip/include/same70/same70n21.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70q19.h: libraries/libchip/include/same70/same70q19.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70q20.h: libraries/libchip/include/same70/same70q20.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/same70q21.h: libraries/libchip/include/same70/same70q21.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/same70q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/same70q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/system_same70.h: libraries/libchip/include/same70/system_same70.h $(PROJECT_INCLUDE)/libchip/include/same70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/system_same70.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/system_same70.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/same70/component
-	@: > $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_acc.h: libraries/libchip/include/same70/component/component_acc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_acc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_acc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_aes.h: libraries/libchip/include/same70/component/component_aes.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_aes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_aes.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_afec.h: libraries/libchip/include/same70/component/component_afec.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_afec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_afec.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_chipid.h: libraries/libchip/include/same70/component/component_chipid.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_chipid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_chipid.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_dacc.h: libraries/libchip/include/same70/component/component_dacc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_dacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_dacc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_efc.h: libraries/libchip/include/same70/component/component_efc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_efc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_efc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_gmac.h: libraries/libchip/include/same70/component/component_gmac.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_gmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_gmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_gpbr.h: libraries/libchip/include/same70/component/component_gpbr.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_gpbr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_gpbr.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_hsmci.h: libraries/libchip/include/same70/component/component_hsmci.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_hsmci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_hsmci.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_icm.h: libraries/libchip/include/same70/component/component_icm.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_icm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_icm.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_isi.h: libraries/libchip/include/same70/component/component_isi.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_isi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_isi.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_matrix.h: libraries/libchip/include/same70/component/component_matrix.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_matrix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_matrix.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_mcan.h: libraries/libchip/include/same70/component/component_mcan.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_mcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_mcan.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_pio.h: libraries/libchip/include/same70/component/component_pio.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pio.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_pmc.h: libraries/libchip/include/same70/component/component_pmc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_pwm.h: libraries/libchip/include/same70/component/component_pwm.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_pwm.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_qspi.h: libraries/libchip/include/same70/component/component_qspi.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_qspi.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_rstc.h: libraries/libchip/include/same70/component/component_rstc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rstc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rstc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_rswdt.h: libraries/libchip/include/same70/component/component_rswdt.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rswdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rswdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtc.h: libraries/libchip/include/same70/component/component_rtc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtt.h: libraries/libchip/include/same70/component/component_rtt.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_rtt.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_sdramc.h: libraries/libchip/include/same70/component/component_sdramc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_sdramc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_sdramc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_smc.h: libraries/libchip/include/same70/component/component_smc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_smc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_spi.h: libraries/libchip/include/same70/component/component_spi.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_spi.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_ssc.h: libraries/libchip/include/same70/component/component_ssc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_ssc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_ssc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_supc.h: libraries/libchip/include/same70/component/component_supc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_supc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_supc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_tc.h: libraries/libchip/include/same70/component/component_tc.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_tc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_tc.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_trng.h: libraries/libchip/include/same70/component/component_trng.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_trng.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_trng.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_twihs.h: libraries/libchip/include/same70/component/component_twihs.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_twihs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_twihs.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_uart.h: libraries/libchip/include/same70/component/component_uart.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_uart.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_usart.h: libraries/libchip/include/same70/component/component_usart.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_usart.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_usbhs.h: libraries/libchip/include/same70/component/component_usbhs.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_usbhs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_usbhs.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_utmi.h: libraries/libchip/include/same70/component/component_utmi.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_utmi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_utmi.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_wdt.h: libraries/libchip/include/same70/component/component_wdt.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_wdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_wdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/component/component_xdmac.h: libraries/libchip/include/same70/component/component_xdmac.h $(PROJECT_INCLUDE)/libchip/include/same70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/component/component_xdmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/component/component_xdmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/same70/pio
-	@: > $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j19.h: libraries/libchip/include/same70/pio/pio_same70j19.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j20.h: libraries/libchip/include/same70/pio/pio_same70j20.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j21.h: libraries/libchip/include/same70/pio/pio_same70j21.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n19.h: libraries/libchip/include/same70/pio/pio_same70n19.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n20.h: libraries/libchip/include/same70/pio/pio_same70n20.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n21.h: libraries/libchip/include/same70/pio/pio_same70n21.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q19.h: libraries/libchip/include/same70/pio/pio_same70q19.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q20.h: libraries/libchip/include/same70/pio/pio_same70q20.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q21.h: libraries/libchip/include/same70/pio/pio_same70q21.h $(PROJECT_INCLUDE)/libchip/include/same70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/same70/pio/pio_same70q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/sams70
-	@: > $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70.h: libraries/libchip/include/sams70/sams70.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70j19.h: libraries/libchip/include/sams70/sams70j19.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70j20.h: libraries/libchip/include/sams70/sams70j20.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70j21.h: libraries/libchip/include/sams70/sams70j21.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70n19.h: libraries/libchip/include/sams70/sams70n19.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70n20.h: libraries/libchip/include/sams70/sams70n20.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70n21.h: libraries/libchip/include/sams70/sams70n21.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70q19.h: libraries/libchip/include/sams70/sams70q19.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70q20.h: libraries/libchip/include/sams70/sams70q20.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/sams70q21.h: libraries/libchip/include/sams70/sams70q21.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/sams70q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/system_sams70.h: libraries/libchip/include/sams70/system_sams70.h $(PROJECT_INCLUDE)/libchip/include/sams70/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/system_sams70.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/system_sams70.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/sams70/component
-	@: > $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_acc.h: libraries/libchip/include/sams70/component/component_acc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_acc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_acc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_aes.h: libraries/libchip/include/sams70/component/component_aes.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_aes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_aes.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_afec.h: libraries/libchip/include/sams70/component/component_afec.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_afec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_afec.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_chipid.h: libraries/libchip/include/sams70/component/component_chipid.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_chipid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_chipid.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_dacc.h: libraries/libchip/include/sams70/component/component_dacc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_dacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_dacc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_efc.h: libraries/libchip/include/sams70/component/component_efc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_efc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_efc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_gpbr.h: libraries/libchip/include/sams70/component/component_gpbr.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_gpbr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_gpbr.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_hsmci.h: libraries/libchip/include/sams70/component/component_hsmci.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_hsmci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_hsmci.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_icm.h: libraries/libchip/include/sams70/component/component_icm.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_icm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_icm.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_isi.h: libraries/libchip/include/sams70/component/component_isi.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_isi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_isi.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_matrix.h: libraries/libchip/include/sams70/component/component_matrix.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_matrix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_matrix.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pio.h: libraries/libchip/include/sams70/component/component_pio.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pio.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pmc.h: libraries/libchip/include/sams70/component/component_pmc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pwm.h: libraries/libchip/include/sams70/component/component_pwm.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_pwm.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_qspi.h: libraries/libchip/include/sams70/component/component_qspi.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_qspi.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rstc.h: libraries/libchip/include/sams70/component/component_rstc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rstc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rstc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rswdt.h: libraries/libchip/include/sams70/component/component_rswdt.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rswdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rswdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtc.h: libraries/libchip/include/sams70/component/component_rtc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtt.h: libraries/libchip/include/sams70/component/component_rtt.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_rtt.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_sdramc.h: libraries/libchip/include/sams70/component/component_sdramc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_sdramc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_sdramc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_smc.h: libraries/libchip/include/sams70/component/component_smc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_smc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_spi.h: libraries/libchip/include/sams70/component/component_spi.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_spi.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_ssc.h: libraries/libchip/include/sams70/component/component_ssc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_ssc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_ssc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_supc.h: libraries/libchip/include/sams70/component/component_supc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_supc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_supc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_tc.h: libraries/libchip/include/sams70/component/component_tc.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_tc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_tc.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_trng.h: libraries/libchip/include/sams70/component/component_trng.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_trng.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_trng.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_twihs.h: libraries/libchip/include/sams70/component/component_twihs.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_twihs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_twihs.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_uart.h: libraries/libchip/include/sams70/component/component_uart.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_uart.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usart.h: libraries/libchip/include/sams70/component/component_usart.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usart.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usbhs.h: libraries/libchip/include/sams70/component/component_usbhs.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usbhs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_usbhs.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_utmi.h: libraries/libchip/include/sams70/component/component_utmi.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_utmi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_utmi.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_wdt.h: libraries/libchip/include/sams70/component/component_wdt.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_wdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_wdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/component/component_xdmac.h: libraries/libchip/include/sams70/component/component_xdmac.h $(PROJECT_INCLUDE)/libchip/include/sams70/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_xdmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/component/component_xdmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/sams70/pio
-	@: > $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j19.h: libraries/libchip/include/sams70/pio/pio_sams70j19.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j20.h: libraries/libchip/include/sams70/pio/pio_sams70j20.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j21.h: libraries/libchip/include/sams70/pio/pio_sams70j21.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n19.h: libraries/libchip/include/sams70/pio/pio_sams70n19.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n20.h: libraries/libchip/include/sams70/pio/pio_sams70n20.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n21.h: libraries/libchip/include/sams70/pio/pio_sams70n21.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q19.h: libraries/libchip/include/sams70/pio/pio_sams70q19.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q20.h: libraries/libchip/include/sams70/pio/pio_sams70q20.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q21.h: libraries/libchip/include/sams70/pio/pio_sams70q21.h $(PROJECT_INCLUDE)/libchip/include/sams70/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/sams70/pio/pio_sams70q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/samv71
-	@: > $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71.h: libraries/libchip/include/samv71/samv71.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71j19.h: libraries/libchip/include/samv71/samv71j19.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71j20.h: libraries/libchip/include/samv71/samv71j20.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71j21.h: libraries/libchip/include/samv71/samv71j21.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71n19.h: libraries/libchip/include/samv71/samv71n19.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71n20.h: libraries/libchip/include/samv71/samv71n20.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71n21.h: libraries/libchip/include/samv71/samv71n21.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71q19.h: libraries/libchip/include/samv71/samv71q19.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71q20.h: libraries/libchip/include/samv71/samv71q20.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/samv71q21.h: libraries/libchip/include/samv71/samv71q21.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/samv71q21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/system_samv71.h: libraries/libchip/include/samv71/system_samv71.h $(PROJECT_INCLUDE)/libchip/include/samv71/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/system_samv71.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/system_samv71.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/samv71/component
-	@: > $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_acc.h: libraries/libchip/include/samv71/component/component_acc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_acc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_acc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_aes.h: libraries/libchip/include/samv71/component/component_aes.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_aes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_aes.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_afec.h: libraries/libchip/include/samv71/component/component_afec.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_afec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_afec.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_chipid.h: libraries/libchip/include/samv71/component/component_chipid.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_chipid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_chipid.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_dacc.h: libraries/libchip/include/samv71/component/component_dacc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_dacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_dacc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_efc.h: libraries/libchip/include/samv71/component/component_efc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_efc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_efc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gmac.h: libraries/libchip/include/samv71/component/component_gmac.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gpbr.h: libraries/libchip/include/samv71/component/component_gpbr.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gpbr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_gpbr.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_hsmci.h: libraries/libchip/include/samv71/component/component_hsmci.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_hsmci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_hsmci.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_icm.h: libraries/libchip/include/samv71/component/component_icm.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_icm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_icm.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_isi.h: libraries/libchip/include/samv71/component/component_isi.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_isi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_isi.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_matrix.h: libraries/libchip/include/samv71/component/component_matrix.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_matrix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_matrix.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mcan.h: libraries/libchip/include/samv71/component/component_mcan.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mcan.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mlb.h: libraries/libchip/include/samv71/component/component_mlb.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mlb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_mlb.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pio.h: libraries/libchip/include/samv71/component/component_pio.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pio.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pmc.h: libraries/libchip/include/samv71/component/component_pmc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pmc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pwm.h: libraries/libchip/include/samv71/component/component_pwm.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_pwm.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_qspi.h: libraries/libchip/include/samv71/component/component_qspi.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_qspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_qspi.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rstc.h: libraries/libchip/include/samv71/component/component_rstc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rstc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rstc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rswdt.h: libraries/libchip/include/samv71/component/component_rswdt.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rswdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rswdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtc.h: libraries/libchip/include/samv71/component/component_rtc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtt.h: libraries/libchip/include/samv71/component/component_rtt.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_rtt.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_sdramc.h: libraries/libchip/include/samv71/component/component_sdramc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_sdramc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_sdramc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_smc.h: libraries/libchip/include/samv71/component/component_smc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_smc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_spi.h: libraries/libchip/include/samv71/component/component_spi.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_spi.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_ssc.h: libraries/libchip/include/samv71/component/component_ssc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_ssc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_ssc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_supc.h: libraries/libchip/include/samv71/component/component_supc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_supc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_supc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_tc.h: libraries/libchip/include/samv71/component/component_tc.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_tc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_tc.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_trng.h: libraries/libchip/include/samv71/component/component_trng.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_trng.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_trng.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_twihs.h: libraries/libchip/include/samv71/component/component_twihs.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_twihs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_twihs.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_uart.h: libraries/libchip/include/samv71/component/component_uart.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_uart.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usart.h: libraries/libchip/include/samv71/component/component_usart.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usart.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usbhs.h: libraries/libchip/include/samv71/component/component_usbhs.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usbhs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_usbhs.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_utmi.h: libraries/libchip/include/samv71/component/component_utmi.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_utmi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_utmi.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_wdt.h: libraries/libchip/include/samv71/component/component_wdt.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_wdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_wdt.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/component/component_xdmac.h: libraries/libchip/include/samv71/component/component_xdmac.h $(PROJECT_INCLUDE)/libchip/include/samv71/component/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_xdmac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/component/component_xdmac.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libchip/include/samv71/pio
-	@: > $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j19.h: libraries/libchip/include/samv71/pio/pio_samv71j19.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j20.h: libraries/libchip/include/samv71/pio/pio_samv71j20.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j21.h: libraries/libchip/include/samv71/pio/pio_samv71j21.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71j21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n19.h: libraries/libchip/include/samv71/pio/pio_samv71n19.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n20.h: libraries/libchip/include/samv71/pio/pio_samv71n20.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n21.h: libraries/libchip/include/samv71/pio/pio_samv71n21.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71n21.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q19.h: libraries/libchip/include/samv71/pio/pio_samv71q19.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q19.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q19.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q20.h: libraries/libchip/include/samv71/pio/pio_samv71q20.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q20.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q20.h
-
-$(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q21.h: libraries/libchip/include/samv71/pio/pio_samv71q21.h $(PROJECT_INCLUDE)/libchip/include/samv71/pio/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q21.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/include/samv71/pio/pio_samv71q21.h
-
diff --git a/c/src/lib/libbsp/arm/stm32f4/bsp_specs b/c/src/lib/libbsp/arm/atsam/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/stm32f4/bsp_specs
rename to c/src/lib/libbsp/arm/atsam/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index 38ac88d..ae46cb3 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -11,44 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/arm-a8core-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/beagleboneblack.h
-include_bsp_HEADERS += include/bbb-gpio.h
-include_bsp_HEADERS += include/bbb-pwm.h
-
-include_libcpu_HEADERS =
-include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/omap3.h
-include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/am335x.h
-include_libcpu_HEADERS += ../../../libcpu/arm/shared/include/omap_timer.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -58,10 +26,8 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.beagle
-
-EXTRA_DIST += startup/linkcmds.beagle
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.beagle
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -70,7 +36,7 @@ EXTRA_DIST += startup/linkcmds.beagle
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -142,5 +108,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/beagle/headers.am
diff --git a/c/src/lib/libbsp/arm/beagle/configure.ac b/c/src/lib/libbsp/arm/beagle/configure.ac
index 1dcada5..bcfc556 100644
--- a/c/src/lib/libbsp/arm/beagle/configure.ac
+++ b/c/src/lib/libbsp/arm/beagle/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.68])
 AC_INIT([rtems-c-src-lib-libbsp-arm-beagle],[_RTEMS_VERSION],[rtems-bugs at rtems.com])
 AC_CONFIG_SRCDIR([make/custom/beagleboardorig.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.11.1])
@@ -46,7 +49,6 @@ RTEMS_BSPOPTS_SET([BBB_DEBUG],[beaglebone*],[0])
 RTEMS_BSPOPTS_HELP([BBB_DEBUG],[Enable BBB debug])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/beagle/preinstall.am b/c/src/lib/libbsp/arm/beagle/preinstall.am
deleted file mode 100644
index 831f9cf..0000000
--- a/c/src/lib/libbsp/arm/beagle/preinstall.am
+++ /dev/null
@@ -1,144 +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)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(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/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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a8core-start.h: ../shared/include/arm-a8core-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a8core-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a8core-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.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/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/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/beagleboneblack.h: include/beagleboneblack.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/beagleboneblack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/beagleboneblack.h
-
-$(PROJECT_INCLUDE)/bsp/bbb-gpio.h: include/bbb-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bbb-gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bbb-gpio.h
-
-$(PROJECT_INCLUDE)/bsp/bbb-pwm.h: include/bbb-pwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bbb-pwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bbb-pwm.h
-
-$(PROJECT_INCLUDE)/libcpu/omap3.h: ../../../libcpu/arm/shared/include/omap3.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/omap3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/omap3.h
-
-$(PROJECT_INCLUDE)/libcpu/am335x.h: ../../../libcpu/arm/shared/include/am335x.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/am335x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/am335x.h
-
-$(PROJECT_INCLUDE)/libcpu/omap_timer.h: ../../../libcpu/arm/shared/include/omap_timer.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/omap_timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/omap_timer.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.beagle: startup/linkcmds.beagle $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.beagle
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.beagle
-
diff --git a/c/src/lib/libbsp/arm/smdk2410/bsp_specs b/c/src/lib/libbsp/arm/beagle/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/smdk2410/bsp_specs
rename to c/src/lib/libbsp/arm/beagle/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/configure.ac b/c/src/lib/libbsp/arm/configure.ac
index 35de7a7..285cd31 100644
--- a/c/src/lib/libbsp/arm/configure.ac
+++ b/c/src/lib/libbsp/arm/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([../arm])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 12cab14..0dc5c54 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -4,19 +4,10 @@ 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
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/mc9328mxl.h
-
-include_bsp_HEADERS =
-libbsp_a_CPPFLAGS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -45,9 +36,6 @@ libbsp_a_SOURCES += timer/timer.c
 # console
 libbsp_a_SOURCES += console/uart.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
@@ -76,5 +64,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/csb336/headers.am
diff --git a/c/src/lib/libbsp/arm/csb336/configure.ac b/c/src/lib/libbsp/arm/csb336/configure.ac
index bbdf556..11ccabf 100644
--- a/c/src/lib/libbsp/arm/csb336/configure.ac
+++ b/c/src/lib/libbsp/arm/csb336/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-csb336],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/csb336.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/arm/csb336/preinstall.am b/c/src/lib/libbsp/arm/csb336/preinstall.am
deleted file mode 100644
index dbdb788..0000000
--- a/c/src/lib/libbsp/arm/csb336/preinstall.am
+++ /dev/null
@@ -1,79 +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)/mc9328mxl.h: include/mc9328mxl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mc9328mxl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mc9328mxl.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
-
-$(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/rtl22xx/bsp_specs b/c/src/lib/libbsp/arm/csb336/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/rtl22xx/bsp_specs
rename to c/src/lib/libbsp/arm/csb336/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 6999c02..a2d448c 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 5567bf0..066d425 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 57ab234..0000000
--- 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/realview-pbx-a9/bsp_specs b/c/src/lib/libbsp/arm/csb337/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/realview-pbx-a9/bsp_specs
rename to c/src/lib/libbsp/arm/csb337/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 6cb4af3..74e235c 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -4,33 +4,21 @@ 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_bsp_HEADERS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-include_HEADERS += include/ep7312.h
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): 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 =
 
-include_HEADERS += ../../arm/shared/comm/uart.h
 # startup
 libbsp_a_SOURCES += \
     ../../shared/bspgetworkarea.c \
@@ -52,9 +40,6 @@ libbsp_a_SOURCES += console/uart.c ../../shared/console.c \
 libbsp_a_SOURCES += timer/timer.c
 
 # irq
-include_bsp_HEADERS += ../../shared/include/irq-generic.h \
-	../../shared/include/irq-info.h \
-	irq/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
@@ -83,5 +68,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/edb7312/headers.am
diff --git a/c/src/lib/libbsp/arm/edb7312/configure.ac b/c/src/lib/libbsp/arm/edb7312/configure.ac
index 8c8614a..63c7823 100644
--- a/c/src/lib/libbsp/arm/edb7312/configure.ac
+++ b/c/src/lib/libbsp/arm/edb7312/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-edb7312],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/edb7312.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/arm/edb7312/preinstall.am b/c/src/lib/libbsp/arm/edb7312/preinstall.am
deleted file mode 100644
index fc2049a..0000000
--- a/c/src/lib/libbsp/arm/edb7312/preinstall.am
+++ /dev/null
@@ -1,83 +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)/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_INCLUDE)/ep7312.h: include/ep7312.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ep7312.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ep7312.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
-
-$(PROJECT_INCLUDE)/uart.h: ../../arm/shared/comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.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/irq.h: irq/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/raspberrypi/bsp_specs b/c/src/lib/libbsp/arm/edb7312/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/bsp_specs
rename to c/src/lib/libbsp/arm/edb7312/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index 8ed842e..3287928 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -4,21 +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_bsp_HEADERS = include/irq.h
-include_bsp_HEADERS += include/swi.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -28,7 +15,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 =
@@ -78,5 +65,5 @@ libbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 libbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/gdbarmsim/headers.am
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/configure.ac b/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
index 5733553..b5385d9 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
+++ b/c/src/lib/libbsp/arm/gdbarmsim/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-gdbarmsim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/arm1136jfs.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/arm/gdbarmsim/preinstall.am b/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am
deleted file mode 100644
index 03cc4ca..0000000
--- a/c/src/lib/libbsp/arm/gdbarmsim/preinstall.am
+++ /dev/null
@@ -1,87 +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)/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/swi.h: include/swi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/swi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/swi.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/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)/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_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.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/arm/lpc32xx/bsp_specs b/c/src/lib/libbsp/arm/gdbarmsim/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/bsp_specs
rename to c/src/lib/libbsp/arm/gdbarmsim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 5fb8d70..d4793d6 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -4,19 +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/pxa255.h
-include_HEADERS += include/ffuart.h
-
-include_bsp_HEADERS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -26,7 +15,7 @@ start.$(OBJEXT): 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
 
@@ -48,9 +37,6 @@ libbsp_a_SOURCES += console/uarts.c ../../shared/console.c \
   ../../shared/console_read.c ../../shared/console_write.c 
 libbsp_a_SOURCES += console/ffuart.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
@@ -84,5 +70,5 @@ libbsp_a_LIBADD += rtl8019.rel
 endif
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/gumstix/headers.am
diff --git a/c/src/lib/libbsp/arm/gumstix/configure.ac b/c/src/lib/libbsp/arm/gumstix/configure.ac
index 037990b..299085b 100644
--- a/c/src/lib/libbsp/arm/gumstix/configure.ac
+++ b/c/src/lib/libbsp/arm/gumstix/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-gumstix],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gumstix.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/arm/gumstix/preinstall.am b/c/src/lib/libbsp/arm/gumstix/preinstall.am
deleted file mode 100644
index 99477a8..0000000
--- a/c/src/lib/libbsp/arm/gumstix/preinstall.am
+++ /dev/null
@@ -1,87 +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)/pxa255.h: include/pxa255.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pxa255.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pxa255.h
-
-$(PROJECT_INCLUDE)/ffuart.h: include/ffuart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ffuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ffuart.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
-
-$(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
-
-if ON_SKYEYE
-endif
-if ON_SKYEYE
-endif
diff --git a/c/src/lib/libbsp/arm/lpc24xx/bsp_specs b/c/src/lib/libbsp/arm/gumstix/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/bsp_specs
rename to c/src/lib/libbsp/arm/gumstix/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index 9addb13..bc2f6ac 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -4,50 +4,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_arm_freescale_imxdir = $(includedir)/arm/freescale/imx
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-gic.h
-include_bsp_HEADERS += ../shared/include/arm-gic-irq.h
-include_bsp_HEADERS += ../shared/include/arm-gic-regs.h
-include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-
-include_arm_freescale_imx_HEADERS =
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_ccmvar.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_ecspireg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_gpcreg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_i2creg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_iomuxreg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_iomuxvar.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_srcreg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_uartreg.h
-include_arm_freescale_imx_HEADERS += include/arm/freescale/imx/imx_wdogreg.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -57,8 +19,8 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.imx7
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.imx7
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -67,7 +29,7 @@ project_lib_DATA += startup/linkcmds.imx7
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -134,5 +96,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/imx/headers.am
diff --git a/c/src/lib/libbsp/arm/imx/configure.ac b/c/src/lib/libbsp/arm/imx/configure.ac
index bb29efd..318c4e9 100644
--- a/c/src/lib/libbsp/arm/imx/configure.ac
+++ b/c/src/lib/libbsp/arm/imx/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-imx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/imx7.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])
@@ -58,7 +61,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/imx/preinstall.am b/c/src/lib/libbsp/arm/imx/preinstall.am
deleted file mode 100644
index 82b3e69..0000000
--- a/c/src/lib/libbsp/arm/imx/preinstall.am
+++ /dev/null
@@ -1,168 +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)/arm/freescale/imx/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arm/freescale/imx
-	@: > $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arm/freescale/imx/$(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/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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.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/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.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)/arm/freescale/imx/imx_ccmvar.h: include/arm/freescale/imx/imx_ccmvar.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_ccmvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_ccmvar.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_ecspireg.h: include/arm/freescale/imx/imx_ecspireg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_ecspireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_ecspireg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_gpcreg.h: include/arm/freescale/imx/imx_gpcreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_gpcreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_gpcreg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_i2creg.h: include/arm/freescale/imx/imx_i2creg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_i2creg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_i2creg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxreg.h: include/arm/freescale/imx/imx_iomuxreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxreg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxvar.h: include/arm/freescale/imx/imx_iomuxvar.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_iomuxvar.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_srcreg.h: include/arm/freescale/imx/imx_srcreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_srcreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_srcreg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h: include/arm/freescale/imx/imx_uartreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_uartreg.h
-
-$(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.h: include/arm/freescale/imx/imx_wdogreg.h $(PROJECT_INCLUDE)/arm/freescale/imx/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arm/freescale/imx/imx_wdogreg.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.imx7: startup/linkcmds.imx7 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.imx7
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.imx7
-
diff --git a/c/src/lib/libbsp/arm/lpc176x/bsp_specs b/c/src/lib/libbsp/arm/imx/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/bsp_specs
rename to c/src/lib/libbsp/arm/imx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index 6b950c2..3e5e0e1 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -4,51 +4,26 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-
-EXTRA_DIST += startup/linkcmds.lm3s6965 startup/linkcmds.lm3s6965_qemu startup/linkcmds.lm3s3749
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.lm3s3749
+dist_project_lib_DATA += startup/linkcmds.lm3s6965
+dist_project_lib_DATA += startup/linkcmds.lm3s6965_qemu
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS =
-include_HEADERS += include/tm27.h
-include_HEADERS += include/bsp.h
-
-nodist_include_HEADERS =
-nodist_include_HEADERS += include/bspopts.h
-
-nodist_include_bsp_HEADERS =
-nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/uart.h
-include_bsp_HEADERS += include/io.h
-include_bsp_HEADERS += include/syscon.h
-include_bsp_HEADERS += include/ssi.h
-include_bsp_HEADERS += include/lm3s69xx.h
-
 ###############################################################################
 #                  LibBSP                                                     #
 ###############################################################################
@@ -56,7 +31,7 @@ include_bsp_HEADERS += include/lm3s69xx.h
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -119,5 +94,5 @@ libbsp_a_SOURCES += ssi/ssi.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/lm3s69xx/headers.am
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/configure.ac b/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
index a373e25..b02e213 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lm3s69xx/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-lm3s69xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lm3s3749.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])
@@ -75,7 +78,6 @@ RTEMS_BSPOPTS_SET([LM3S69XX_MCU_LM4F120],[lm4f120*],[1])
 RTEMS_BSPOPTS_HELP([LM3S69XX_MCU_LM4F120],[board has LM4F120xxx MCU])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/preinstall.am b/c/src/lib/libbsp/arm/lm3s69xx/preinstall.am
deleted file mode 100644
index e305a06..0000000
--- a/c/src/lib/libbsp/arm/lm3s69xx/preinstall.am
+++ /dev/null
@@ -1,111 +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_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)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.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_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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.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/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.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/uart.h: include/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/io.h: include/io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io.h
-
-$(PROJECT_INCLUDE)/bsp/syscon.h: include/syscon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscon.h
-
-$(PROJECT_INCLUDE)/bsp/ssi.h: include/ssi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ssi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ssi.h
-
-$(PROJECT_INCLUDE)/bsp/lm3s69xx.h: include/lm3s69xx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lm3s69xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lm3s69xx.h
-
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/bsp_specs b/c/src/lib/libbsp/arm/lm3s69xx/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/lm3s69xx/bsp_specs
rename to c/src/lib/libbsp/arm/lm3s69xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 4e2d98b..634df1a 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -11,56 +11,13 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 
 # ----------------------------
 # ------  Headers
 # ----------------------------
 
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/dma.h
-include_bsp_HEADERS += include/io-defs.h
-include_bsp_HEADERS += include/io.h
-include_bsp_HEADERS += include/common-types.h
-include_bsp_HEADERS += include/gpio-defs.h
-include_bsp_HEADERS += include/lpc-gpio.h
-include_bsp_HEADERS += include/can.h
-include_bsp_HEADERS += include/can-defs.h
-include_bsp_HEADERS += include/pwmout.h
-include_bsp_HEADERS += include/pwmout-defs.h
-include_bsp_HEADERS += include/adc.h
-include_bsp_HEADERS += include/adc-defs.h
-include_bsp_HEADERS += include/timer-defs.h
-include_bsp_HEADERS += include/timer.h
-include_bsp_HEADERS += include/watchdog.h
-include_bsp_HEADERS += include/watchdog-defs.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/lpc176x.h
-include_bsp_HEADERS += include/lpc-clock-config.h
-include_bsp_HEADERS += include/system-clocks.h
-include_bsp_HEADERS += include/mbed-pinmap.h
-
-include_HEADERS += include/tm27.h
-
 
 # ----------------------------
 # ------  Data
@@ -70,12 +27,11 @@ EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
-project_lib_DATA += startup/linkcmds
-
-EXTRA_DIST += startup/linkcmds.lpc1768_mbed
-EXTRA_DIST += startup/linkcmds.lpc1768_mbed_ahb_ram
-EXTRA_DIST += startup/linkcmds.lpc1768_mbed_ahb_ram_eth
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed
+dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed_ahb_ram
+dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed_ahb_ram_eth
 
 # ----------------------------
 # ------  LibBSP
@@ -84,7 +40,7 @@ EXTRA_DIST += startup/linkcmds.lpc1768_mbed_ahb_ram_eth
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -172,5 +128,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/lpc176x/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc176x/configure.ac b/c/src/lib/libbsp/arm/lpc176x/configure.ac
index dae4322..b64bef7 100644
--- a/c/src/lib/libbsp/arm/lpc176x/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc176x/configure.ac
@@ -10,6 +10,9 @@ AC_INIT([rtems-c-src-lib-libbsp-arm-lpc176x],[_RTEMS_VERSION],
 				[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lpc1768_mbed_ahb_ram.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])
@@ -68,7 +71,6 @@ RTEMS_BSPOPTS_SET([LPC_DMA_CHANNEL_COUNT],[*],[2])
 RTEMS_BSPOPTS_HELP([LPC_DMA_CHANNEL_COUNT],[DMA channel count])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/lpc176x/preinstall.am b/c/src/lib/libbsp/arm/lpc176x/preinstall.am
deleted file mode 100644
index 1ecae36..0000000
--- a/c/src/lib/libbsp/arm/lpc176x/preinstall.am
+++ /dev/null
@@ -1,187 +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)/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_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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.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/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-i2s.h: ../shared/lpc/include/lpc-i2s.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-
-$(PROJECT_INCLUDE)/bsp/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-
-$(PROJECT_INCLUDE)/bsp/dma.h: include/dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/dma.h
-
-$(PROJECT_INCLUDE)/bsp/io-defs.h: include/io-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io-defs.h
-
-$(PROJECT_INCLUDE)/bsp/io.h: include/io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io.h
-
-$(PROJECT_INCLUDE)/bsp/common-types.h: include/common-types.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/common-types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/common-types.h
-
-$(PROJECT_INCLUDE)/bsp/gpio-defs.h: include/gpio-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio-defs.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-gpio.h: include/lpc-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-gpio.h
-
-$(PROJECT_INCLUDE)/bsp/can.h: include/can.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/can.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/can.h
-
-$(PROJECT_INCLUDE)/bsp/can-defs.h: include/can-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/can-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/can-defs.h
-
-$(PROJECT_INCLUDE)/bsp/pwmout.h: include/pwmout.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pwmout.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pwmout.h
-
-$(PROJECT_INCLUDE)/bsp/pwmout-defs.h: include/pwmout-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pwmout-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pwmout-defs.h
-
-$(PROJECT_INCLUDE)/bsp/adc.h: include/adc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/adc.h
-
-$(PROJECT_INCLUDE)/bsp/adc-defs.h: include/adc-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/adc-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/adc-defs.h
-
-$(PROJECT_INCLUDE)/bsp/timer-defs.h: include/timer-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/timer-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/timer-defs.h
-
-$(PROJECT_INCLUDE)/bsp/timer.h: include/timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/timer.h
-
-$(PROJECT_INCLUDE)/bsp/watchdog.h: include/watchdog.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/watchdog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/watchdog.h
-
-$(PROJECT_INCLUDE)/bsp/watchdog-defs.h: include/watchdog-defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/watchdog-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/watchdog-defs.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/lpc176x.h: include/lpc176x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc176x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc176x.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-clock-config.h: include/lpc-clock-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-
-$(PROJECT_INCLUDE)/bsp/system-clocks.h: include/system-clocks.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/system-clocks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/system-clocks.h
-
-$(PROJECT_INCLUDE)/bsp/mbed-pinmap.h: include/mbed-pinmap.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mbed-pinmap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mbed-pinmap.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/arm/imx/bsp_specs b/c/src/lib/libbsp/arm/lpc176x/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/imx/bsp_specs
rename to c/src/lib/libbsp/arm/lpc176x/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index 1473a7b..f477332 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -11,50 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-pl111-fb.h
-include_bsp_HEADERS += ../shared/include/arm-pl111-regs.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-emc.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-lcd.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/dma.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/io.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/lcd.h
-include_bsp_HEADERS += include/lpc17xx.h
-include_bsp_HEADERS += include/lpc24xx.h
-include_bsp_HEADERS += include/lpc-clock-config.h
-include_bsp_HEADERS += include/lpc-ethernet-config.h
-include_bsp_HEADERS += include/ssp.h
-include_bsp_HEADERS += include/start-config.h
-include_bsp_HEADERS += include/system-clocks.h
-
-include_HEADERS += include/tm27.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -64,21 +26,21 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.lpc17xx_ea_ram
-project_lib_DATA += startup/linkcmds.lpc17xx_ea_rom_int
-project_lib_DATA += startup/linkcmds.lpc17xx_plx800_ram
-project_lib_DATA += startup/linkcmds.lpc17xx_plx800_rom_int
-project_lib_DATA += startup/linkcmds.lpc2362
-project_lib_DATA += startup/linkcmds.lpc23xx_tli800
-project_lib_DATA += startup/linkcmds.lpc24xx_ea
-project_lib_DATA += startup/linkcmds.lpc24xx_ncs_ram
-project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_ext
-project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_int
-project_lib_DATA += startup/linkcmds.lpc24xx_plx800_ram
-project_lib_DATA += startup/linkcmds.lpc24xx_plx800_rom_int
-project_lib_DATA += startup/linkcmds.lpc40xx_ea_ram
-project_lib_DATA += startup/linkcmds.lpc40xx_ea_rom_int
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.lpc17xx_ea_ram
+dist_project_lib_DATA += startup/linkcmds.lpc17xx_ea_rom_int
+dist_project_lib_DATA += startup/linkcmds.lpc17xx_plx800_ram
+dist_project_lib_DATA += startup/linkcmds.lpc17xx_plx800_rom_int
+dist_project_lib_DATA += startup/linkcmds.lpc2362
+dist_project_lib_DATA += startup/linkcmds.lpc23xx_tli800
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_ea
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_ram
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_ext
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_int
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_plx800_ram
+dist_project_lib_DATA += startup/linkcmds.lpc24xx_plx800_rom_int
+dist_project_lib_DATA += startup/linkcmds.lpc40xx_ea_ram
+dist_project_lib_DATA += startup/linkcmds.lpc40xx_ea_rom_int
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -87,7 +49,7 @@ project_lib_DATA += startup/linkcmds.lpc40xx_ea_rom_int
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -192,5 +154,5 @@ endif
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/lpc24xx/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc24xx/configure.ac b/c/src/lib/libbsp/arm/lpc24xx/configure.ac
index 14c242c..50b654f 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc24xx/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-lpc24xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lpc17xx_ea_ram.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])
@@ -123,7 +126,6 @@ RTEMS_BSPOPTS_SET([BSP_USB_OTG_TRANSCEIVER_I2C_ADDR],[lpc17xx_ea* | lpc40xx_ea*]
 RTEMS_BSPOPTS_HELP([BSP_USB_OTG_TRANSCEIVER_I2C_ADDR],[USB OTG transceiver I2C address used by USB stack])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am
deleted file mode 100644
index e77853f..0000000
--- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am
+++ /dev/null
@@ -1,223 +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)/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_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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.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/arm-pl111-fb.h: ../shared/include/arm-pl111-fb.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h: ../shared/include/arm-pl111-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-i2s.h: ../shared/lpc/include/lpc-i2s.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-emc.h: ../shared/lpc/include/lpc-emc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-emc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-emc.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-lcd.h: ../shared/lpc/include/lpc-lcd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
-
-$(PROJECT_INCLUDE)/bsp/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-
-$(PROJECT_INCLUDE)/bsp/dma.h: include/dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/dma.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/io.h: include/io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io.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/lcd.h: include/lcd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lcd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lcd.h
-
-$(PROJECT_INCLUDE)/bsp/lpc17xx.h: include/lpc17xx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc17xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc17xx.h
-
-$(PROJECT_INCLUDE)/bsp/lpc24xx.h: include/lpc24xx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc24xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc24xx.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-clock-config.h: include/lpc-clock-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h: include/lpc-ethernet-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h
-
-$(PROJECT_INCLUDE)/bsp/ssp.h: include/ssp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ssp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ssp.h
-
-$(PROJECT_INCLUDE)/bsp/start-config.h: include/start-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start-config.h
-
-$(PROJECT_INCLUDE)/bsp/system-clocks.h: include/system-clocks.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/system-clocks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/system-clocks.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.lpc17xx_ea_ram: startup/linkcmds.lpc17xx_ea_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc17xx_ea_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc17xx_ea_ram
-
-$(PROJECT_LIB)/linkcmds.lpc17xx_ea_rom_int: startup/linkcmds.lpc17xx_ea_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc17xx_ea_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc17xx_ea_rom_int
-
-$(PROJECT_LIB)/linkcmds.lpc17xx_plx800_ram: startup/linkcmds.lpc17xx_plx800_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc17xx_plx800_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc17xx_plx800_ram
-
-$(PROJECT_LIB)/linkcmds.lpc17xx_plx800_rom_int: startup/linkcmds.lpc17xx_plx800_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc17xx_plx800_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc17xx_plx800_rom_int
-
-$(PROJECT_LIB)/linkcmds.lpc2362: startup/linkcmds.lpc2362 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc2362
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc2362
-
-$(PROJECT_LIB)/linkcmds.lpc23xx_tli800: startup/linkcmds.lpc23xx_tli800 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc23xx_tli800
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc23xx_tli800
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_ea: startup/linkcmds.lpc24xx_ea $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ea
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ea
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram: startup/linkcmds.lpc24xx_ncs_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext: startup/linkcmds.lpc24xx_ncs_rom_ext $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int: startup/linkcmds.lpc24xx_ncs_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_plx800_ram: startup/linkcmds.lpc24xx_plx800_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_plx800_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_plx800_ram
-
-$(PROJECT_LIB)/linkcmds.lpc24xx_plx800_rom_int: startup/linkcmds.lpc24xx_plx800_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_plx800_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_plx800_rom_int
-
-$(PROJECT_LIB)/linkcmds.lpc40xx_ea_ram: startup/linkcmds.lpc40xx_ea_ram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc40xx_ea_ram
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc40xx_ea_ram
-
-$(PROJECT_LIB)/linkcmds.lpc40xx_ea_rom_int: startup/linkcmds.lpc40xx_ea_rom_int $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc40xx_ea_rom_int
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc40xx_ea_rom_int
-
diff --git a/c/src/lib/libbsp/arm/gumstix/bsp_specs b/c/src/lib/libbsp/arm/lpc24xx/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/gumstix/bsp_specs
rename to c/src/lib/libbsp/arm/lpc24xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index df6353d..d92bccc 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -11,47 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-i2s.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-emc.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-lcd.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/mmu.h
-include_bsp_HEADERS += include/lpc32xx.h
-include_bsp_HEADERS += include/lpc-clock-config.h
-include_bsp_HEADERS += include/lpc-ethernet-config.h
-include_bsp_HEADERS += include/nand-mlc.h
-include_bsp_HEADERS += include/boot.h
-include_bsp_HEADERS += include/hsu.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/emc.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -61,13 +26,12 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.lpc32xx
-
-EXTRA_DIST += startup/linkcmds.lpc32xx_phycore \
-	startup/linkcmds.lpc32xx_mzx_stage_1 \
-	startup/linkcmds.lpc32xx_mzx_stage_2 \
-	startup/linkcmds.lpc32xx_mzx
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.lpc32xx
+dist_project_lib_DATA += startup/linkcmds.lpc32xx_phycore
+dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx_stage_1
+dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx_stage_2
+dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -76,7 +40,7 @@ EXTRA_DIST += startup/linkcmds.lpc32xx_phycore \
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -170,5 +134,5 @@ endif
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/lpc32xx/headers.am
diff --git a/c/src/lib/libbsp/arm/lpc32xx/configure.ac b/c/src/lib/libbsp/arm/lpc32xx/configure.ac
index 553d1ce..1383d97 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/configure.ac
+++ b/c/src/lib/libbsp/arm/lpc32xx/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-lpc32xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lpc32xx_mzx.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])
@@ -106,7 +109,6 @@ RTEMS_BSPOPTS_SET([TESTS_USE_PRINTK],[*],[1])
 RTEMS_BSPOPTS_HELP([TESTS_USE_PRINTK],[tests use printk() for output])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/lpc32xx/preinstall.am b/c/src/lib/libbsp/arm/lpc32xx/preinstall.am
deleted file mode 100644
index bc21332..0000000
--- a/c/src/lib/libbsp/arm/lpc32xx/preinstall.am
+++ /dev/null
@@ -1,163 +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)/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_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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.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/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-i2s.h: ../shared/lpc/include/lpc-i2s.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-i2s.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-emc.h: ../shared/lpc/include/lpc-emc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-emc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-emc.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-lcd.h: ../shared/lpc/include/lpc-lcd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-lcd.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.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/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/lpc32xx.h: include/lpc32xx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc32xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc32xx.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-clock-config.h: include/lpc-clock-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-clock-config.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h: include/lpc-ethernet-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-ethernet-config.h
-
-$(PROJECT_INCLUDE)/bsp/nand-mlc.h: include/nand-mlc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/nand-mlc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/nand-mlc.h
-
-$(PROJECT_INCLUDE)/bsp/boot.h: include/boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/boot.h
-
-$(PROJECT_INCLUDE)/bsp/hsu.h: include/hsu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hsu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hsu.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/emc.h: include/emc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/emc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/emc.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.lpc32xx: startup/linkcmds.lpc32xx $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc32xx
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc32xx
-
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/bsp_specs b/c/src/lib/libbsp/arm/lpc32xx/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/gdbarmsim/bsp_specs
rename to c/src/lib/libbsp/arm/lpc32xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/preinstall.am b/c/src/lib/libbsp/arm/preinstall.am
deleted file mode 100644
index 3e66ebe..0000000
--- a/c/src/lib/libbsp/arm/preinstall.am
+++ /dev/null
@@ -1,41 +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)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(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_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.armv4: shared/startup/linkcmds.armv4 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.armv4
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.armv4
-
-$(PROJECT_LIB)/linkcmds.armv7m: shared/startup/linkcmds.armv7m $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.armv7m
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.armv7m
-
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 8ed1aac..9404677 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -11,50 +11,14 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 # Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
 noinst_HEADERS = console/font_data.h
 
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../../shared/include/gpio.h
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-timer.h
-include_bsp_HEADERS += ../shared/lpc/include/lpc-dma.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/mmu.h
-include_bsp_HEADERS += include/usart.h
-include_bsp_HEADERS += include/raspberrypi.h
-include_bsp_HEADERS += include/rpi-gpio.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/spi.h
-include_bsp_HEADERS += include/mailbox.h
-include_bsp_HEADERS += include/vc.h
-include_bsp_HEADERS += include/rpi-fb.h
-include_bsp_HEADERS += console/fbcons.h
-
 ###############################################################################
 # Data                                                       #
 ###############################################################################
@@ -64,8 +28,7 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += ../shared/startup/linkcmds.base
+project_lib_DATA += linkcmds
 
 ###############################################################################
 # LibBSP                                                     #
@@ -74,7 +37,7 @@ project_lib_DATA += ../shared/startup/linkcmds.base
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -188,5 +151,5 @@ libbsp_a_SOURCES += ../shared/mminit.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/raspberrypi/headers.am
diff --git a/c/src/lib/libbsp/arm/raspberrypi/configure.ac b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
index 6d771a4..97e74d9 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/configure.ac
+++ b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
@@ -9,6 +9,8 @@ AC_PREREQ([2.68])
 AC_INIT([rtems-c-src-lib-libbsp-arm-raspberrypi],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/raspberrypi.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -58,5 +60,5 @@ RTEMS_BSP_CLEANUP_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds])
+linkcmds:startup/linkcmds.in])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/raspberrypi/preinstall.am b/c/src/lib/libbsp/arm/raspberrypi/preinstall.am
deleted file mode 100644
index 9dca9cf..0000000
--- a/c/src/lib/libbsp/arm/raspberrypi/preinstall.am
+++ /dev/null
@@ -1,167 +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)/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_INCLUDE)/bsp/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/gpio.h: ../../shared/include/gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpio.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/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/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-timer.h: ../shared/lpc/include/lpc-timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-timer.h
-
-$(PROJECT_INCLUDE)/bsp/lpc-dma.h: ../shared/lpc/include/lpc-dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/lpc-dma.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.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/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/usart.h: include/usart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/usart.h
-
-$(PROJECT_INCLUDE)/bsp/raspberrypi.h: include/raspberrypi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/raspberrypi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/raspberrypi.h
-
-$(PROJECT_INCLUDE)/bsp/rpi-gpio.h: include/rpi-gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rpi-gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rpi-gpio.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/spi.h: include/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spi.h
-
-$(PROJECT_INCLUDE)/bsp/mailbox.h: include/mailbox.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mailbox.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mailbox.h
-
-$(PROJECT_INCLUDE)/bsp/vc.h: include/vc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vc.h
-
-$(PROJECT_INCLUDE)/bsp/rpi-fb.h: include/rpi-fb.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rpi-fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rpi-fb.h
-
-$(PROJECT_INCLUDE)/bsp/fbcons.h: console/fbcons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fbcons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fbcons.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
diff --git a/c/src/lib/libbsp/arm/edb7312/bsp_specs b/c/src/lib/libbsp/arm/raspberrypi/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/edb7312/bsp_specs
rename to c/src/lib/libbsp/arm/raspberrypi/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
index 9cd72c3..2136515 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -11,46 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-gic.h
-include_bsp_HEADERS += ../shared/include/arm-gic-irq.h
-include_bsp_HEADERS += ../shared/include/arm-gic-regs.h
-include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h
-include_bsp_HEADERS += ../shared/include/arm-pl011.h
-include_bsp_HEADERS += ../shared/include/arm-pl011-regs.h
-include_bsp_HEADERS += ../shared/include/arm-pl050.h
-include_bsp_HEADERS += ../shared/include/arm-pl050-regs.h
-include_bsp_HEADERS += ../shared/include/arm-pl111-fb.h
-include_bsp_HEADERS += ../shared/include/arm-pl111-regs.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/irq.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -60,9 +26,9 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu
-project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu
+dist_project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -71,7 +37,7 @@ project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -137,5 +103,5 @@ libbsp_a_SOURCES += startup/fb-config.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/realview-pbx-a9/headers.am
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac b/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
index f01e216..8674da3 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-realview-bpx-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/realview_pbx_a9_qemu.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])
@@ -50,7 +53,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/preinstall.am b/c/src/lib/libbsp/arm/realview-pbx-a9/preinstall.am
deleted file mode 100644
index 6751664..0000000
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/preinstall.am
+++ /dev/null
@@ -1,163 +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)/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_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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.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/arm-a9mpcore-clock.h: ../shared/include/arm-a9mpcore-clock.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h: ../shared/include/arm-a9mpcore-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl011.h: ../shared/include/arm-pl011.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl011.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl011.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl011-regs.h: ../shared/include/arm-pl011-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl011-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl011-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl050.h: ../shared/include/arm-pl050.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl050.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl050.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl050-regs.h: ../shared/include/arm-pl050-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl050-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl050-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h: ../shared/include/arm-pl111-fb.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl111-fb.h
-
-$(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h: ../shared/include/arm-pl111-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-pl111-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.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_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_LIB)/linkcmds.realview_pbx_a9_qemu: startup/linkcmds.realview_pbx_a9_qemu $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu
-
-$(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu_smp: startup/linkcmds.realview_pbx_a9_qemu_smp $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu_smp
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.realview_pbx_a9_qemu_smp
-
diff --git a/c/src/lib/libbsp/arm/csb337/bsp_specs b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/csb337/bsp_specs
rename to c/src/lib/libbsp/arm/realview-pbx-a9/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index 8be245e..f4b1643 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -4,18 +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/lpc22xx.h
-
-include_bsp_HEADERS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -26,12 +16,11 @@ start.$(OBJEXT): 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 =
 
-include_HEADERS += ../../arm/shared/comm/uart.h
 # startup
 libbsp_a_SOURCES += \
     ../../shared/bsppredriverhook.c \
@@ -49,9 +38,6 @@ libbsp_a_SOURCES += ../../shared/console.c \
     ../../shared/console_select.c ../../shared/console_control.c \
     ../../shared/console_read.c ../../shared/console_write.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
@@ -80,5 +66,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/rtl22xx/headers.am
diff --git a/c/src/lib/libbsp/arm/rtl22xx/configure.ac b/c/src/lib/libbsp/arm/rtl22xx/configure.ac
index 950d22f..d8e7930 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/configure.ac
+++ b/c/src/lib/libbsp/arm/rtl22xx/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-rtl22xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/rtl22xx.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/arm/rtl22xx/preinstall.am b/c/src/lib/libbsp/arm/rtl22xx/preinstall.am
deleted file mode 100644
index 1748114..0000000
--- a/c/src/lib/libbsp/arm/rtl22xx/preinstall.am
+++ /dev/null
@@ -1,83 +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)/lpc22xx.h: include/lpc22xx.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/lpc22xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/lpc22xx.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
-
-$(PROJECT_INCLUDE)/uart.h: ../../arm/shared/comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.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/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/csb336/bsp_specs b/c/src/lib/libbsp/arm/rtl22xx/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/csb336/bsp_specs
rename to c/src/lib/libbsp/arm/rtl22xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 1fe3780..45a280c 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -4,22 +4,10 @@ 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
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
-include_HEADERS = include/bsp.h
-include_HEADERS += smc/smc.h
-include_HEADERS += include/tm27.h
-include_HEADERS += include/s3c24xx.h
-include_HEADERS += include/s3c2400.h
-include_HEADERS += include/s3c2410.h
-
-include_bsp_HEADERS =
-libbsp_a_CPPFLAGS =
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 EXTRA_DIST += start/start.S
@@ -27,7 +15,7 @@ start.$(OBJEXT): 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 =
@@ -58,9 +46,6 @@ libbsp_a_SOURCES += ../../shared/console_read.c
 libbsp_a_SOURCES += ../../shared/console_write.c
 libbsp_a_SOURCES += ../../shared/console_control.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
@@ -80,5 +65,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/smdk2410/headers.am
diff --git a/c/src/lib/libbsp/arm/smdk2410/configure.ac b/c/src/lib/libbsp/arm/smdk2410/configure.ac
index 7328ecb..c4dcf1d 100644
--- a/c/src/lib/libbsp/arm/smdk2410/configure.ac
+++ b/c/src/lib/libbsp/arm/smdk2410/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-smdk2410],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/smdk2410.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/arm/smdk2410/preinstall.am b/c/src/lib/libbsp/arm/smdk2410/preinstall.am
deleted file mode 100644
index a049bab..0000000
--- a/c/src/lib/libbsp/arm/smdk2410/preinstall.am
+++ /dev/null
@@ -1,91 +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)/smc.h: smc/smc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/smc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/smc.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)/s3c24xx.h: include/s3c24xx.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c24xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c24xx.h
-
-$(PROJECT_INCLUDE)/s3c2400.h: include/s3c2400.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2400.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2400.h
-
-$(PROJECT_INCLUDE)/s3c2410.h: include/s3c2410.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2410.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2410.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
-
-$(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/beagle/bsp_specs b/c/src/lib/libbsp/arm/smdk2410/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/beagle/bsp_specs
rename to c/src/lib/libbsp/arm/smdk2410/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index b2e4544..98abdc3 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -4,66 +4,25 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-
-EXTRA_DIST += startup/linkcmds.stm32f4
-EXTRA_DIST += startup/linkcmds.stm32f105rc
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.stm32f105rc
+dist_project_lib_DATA += startup/linkcmds.stm32f4
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS =
-include_HEADERS += include/tm27.h
-include_HEADERS += include/bsp.h
-
-nodist_include_HEADERS =
-nodist_include_HEADERS += include/bspopts.h
-
-nodist_include_bsp_HEADERS =
-nodist_include_bsp_HEADERS += ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/armv7m/include/armv7m-irq.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/usart.h
-include_bsp_HEADERS += include/stm32f4.h
-include_bsp_HEADERS += include/stm32f10xxx_gpio.h
-include_bsp_HEADERS += include/stm32f10xxx_rcc.h
-include_bsp_HEADERS += include/stm32f10xxx_exti.h
-include_bsp_HEADERS += include/stm32f4xxxx_adc.h
-include_bsp_HEADERS += include/stm32f4xxxx_exti.h
-include_bsp_HEADERS += include/stm32f4xxxx_gpio.h
-include_bsp_HEADERS += include/stm32f4xxxx_rcc.h
-include_bsp_HEADERS += include/stm32f4xxxx_pwr.h
-include_bsp_HEADERS += include/stm32f4xxxx_syscfg.h
-include_bsp_HEADERS += include/stm32f4xxxx_tim.h
-include_bsp_HEADERS += include/stm32f4xxxx_flash.h
-include_bsp_HEADERS += include/stm32f4xxxx_otgfs.h
-include_bsp_HEADERS += include/stm32_i2c.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/stm32_usart.h
-include_bsp_HEADERS += include/io.h
-include_bsp_HEADERS += include/rcc.h
-
 ###############################################################################
 #                  LibBSP                                                     #
 ###############################################################################
@@ -71,7 +30,7 @@ include_bsp_HEADERS += include/rcc.h
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -136,5 +95,5 @@ libbsp_a_CPPFLAGS += -I$(srcdir)/../../../libcpu/arm/shared/include
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/stm32f4/headers.am
diff --git a/c/src/lib/libbsp/arm/stm32f4/configure.ac b/c/src/lib/libbsp/arm/stm32f4/configure.ac
index 4bf5871..980a2ac 100644
--- a/c/src/lib/libbsp/arm/stm32f4/configure.ac
+++ b/c/src/lib/libbsp/arm/stm32f4/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-stm32f4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/stm32f4.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])
@@ -68,7 +71,6 @@ RTEMS_BSPOPTS_SET([STM32F4_ENABLE_I2C2],[*],[])
 RTEMS_BSPOPTS_HELP([STM32F4_ENABLE_I2C2],[enable I2C 2])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/stm32f4/preinstall.am b/c/src/lib/libbsp/arm/stm32f4/preinstall.am
deleted file mode 100644
index 5048945..0000000
--- a/c/src/lib/libbsp/arm/stm32f4/preinstall.am
+++ /dev/null
@@ -1,167 +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_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)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.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_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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.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/armv7m-irq.h: ../shared/armv7m/include/armv7m-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/armv7m-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/armv7m-irq.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/usart.h: include/usart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/usart.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4.h: include/stm32f4.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f10xxx_gpio.h: include/stm32f10xxx_gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f10xxx_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f10xxx_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f10xxx_rcc.h: include/stm32f10xxx_rcc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f10xxx_rcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f10xxx_rcc.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f10xxx_exti.h: include/stm32f10xxx_exti.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f10xxx_exti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f10xxx_exti.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_adc.h: include/stm32f4xxxx_adc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_adc.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_exti.h: include/stm32f4xxxx_exti.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_exti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_exti.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_gpio.h: include/stm32f4xxxx_gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_rcc.h: include/stm32f4xxxx_rcc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_rcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_rcc.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_pwr.h: include/stm32f4xxxx_pwr.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_pwr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_pwr.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_syscfg.h: include/stm32f4xxxx_syscfg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_syscfg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_syscfg.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_tim.h: include/stm32f4xxxx_tim.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_tim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_tim.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_flash.h: include/stm32f4xxxx_flash.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_flash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_flash.h
-
-$(PROJECT_INCLUDE)/bsp/stm32f4xxxx_otgfs.h: include/stm32f4xxxx_otgfs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_otgfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32f4xxxx_otgfs.h
-
-$(PROJECT_INCLUDE)/bsp/stm32_i2c.h: include/stm32_i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32_i2c.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/stm32_usart.h: include/stm32_usart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stm32_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stm32_usart.h
-
-$(PROJECT_INCLUDE)/bsp/io.h: include/io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/io.h
-
-$(PROJECT_INCLUDE)/bsp/rcc.h: include/rcc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rcc.h
-
diff --git a/c/src/lib/libbsp/arm/atsam/bsp_specs b/c/src/lib/libbsp/arm/stm32f4/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/bsp_specs
rename to c/src/lib/libbsp/arm/stm32f4/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 000e9ff..1ad6344 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -11,82 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-include_bsp_ti_herculesdir = $(includedir)/bsp/ti_herc
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 # ----------------------------
 # ------  Headers
 # ----------------------------
 
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += include/tms570.h
-include_bsp_HEADERS += include/tms570-sci.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/tms570-rti.h
-include_bsp_HEADERS += include/tms570-vim.h
-include_bsp_HEADERS += include/tms570-pom.h
-include_bsp_HEADERS += include/tms570-sci-driver.h
-include_bsp_HEADERS += include/system-clocks.h
-include_bsp_HEADERS += include/tms570-pinmux.h
-
-include_bsp_HEADERS += include/tms570-pins.h
-include_bsp_HEADERS += include/tms570ls3137zwt-pins.h
-include_bsp_HEADERS += include/tms570lc4357-pins.h
-
-include_bsp_ti_hercules_HEADERS = include/ti_herc/reg_adc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_ccmsr.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_crc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dcan.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dcc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dma.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dmm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_efuse.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emacc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emacm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emif.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_esm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_flash.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_flex_ray.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_gio.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_htu.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_i2c.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_iomm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_lin.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_mdio.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_n2het.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pbist.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pll.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pmm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_rti.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_rtp.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sci.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_tcr.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_tcram.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_vim.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pom.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_spi.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_stc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sys.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sys2.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pcr.h
-
-include_HEADERS += include/tm27.h
-
 # ----------------------------
 # ------  Data
 # ----------------------------
@@ -95,12 +25,12 @@ EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
-project_lib_DATA += startup/linkcmds
 
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_with_loader
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_sdram
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_intram
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_intram
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_sdram
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_with_loader
 
 # ----------------------------
 # ------  LibBSP
@@ -109,7 +39,7 @@ EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_intram
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -184,10 +114,6 @@ libbsp_a_SOURCES += hwinit/tms570_selftest_par_std.c
 libbsp_a_SOURCES += hwinit/tms570_selftest_parity.c
 libbsp_a_SOURCES += hwinit/tms570_tcram_tests.c
 
-include_bsp_HEADERS += hwinit/tms570_selftest_parity.h
-include_bsp_HEADERS += hwinit/tms570_hwinit.h
-include_bsp_HEADERS += hwinit/tms570_selftest.h
-
 # Start hooks
 libbsp_a_SOURCES += hwinit/bspstarthooks-hwinit.c
 else
@@ -201,5 +127,5 @@ endif
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/tms570/headers.am
diff --git a/c/src/lib/libbsp/arm/tms570/configure.ac b/c/src/lib/libbsp/arm/tms570/configure.ac
index 37c5b61..8a3789f 100644
--- a/c/src/lib/libbsp/arm/tms570/configure.ac
+++ b/c/src/lib/libbsp/arm/tms570/configure.ac
@@ -10,6 +10,9 @@ AC_INIT([rtems-c-src-lib-libbsp-arm-tms570],[_RTEMS_VERSION],
 				[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/tms570ls3137_hdk.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])
@@ -55,7 +58,6 @@ RTEMS_BSPOPTS_HELP([TMS570_USE_HWINIT_STARTUP],[Include BSP startup code for TMS
 AM_CONDITIONAL(TMS570_USE_HWINIT_STARTUP,test "$TMS570_USE_HWINIT_STARTUP" = "1")
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/tms570/preinstall.am b/c/src/lib/libbsp/arm/tms570/preinstall.am
deleted file mode 100644
index 1f23f9c..0000000
--- a/c/src/lib/libbsp/arm/tms570/preinstall.am
+++ /dev/null
@@ -1,297 +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/ti_herc/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/ti_herc
-	@: > $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/ti_herc/$(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)/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_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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.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/tms570.h: include/tms570.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-sci.h: include/tms570-sci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-sci.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/tms570-rti.h: include/tms570-rti.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-rti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-rti.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-vim.h: include/tms570-vim.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-vim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-vim.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pom.h: include/tms570-pom.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pom.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h: include/tms570-sci-driver.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h
-
-$(PROJECT_INCLUDE)/bsp/system-clocks.h: include/system-clocks.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/system-clocks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/system-clocks.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pinmux.h: include/tms570-pinmux.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pinmux.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pinmux.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pins.h: include/tms570-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pins.h
-
-$(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h: include/tms570ls3137zwt-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h
-
-$(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h: include/tms570lc4357-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h: include/ti_herc/reg_adc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h: include/ti_herc/reg_ccmsr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h: include/ti_herc/reg_crc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h: include/ti_herc/reg_dcan.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h: include/ti_herc/reg_dcc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h: include/ti_herc/reg_dma.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h: include/ti_herc/reg_dmm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h: include/ti_herc/reg_efuse.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h: include/ti_herc/reg_emacc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h: include/ti_herc/reg_emacm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h: include/ti_herc/reg_emif.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h: include/ti_herc/reg_esm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h: include/ti_herc/reg_flash.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h: include/ti_herc/reg_flex_ray.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h: include/ti_herc/reg_gio.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h: include/ti_herc/reg_htu.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h: include/ti_herc/reg_i2c.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h: include/ti_herc/reg_iomm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h: include/ti_herc/reg_lin.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h: include/ti_herc/reg_mdio.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h: include/ti_herc/reg_n2het.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h: include/ti_herc/reg_pbist.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h: include/ti_herc/reg_pll.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h: include/ti_herc/reg_pmm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h: include/ti_herc/reg_rti.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h: include/ti_herc/reg_rtp.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h: include/ti_herc/reg_sci.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h: include/ti_herc/reg_tcr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h: include/ti_herc/reg_tcram.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h: include/ti_herc/reg_vim.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h: include/ti_herc/reg_pom.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h: include/ti_herc/reg_spi.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h: include/ti_herc/reg_stc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h: include/ti_herc/reg_sys.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h: include/ti_herc/reg_sys2.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h: include/ti_herc/reg_pcr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-if TMS570_USE_HWINIT_STARTUP
-$(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h: hwinit/tms570_selftest_parity.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h
-
-$(PROJECT_INCLUDE)/bsp/tms570_hwinit.h: hwinit/tms570_hwinit.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_hwinit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_hwinit.h
-
-$(PROJECT_INCLUDE)/bsp/tms570_selftest.h: hwinit/tms570_selftest.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_selftest.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_selftest.h
-endif
diff --git a/c/src/lib/libbsp/arm/tms570/bsp_specs b/c/src/lib/libbsp/arm/tms570/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/tms570/bsp_specs
rename to c/src/lib/libbsp/arm/tms570/startup/bsp_specs
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 8a8a693..94f4e0f 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -11,45 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-clock.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-irq.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-regs.h
-include_bsp_HEADERS += ../shared/include/arm-a9mpcore-start.h
-include_bsp_HEADERS += ../shared/include/arm-cp15-start.h
-include_bsp_HEADERS += ../shared/include/arm-errata.h
-include_bsp_HEADERS += ../shared/include/arm-gic.h
-include_bsp_HEADERS += ../shared/include/arm-gic-irq.h
-include_bsp_HEADERS += ../shared/include/arm-gic-regs.h
-include_bsp_HEADERS += ../shared/include/arm-gic-tm27.h
-include_bsp_HEADERS += ../shared/include/arm-release-id.h
-include_bsp_HEADERS += include/cadence-i2c.h
-include_bsp_HEADERS += include/cadence-i2c-regs.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/zynq-uart.h
-include_bsp_HEADERS += include/zynq-uart-regs.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -59,7 +26,7 @@ start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -68,7 +35,7 @@ project_lib_DATA += startup/linkcmds
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -131,5 +98,5 @@ libbsp_a_SOURCES += startup/bspstarthooks.c startup/bspstartmmu.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/xilinx-zynq/headers.am
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
index 67cdb5f..f5a0af5 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
@@ -9,6 +9,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-arm-xilinx-zynq-a9],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/xilinx_zynq_a9_qemu.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -149,5 +151,5 @@ RTEMS_BSP_CLEANUP_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-startup/linkcmds])
+linkcmds:startup/linkcmds.in])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am b/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am
deleted file mode 100644
index 0a025b3..0000000
--- a/c/src/lib/libbsp/arm/xilinx-zynq/preinstall.am
+++ /dev/null
@@ -1,151 +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)/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_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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.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/arm-a9mpcore-clock.h: ../shared/include/arm-a9mpcore-clock.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-clock.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h: ../shared/include/arm-a9mpcore-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h: ../shared/include/arm-a9mpcore-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h: ../shared/include/arm-a9mpcore-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-a9mpcore-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-cp15-start.h: ../shared/include/arm-cp15-start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-cp15-start.h
-
-$(PROJECT_INCLUDE)/bsp/arm-errata.h: ../shared/include/arm-errata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-errata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-errata.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic.h: ../shared/include/arm-gic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-irq.h: ../shared/include/arm-gic-irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-irq.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-regs.h: ../shared/include/arm-gic-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-regs.h
-
-$(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h: ../shared/include/arm-gic-tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-gic-tm27.h
-
-$(PROJECT_INCLUDE)/bsp/arm-release-id.h: ../shared/include/arm-release-id.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/arm-release-id.h
-
-$(PROJECT_INCLUDE)/bsp/cadence-i2c.h: include/cadence-i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cadence-i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cadence-i2c.h
-
-$(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.h: include/cadence-i2c-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cadence-i2c-regs.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/zynq-uart.h: include/zynq-uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/zynq-uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/zynq-uart.h
-
-$(PROJECT_INCLUDE)/bsp/zynq-uart-regs.h: include/zynq-uart-regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/zynq-uart-regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/zynq-uart-regs.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs
rename to c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/Makefile.am b/c/src/lib/libbsp/bfin/Makefile.am
index c25b2d3..24e3862 100644
--- a/c/src/lib/libbsp/bfin/Makefile.am
+++ b/c/src/lib/libbsp/bfin/Makefile.am
@@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/bfin/headers.am
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index 4207c32..32cb3c0 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/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
 
@@ -48,5 +40,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/TLL6527M/headers.am
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/configure.ac b/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
index 3c3d66c..7fcdf6f9 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
+++ b/c/src/lib/libbsp/bfin/TLL6527M/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-bfin-TLL6527M],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/TLL6527M.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/TLL6527M/preinstall.am b/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am
deleted file mode 100644
index f36f0fe..0000000
--- a/c/src/lib/libbsp/bfin/TLL6527M/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/sparc/leon3/bsp_specs b/c/src/lib/libbsp/bfin/TLL6527M/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon3/bsp_specs
rename to c/src/lib/libbsp/bfin/TLL6527M/startup/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index 92f9795..afa5c9c 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -4,15 +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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
@@ -23,7 +16,7 @@ start.$(OBJEXT): 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 =
@@ -59,5 +52,5 @@ libbsp_a_LIBADD += networkconfig.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/bfin/bf537Stamp/headers.am
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac b/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
index c1603bb..9628cbf 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-bfin-bf537Stamp],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/bf537Stamp.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/bf537Stamp/preinstall.am b/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am
deleted file mode 100644
index 0bdb655..0000000
--- a/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am
+++ /dev/null
@@ -1,63 +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)/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/sparc/leon2/bsp_specs b/c/src/lib/libbsp/bfin/bf537Stamp/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sparc/leon2/bsp_specs
rename to c/src/lib/libbsp/bfin/bf537Stamp/startup/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/configure.ac b/c/src/lib/libbsp/bfin/configure.ac
index 1ad9c92..29669ce 100644
--- a/c/src/lib/libbsp/bfin/configure.ac
+++ b/c/src/lib/libbsp/bfin/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-bfin],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([../bfin])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index f52d6ca..9acbd1b 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 90c4819..63eb276 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/preinstall.am b/c/src/lib/libbsp/bfin/eZKit533/preinstall.am
deleted file mode 100644
index f36f0fe..0000000
--- 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/sparc/erc32/bsp_specs b/c/src/lib/libbsp/bfin/eZKit533/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sparc/erc32/bsp_specs
rename to c/src/lib/libbsp/bfin/eZKit533/startup/bsp_specs
diff --git a/c/src/lib/libbsp/epiphany/Makefile.am b/c/src/lib/libbsp/epiphany/Makefile.am
index 86705a7..f0db9ba 100644
--- a/c/src/lib/libbsp/epiphany/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/Makefile.am
@@ -3,6 +3,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## Currently, the shared directory is not explicitly
 ## added but it is present in the source tree.
 _SUBDIRS = @RTEMS_BSP_FAMILY@
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/epiphany/headers.am
diff --git a/c/src/lib/libbsp/epiphany/configure.ac b/c/src/lib/libbsp/epiphany/configure.ac
index bba5440..f351e18 100644
--- a/c/src/lib/libbsp/epiphany/configure.ac
+++ b/c/src/lib/libbsp/epiphany/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-epiphany],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 AC_CONFIG_SRCDIR([epiphany_sim])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2])
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index 3645c02..3401b9a 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -9,31 +9,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-include_bsp_HEADERS = ../shared/include/linker-symbols.h
-
-include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/console-polled.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -43,7 +24,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -90,5 +71,5 @@ libbsp_a_SOURCES += console/console-io.c
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/epiphany/epiphany_sim/headers.am
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
index 05d29d7..b5448a7 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ(2.69)
 AC_INIT([rtems-c-src-lib-libbsp-epiphany-sim],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 AC_CONFIG_SRCDIR([make/custom/epiphany_sim.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign subdir-objects 1.12.2])
@@ -30,7 +33,6 @@ RTEMS_CHECK_SMP
 AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h b/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h
deleted file mode 100644
index c5d9a60..0000000
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * @ingroup bsp_epiphany
- *
- * @brief Epiphany BSP Options
- */
-
-/*
- *
- * Copyright (c) 2015 University of York.
- * Hesham ALMatary <hmka501 at york.ac.uk>
- *
- * COPYRIGHT (c) 1989-1999.
- * On-Line Applications Research Corporation (OAR).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* include/bspopts.h.in.  Generated from configure.ac by autoheader.  */
-
-#ifndef LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H
-#define LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H
-
-/**
- * @name Options
- *
- * @{
- */
-
-/**
- * @brief Dirties memory to test for programs that assume zeroed memory.
- *
- * If defined, then the BSP Framework will put a non-zero pattern into the
- * RTEMS Workspace and C program heap. This should assist in finding code that
- * assumes memory starts set to zero.
- */
-#undef BSP_DIRTY_MEMORY
-
-/**
- * @brief Print and wait for key press for reset.
- *
- * If defined, print a message and wait until pressed before resetting board
- * when application exits.
- */
-#undef BSP_PRESS_KEY_FOR_RESET
-
-/**
- * @brief Prints exception context upon unexpected exceptions
- *
- * If defined, prints the exception context when an unexpected exception occurs.
- */
-#undef BSP_PRINT_EXCEPTION_CONTEXT
-
-/**
- * @brief Resets on application exit.
- *
- * If defined, reset the board when the application exits.
- */
-#undef BSP_RESET_BOARD_AT_EXIT
-
-/**
- * @brief Reset vector address for BSP start
- */
-#undef BSP_START_RESET_VECTOR
-
-/**
- * @brief Define to the address where bug reports for this package should be
- * sent.
- */
-#undef PACKAGE_BUGREPORT
-
-/**
- * @brief Define to the full name of this package.
- */
-#undef PACKAGE_NAME
-
-/**
- * @brief Define to the full name and version of this package.
- */
-#undef PACKAGE_STRING
-
-/**
- * @brief Define to the one symbol short name of this package.
- */
-#undef PACKAGE_TARNAME
-
-/**
- * @brief Define to the home page for this package.
- */
-#undef PACKAGE_URL
-
-/**
- * @brief Define to the version of this package.
- */
-#undef PACKAGE_VERSION
-
-/** @} */
-
-#endif /* LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H */
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am b/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am
deleted file mode 100644
index e35a2e7..0000000
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am
+++ /dev/null
@@ -1,100 +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)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(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)/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/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/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.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/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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.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)/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)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sh/shsim/bsp_specs b/c/src/lib/libbsp/epiphany/epiphany_sim/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sh/shsim/bsp_specs
rename to c/src/lib/libbsp/epiphany/epiphany_sim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/epiphany/preinstall.am b/c/src/lib/libbsp/epiphany/preinstall.am
deleted file mode 100644
index dba6cc4..0000000
--- a/c/src/lib/libbsp/epiphany/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/c/src/lib/libbsp/i386/Makefile.am b/c/src/lib/libbsp/i386/Makefile.am
index 9596467..b395cd6 100644
--- a/c/src/lib/libbsp/i386/Makefile.am
+++ b/c/src/lib/libbsp/i386/Makefile.am
@@ -27,3 +27,4 @@ EXTRA_DIST += shared/pci/pci_io.c
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/i386/headers.am
diff --git a/c/src/lib/libbsp/i386/configure.ac b/c/src/lib/libbsp/i386/configure.ac
index ca40d3c..18aa96b 100644
--- a/c/src/lib/libbsp/i386/configure.ac
+++ b/c/src/lib/libbsp/i386/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-i386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([pc386])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index bf64125..0fc36a6 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -12,38 +12,15 @@ CLEANFILES =
 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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
 _SUBDIRS = . tools
 
-nodist_include_bsp_HEADERS += include/bspimpl.h
-include_bsp_HEADERS  = ../../i386/shared/irq/irq.h
-include_bsp_HEADERS += ../../i386/shared/irq/irq_asm.h
-include_bsp_HEADERS += ../../i386/shared/comm/tty_drv.h
-include_bsp_HEADERS += ../../i386/shared/realmode_int/realmode_int.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += console/rtd316.h
-include_bsp_HEADERS += console/exar17d15x.h
-include_bsp_HEADERS += include/tblsizes.h
-
-if HAS_SMP
-include_bsp_HEADERS += ../../i386/shared/irq/apic.h
-include_bsp_HEADERS += ../../i386/shared/smp/smp-imps.h
-endif
-
-include_HEADERS += include/crt.h
+TMPINSTALL_FILES =
 
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
@@ -63,9 +40,13 @@ start16.bin: start16-elf32.$(OBJEXT)
 	$(OBJCOPY) -O binary $< $@
 CLEANFILES += start16.bin
 
+$(PROJECT_LIB)/start16.bin: start16.bin $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/start16.bin
+TMPINSTALL_FILES += $(PROJECT_LIB)/start16.bin
+
 project_lib_DATA += start16.bin
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -76,14 +57,7 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 libbsp_a_SOURCES += clock/todcfg.c
 libbsp_a_SOURCES += ../../shared/tod.c
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS  =
-
 if RTEMS_VGA
-include_rtems_HEADERS += console/keyboard.h
-include_rtems_HEADERS += console/kd.h
-include_rtems_HEADERS += console/ps2_drv.h
-include_rtems_HEADERS += console/vgacons.h
 libbsp_a_SOURCES += console/inch.c
 libbsp_a_SOURCES += console/outch.c
 libbsp_a_SOURCES += console/defkeymap.c
@@ -95,7 +69,6 @@ libbsp_a_SOURCES += console/vt.c
 libbsp_a_SOURCES += console/videoAsm.S
 libbsp_a_SOURCES += console/kbd_parser.c
 libbsp_a_SOURCES += console/vgacons.c
-include_bsp_HEADERS += console/fb_default_mode.h
 if USE_VGA
 libbsp_a_SOURCES += console/fb_vga.c
 endif
@@ -103,15 +76,11 @@ if USE_CIRRUS_GD5446
 libbsp_a_SOURCES += console/fb_cirrus.c
 endif
 if USE_VBE_RM
-include_bsp_HEADERS += include/vbe3.h
-include_HEADERS += include/edid.h
-include_bsp_HEADERS += include/fb_vesa.h
 libbsp_a_SOURCES += console/fb_vesa_rm.c
 endif
 endif
 
 # console (non-graphics support)
-include_HEADERS += ../../i386/shared/comm/i386_io.h
 libbsp_a_SOURCES += console/serial_mouse_config.c
 libbsp_a_SOURCES += ../../i386/shared/comm/uart.c
 libbsp_a_SOURCES += ../../i386/shared/comm/tty_drv.c
@@ -142,7 +111,6 @@ libbsp_a_SOURCES += ../../i386/shared/pci/pci_io.c
 libbsp_a_SOURCES += ../../shared/pci/pci_bus_count.c
 libbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
 
-include_HEADERS += ../../i386/shared/comm/uart.h
 # startup
 libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
 libbsp_a_SOURCES += startup/bsp_fatal_halt.c
@@ -246,6 +214,6 @@ EXTRA_DIST += STATUS
 EXTRA_DIST += times_i486dx
 EXTRA_DIST += times_p5
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
 include $(top_srcdir)/../../../../automake/subdirs.am
+include $(srcdir)/../../../../../../bsps/i386/pc386/headers.am
diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac
index 83969b4..74cf64c 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-i386-pc386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/pc386.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/i386/pc386/preinstall.am b/c/src/lib/libbsp/i386/pc386/preinstall.am
deleted file mode 100644
index 7476a70..0000000
--- a/c/src/lib/libbsp/i386/pc386/preinstall.am
+++ /dev/null
@@ -1,173 +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)/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_INCLUDE)/bsp/bspimpl.h: include/bspimpl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspimpl.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: ../../i386/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq_asm.h: ../../i386/shared/irq/irq_asm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_asm.h
-
-$(PROJECT_INCLUDE)/bsp/tty_drv.h: ../../i386/shared/comm/tty_drv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tty_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tty_drv.h
-
-$(PROJECT_INCLUDE)/bsp/realmode_int.h: ../../i386/shared/realmode_int/realmode_int.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/realmode_int.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/realmode_int.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/rtd316.h: console/rtd316.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/rtd316.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/rtd316.h
-
-$(PROJECT_INCLUDE)/bsp/exar17d15x.h: console/exar17d15x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/exar17d15x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/exar17d15x.h
-
-$(PROJECT_INCLUDE)/bsp/tblsizes.h: include/tblsizes.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tblsizes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tblsizes.h
-
-if HAS_SMP
-$(PROJECT_INCLUDE)/bsp/apic.h: ../../i386/shared/irq/apic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apic.h
-
-$(PROJECT_INCLUDE)/bsp/smp-imps.h: ../../i386/shared/smp/smp-imps.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/smp-imps.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/smp-imps.h
-endif
-$(PROJECT_INCLUDE)/crt.h: include/crt.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/start16.bin: start16.bin $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start16.bin
-TMPINSTALL_FILES += $(PROJECT_LIB)/start16.bin
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-if RTEMS_VGA
-$(PROJECT_INCLUDE)/rtems/keyboard.h: console/keyboard.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/keyboard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/keyboard.h
-
-$(PROJECT_INCLUDE)/rtems/kd.h: console/kd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/kd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/kd.h
-
-$(PROJECT_INCLUDE)/rtems/ps2_drv.h: console/ps2_drv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ps2_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ps2_drv.h
-
-$(PROJECT_INCLUDE)/rtems/vgacons.h: console/vgacons.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vgacons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vgacons.h
-
-$(PROJECT_INCLUDE)/bsp/fb_default_mode.h: console/fb_default_mode.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fb_default_mode.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fb_default_mode.h
-
-if USE_VBE_RM
-$(PROJECT_INCLUDE)/bsp/vbe3.h: include/vbe3.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vbe3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vbe3.h
-
-$(PROJECT_INCLUDE)/edid.h: include/edid.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/edid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/edid.h
-
-$(PROJECT_INCLUDE)/bsp/fb_vesa.h: include/fb_vesa.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fb_vesa.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fb_vesa.h
-endif
-endif
-$(PROJECT_INCLUDE)/i386_io.h: ../../i386/shared/comm/i386_io.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i386_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i386_io.h
-
-$(PROJECT_INCLUDE)/uart.h: ../../i386/shared/comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.h
-
-if HAS_SMP
-$(PROJECT_LIB)/appstart.$(OBJEXT): appstart.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/appstart.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/appstart.$(OBJEXT)
-endif
diff --git a/c/src/lib/libbsp/sh/gensh4/bsp_specs b/c/src/lib/libbsp/i386/pc386/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh4/bsp_specs
rename to c/src/lib/libbsp/i386/pc386/startup/bsp_specs
diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.ac b/c/src/lib/libbsp/i386/pc386/tools/configure.ac
index 7824833..7a7c981 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/tools/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-i386-pc386-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([Spec.doc])
 RTEMS_TOP(../../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 CFLAGS="-g -O2 -Wall"
 
diff --git a/c/src/lib/libbsp/lm32/Makefile.am b/c/src/lib/libbsp/lm32/Makefile.am
index c25b2d3..ae304be 100644
--- a/c/src/lib/libbsp/lm32/Makefile.am
+++ b/c/src/lib/libbsp/lm32/Makefile.am
@@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/lm32/headers.am
diff --git a/c/src/lib/libbsp/lm32/configure.ac b/c/src/lib/libbsp/lm32/configure.ac
index 79debe1..ce06e84 100644
--- a/c/src/lib/libbsp/lm32/configure.ac
+++ b/c/src/lib/libbsp/lm32/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-lm32],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([../lm32])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index c2bbe61..1cc2028 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -4,27 +4,19 @@ 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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += include/system_conf.h
 
 EXTRA_DIST += ../../lm32/shared/start/start.S
 start.$(OBJEXT): ../../lm32/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 =
@@ -62,5 +54,5 @@ libbsp_a_LIBADD += network.rel
 endif
 
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/lm32/lm32_evr/headers.am
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
index 9a23e7c..93426ff 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
+++ b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-lm32-lm32_evr],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/lm32_evr.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/lm32/lm32_evr/preinstall.am b/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am
deleted file mode 100644
index 2e6ad01..0000000
--- a/c/src/lib/libbsp/lm32/lm32_evr/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)/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_INCLUDE)/system_conf.h: include/system_conf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/system_conf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/system_conf.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/sh/gensh2/bsp_specs b/c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh2/bsp_specs
rename to c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index c120caa..ee3161a 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -4,43 +4,19 @@ 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_bsp_HEADERS  = ../../lm32/shared/include/irq.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_gpio/milkymist_gpio.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_buttons/milkymist_buttons.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_ac97/milkymist_ac97.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_usbinput/milkymist_usbinput.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_pfpu/milkymist_pfpu.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_tmu/milkymist_tmu.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_memcard/milkymist_memcard.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_flash/milkymist_flash.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_dmx/milkymist_dmx.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_midi/milkymist_midi.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_ir/milkymist_ir.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_video/milkymist_video.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_versions/milkymist_versions.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
+dist_project_lib_DATA = startup/bsp_specs
+
 DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-include_HEADERS += include/system_conf.h
 
 EXTRA_DIST += ../../lm32/shared/start/start.S
 start.$(OBJEXT): ../../lm32/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 =
@@ -124,5 +100,5 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/lm32/milkymist/headers.am
diff --git a/c/src/lib/libbsp/lm32/milkymist/configure.ac b/c/src/lib/libbsp/lm32/milkymist/configure.ac
index eb41c95..7bd05a6 100644
--- a/c/src/lib/libbsp/lm32/milkymist/configure.ac
+++ b/c/src/lib/libbsp/lm32/milkymist/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-lm32-milkymist],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/milkymist.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/lm32/milkymist/preinstall.am b/c/src/lib/libbsp/lm32/milkymist/preinstall.am
deleted file mode 100644
index efdddba..0000000
--- a/c/src/lib/libbsp/lm32/milkymist/preinstall.am
+++ /dev/null
@@ -1,127 +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)/bsp/irq.h: ../../lm32/shared/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/milkymist_gpio.h: ../../lm32/shared/milkymist_gpio/milkymist_gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_buttons.h: ../../lm32/shared/milkymist_buttons/milkymist_buttons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_buttons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_buttons.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_ac97.h: ../../lm32/shared/milkymist_ac97/milkymist_ac97.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_ac97.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_ac97.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h: ../../lm32/shared/milkymist_usbinput/milkymist_usbinput.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h: ../../lm32/shared/milkymist_pfpu/milkymist_pfpu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_tmu.h: ../../lm32/shared/milkymist_tmu/milkymist_tmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_tmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_tmu.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_memcard.h: ../../lm32/shared/milkymist_memcard/milkymist_memcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_memcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_memcard.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_flash.h: ../../lm32/shared/milkymist_flash/milkymist_flash.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_flash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_flash.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_dmx.h: ../../lm32/shared/milkymist_dmx/milkymist_dmx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_dmx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_dmx.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_midi.h: ../../lm32/shared/milkymist_midi/milkymist_midi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_midi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_midi.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_ir.h: ../../lm32/shared/milkymist_ir/milkymist_ir.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_ir.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_ir.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_video.h: ../../lm32/shared/milkymist_video/milkymist_video.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_video.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_video.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_versions.h: ../../lm32/shared/milkymist_versions/milkymist_versions.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_versions.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_versions.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_INCLUDE)/system_conf.h: include/system_conf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/system_conf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/system_conf.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/sh/gensh1/bsp_specs b/c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sh/gensh1/bsp_specs
rename to c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m32c/configure.ac b/c/src/lib/libbsp/m32c/configure.ac
index ee3f840..0ae91b3 100644
--- a/c/src/lib/libbsp/m32c/configure.ac
+++ b/c/src/lib/libbsp/m32c/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m32c],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([m32cbsp])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index ef8056b..a10f56c 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -23,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 startup_SOURCES = ../../shared/bspclean.c \
     ../../shared/bsppredriverhook.c \
@@ -46,5 +38,5 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
 libbsp_a_SOURCES += ../../shared/include/cache_.h
 libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m32c/m32cbsp/headers.am
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/configure.ac b/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
index 83bc49e..2037af8 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
+++ b/c/src/lib/libbsp/m32c/m32cbsp/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m32c-m32csim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/m32csim.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/m32c/m32cbsp/preinstall.am b/c/src/lib/libbsp/m32c/m32cbsp/preinstall.am
deleted file mode 100644
index 67ab64c..0000000
--- a/c/src/lib/libbsp/m32c/m32cbsp/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)/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_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.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/moxie/moxiesim/bsp_specs b/c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/moxie/moxiesim/bsp_specs
rename to c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am
index e03929f..4beada2 100644
--- a/c/src/lib/libbsp/m68k/Makefile.am
+++ b/c/src/lib/libbsp/m68k/Makefile.am
@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## Descend into the @RTEMS_BSP_FAMILY@ directory
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = shared/include/linker-symbols.h
-
 dist_project_lib_DATA = shared/startup/linkcmds.base
 
 EXTRA_DIST =
@@ -14,10 +11,8 @@ EXTRA_DIST += shared/start.S
 
 EXTRA_DIST += shared/bspspuriousinit.c shared/m68000spurious.c
 
-include_HEADERS = shared/mvme/mvme16x_hw.h
-
 EXTRA_DIST += shared/gdbstub/m68k-stub.c shared/gdbstub/gdb_if.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/m68k/headers.am
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index 6e9ed76..a3d051a 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -4,15 +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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,7 @@ start.$(OBJEXT): 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 =
@@ -59,5 +52,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/av5282/headers.am
diff --git a/c/src/lib/libbsp/m68k/av5282/configure.ac b/c/src/lib/libbsp/m68k/av5282/configure.ac
index 7282407..4d5e885 100644
--- a/c/src/lib/libbsp/m68k/av5282/configure.ac
+++ b/c/src/lib/libbsp/m68k/av5282/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-av5282],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/av5282.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/m68k/av5282/preinstall.am b/c/src/lib/libbsp/m68k/av5282/preinstall.am
deleted file mode 100644
index 0bdb655..0000000
--- a/c/src/lib/libbsp/m68k/av5282/preinstall.am
+++ /dev/null
@@ -1,63 +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)/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/riscv/riscv_generic/bsp_specs b/c/src/lib/libbsp/m68k/av5282/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/riscv/riscv_generic/bsp_specs
rename to c/src/lib/libbsp/m68k/av5282/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/configure.ac b/c/src/lib/libbsp/m68k/configure.ac
index 4f26893..8c5e064 100644
--- a/c/src/lib/libbsp/m68k/configure.ac
+++ b/c/src/lib/libbsp/m68k/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([shared])
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index 70278e7..ce4afb1 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -24,7 +16,7 @@ start.$(OBJEXT): 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 =
@@ -51,5 +43,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \
     ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/csb360/headers.am
diff --git a/c/src/lib/libbsp/m68k/csb360/configure.ac b/c/src/lib/libbsp/m68k/csb360/configure.ac
index f2611c5..74cdcde 100644
--- a/c/src/lib/libbsp/m68k/csb360/configure.ac
+++ b/c/src/lib/libbsp/m68k/csb360/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-csb360],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/csb360.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/m68k/csb360/preinstall.am b/c/src/lib/libbsp/m68k/csb360/preinstall.am
deleted file mode 100644
index 67ab64c..0000000
--- a/c/src/lib/libbsp/m68k/csb360/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)/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_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.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/or1k/generic_or1k/bsp_specs b/c/src/lib/libbsp/m68k/csb360/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/or1k/generic_or1k/bsp_specs
rename to c/src/lib/libbsp/m68k/csb360/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index 58c75f7..bbb1f63 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -4,30 +4,18 @@ 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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-include_HEADERS += include/m340uart.h
-include_HEADERS += include/m340timer.h
-include_HEADERS += include/m68340.h
-include_HEADERS += include/m68340.inc
-include_HEADERS += include/m68349.inc
 
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): 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 =
@@ -53,5 +41,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/gen68340/headers.am
diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.ac b/c/src/lib/libbsp/m68k/gen68340/configure.ac
index 6a13816..a984f2d 100644
--- a/c/src/lib/libbsp/m68k/gen68340/configure.ac
+++ b/c/src/lib/libbsp/m68k/gen68340/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-gen68340],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gen68340.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/m68k/gen68340/preinstall.am b/c/src/lib/libbsp/m68k/gen68340/preinstall.am
deleted file mode 100644
index d4174d0..0000000
--- a/c/src/lib/libbsp/m68k/gen68340/preinstall.am
+++ /dev/null
@@ -1,83 +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)/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_INCLUDE)/m340uart.h: include/m340uart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m340uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340uart.h
-
-$(PROJECT_INCLUDE)/m340timer.h: include/m340timer.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m340timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340timer.h
-
-$(PROJECT_INCLUDE)/m68340.h: include/m68340.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68340.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.h
-
-$(PROJECT_INCLUDE)/m68340.inc: include/m68340.inc $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68340.inc
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.inc
-
-$(PROJECT_INCLUDE)/m68349.inc: include/m68349.inc $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68349.inc
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68349.inc
-
-$(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/m68k/uC5282/bsp_specs b/c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/uC5282/bsp_specs
rename to c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index a134d79..9bb4369 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -4,25 +4,21 @@ 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
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmds.prom \
-    startup/linkcmds.bootp
 
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.bootp
+dist_project_lib_DATA += startup/linkcmds.prom
+
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
@@ -60,5 +56,5 @@ if HAS_FPSP
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/gen68360/headers.am
diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac
index 965e491..5a0e72c 100644
--- a/c/src/lib/libbsp/m68k/gen68360/configure.ac
+++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-gen68360],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/gen68360.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/m68k/gen68360/preinstall.am b/c/src/lib/libbsp/m68k/gen68360/preinstall.am
deleted file mode 100644
index 17d061f..0000000
--- a/c/src/lib/libbsp/m68k/gen68360/preinstall.am
+++ /dev/null
@@ -1,71 +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)/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)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.prom: startup/linkcmds.prom $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.prom
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.prom
-
-$(PROJECT_LIB)/linkcmds.bootp: startup/linkcmds.bootp $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.bootp
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.bootp
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs b/c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/nios2/nios2_iss/bsp_specs
rename to c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 6259ced..fd9eac0 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -4,18 +4,7 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
+dist_project_lib_DATA = startup/bsp_specs
 
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
@@ -26,16 +15,14 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA = bsp_specs
-dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash
+project_lib_DATA += linkcmds
 dist_project_lib_DATA += startup/linkcmds.COBRA5475
 dist_project_lib_DATA += startup/linkcmds.m5484FireEngine
-
-project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # startup
 libbsp_a_SOURCES += \
@@ -82,5 +69,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/genmcf548x/headers.am
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
index ce1804c..d7ec670 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
+++ b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-genmcf548x],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/COBRA5475.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])
@@ -43,7 +46,6 @@ RTEMS_BSPOPTS_HELP([HAS_LOW_LEVEL_INIT],
 [If defined, we will do all the low level init of the chip (like bus/memory...).])
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
deleted file mode 100644
index 7308faf..0000000
--- a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
+++ /dev/null
@@ -1,87 +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.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/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/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_LIB)/linkcmds.m5484FireEngine.flash: startup/linkcmds.m5484FireEngine.flash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash
-
-$(PROJECT_LIB)/linkcmds.COBRA5475: startup/linkcmds.COBRA5475 $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.COBRA5475
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.COBRA5475
-
-$(PROJECT_LIB)/linkcmds.m5484FireEngine: startup/linkcmds.m5484FireEngine $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs b/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147s/bsp_specs
rename to c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 9093707..7e0c389 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -4,23 +4,12 @@ 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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 _SUBDIRS = . tools
 
-include_HEADERS += include/i2c.h
-include_HEADERS += include/i2cdrv.h
-include_HEADERS += include/ds1307.h
-include_HEADERS += include/nvram.h
 
 EXTRA_DIST += times
 
@@ -29,8 +18,10 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds startup/gdbinit \
-    startup/linkcmds.flash
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.flash
+
+dist_project_lib_DATA += startup/gdbinit
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -64,5 +55,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5206/timer.rel \
     ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf5206elite/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
index 5c46002..ccb3625 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf5206elite.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/m68k/mcf5206elite/preinstall.am b/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am
deleted file mode 100644
index c08f87d..0000000
--- a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am
+++ /dev/null
@@ -1,87 +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)/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_INCLUDE)/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2c.h
-
-$(PROJECT_INCLUDE)/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cdrv.h
-
-$(PROJECT_INCLUDE)/ds1307.h: include/ds1307.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ds1307.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ds1307.h
-
-$(PROJECT_INCLUDE)/nvram.h: include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.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
-
-$(PROJECT_LIB)/gdbinit: startup/gdbinit $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/gdbinit
-PREINSTALL_FILES += $(PROJECT_LIB)/gdbinit
-
-$(PROJECT_LIB)/linkcmds.flash: startup/linkcmds.flash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.flash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.flash
-
diff --git a/c/src/lib/libbsp/mips/rbtx4938/bsp_specs b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4938/bsp_specs
rename to c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac
index 39e9682..c2654a5 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/tools/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5206elite-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([runtest])
 RTEMS_TOP(../../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
 AM_MAINTAINER_MODE
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index e1e8409..5c51afe 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -4,15 +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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,7 @@ start.$(OBJEXT): 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 =
@@ -50,5 +43,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5223x/cachepd.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf52235/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf52235/configure.ac b/c/src/lib/libbsp/m68k/mcf52235/configure.ac
index 3054b0d..da0b172 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf52235/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf52235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf52235.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/m68k/mcf52235/preinstall.am b/c/src/lib/libbsp/m68k/mcf52235/preinstall.am
deleted file mode 100644
index 0bdb655..0000000
--- a/c/src/lib/libbsp/m68k/mcf52235/preinstall.am
+++ /dev/null
@@ -1,63 +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)/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/m68k/mvme147/bsp_specs b/c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme147/bsp_specs
rename to c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index e753379..b33adc2 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -4,15 +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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,7 @@ start.$(OBJEXT): 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 = \
@@ -45,5 +38,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mcf5225x/cachepd.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf5225x/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
index 4a7371f..fab934b 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5225x/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-dpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf5225x.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/m68k/mcf5225x/preinstall.am b/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am
deleted file mode 100644
index 0bdb655..0000000
--- a/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am
+++ /dev/null
@@ -1,63 +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)/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/m68k/mcf5235/bsp_specs b/c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5235/bsp_specs
rename to c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index 95de41c..8a90278 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -4,26 +4,21 @@ 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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash \
-    startup/linkcmdsram
-
 EXTRA_DIST += start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmdsflash
+dist_project_lib_DATA += startup/linkcmdsram
+
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 
@@ -60,5 +55,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf5235/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5235/configure.ac b/c/src/lib/libbsp/m68k/mcf5235/configure.ac
index 82df518..07838cd 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5235/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf5235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf5235.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/m68k/mcf5235/preinstall.am b/c/src/lib/libbsp/m68k/mcf5235/preinstall.am
deleted file mode 100644
index 1f590e7..0000000
--- a/c/src/lib/libbsp/m68k/mcf5235/preinstall.am
+++ /dev/null
@@ -1,71 +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)/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)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmdsflash: startup/linkcmdsflash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsflash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsflash
-
-$(PROJECT_LIB)/linkcmdsram: startup/linkcmdsram $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsram
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsram
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/bsp_specs b/c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5225x/bsp_specs
rename to c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index 49595e9..b6527db 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -4,15 +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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -22,7 +15,8 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmdsflash
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -61,5 +55,5 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mcf5329/headers.am
diff --git a/c/src/lib/libbsp/m68k/mcf5329/configure.ac b/c/src/lib/libbsp/m68k/mcf5329/configure.ac
index ca49b5e..99eb6f5 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/configure.ac
+++ b/c/src/lib/libbsp/m68k/mcf5329/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mcf52235],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mcf5329.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/m68k/mcf5329/preinstall.am b/c/src/lib/libbsp/m68k/mcf5329/preinstall.am
deleted file mode 100644
index c521ac7..0000000
--- a/c/src/lib/libbsp/m68k/mcf5329/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)/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
-
-$(PROJECT_LIB)/linkcmdsflash: startup/linkcmdsflash $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmdsflash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmdsflash
-
diff --git a/c/src/lib/libbsp/mips/rbtx4925/bsp_specs b/c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4925/bsp_specs
rename to c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 0d06bea..0cd22f2 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -4,19 +4,10 @@ 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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
-include_HEADERS += include/mrm332.h
-
 EXTRA_DIST += times
 
 EXTRA_DIST += start/start.S
@@ -24,7 +15,7 @@ start.$(OBJEXT): 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 =
@@ -51,5 +42,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/misc.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mrm332/headers.am
diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac
index a00483f..c8fb1c1 100644
--- a/c/src/lib/libbsp/m68k/mrm332/configure.ac
+++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mrm332.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/m68k/mrm332/preinstall.am b/c/src/lib/libbsp/m68k/mrm332/preinstall.am
deleted file mode 100644
index 7bf1c01..0000000
--- a/c/src/lib/libbsp/m68k/mrm332/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)/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_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.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/mips/malta/bsp_specs b/c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/mips/malta/bsp_specs
rename to c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 2314474..6b1ec39 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -4,29 +4,20 @@ 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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
 
 ## Zilog component header files
-include_rtems_zilogdir = $(includedir)/rtems/zilog
-include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h
 
 EXTRA_DIST += ../../m68k/shared/start/start.S
 start.$(OBJEXT): ../../m68k/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 =
@@ -52,5 +43,5 @@ libbsp_a_LIBADD = \
 
 EXTRA_DIST += times
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme147/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme147/configure.ac b/c/src/lib/libbsp/m68k/mvme147/configure.ac
index e6b583d..eaec21f 100644
--- a/c/src/lib/libbsp/m68k/mvme147/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme147/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/mvme147.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/m68k/mvme147/preinstall.am b/c/src/lib/libbsp/m68k/mvme147/preinstall.am
deleted file mode 100644
index a7c23bb..0000000
--- a/c/src/lib/libbsp/m68k/mvme147/preinstall.am
+++ /dev/null
@@ -1,72 +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) $<