[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) $< $(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)/rtems/zilog/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
- @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.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/mcf52235/bsp_specs b/c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf52235/bsp_specs
rename to c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index 1e663ce..c4d5f5f 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/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 =
@@ -60,5 +51,5 @@ libbsp_a_LIBADD = \
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme147s/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac
index 86dc3b4..14f9a8b 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147s],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/mvme147s.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/mvme147s/preinstall.am b/c/src/lib/libbsp/m68k/mvme147s/preinstall.am
deleted file mode 100644
index a7c23bb..0000000
--- a/c/src/lib/libbsp/m68k/mvme147s/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) $< $(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)/rtems/zilog/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
- @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.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/genmcf548x/bsp_specs b/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/genmcf548x/bsp_specs
rename to c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 2ea3f52..9ecf9f5 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -4,30 +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/page_table.h
-
## Zilog component header files
-include_rtems_zilogdir = $(includedir)/rtems/zilog
-include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.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 =
@@ -71,5 +60,5 @@ endif
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme162/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac
index f3ade4e..aef4298 100644
--- a/c/src/lib/libbsp/m68k/mvme162/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme162],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/mvme162.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/mvme162/preinstall.am b/c/src/lib/libbsp/m68k/mvme162/preinstall.am
deleted file mode 100644
index fe2fdb9..0000000
--- a/c/src/lib/libbsp/m68k/mvme162/preinstall.am
+++ /dev/null
@@ -1,76 +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)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
-
-$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
- @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: ../../shared/include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.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/jmr3904/bsp_specs b/c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/mips/jmr3904/bsp_specs
rename to c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index a295731..fdea7cb 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -4,26 +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/page_table.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 =
@@ -63,5 +55,5 @@ endif
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme167/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.ac b/c/src/lib/libbsp/m68k/mvme167/configure.ac
index d93f1b4..20120fc 100644
--- a/c/src/lib/libbsp/m68k/mvme167/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme167/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme167],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/mvme167.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/mvme167/preinstall.am b/c/src/lib/libbsp/m68k/mvme167/preinstall.am
deleted file mode 100644
index 60f6c0b..0000000
--- a/c/src/lib/libbsp/m68k/mvme167/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)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.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/hurricane/bsp_specs b/c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/bsp_specs
rename to c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/preinstall.am b/c/src/lib/libbsp/m68k/preinstall.am
deleted file mode 100644
index 2e2ec9e..0000000
--- a/c/src/lib/libbsp/m68k/preinstall.am
+++ /dev/null
@@ -1,42 +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)/$(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/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_INCLUDE)/mvme16x_hw.h: shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
-
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 86b7595..5572d3f 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/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 =
@@ -57,5 +50,5 @@ if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/uC5282/headers.am
diff --git a/c/src/lib/libbsp/m68k/uC5282/configure.ac b/c/src/lib/libbsp/m68k/uC5282/configure.ac
index a01db32..3025976 100644
--- a/c/src/lib/libbsp/m68k/uC5282/configure.ac
+++ b/c/src/lib/libbsp/m68k/uC5282/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-m68k-uC5282],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/uC5282.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/uC5282/preinstall.am b/c/src/lib/libbsp/m68k/uC5282/preinstall.am
deleted file mode 100644
index 0bdb655..0000000
--- a/c/src/lib/libbsp/m68k/uC5282/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/gen68340/bsp_specs b/c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68340/bsp_specs
rename to c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/Makefile.am b/c/src/lib/libbsp/mips/Makefile.am
index 5264530..6d42748 100644
--- a/c/src/lib/libbsp/mips/Makefile.am
+++ b/c/src/lib/libbsp/mips/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/mips/headers.am
diff --git a/c/src/lib/libbsp/mips/configure.ac b/c/src/lib/libbsp/mips/configure.ac
index 8197370..288be9e 100644
--- a/c/src/lib/libbsp/mips/configure.ac
+++ b/c/src/lib/libbsp/mips/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([csb350])
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/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index 33ec193..fba96dc 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -4,21 +4,9 @@ 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 = ../shared/liblnk/regs.h
#isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.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 +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 =
@@ -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/mips/csb350/headers.am
diff --git a/c/src/lib/libbsp/mips/csb350/configure.ac b/c/src/lib/libbsp/mips/csb350/configure.ac
index ba49c66..ca7f3dc 100644
--- a/c/src/lib/libbsp/mips/csb350/configure.ac
+++ b/c/src/lib/libbsp/mips/csb350/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-mips-csb350],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/csb350.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/mips/csb350/preinstall.am b/c/src/lib/libbsp/mips/csb350/preinstall.am
deleted file mode 100644
index 71be6d1..0000000
--- a/c/src/lib/libbsp/mips/csb350/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)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.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_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/mips/csb350/bsp_specs b/c/src/lib/libbsp/mips/csb350/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/mips/csb350/bsp_specs
rename to c/src/lib/libbsp/mips/csb350/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index c675d9f..a634a84 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -4,21 +4,9 @@ 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/usc.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
#isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
@@ -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 =
@@ -71,5 +59,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rm52xx/timer.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/hurricane/headers.am
diff --git a/c/src/lib/libbsp/mips/hurricane/configure.ac b/c/src/lib/libbsp/mips/hurricane/configure.ac
index e66e8d2..99d16d9 100644
--- a/c/src/lib/libbsp/mips/hurricane/configure.ac
+++ b/c/src/lib/libbsp/mips/hurricane/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-mips-hurricane],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/hurricane.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/mips/hurricane/preinstall.am b/c/src/lib/libbsp/mips/hurricane/preinstall.am
deleted file mode 100644
index 8ad1e3f..0000000
--- a/c/src/lib/libbsp/mips/hurricane/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)/usc.h: include/usc.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/usc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/usc.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.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_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/mvme167/bsp_specs b/c/src/lib/libbsp/mips/hurricane/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme167/bsp_specs
rename to c/src/lib/libbsp/mips/hurricane/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 6e5154d..5d599cf 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -4,21 +4,9 @@ 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 = ../shared/liblnk/regs.h
#isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.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
@@ -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 =
@@ -62,5 +50,5 @@ libbsp_a_SOURCES += ../shared/irq/interruptmask.c
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/jmr3904/headers.am
diff --git a/c/src/lib/libbsp/mips/jmr3904/configure.ac b/c/src/lib/libbsp/mips/jmr3904/configure.ac
index edd2420..7fc9bbd 100644
--- a/c/src/lib/libbsp/mips/jmr3904/configure.ac
+++ b/c/src/lib/libbsp/mips/jmr3904/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-mips-jmr3904],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/jmr3904.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/mips/jmr3904/preinstall.am b/c/src/lib/libbsp/mips/jmr3904/preinstall.am
deleted file mode 100644
index 71be6d1..0000000
--- a/c/src/lib/libbsp/mips/jmr3904/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)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.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_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/m68k/mvme162/bsp_specs b/c/src/lib/libbsp/mips/jmr3904/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme162/bsp_specs
rename to c/src/lib/libbsp/mips/jmr3904/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index b73ce85..38b902c 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -7,23 +7,11 @@ 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 = ../shared/liblnk/regs.h
#isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
#pci
-include_bsp_HEADERS += include/pci.h
#irq
-include_bsp_HEADERS += ../shared/irq/i8259.h
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
@@ -32,7 +20,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 =
@@ -85,5 +73,5 @@ libbsp_a_SOURCES += irq/vectorisrs.c
libbsp_a_SOURCES += irq/interruptmask.c
libbsp_a_SOURCES += ../shared/irq/i8259.c
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/malta/headers.am
diff --git a/c/src/lib/libbsp/mips/malta/configure.ac b/c/src/lib/libbsp/mips/malta/configure.ac
index 248734f..6633da1 100644
--- a/c/src/lib/libbsp/mips/malta/configure.ac
+++ b/c/src/lib/libbsp/mips/malta/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-mips-malta],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/malta.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/mips/malta/preinstall.am b/c/src/lib/libbsp/mips/malta/preinstall.am
deleted file mode 100644
index e725a6b..0000000
--- a/c/src/lib/libbsp/mips/malta/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/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.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_INCLUDE)/bsp/pci.h: include/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/i8259.h: ../shared/irq/i8259.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i8259.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i8259.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/mrm332/bsp_specs b/c/src/lib/libbsp/mips/malta/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mrm332/bsp_specs
rename to c/src/lib/libbsp/mips/malta/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index b4ba01b..3ea41e4 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -4,20 +4,9 @@ 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 = ../shared/liblnk/regs.h
#isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
@@ -28,7 +17,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 =
@@ -70,5 +59,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/rbtx4925/headers.am
diff --git a/c/src/lib/libbsp/mips/rbtx4925/configure.ac b/c/src/lib/libbsp/mips/rbtx4925/configure.ac
index fe8eaac..b99751d 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/configure.ac
+++ b/c/src/lib/libbsp/mips/rbtx4925/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-mips-rbtx4925],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/rbtx4925.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/mips/rbtx4925/preinstall.am b/c/src/lib/libbsp/mips/rbtx4925/preinstall.am
deleted file mode 100644
index 5cb075c..0000000
--- a/c/src/lib/libbsp/mips/rbtx4925/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)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.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_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/mcf5329/bsp_specs b/c/src/lib/libbsp/mips/rbtx4925/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5329/bsp_specs
rename to c/src/lib/libbsp/mips/rbtx4925/startup/bsp_specs
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index b4ba01b..3a8443a 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -4,20 +4,9 @@ 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 = ../shared/liblnk/regs.h
#isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
@@ -28,7 +17,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 =
@@ -70,5 +59,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/rbtx4938/headers.am
diff --git a/c/src/lib/libbsp/mips/rbtx4938/configure.ac b/c/src/lib/libbsp/mips/rbtx4938/configure.ac
index 9d3ce56..e48c697 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/configure.ac
+++ b/c/src/lib/libbsp/mips/rbtx4938/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-mips-rbtx4938],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/rbtx4938.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/mips/rbtx4938/preinstall.am b/c/src/lib/libbsp/mips/rbtx4938/preinstall.am
deleted file mode 100644
index 5cb075c..0000000
--- a/c/src/lib/libbsp/mips/rbtx4938/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)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.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_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/mcf5206elite/bsp_specs b/c/src/lib/libbsp/mips/rbtx4938/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/bsp_specs
rename to c/src/lib/libbsp/mips/rbtx4938/startup/bsp_specs
diff --git a/c/src/lib/libbsp/moxie/configure.ac b/c/src/lib/libbsp/moxie/configure.ac
index 7aca328..ac8468f 100644
--- a/c/src/lib/libbsp/moxie/configure.ac
+++ b/c/src/lib/libbsp/moxie/configure.ac
@@ -6,6 +6,8 @@ AC_PREREQ(2.60)
AC_INIT([rtems-c-src-lib-libbsp-moxie],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([moxiesim])
RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define foreign 1.10])
diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index a986285..60d4678 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -8,16 +8,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
@@ -26,7 +18,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 =
@@ -54,5 +46,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/moxie/moxiesim/headers.am
diff --git a/c/src/lib/libbsp/moxie/moxiesim/configure.ac b/c/src/lib/libbsp/moxie/moxiesim/configure.ac
index aeb95b0..23dda64 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/configure.ac
+++ b/c/src/lib/libbsp/moxie/moxiesim/configure.ac
@@ -6,6 +6,9 @@ AC_PREREQ(2.60)
AC_INIT([rtems-c-src-lib-libbsp-moxie-moxiesim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/moxiesim.cfg])
RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
diff --git a/c/src/lib/libbsp/moxie/moxiesim/preinstall.am b/c/src/lib/libbsp/moxie/moxiesim/preinstall.am
deleted file mode 100644
index 67ab64c..0000000
--- a/c/src/lib/libbsp/moxie/moxiesim/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/m32c/m32cbsp/bsp_specs b/c/src/lib/libbsp/moxie/moxiesim/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m32c/m32cbsp/bsp_specs
rename to c/src/lib/libbsp/moxie/moxiesim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/nios2/configure.ac b/c/src/lib/libbsp/nios2/configure.ac
index b6f084b..ae0c31c 100644
--- a/c/src/lib/libbsp/nios2/configure.ac
+++ b/c/src/lib/libbsp/nios2/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([nios2_iss])
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/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index dcaa894..b3f6675 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
-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
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
DISTCLEANFILES = include/bspopts.h
@@ -26,11 +18,11 @@ crtnn.$(OBJEXT): start/crtnn.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT) crtnn.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
# startup
libbsp_a_SOURCES += ../../shared/bspclean.c
@@ -54,5 +46,5 @@ libbsp_a_SOURCES += timer/timer.c
# Cache
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/nios2/nios2_iss/headers.am
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
index 3f0a261..2dd6eb2 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
+++ b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-nios2-nios2_iss],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/nios2_iss.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/nios2/nios2_iss/preinstall.am b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am
deleted file mode 100644
index 5f3e9a1..0000000
--- a/c/src/lib/libbsp/nios2/nios2_iss/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_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(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/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)/crtnn.$(OBJEXT): crtnn.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/crtnn.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/crtnn.$(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/gen68360/bsp_specs b/c/src/lib/libbsp/nios2/nios2_iss/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/gen68360/bsp_specs
rename to c/src/lib/libbsp/nios2/nios2_iss/startup/bsp_specs
diff --git a/c/src/lib/libbsp/no_cpu/configure.ac b/c/src/lib/libbsp/no_cpu/configure.ac
index b2feaa9..cf347b4 100644
--- a/c/src/lib/libbsp/no_cpu/configure.ac
+++ b/c/src/lib/libbsp/no_cpu/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-no_cpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([no_bsp])
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/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
index c92c13f..339870f 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -4,20 +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
noinst_PROGRAMS =
-
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA = linkcmds
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -42,5 +34,5 @@ libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/no_cpu/no_bsp/headers.am
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac b/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
index 1c8fb3c..f391643 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-no_cpu-no_bsp],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/no_bsp.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/no_cpu/no_bsp/preinstall.am b/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am
deleted file mode 100644
index e9ea130..0000000
--- a/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am
+++ /dev/null
@@ -1,54 +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)/$(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
-
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs
rename to c/src/lib/libbsp/no_cpu/no_bsp/startup/bsp_specs
diff --git a/c/src/lib/libbsp/or1k/Makefile.am b/c/src/lib/libbsp/or1k/Makefile.am
index 6d6feb2..8f3cbcb 100644
--- a/c/src/lib/libbsp/or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/Makefile.am
@@ -5,6 +5,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
## 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/or1k/headers.am
diff --git a/c/src/lib/libbsp/or1k/configure.ac b/c/src/lib/libbsp/or1k/configure.ac
index e809e40..e3ee8ad 100644
--- a/c/src/lib/libbsp/or1k/configure.ac
+++ b/c/src/lib/libbsp/or1k/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-or1k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([generic_or1k])
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/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index 0153915..d5a4b74 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -10,34 +10,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_bsp_HEADERS =
-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/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/cache_.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/uart.h
-include_bsp_HEADERS += include/generic_or1k.h
-
-nodist_include_HEADERS = include/bspopts.h
-
###############################################################################
# Data #
###############################################################################
@@ -47,8 +25,8 @@ start.$(OBJEXT): 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
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
###############################################################################
# LibBSP #
@@ -57,7 +35,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 =
# Startup
@@ -104,5 +82,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
DISTCLEANFILES = include/bspopts.h
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/or1k/generic_or1k/headers.am
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
index a24e219..d519fc4 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
+++ b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
@@ -8,6 +8,9 @@ AC_PREREQ(2.69)
AC_INIT([rtems-c-src-lib-libbsp-or1k-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/generic_or1k.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])
@@ -24,7 +27,6 @@ RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am b/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am
deleted file mode 100644
index c11fdb9..0000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am
+++ /dev/null
@@ -1,116 +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/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/cache_.h: ../shared/include/cache_.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cache_.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cache_.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/generic_or1k.h: include/generic_or1k.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/generic_or1k.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/generic_or1k.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
-
-$(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/m68k/csb360/bsp_specs b/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/csb360/bsp_specs
rename to c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs
diff --git a/c/src/lib/libbsp/or1k/preinstall.am b/c/src/lib/libbsp/or1k/preinstall.am
deleted file mode 100644
index dba6cc4..0000000
--- a/c/src/lib/libbsp/or1k/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/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am
index b28f6d5..eb48279 100644
--- a/c/src/lib/libbsp/powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/Makefile.am
@@ -69,3 +69,4 @@ EXTRA_DIST += shared/vme/vmeconfig.c \
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/powerpc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index d0eafbf..c51965b 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -8,21 +8,13 @@ noinst_PROGRAMS =
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
project_lib_DATA =
#include
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_HEADERS += include/tm27.h
DISTCLEANFILES += include/bspopts.h
-include_bsp_HEADERS =
-
#start
EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
@@ -50,8 +42,8 @@ project_lib_DATA += motld_start.$(OBJEXT)
#startup
+project_lib_DATA += linkcmds
dist_project_lib_DATA += ../shared/startup/linkcmds.share
-dist_project_lib_DATA += startup/linkcmds
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -69,15 +61,10 @@ libbsp_a_SOURCES += startup/bspstart.c \
startup/bspclean.c \
../../shared/gnatinstallhandler.c
-include_bsp_HEADERS += ../shared/motorola/vpd.h
-
#pclock
libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
#console
-include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h
-include_bsp_HEADERS += ../../powerpc/shared/console/uart.h
-
libbsp_a_SOURCES += \
../../powerpc/shared/console/uart.c \
../../powerpc/shared/console/console.c \
@@ -85,43 +72,22 @@ libbsp_a_SOURCES += \
../../powerpc/shared/console/uart.h
#irq
-include_bsp_HEADERS += irq/irq.h
-
libbsp_a_SOURCES += irq/irq_init.c irq/discovery_pic.c
#marvell
-include_bsp_HEADERS += marvell/gtreg.h marvell/gtintrreg.h \
- marvell/gti2creg.h marvell/gti2c_busdrv.h marvell/gt_timer.h \
- marvell/gtpcireg.h
-
libbsp_a_SOURCES += marvell/discovery.c marvell/gti2c.c marvell/gt_timer.c
#flash
-include_bsp_HEADERS += ../shared/flash/flashPgm.h
-include_bsp_HEADERS += ../shared/flash/flashPgmPvt.h
-
libbsp_a_SOURCES += ../shared/flash/flash.c \
../shared/flash/intelFlash.c \
flash/flashcfg.c
#pci
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
-
libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
pci/gt_pci_init.c pci/pci_io_remap.c pci/motload_fixup.c \
../../powerpc/shared/pci/pcifinddevice.c
#vme
-include_bsp_HEADERS += vme/VMEConfig.h \
- ../../shared/vmeUniverse/vmeUniverse.h \
- ../../shared/vmeUniverse/vmeUniverseDMA.h \
- ../../shared/vmeUniverse/vme_am_defs.h \
- ../../shared/vmeUniverse/vmeTsi148.h \
- ../../shared/vmeUniverse/vmeTsi148DMA.h \
- ../../shared/vmeUniverse/bspVmeDmaList.h \
- ../../shared/vmeUniverse/VME.h \
- ../../shared/vmeUniverse/VMEDMA.h
-
libbsp_a_SOURCES += ../shared/vme/vmeconfig.c \
../shared/vme/vme_universe.c \
../../shared/vmeUniverse/vmeUniverse.c \
@@ -130,17 +96,12 @@ libbsp_a_SOURCES += ../shared/vme/vmeconfig.c \
#network
if HAS_NETWORKING
-include_bsp_HEADERS += network/support/early_enet_link_status.h \
- network/support/bsp_bsdnet_attach.h
-
noinst_PROGRAMS += network_support.rel
network_support_rel_SOURCES = network/support/early_link_status.c \
network/support/bsp_attach.c
network_support_rel_CPPFLAGS = $(AM_CPPFLAGS)
network_support_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_bsp_HEADERS += network/if_mve/if_mve_pub.h
-
noinst_PROGRAMS += network_if_mve_tmp.rel
network_if_mve_tmp_rel_SOURCES = network/if_mve/mv643xx_eth.c
network_if_mve_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) -DDISABLE_DETACHING
@@ -169,8 +130,6 @@ network_if_mve.rel: network_if_mve_tmp.rel
-G mveth_serial_ctrl_config_val \
$^ $@
-include_bsp_HEADERS += network/if_gfe/if_gfe_pub.h
-
noinst_PROGRAMS += network_if_gfe_tmp.rel
network_if_gfe_tmp_rel_SOURCES = network/if_gfe/if_gfe.c network/if_gfe/if_gfe_rtems.c
network_if_gfe_tmp_rel_CPPFLAGS = $(AM_CPPFLAGS) \
@@ -186,8 +145,6 @@ network_if_gfe.rel: network_if_gfe_tmp.rel
$^ $@
-include_bsp_HEADERS += network/if_em/if_em_pub.h
-
noinst_PROGRAMS += network_if_em_tmp.rel
network_if_em_tmp_rel_SOURCES = network/if_em/if_em.c \
network/if_em/if_em_hw.c \
@@ -224,5 +181,5 @@ endif
EXTRA_DIST += README LICENSE
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/beatnik/headers.am
diff --git a/c/src/lib/libbsp/powerpc/beatnik/configure.ac b/c/src/lib/libbsp/powerpc/beatnik/configure.ac
index 82c73b0..2c6a813 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/configure.ac
+++ b/c/src/lib/libbsp/powerpc/beatnik/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-beatnik],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/beatnik.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/powerpc/beatnik/preinstall.am b/c/src/lib/libbsp/powerpc/beatnik/preinstall.am
deleted file mode 100644
index aaf5448..0000000
--- a/c/src/lib/libbsp/powerpc/beatnik/preinstall.am
+++ /dev/null
@@ -1,180 +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)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/motld_start.$(OBJEXT): motld_start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/motld_start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/motld_start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/vpd.h: ../shared/motorola/vpd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vpd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vpd.h
-
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.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
-
-$(PROJECT_INCLUDE)/bsp/gtreg.h: marvell/gtreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtreg.h
-
-$(PROJECT_INCLUDE)/bsp/gtintrreg.h: marvell/gtintrreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtintrreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtintrreg.h
-
-$(PROJECT_INCLUDE)/bsp/gti2creg.h: marvell/gti2creg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gti2creg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gti2creg.h
-
-$(PROJECT_INCLUDE)/bsp/gti2c_busdrv.h: marvell/gti2c_busdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gti2c_busdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gti2c_busdrv.h
-
-$(PROJECT_INCLUDE)/bsp/gt_timer.h: marvell/gt_timer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gt_timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gt_timer.h
-
-$(PROJECT_INCLUDE)/bsp/gtpcireg.h: marvell/gtpcireg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtpcireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtpcireg.h
-
-$(PROJECT_INCLUDE)/bsp/flashPgm.h: ../shared/flash/flashPgm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/flashPgm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/flashPgm.h
-
-$(PROJECT_INCLUDE)/bsp/flashPgmPvt.h: ../shared/flash/flashPgmPvt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/flashPgmPvt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/flashPgmPvt.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h: ../../shared/vmeUniverse/vmeUniverseDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-
-$(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-
-$(PROJECT_INCLUDE)/bsp/vmeTsi148.h: ../../shared/vmeUniverse/vmeTsi148.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeTsi148.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeTsi148.h
-
-$(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h: ../../shared/vmeUniverse/vmeTsi148DMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h
-
-$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/early_enet_link_status.h: network/support/early_enet_link_status.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/early_enet_link_status.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/early_enet_link_status.h
-
-$(PROJECT_INCLUDE)/bsp/bsp_bsdnet_attach.h: network/support/bsp_bsdnet_attach.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bsp_bsdnet_attach.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bsp_bsdnet_attach.h
-
-$(PROJECT_INCLUDE)/bsp/if_mve_pub.h: network/if_mve/if_mve_pub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_mve_pub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_mve_pub.h
-
-$(PROJECT_INCLUDE)/bsp/if_gfe_pub.h: network/if_gfe/if_gfe_pub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_gfe_pub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_gfe_pub.h
-
-$(PROJECT_INCLUDE)/bsp/if_em_pub.h: network/if_em/if_em_pub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_em_pub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_em_pub.h
-endif
diff --git a/c/src/lib/libbsp/powerpc/beatnik/bsp_specs b/c/src/lib/libbsp/powerpc/beatnik/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/bsp_specs
rename to c/src/lib/libbsp/powerpc/beatnik/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/configure.ac b/c/src/lib/libbsp/powerpc/configure.ac
index bf3947c..2725b86 100644
--- a/c/src/lib/libbsp/powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([qoriq])
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/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 88e8d51..a727020 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -4,18 +4,8 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_bspdir = $(includedir)/bsp
-include_bestcommdir = $(include_bspdir)/bestcomm
-include_bestcomm_includedir = $(include_bestcommdir)/include
-include_bestcomm_include_mgt5200dir = $(include_bestcomm_includedir)/mgt5200
-include_bestcomm_task_apidir = $(include_bestcommdir)/task_api
+dist_project_lib_DATA = startup/bsp_specs
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
@@ -31,14 +21,14 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.brs5l
+dist_project_lib_DATA += startup/linkcmds.brs6l
+dist_project_lib_DATA += startup/linkcmds.dp2
dist_project_lib_DATA += startup/linkcmds.gen5200_base
-project_lib_DATA += startup/linkcmds
-EXTRA_DIST += startup/linkcmds.brs5l
-EXTRA_DIST += startup/linkcmds.brs6l
-EXTRA_DIST += startup/linkcmds.icecube
-EXTRA_DIST += startup/linkcmds.pm520_cr825
-EXTRA_DIST += startup/linkcmds.pm520_ze30
-EXTRA_DIST += startup/linkcmds.dp2
+dist_project_lib_DATA += startup/linkcmds.icecube
+dist_project_lib_DATA += startup/linkcmds.pm520_cr825
+dist_project_lib_DATA += startup/linkcmds.pm520_ze30
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -61,19 +51,6 @@ libbsp_a_SOURCES += bestcomm/include/ppctypes.h \
bestcomm/task_api/bestcomm_api_mem.h bestcomm/task_api/bestcomm_cntrl.h \
bestcomm/task_api/tasksetup_bdtable.h \
bestcomm/task_api/tasksetup_general.h
-include_bestcomm_HEADERS = bestcomm/bestcomm_priv.h \
- bestcomm/dma_image.h \
- bestcomm/dma_image.capi.h \
- bestcomm/bestcomm_api.h \
- bestcomm/bestcomm_glue.h
-include_bestcomm_include_HEADERS = bestcomm/include/ppctypes.h
-include_bestcomm_include_mgt5200_HEADERS = bestcomm/include/mgt5200/mgt5200.h \
- bestcomm/include/mgt5200/sdma.h
-include_bestcomm_task_api_HEADERS = bestcomm/task_api/tasksetup_general.h \
- bestcomm/task_api/tasksetup_bdtable.h \
- bestcomm/task_api/bestcomm_cntrl.h \
- bestcomm/task_api/bestcomm_api_mem.h
-
# clock
# clock
libbsp_a_SOURCES += ../shared/clock/clock.c
@@ -87,24 +64,6 @@ libbsp_a_SOURCES += ide/ata.c
libbsp_a_SOURCES += ide/ata-instance.c
libbsp_a_SOURCES += ide/ata-dma-pio-single.c
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/bootcard.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/u-boot.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../shared/include/u-boot-board-info.h
-include_bsp_HEADERS += include/ata.h
-include_bsp_HEADERS += include/bestcomm.h
-include_bsp_HEADERS += include/bestcomm_ops.h
-include_bsp_HEADERS += include/i2cdrv.h
-include_bsp_HEADERS += include/i2c.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/mpc5200.h
-include_bsp_HEADERS += include/mscan-base.h
-include_bsp_HEADERS += include/u-boot-config.h
-include_bsp_HEADERS += mscan/mscan.h
-
# irq
libbsp_a_SOURCES += include/irq.h \
irq/irq.c \
@@ -117,11 +76,9 @@ libbsp_a_SOURCES += include/irq.h \
# mscan
libbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h
-include_bsp_HEADERS += nvram/nvram.h
# nvram
libbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
-include_bsp_HEADERS += slicetimer/slicetimer.h
# slicetimer
libbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h
@@ -161,5 +118,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/gen5200/headers.am
diff --git a/c/src/lib/libbsp/powerpc/gen5200/configure.ac b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
index 74b7440..b5cf38f 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-gen5200],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/brs5l.cfg])
RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -129,7 +132,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
AC_CONFIG_FILES([Makefile])
RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
RTEMS_PPC_EXCEPTIONS
diff --git a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am b/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
deleted file mode 100644
index 73c986e..0000000
--- a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
+++ /dev/null
@@ -1,207 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
- $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm
- @: > $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/include
- @: > $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200
- @: > $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/task_api
- @: > $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.gen5200_base: startup/linkcmds.gen5200_base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gen5200_base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gen5200_base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h: bestcomm/bestcomm_priv.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h: bestcomm/dma_image.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h: bestcomm/dma_image.capi.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h: bestcomm/bestcomm_api.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h: bestcomm/bestcomm_glue.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h: bestcomm/include/ppctypes.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h: bestcomm/include/mgt5200/mgt5200.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h: bestcomm/include/mgt5200/sdma.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h: bestcomm/task_api/tasksetup_general.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h: bestcomm/task_api/tasksetup_bdtable.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h: bestcomm/task_api/bestcomm_cntrl.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h: bestcomm/task_api/bestcomm_api_mem.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-
-$(PROJECT_INCLUDE)/bsp/ata.h: include/ata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ata.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm.h: include/bestcomm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm.h
-
-$(PROJECT_INCLUDE)/bsp/bestcomm_ops.h: include/bestcomm_ops.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm_ops.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm_ops.h
-
-$(PROJECT_INCLUDE)/bsp/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cdrv.h
-
-$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/mpc5200.h: include/mpc5200.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc5200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc5200.h
-
-$(PROJECT_INCLUDE)/bsp/mscan-base.h: include/mscan-base.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mscan-base.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mscan-base.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-
-$(PROJECT_INCLUDE)/bsp/mscan.h: mscan/mscan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mscan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mscan.h
-
-$(PROJECT_INCLUDE)/bsp/nvram.h: nvram/nvram.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/nvram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/nvram.h
-
-$(PROJECT_INCLUDE)/bsp/slicetimer.h: slicetimer/slicetimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/slicetimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/slicetimer.h
-
diff --git a/c/src/lib/libbsp/powerpc/ss555/bsp_specs b/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/ss555/bsp_specs
rename to c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index d6aaf3c..5f9bad7 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -4,31 +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_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/u-boot.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/tictac.h
-include_bsp_HEADERS += ../shared/include/u-boot-board-info.h
-include_bsp_HEADERS += include/hwreg_vals.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/tsec-config.h
-include_bsp_HEADERS += include/u-boot-config.h
-
noinst_PROGRAMS =
@@ -42,14 +21,14 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds \
- ../shared/startup/linkcmds.base \
- startup/linkcmds.mpc83xx \
- startup/linkcmds.mpc8309som \
- startup/linkcmds.mpc8313erdb \
- startup/linkcmds.br_uid \
- startup/linkcmds.mpc8349eamds \
- startup/linkcmds.hsc_cm01
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.br_uid
+dist_project_lib_DATA += startup/linkcmds.hsc_cm01
+dist_project_lib_DATA += startup/linkcmds.mpc8309som
+dist_project_lib_DATA += startup/linkcmds.mpc8313erdb
+dist_project_lib_DATA += startup/linkcmds.mpc8349eamds
+dist_project_lib_DATA += startup/linkcmds.mpc83xx
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -119,5 +98,5 @@ endif
EXTRA_DIST += README.mpc8349eamds
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/gen83xx/headers.am
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/configure.ac b/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
index 7764d2e..fd96450 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen83xx/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-gen83xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/br_uid.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])
@@ -92,7 +95,6 @@ AC_CONFIG_FILES([Makefile])
RTEMS_BSP_BOOTCARD_OPTIONS
RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
RTEMS_PPC_EXCEPTIONS
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am b/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
deleted file mode 100644
index 69ee597..0000000
--- a/c/src/lib/libbsp/powerpc/gen83xx/preinstall.am
+++ /dev/null
@@ -1,143 +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/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/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/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
-
-$(PROJECT_INCLUDE)/bsp/hwreg_vals.h: include/hwreg_vals.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwreg_vals.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/tsec-config.h: include/tsec-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec-config.h
-
-$(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.mpc83xx: startup/linkcmds.mpc83xx $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc83xx
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc83xx
-
-$(PROJECT_LIB)/linkcmds.mpc8309som: startup/linkcmds.mpc8309som $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc8309som
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc8309som
-
-$(PROJECT_LIB)/linkcmds.mpc8313erdb: startup/linkcmds.mpc8313erdb $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc8313erdb
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc8313erdb
-
-$(PROJECT_LIB)/linkcmds.br_uid: startup/linkcmds.br_uid $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.br_uid
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.br_uid
-
-$(PROJECT_LIB)/linkcmds.mpc8349eamds: startup/linkcmds.mpc8349eamds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc8349eamds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc8349eamds
-
-$(PROJECT_LIB)/linkcmds.hsc_cm01: startup/linkcmds.hsc_cm01 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.hsc_cm01
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.hsc_cm01
-
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/bsp_specs b/c/src/lib/libbsp/powerpc/gen83xx/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen83xx/bsp_specs
rename to c/src/lib/libbsp/powerpc/gen83xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 1a835ad..24b3066 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/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/mmu_405.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
@@ -22,7 +14,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -39,14 +31,10 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \
# dlentry
libbsp_a_SOURCES += dlentry/dlentry.S
-include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \
- ../../powerpc/shared/console/consoleIo.h
# console
libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
../../powerpc/shared/console/console.c
-include_bsp_HEADERS += irq/irq.h
-
# irq
libbsp_a_SOURCES += irq/irq_init.c irq/irq.c
@@ -70,5 +58,5 @@ if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/haleakala/headers.am
diff --git a/c/src/lib/libbsp/powerpc/haleakala/configure.ac b/c/src/lib/libbsp/powerpc/haleakala/configure.ac
index 63111bc..c6b116f 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/configure.ac
+++ b/c/src/lib/libbsp/powerpc/haleakala/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-haleakala],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/haleakala.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/powerpc/haleakala/preinstall.am b/c/src/lib/libbsp/powerpc/haleakala/preinstall.am
deleted file mode 100644
index 81d3386..0000000
--- a/c/src/lib/libbsp/powerpc/haleakala/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)/mmu_405.h: include/mmu_405.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mmu_405.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mmu_405.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)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.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/powerpc/haleakala/bsp_specs b/c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/haleakala/bsp_specs
rename to c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 8196c9d..96ec40e 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -10,20 +10,12 @@ endif
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 += ../../powerpc/shared/include/nvram.h
EXTRA_DIST += ../../powerpc/shared/start/start.S
start.$(OBJEXT): ../../powerpc/shared/start/start.S
@@ -40,8 +32,8 @@ vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += vectors_entry.$(OBJEXT)
+project_lib_DATA += linkcmds
dist_project_lib_DATA += ../shared/startup/linkcmds.share
-dist_project_lib_DATA += startup/linkcmds
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -67,9 +59,6 @@ libbsp_a_SOURCES += ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c
# pclock
libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
-include_bsp_HEADERS = ../../powerpc/shared/console/consoleIo.h
-include_bsp_HEADERS += ../../powerpc/shared/console/uart.h
-
# Needs conditional compilation
polledIO_CPPFLAGS = -DSTATIC_LOG_ALLOC
noinst_PROGRAMS += polledIO.rel
@@ -84,25 +73,20 @@ libbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
libbsp_a_SOURCES += ../../powerpc/shared/console/keyboard.h
libbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
-include_bsp_HEADERS += include/bsp/irq.h
-
# irq
libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c
libbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
libbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c
-include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h
# motorola
libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h
libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c
-include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
# openpic
libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
# pci
libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
libbsp_a_SOURCES += ../../powerpc/shared/pci/detect_raven_bridge.c
@@ -110,20 +94,11 @@ libbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
libbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.h
-include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \
- ../../powerpc/shared/residual/pnp.h
# residual
libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h
libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.h
libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
-include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
- ../../shared/vmeUniverse/vme_am_defs.h \
- ../../shared/vmeUniverse/VME.h \
- include/bsp/VMEConfig.h \
- ../../shared/vmeUniverse/vmeUniverseDMA.h\
- ../../shared/vmeUniverse/bspVmeDmaList.h\
- ../../shared/vmeUniverse/VMEDMA.h
# vme
libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c
libbsp_a_SOURCES += ../../shared/vmeUniverse/bspVmeDmaList.c
@@ -169,6 +144,6 @@ EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \
EXTRA_DIST += README.dec21140
EXTRA_DIST += times.mcp750 times.mvme2307
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
include $(top_srcdir)/../../../../automake/subdirs.am
+include $(srcdir)/../../../../../../bsps/powerpc/motorola_powerpc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
index dd832f0..97f4925 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -23,11 +23,11 @@ bootloader_SOURCES = ../../../powerpc/shared/bootloader/head.S \
# ----
# Remove references to EABI when compiling bootloader
BOOTLOADER_CPU_CFLAGS=$(subst -msdata=eabi,,$(subst -meabi,,$(CPU_CFLAGS)))
-AM_CPPFLAGS = -D__BOOT__
-AM_CFLAGS = $(GCCSPECS) -mrelocatable -msoft-float \
+AM_CPPFLAGS = -D__BOOT__ @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@
+AM_CFLAGS = -mrelocatable -msoft-float \
-mstrict-align -fno-builtin -Wall -mmultiple -mstring -O2 \
-fomit-frame-pointer -ffixed-r13 -mno-sdata $(BOOTLOADER_CPU_CFLAGS)
-AM_CCASFLAGS = $(AM_CPPFLAGS) $(GCCSPECS) \
+AM_CCASFLAGS = $(AM_CPPFLAGS) \
-mrelocatable -DASM $(BOOTLOADER_CPU_CFLAGS)
#
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
index 2670d0d..8dd21e4 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-motorola_powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/mcp750.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/powerpc/motorola_powerpc/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
deleted file mode 100644
index 362a026..0000000
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
+++ /dev/null
@@ -1,143 +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)/nvram.h: ../../powerpc/shared/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)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/vectors_entry.$(OBJEXT): vectors_entry.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/vectors_entry.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/vectors_entry.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.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
-
-$(PROJECT_INCLUDE)/bsp/motorola.h: ../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
-
-$(PROJECT_INCLUDE)/bsp/openpic.h: ../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/residual.h: ../../powerpc/shared/residual/residual.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/residual.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/residual.h
-
-$(PROJECT_INCLUDE)/bsp/pnp.h: ../../powerpc/shared/residual/pnp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pnp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pnp.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-
-$(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: include/bsp/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h: ../../shared/vmeUniverse/vmeUniverseDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-
-$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-
-$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-
-if QEMU
-endif
-if QEMU
-endif
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/bsp_specs b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qemuppc/bsp_specs
rename to c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index fa8eb58..6cf6acc 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -4,11 +4,9 @@ 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
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
@@ -24,47 +22,27 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
project_lib_DATA += rtems_crti.$(OBJEXT)
# Link commands
-project_lib_DATA += startup/linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds.mpc55xx
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
dist_project_lib_DATA += startup/linkcmds.gwlcfm
dist_project_lib_DATA += startup/linkcmds.mpc5566evb
dist_project_lib_DATA += startup/linkcmds.mpc5566evb_spe
-dist_project_lib_DATA += startup/linkcmds.mpc5643l_evb
+dist_project_lib_DATA += startup/linkcmds.mpc55xx
dist_project_lib_DATA += startup/linkcmds.mpc5643l_dpu
-dist_project_lib_DATA += startup/linkcmds.mpc5674fevb
-dist_project_lib_DATA += startup/linkcmds.mpc5674fevb_spe
-dist_project_lib_DATA += startup/linkcmds.phycore_mpc5554
+dist_project_lib_DATA += startup/linkcmds.mpc5643l_evb
dist_project_lib_DATA += startup/linkcmds.mpc5668g
dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508
-dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_boot
dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_app
+dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_boot
+dist_project_lib_DATA += startup/linkcmds.mpc5674fevb
+dist_project_lib_DATA += startup/linkcmds.mpc5674fevb_spe
dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6
dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_base
+dist_project_lib_DATA += startup/linkcmds.phycore_mpc5554
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
-# Includes
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-include_bsp_HEADERS =
-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/utility.h
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += ../shared/include/tictac.h
-include_bsp_HEADERS += include/bsp/irq.h
-include_bsp_HEADERS += include/mpc55xx-config.h
-include_bsp_HEADERS += include/smsc9218i.h
-include_bsp_HEADERS += include/console-esci.h
-include_bsp_HEADERS += include/console-generic.h
-include_bsp_HEADERS += include/console-linflex.h
-
# startup
libbsp_a_SOURCES += ../../shared/bootcard.c
libbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
@@ -141,5 +119,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/mpc55xxevb/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
index caa630e..f32c89e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
@@ -11,6 +11,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-mpc55xxevb],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/gwlcfm.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])
@@ -220,7 +223,6 @@ RTEMS_BSPOPTS_HELP([MPC55XX_ENABLE_START_PROLOGUE],[if defined, enable start pro
AC_CONFIG_FILES([Makefile])
RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
RTEMS_PPC_EXCEPTIONS
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
deleted file mode 100644
index b6238a5..0000000
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
+++ /dev/null
@@ -1,183 +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/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)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: 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
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.mpc55xx: startup/linkcmds.mpc55xx $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc55xx
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc55xx
-
-$(PROJECT_LIB)/linkcmds.gwlcfm: startup/linkcmds.gwlcfm $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gwlcfm
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gwlcfm
-
-$(PROJECT_LIB)/linkcmds.mpc5566evb: startup/linkcmds.mpc5566evb $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5566evb
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5566evb
-
-$(PROJECT_LIB)/linkcmds.mpc5566evb_spe: startup/linkcmds.mpc5566evb_spe $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5566evb_spe
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5566evb_spe
-
-$(PROJECT_LIB)/linkcmds.mpc5643l_evb: startup/linkcmds.mpc5643l_evb $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5643l_evb
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5643l_evb
-
-$(PROJECT_LIB)/linkcmds.mpc5643l_dpu: startup/linkcmds.mpc5643l_dpu $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5643l_dpu
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5643l_dpu
-
-$(PROJECT_LIB)/linkcmds.mpc5674fevb: startup/linkcmds.mpc5674fevb $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674fevb
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674fevb
-
-$(PROJECT_LIB)/linkcmds.mpc5674fevb_spe: startup/linkcmds.mpc5674fevb_spe $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674fevb_spe
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674fevb_spe
-
-$(PROJECT_LIB)/linkcmds.phycore_mpc5554: startup/linkcmds.phycore_mpc5554 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.phycore_mpc5554
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.phycore_mpc5554
-
-$(PROJECT_LIB)/linkcmds.mpc5668g: startup/linkcmds.mpc5668g $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5668g
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5668g
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_ecu508: startup/linkcmds.mpc5674f_ecu508 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_boot: startup/linkcmds.mpc5674f_ecu508_boot $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_boot
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_boot
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_app: startup/linkcmds.mpc5674f_ecu508_app $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_app
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_ecu508_app
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_rsm6: startup/linkcmds.mpc5674f_rsm6 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6
-
-$(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base: startup/linkcmds.mpc5674f_rsm6_base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/irq-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/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/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/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/mpc55xx-config.h: include/mpc55xx-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc55xx-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc55xx-config.h
-
-$(PROJECT_INCLUDE)/bsp/smsc9218i.h: include/smsc9218i.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/smsc9218i.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/smsc9218i.h
-
-$(PROJECT_INCLUDE)/bsp/console-esci.h: include/console-esci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-esci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-esci.h
-
-$(PROJECT_INCLUDE)/bsp/console-generic.h: include/console-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-generic.h
-
-$(PROJECT_INCLUDE)/bsp/console-linflex.h: include/console-linflex.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-linflex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-linflex.h
-
diff --git a/c/src/lib/libbsp/powerpc/psim/bsp_specs b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/psim/bsp_specs
rename to c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 5436770..bd84c6c 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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 =
-
-dist_project_lib_DATA += startup/linkcmds
-
EXTRA_DIST += start/start.S
start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
+project_lib_DATA += linkcmds
+
EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
@@ -39,10 +31,6 @@ libbsp_a_SOURCES += ../shared/clock/clock.c
# console
libbsp_a_SOURCES += console/console.c
-include_bsp_HEADERS = irq/irq.h \
- ../../shared/include/irq-generic.h \
- ../../shared/include/irq-info.h
-
# irq
libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
libbsp_a_SOURCES += ../../shared/src/irq-generic.c
@@ -84,5 +72,5 @@ endif
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/mpc8260ads/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
index b1f1c27..96a4af7 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-mpc8260ads],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/mpc8260ads.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/powerpc/mpc8260ads/preinstall.am b/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
deleted file mode 100644
index 7c3f1a3..0000000
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/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)/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)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_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
-
-$(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
-
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/bsp_specs b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/bsp_specs
rename to c/src/lib/libbsp/powerpc/mpc8260ads/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 83b63c2..a9c1cea 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/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 =
@@ -43,8 +36,8 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
+project_lib_DATA += linkcmds
dist_project_lib_DATA += ../shared/startup/linkcmds.share
-dist_project_lib_DATA += startup/linkcmds
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -64,39 +57,27 @@ libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
# pclock
libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
-include_bsp_HEADERS = ../../powerpc/shared/console/uart.h
# console
libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
../../powerpc/shared/console/console.c \
../../powerpc/shared/console/consoleIo.h \
../../powerpc/shared/console/uart.h
-include_bsp_HEADERS += irq/irq.h
# irq
libbsp_a_SOURCES += irq/irq_init.c \
../../powerpc/shared/irq/openpic_i8259_irq.c
-include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
# openpic
libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \
../../powerpc/shared/openpic/openpic.c \
../../powerpc/shared/openpic/openpic.h
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
# pci
libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
pci/detect_host_bridge.c \
../../powerpc/shared/pci/generic_clear_hberrs.c \
../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h
-include_bsp_HEADERS += vme/VMEConfig.h \
- ../../shared/vmeUniverse/vmeTsi148.h \
- ../../shared/vmeUniverse/vme_am_defs.h \
- ../../shared/vmeUniverse/VME.h \
- ../../shared/vmeUniverse/vmeTsi148DMA.h\
- ../../shared/vmeUniverse/bspVmeDmaList.h\
- ../../shared/vmeUniverse/VMEDMA.h
-
# vme
libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeTsi148.c \
../../shared/vmeUniverse/bspVmeDmaList.c \
@@ -106,23 +87,18 @@ libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeTsi148.c \
../../powerpc/shared/vme/vmeconfig.c \
../../powerpc/shared/vme/vme_universe.c
-include_bsp_HEADERS += ../shared/flash/flashPgm.h \
- ../shared/flash/flashPgmPvt.h
# flash
libbsp_a_SOURCES += ../shared/flash/flash.c \
../shared/flash/spansionFlash.c \
flash/flashcfg.c
-include_bsp_HEADERS += i2c/mpc8540_i2c_busdrv.h
# i2c
libbsp_a_SOURCES += i2c/mpc8540_i2c.c i2c/i2c_init.c
-include_bsp_HEADERS += ../shared/motorola/vpd.h
# vpd
libbsp_a_SOURCES += ../shared/motorola/vpd.c
if HAS_NETWORKING
-include_bsp_HEADERS += network/if_tsec_pub.h
noinst_PROGRAMS += network.rel
network_rel_SOURCES = network/tsec.c
network_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -145,5 +121,5 @@ endif
EXTRA_DIST += LICENSE README KNOWN_PROBLEMS
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/mvme3100/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
index f19e6c6..ec58a87 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mvme3100/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-mvme3100],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/mvme3100.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/powerpc/mvme3100/preinstall.am b/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am
deleted file mode 100644
index b9c4917..0000000
--- a/c/src/lib/libbsp/powerpc/mvme3100/preinstall.am
+++ /dev/null
@@ -1,136 +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)/motld_start.$(OBJEXT): motld_start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/motld_start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/motld_start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.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
-
-$(PROJECT_INCLUDE)/bsp/openpic.h: ../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/vmeTsi148.h: ../../shared/vmeUniverse/vmeTsi148.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeTsi148.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeTsi148.h
-
-$(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-$(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h: ../../shared/vmeUniverse/vmeTsi148DMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeTsi148DMA.h
-
-$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-
-$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-
-$(PROJECT_INCLUDE)/bsp/flashPgm.h: ../shared/flash/flashPgm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/flashPgm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/flashPgm.h
-
-$(PROJECT_INCLUDE)/bsp/flashPgmPvt.h: ../shared/flash/flashPgmPvt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/flashPgmPvt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/flashPgmPvt.h
-
-$(PROJECT_INCLUDE)/bsp/mpc8540_i2c_busdrv.h: i2c/mpc8540_i2c_busdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc8540_i2c_busdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc8540_i2c_busdrv.h
-
-$(PROJECT_INCLUDE)/bsp/vpd.h: ../shared/motorola/vpd.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vpd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vpd.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/if_tsec_pub.h: network/if_tsec_pub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_tsec_pub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_tsec_pub.h
-endif
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/bsp_specs b/c/src/lib/libbsp/powerpc/mvme3100/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/bsp_specs
rename to c/src/lib/libbsp/powerpc/mvme3100/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 4b1c464..4d7e0d4 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -4,22 +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
noinst_PROGRAMS =
-dist_project_lib_DATA += ../shared/startup/linkcmds.share
-dist_project_lib_DATA += startup/linkcmds
-
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -41,54 +31,35 @@ libbsp_a_SOURCES += startup/bspstart.c \
# pclock
libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
-include_bsp_HEADERS = ../../powerpc/shared/console/uart.h
-include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h
# console
libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
../../powerpc/shared/console/console.c
-include_bsp_HEADERS += pci/gtpcireg.h
-include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
# pci
libbsp_a_SOURCES += pci/pci.c
libbsp_a_SOURCES += pci/pci_interface.c
libbsp_a_SOURCES += pci/detect_host_bridge.c
libbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
-include_bsp_HEADERS += irq/irq.h
# irq
libbsp_a_SOURCES += irq/irq_init.c irq/BSP_irq.c
# tod
libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
-include_bsp_HEADERS += vectors/bspException.h
-
# vectors
libbsp_a_SOURCES += vectors/exceptionhandler.c \
../../powerpc/shared/start/vectors_entry.S
-include_bsp_HEADERS += GT64260/bspMvme5500.h GT64260/gtreg.h \
- GT64260/GT64260TWSI.h GT64260/VPD.h
# GT64260
libbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c
-include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h \
- ../../shared/vmeUniverse/vmeUniverse.h \
- ../../shared/vmeUniverse/vmeUniverseDMA.h\
- ../../shared/vmeUniverse/bspVmeDmaList.h\
- ../../shared/vmeUniverse/VMEDMA.h \
- ../../shared/vmeUniverse/vme_am_defs.h
# vme
libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c\
../shared/vme/vmeconfig.c ../../shared/vmeUniverse/bspVmeDmaList.c\
../shared/vme/vme_universe.c
if HAS_NETWORKING
-include_bsp_HEADERS += network/if_100MHz/GT64260eth.h \
- network/if_100MHz/GT64260ethreg.h network/if_1GHz/if_wmreg.h \
- network/if_1GHz/pcireg.h
-
network_CPPFLAGS = -D_KERNEL -D__BSD_VISIBLE
noinst_PROGRAMS += network.rel
network_rel_SOURCES = network/if_100MHz/GT64260eth.c \
@@ -109,6 +80,9 @@ mvme5500start___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS)
project_lib_DATA += mvme5500start.$(OBJEXT)
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.share
+
libbsp_a_LIBADD = \
../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
@@ -125,5 +99,5 @@ if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/mvme5500/headers.am
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
index 2e93857..5da9add 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mvme5500/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-mvme5500],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/mvme5500.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/powerpc/mvme5500/preinstall.am b/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am
deleted file mode 100644
index 282acf4..0000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am
+++ /dev/null
@@ -1,156 +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.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_INCLUDE)/bsp/uart.h: ../../powerpc/shared/console/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/consoleIo.h: ../../powerpc/shared/console/consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h
-
-$(PROJECT_INCLUDE)/bsp/gtpcireg.h: pci/gtpcireg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtpcireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtpcireg.h
-
-$(PROJECT_INCLUDE)/bsp/pci.h: ../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.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
-
-$(PROJECT_INCLUDE)/bsp/bspException.h: vectors/bspException.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspException.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspException.h
-
-$(PROJECT_INCLUDE)/bsp/bspMvme5500.h: GT64260/bspMvme5500.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspMvme5500.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspMvme5500.h
-
-$(PROJECT_INCLUDE)/bsp/gtreg.h: GT64260/gtreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gtreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gtreg.h
-
-$(PROJECT_INCLUDE)/bsp/GT64260TWSI.h: GT64260/GT64260TWSI.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/GT64260TWSI.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260TWSI.h
-
-$(PROJECT_INCLUDE)/bsp/VPD.h: GT64260/VPD.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VPD.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VPD.h
-
-$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h
-
-$(PROJECT_INCLUDE)/bsp/VMEConfig.h: vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
-
-$(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h: ../../shared/vmeUniverse/vmeUniverseDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
-
-$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
-
-$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
-
-$(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/GT64260eth.h: network/if_100MHz/GT64260eth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/GT64260eth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260eth.h
-
-$(PROJECT_INCLUDE)/bsp/GT64260ethreg.h: network/if_100MHz/GT64260ethreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/GT64260ethreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/GT64260ethreg.h
-
-$(PROJECT_INCLUDE)/bsp/if_wmreg.h: network/if_1GHz/if_wmreg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/if_wmreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/if_wmreg.h
-
-$(PROJECT_INCLUDE)/bsp/pcireg.h: network/if_1GHz/pcireg.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcireg.h
-endif
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/mvme5500start.$(OBJEXT): mvme5500start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/mvme5500start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/mvme5500start.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/bsp_specs b/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc8260ads/bsp_specs
rename to c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 6615047..61f7814 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/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/psim.h
-
-include_bsp_HEADERS = ../shared/include/linker-symbols.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
@@ -30,8 +19,8 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
+project_lib_DATA += linkcmds
dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -52,8 +41,6 @@ libbsp_a_SOURCES += ../../shared/console-polled.c
libbsp_a_SOURCES += console/console-io.c console/consupp.S
# irq
-include_bsp_HEADERS += irq/irq.h ../shared/openpic/openpic.h \
- ../../shared/include/irq-generic.h
libbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c \
../shared/openpic/openpic.c ../../shared/src/irq-server.c \
../../shared/src/irq-generic.c ../../shared/src/irq-default-handler.c
@@ -84,5 +71,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/psim/headers.am
diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac
index d97ac6c..11f5887 100644
--- a/c/src/lib/libbsp/powerpc/psim/configure.ac
+++ b/c/src/lib/libbsp/powerpc/psim/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-psim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/psim.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/powerpc/psim/preinstall.am b/c/src/lib/libbsp/powerpc/psim/preinstall.am
deleted file mode 100644
index dd18989..0000000
--- a/c/src/lib/libbsp/powerpc/psim/preinstall.am
+++ /dev/null
@@ -1,95 +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)/psim.h: include/psim.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/psim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/psim.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)/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)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(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
-
-$(PROJECT_INCLUDE)/bsp/openpic.h: ../shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.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
-
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/bsp_specs b/c/src/lib/libbsp/powerpc/psim/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mpc55xxevb/bsp_specs
rename to c/src/lib/libbsp/powerpc/psim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 7be4f11..6d887f2 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/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 =
@@ -28,7 +20,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
# startup
startup_SOURCES = ../../shared/bspclean.c \
@@ -46,9 +38,6 @@ clock_SOURCES = ../shared/clock/clock.c
console_SOURCES = ../../shared/console-polled.c console/console-io.c
# irq
-include_bsp_HEADERS = irq/irq.h \
- ../../shared/include/irq-generic.h \
- ../../shared/include/irq-info.h
irq_SOURCES =
irq_SOURCES += ../../shared/src/irq-default-handler.c
irq_SOURCES += ../../shared/src/irq-generic.c
@@ -70,5 +59,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/qemuppc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/configure.ac b/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
index 3209a00..0dab820 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/qemuppc/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-qemuppc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/qemuppc.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/powerpc/qemuppc/preinstall.am b/c/src/lib/libbsp/powerpc/qemuppc/preinstall.am
deleted file mode 100644
index 3867c4e..0000000
--- a/c/src/lib/libbsp/powerpc/qemuppc/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)/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)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(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
-
-$(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
-
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs b/c/src/lib/libbsp/powerpc/qemuppc/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
rename to c/src/lib/libbsp/powerpc/qemuppc/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 646dbfb..6760cec 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_bspdir = $(includedir)/bsp
-include_asmdir = $(includedir)/asm
-include_uapi_asmdir = $(includedir)/uapi/asm
+dist_project_lib_DATA = startup/bsp_specs
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
DISTCLEANFILES = include/bspopts.h
EXTRA_DIST += README
@@ -21,27 +13,6 @@ EXTRA_DIST += README
noinst_PROGRAMS =
-include_bsp_HEADERS = include/irq.h \
- ../../shared/include/irq-generic.h \
- ../../shared/include/irq-info.h \
- ../../shared/include/bootcard.h \
- ../../shared/include/utility.h \
- ../shared/include/start.h \
- ../shared/include/tictac.h \
- ../shared/include/linker-symbols.h \
- include/tsec-config.h \
- include/mmu.h \
- include/intercom.h \
- include/uart-bridge.h \
- include/qoriq.h
-
-include_asm_HEADERS =
-include_asm_HEADERS += include/asm/epapr_hcalls.h
-include_asm_HEADERS += include/asm/fsl_hcalls.h
-
-include_uapi_asm_HEADERS =
-include_uapi_asm_HEADERS += include/uapi/asm/epapr_hcalls.h
-
EXTRA_DIST += start/start.S
start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
@@ -57,13 +28,13 @@ rtems_crtn.$(OBJEXT): ../../powerpc/shared/start/rtems_crtn.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crtn.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds \
- ../shared/startup/linkcmds.base \
- startup/linkcmds.qoriq_core_0 \
- startup/linkcmds.qoriq_core_1 \
- startup/linkcmds.qoriq_e500 \
- startup/linkcmds.qoriq_e6500_32 \
- startup/linkcmds.qoriq_e6500_64
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.qoriq_core_0
+dist_project_lib_DATA += startup/linkcmds.qoriq_core_1
+dist_project_lib_DATA += startup/linkcmds.qoriq_e500
+dist_project_lib_DATA += startup/linkcmds.qoriq_e6500_32
+dist_project_lib_DATA += startup/linkcmds.qoriq_e6500_64
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -141,5 +112,5 @@ if HAS_SMP
libbsp_a_SOURCES += startup/bspsmp.c
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/qoriq/headers.am
diff --git a/c/src/lib/libbsp/powerpc/qoriq/configure.ac b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
index f0e8af6..02fffa7 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/configure.ac
+++ b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-qoriq],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/qoriq_core_0.cfg])
RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
@@ -168,7 +171,6 @@ AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
RTEMS_BSP_CLEANUP_OPTIONS
RTEMS_PPC_EXCEPTIONS
-RTEMS_BSP_LINKCMDS
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am b/c/src/lib/libbsp/powerpc/qoriq/preinstall.am
deleted file mode 100644
index 5fe3411..0000000
--- a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am
+++ /dev/null
@@ -1,165 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
- $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/asm/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/asm
- @: > $(PROJECT_INCLUDE)/asm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/asm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/uapi/asm/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/uapi/asm
- @: > $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/tsec-config.h: include/tsec-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec-config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec-config.h
-
-$(PROJECT_INCLUDE)/bsp/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mmu.h
-
-$(PROJECT_INCLUDE)/bsp/intercom.h: include/intercom.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/intercom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/intercom.h
-
-$(PROJECT_INCLUDE)/bsp/uart-bridge.h: include/uart-bridge.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-bridge.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-bridge.h
-
-$(PROJECT_INCLUDE)/bsp/qoriq.h: include/qoriq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/qoriq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/qoriq.h
-
-$(PROJECT_INCLUDE)/asm/epapr_hcalls.h: include/asm/epapr_hcalls.h $(PROJECT_INCLUDE)/asm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm/epapr_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm/epapr_hcalls.h
-
-$(PROJECT_INCLUDE)/asm/fsl_hcalls.h: include/asm/fsl_hcalls.h $(PROJECT_INCLUDE)/asm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm/fsl_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm/fsl_hcalls.h
-
-$(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h: include/uapi/asm/epapr_hcalls.h $(PROJECT_INCLUDE)/uapi/asm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uapi/asm/epapr_hcalls.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crtn.$(OBJEXT): rtems_crtn.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crtn.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crtn.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.qoriq_core_0: startup/linkcmds.qoriq_core_0 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_core_0
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_core_0
-
-$(PROJECT_LIB)/linkcmds.qoriq_core_1: startup/linkcmds.qoriq_core_1 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_core_1
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_core_1
-
-$(PROJECT_LIB)/linkcmds.qoriq_e500: startup/linkcmds.qoriq_e500 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e500
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e500
-
-$(PROJECT_LIB)/linkcmds.qoriq_e6500_32: startup/linkcmds.qoriq_e6500_32 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e6500_32
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e6500_32
-
-$(PROJECT_LIB)/linkcmds.qoriq_e6500_64: startup/linkcmds.qoriq_e6500_64 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e6500_64
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e6500_64
-
diff --git a/c/src/lib/libbsp/powerpc/qoriq/bsp_specs b/c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/bsp_specs
rename to c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index a2cd12f..afa059e 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -4,28 +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
-include_bsp_HEADERS = irq/irq.h
-
EXTRA_DIST += times
-dist_project_lib_DATA += startup/linkcmds
-
EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
+project_lib_DATA += linkcmds
+
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -55,5 +46,5 @@ libbsp_a_LIBADD = \
../../../libcpu/@RTEMS_CPU@/mpc5xx/timer.rel \
../../../libcpu/@RTEMS_CPU@/mpc5xx/vectors.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/ss555/headers.am
diff --git a/c/src/lib/libbsp/powerpc/ss555/configure.ac b/c/src/lib/libbsp/powerpc/ss555/configure.ac
index f586a58..159755d 100644
--- a/c/src/lib/libbsp/powerpc/ss555/configure.ac
+++ b/c/src/lib/libbsp/powerpc/ss555/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-mbx5xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/ss555.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/powerpc/ss555/preinstall.am b/c/src/lib/libbsp/powerpc/ss555/preinstall.am
deleted file mode 100644
index c051571..0000000
--- a/c/src/lib/libbsp/powerpc/ss555/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/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/powerpc/gen5200/bsp_specs b/c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/bsp_specs
rename to c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 811e244..bb7b787 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -4,14 +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
DISTCLEANFILES = include/bspopts.h
EXTRA_DIST += README
@@ -19,15 +13,6 @@ EXTRA_DIST += README
noinst_PROGRAMS =
-include_bsp_HEADERS = include/irq.h \
- ../../shared/include/irq-generic.h \
- ../../shared/include/irq-info.h \
- ../../shared/include/bootcard.h \
- ../../shared/include/utility.h \
- ../shared/include/start.h \
- ../shared/include/tictac.h \
- ../shared/include/linker-symbols.h
-
EXTRA_DIST += start/start.S
start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
@@ -38,9 +23,9 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds \
- ../shared/startup/linkcmds.base \
- startup/linkcmds.t32mppc
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.t32mppc
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -88,5 +73,5 @@ if HAS_SMP
libbsp_a_SOURCES += ../../shared/bspsmp.c
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/t32mppc/headers.am
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/configure.ac b/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
index efaf446..bb86f61 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/t32mppc/configure.ac
@@ -2,6 +2,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-qoriq],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/t32mppc.cfg])
RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.10])
@@ -33,7 +36,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
RTEMS_BSP_CLEANUP_OPTIONS
RTEMS_PPC_EXCEPTIONS
-RTEMS_BSP_LINKCMDS
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am b/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am
deleted file mode 100644
index 0dfb26f..0000000
--- a/c/src/lib/libbsp/powerpc/t32mppc/preinstall.am
+++ /dev/null
@@ -1,103 +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/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
-
-$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds.t32mppc: startup/linkcmds.t32mppc $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.t32mppc
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.t32mppc
-
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/bsp_specs b/c/src/lib/libbsp/powerpc/t32mppc/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/t32mppc/bsp_specs
rename to c/src/lib/libbsp/powerpc/t32mppc/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 5b21dc1..5531021 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -4,24 +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
noinst_PROGRAMS =
-include_bsp_HEADERS = include/tqm.h include/8xx_immap.h \
- include/irq.h \
- ../../shared/include/irq-generic.h \
- ../../shared/include/irq-info.h \
- spi/spi.h
EXTRA_DIST += start/start.S
start.$(OBJEXT): start/start.S
@@ -33,9 +21,9 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT)
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.tqm8xx
dist_project_lib_DATA += startup/linkcmds.tqm8xx_base
-EXTRA_DIST += startup/linkcmds.tqm8xx
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -92,5 +80,5 @@ if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/tqm8xx/headers.am
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
index e94c509a..5721662 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-tqm8xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/pghplus.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])
@@ -95,7 +98,6 @@ RTEMS_BSPOPTS_HELP([BSP_USE_NETWORK_SCC],
AC_CONFIG_FILES([Makefile])
RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
RTEMS_PPC_EXCEPTIONS
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am b/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
deleted file mode 100644
index 5b27200..0000000
--- a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
+++ /dev/null
@@ -1,95 +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/tqm.h: include/tqm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tqm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tqm.h
-
-$(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/8xx_immap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/spi.h: spi/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spi.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.tqm8xx_base: startup/linkcmds.tqm8xx_base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.tqm8xx_base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.tqm8xx_base
-
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/bsp_specs b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/bsp_specs
rename to c/src/lib/libbsp/powerpc/tqm8xx/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 9b6de34..232ec7b 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -4,29 +4,16 @@ 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/xparameters_dflt.h
if HAS_NETWORKING
-include_HEADERS += network/xiltemac.h
endif
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-
EXTRA_DIST += start/start.S
start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
@@ -38,7 +25,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
project_lib_DATA += rtems_crti.$(OBJEXT)
# Link commands
-project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
dist_project_lib_DATA += ../shared/startup/linkcmds.base
noinst_LIBRARIES = libbsp.a
@@ -60,10 +47,6 @@ libbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \
../../shared/console_read.c ../../shared/console_write.c
# irq
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/opbintctrl.h
-include_bsp_HEADERS += 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
@@ -98,5 +81,5 @@ if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/virtex/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac
index 323d975..8c910b5 100644
--- a/c/src/lib/libbsp/powerpc/virtex/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/virtex.cfg])
RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
@@ -45,7 +47,7 @@ RTEMS_BSP_CLEANUP_OPTIONS
# Explicitly list all Makefiles here
AC_CONFIG_FILES([
Makefile
-startup/linkcmds
+linkcmds:startup/linkcmds.in
])
RTEMS_PPC_EXCEPTIONS
diff --git a/c/src/lib/libbsp/powerpc/virtex/preinstall.am b/c/src/lib/libbsp/powerpc/virtex/preinstall.am
deleted file mode 100644
index 9263f7a..0000000
--- a/c/src/lib/libbsp/powerpc/virtex/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_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)/xparameters_dflt.h: include/xparameters_dflt.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xparameters_dflt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/xparameters_dflt.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/xiltemac.h: network/xiltemac.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xiltemac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/xiltemac.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
-
-$(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)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: 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
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(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/opbintctrl.h: include/opbintctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/opbintctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/opbintctrl.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/powerpc/virtex/bsp_specs b/c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex/bsp_specs
rename to c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index 28411c1..c5a2a32 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -5,18 +5,9 @@ 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
# include
-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
# start
@@ -25,7 +16,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
noinst_LIBRARIES = libbsp.a
@@ -49,11 +40,9 @@ libbsp_a_SOURCES += startup/dummy_console.c \
../../shared/dummy_printk_support.c
# irq
-include_bsp_HEADERS += include/irq.h
libbsp_a_SOURCES += irq/irq_init.c
# mmu
-include_bsp_HEADERS += include/mmu.h
libbsp_a_SOURCES += mmu/mmu.c
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
@@ -65,5 +54,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/virtex4/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex4/configure.ac b/c/src/lib/libbsp/powerpc/virtex4/configure.ac
index 8546bfc..75e3c3b 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex4/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/virtex4.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/powerpc/virtex4/preinstall.am b/c/src/lib/libbsp/powerpc/virtex4/preinstall.am
deleted file mode 100644
index 62df611..0000000
--- a/c/src/lib/libbsp/powerpc/virtex4/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)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(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
-
diff --git a/c/src/lib/libbsp/powerpc/virtex5/bsp_specs b/c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex5/bsp_specs
rename to c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 5466edf..ffc9c7e 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -4,18 +4,9 @@ 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
# include
-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
# start
@@ -24,7 +15,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
noinst_LIBRARIES = libbsp.a
@@ -51,11 +42,9 @@ libbsp_a_SOURCES += startup/dummy_console.c \
../../shared/dummy_printk_support.c
# irq
-include_bsp_HEADERS += include/irq.h
libbsp_a_SOURCES += irq/irq_init.c
# mmu
-include_bsp_HEADERS += include/mmu.h
libbsp_a_SOURCES += mmu/mmu.c
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
@@ -67,5 +56,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/virtex5/headers.am
diff --git a/c/src/lib/libbsp/powerpc/virtex5/configure.ac b/c/src/lib/libbsp/powerpc/virtex5/configure.ac
index f3a156c..0c5481d 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex5/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-virtex5],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/virtex5.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/powerpc/virtex5/preinstall.am b/c/src/lib/libbsp/powerpc/virtex5/preinstall.am
deleted file mode 100644
index 62df611..0000000
--- a/c/src/lib/libbsp/powerpc/virtex5/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)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(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
-
diff --git a/c/src/lib/libbsp/powerpc/virtex4/bsp_specs b/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/powerpc/virtex4/bsp_specs
rename to c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs
diff --git a/c/src/lib/libbsp/preinstall.am b/c/src/lib/libbsp/preinstall.am
deleted file mode 100644
index 505803f..0000000
--- a/c/src/lib/libbsp/preinstall.am
+++ /dev/null
@@ -1,40 +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_INCLUDE)/bsp/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/default-initial-extension.h: shared/include/default-initial-extension.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/default-initial-extension.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/default-initial-extension.h
-
-$(PROJECT_INCLUDE)/bsp/fatal.h: shared/include/fatal.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fatal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fatal.h
-
-$(PROJECT_INCLUDE)/bsp/fdt.h: shared/include/fdt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fdt.h
-
-$(PROJECT_INCLUDE)/bsp/console-termios.h: shared/include/console-termios.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-termios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-termios.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
-
diff --git a/c/src/lib/libbsp/riscv/Makefile.am b/c/src/lib/libbsp/riscv/Makefile.am
index 9c319b6..3683101 100644
--- a/c/src/lib/libbsp/riscv/Makefile.am
+++ b/c/src/lib/libbsp/riscv/Makefile.am
@@ -6,9 +6,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
_SUBDIRS = @RTEMS_BSP_FAMILY@
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = shared/include/linker-symbols.h
-
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/riscv/headers.am
diff --git a/c/src/lib/libbsp/riscv/configure.ac b/c/src/lib/libbsp/riscv/configure.ac
index 4479d9a..b8c432c 100644
--- a/c/src/lib/libbsp/riscv/configure.ac
+++ b/c/src/lib/libbsp/riscv/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-riscv],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
AC_CONFIG_SRCDIR([../riscv])
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/riscv/preinstall.am b/c/src/lib/libbsp/riscv/preinstall.am
deleted file mode 100644
index e055b4d..0000000
--- a/c/src/lib/libbsp/riscv/preinstall.am
+++ /dev/null
@@ -1,24 +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_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
-
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index 91f7204..030cb47 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/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 #
@@ -91,5 +72,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/riscv/riscv_generic/headers.am
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
index e2a02a3..20759ce 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
+++ b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
@@ -9,6 +9,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-riscv_generic],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
AC_CONFIG_SRCDIR([make/custom/riscv_generic.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])
@@ -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/riscv/riscv_generic/include/bspopts.h b/c/src/lib/libbsp/riscv/riscv_generic/include/bspopts.h
deleted file mode 100644
index 7858ce0..0000000
--- a/c/src/lib/libbsp/riscv/riscv_generic/include/bspopts.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Copyright (c) 2015 University of York.
- * Hesham Almatary <hesham at alumni.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. */
-
-/* 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
-
-/* If defined, print a message and wait until pressed before resetting board
- when application exits. */
-#undef BSP_PRESS_KEY_FOR_RESET
-
-/* If defined, prints the exception context when an unexpected exception
- occurs. */
-#undef BSP_PRINT_EXCEPTION_CONTEXT
-
-/* If defined, reset the board when the application exits. */
-#undef BSP_RESET_BOARD_AT_EXIT
-
-/* reset vector address for BSP start */
-#undef BSP_START_RESET_VECTOR
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/preinstall.am b/c/src/lib/libbsp/riscv/riscv_generic/preinstall.am
deleted file mode 100644
index e35a2e7..0000000
--- a/c/src/lib/libbsp/riscv/riscv_generic/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/m68k/av5282/bsp_specs b/c/src/lib/libbsp/riscv/riscv_generic/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/m68k/av5282/bsp_specs
rename to c/src/lib/libbsp/riscv/riscv_generic/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sh/configure.ac b/c/src/lib/libbsp/sh/configure.ac
index e543786..79df52f 100644
--- a/c/src/lib/libbsp/sh/configure.ac
+++ b/c/src/lib/libbsp/sh/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([gensh1])
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/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index 50bf675..f2e2993 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -4,24 +4,8 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
-dist_project_lib_DATA = bsp_specs
-
-include_sh_HEADERS = include/sh/sci.h
-include_sh_HEADERS += include/sh/sh7_pfc.h
-include_sh_HEADERS += include/sh/sh7_sci.h
-
-include_rtems_score_HEADERS = include/rtems/score/ispsh7032.h
-include_rtems_score_HEADERS += include/rtems/score/iosh7032.h
-
-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
@@ -30,7 +14,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 =
@@ -69,5 +53,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sh/gensh1/headers.am
diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac
index 6d49847..71f2c2c 100644
--- a/c/src/lib/libbsp/sh/gensh1/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh1/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-sh-gensh1],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/gensh1.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/sh/gensh1/preinstall.am b/c/src/lib/libbsp/sh/gensh1/preinstall.am
deleted file mode 100644
index 8132cc2..0000000
--- a/c/src/lib/libbsp/sh/gensh1/preinstall.am
+++ /dev/null
@@ -1,93 +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)/sh/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
- @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(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)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
-
-$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-
-$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7032.h: include/rtems/score/ispsh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7032.h: include/rtems/score/iosh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.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)/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/lm32/milkymist/bsp_specs b/c/src/lib/libbsp/sh/gensh1/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/lm32/milkymist/bsp_specs
rename to c/src/lib/libbsp/sh/gensh1/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index 57f0ab7..131ee3f 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -4,26 +4,8 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-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_sh_HEADERS = include/sh/io_types.h
-include_sh_HEADERS += include/sh/sci.h
-include_sh_HEADERS += include/sh/sh7_pfc.h
-include_sh_HEADERS += include/sh/sh7_sci.h
-include_sh_HEADERS += include/sh/sci_termios.h
-
-include_rtems_score_HEADERS = include/rtems/score/ispsh7045.h
-include_rtems_score_HEADERS += include/rtems/score/iosh7045.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
@@ -33,8 +15,9 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds startup/linkcmds.ram \
- startup/linkcmds.rom
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.ram
+dist_project_lib_DATA += startup/linkcmds.rom
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -72,5 +55,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/sh/gensh2/headers.am
diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac
index 4fdd7e5..2d6f349 100644
--- a/c/src/lib/libbsp/sh/gensh2/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh2/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-sh-gensh2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/gensh2.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/sh/gensh2/preinstall.am b/c/src/lib/libbsp/sh/gensh2/preinstall.am
deleted file mode 100644
index 742998f..0000000
--- a/c/src/lib/libbsp/sh/gensh2/preinstall.am
+++ /dev/null
@@ -1,109 +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)/sh/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
- @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(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)/sh/io_types.h: include/sh/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h
-
-$(PROJECT_INCLUDE)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
-
-$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-
-$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
-
-$(PROJECT_INCLUDE)/sh/sci_termios.h: include/sh/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: include/rtems/score/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7045.h: include/rtems/score/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.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)/linkcmds.ram: startup/linkcmds.ram $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ram
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ram
-
-$(PROJECT_LIB)/linkcmds.rom: startup/linkcmds.rom $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom
-
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/bsp_specs b/c/src/lib/libbsp/sh/gensh2/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/lm32/lm32_evr/bsp_specs
rename to c/src/lib/libbsp/sh/gensh2/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index f31be5a..42539aa 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -4,36 +4,18 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-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_sh_HEADERS = include/sh/sh4uart.h
-
-include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h
-include_rtems_score_HEADERS += include/rtems/score/ipl.h
-include_rtems_score_HEADERS += include/rtems/score/iosh7750.h
-include_rtems_score_HEADERS += include/rtems/score/ispsh7750.h
-include_rtems_score_HEADERS += include/rtems/score/sh4_regs.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
-include_HEADERS += include/sdram.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 startup/linkcmds.rom \
- startup/linkcmds.rom2ram
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.rom
+dist_project_lib_DATA += startup/linkcmds.rom2ram
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -62,5 +44,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sh/gensh4/headers.am
diff --git a/c/src/lib/libbsp/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac
index 002f8ff..461a054 100644
--- a/c/src/lib/libbsp/sh/gensh4/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh4/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-sh-gensh4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/gensh4.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/sh/gensh4/preinstall.am b/c/src/lib/libbsp/sh/gensh4/preinstall.am
deleted file mode 100644
index 70723c3..0000000
--- a/c/src/lib/libbsp/sh/gensh4/preinstall.am
+++ /dev/null
@@ -1,109 +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)/sh/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
- @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(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)/sh/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
-
-$(PROJECT_INCLUDE)/rtems/score/ipl.h: include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7750.h: include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.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)/sdram.h: include/sdram.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sdram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sdram.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)/linkcmds.rom: startup/linkcmds.rom $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom
-
-$(PROJECT_LIB)/linkcmds.rom2ram: startup/linkcmds.rom2ram $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom2ram
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom2ram
-
diff --git a/c/src/lib/libbsp/i386/pc386/bsp_specs b/c/src/lib/libbsp/sh/gensh4/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/i386/pc386/bsp_specs
rename to c/src/lib/libbsp/sh/gensh4/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 9883913..9cd43ba 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -4,17 +4,8 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS = include/syscall.h
+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
@@ -23,7 +14,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 =
@@ -60,5 +51,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/sh/shsim/headers.am
diff --git a/c/src/lib/libbsp/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac
index 25fa949..a1d3a95 100644
--- a/c/src/lib/libbsp/sh/shsim/configure.ac
+++ b/c/src/lib/libbsp/sh/shsim/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-sh-shsim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/simsh1.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/sh/shsim/preinstall.am b/c/src/lib/libbsp/sh/shsim/preinstall.am
deleted file mode 100644
index 738a41b..0000000
--- a/c/src/lib/libbsp/sh/shsim/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_INCLUDE)/bsp/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscall.h
-
-$(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/epiphany/epiphany_sim/bsp_specs b/c/src/lib/libbsp/sh/shsim/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs
rename to c/src/lib/libbsp/sh/shsim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/Makefile.am b/c/src/lib/libbsp/sparc/Makefile.am
index 30ea849..7a23cbb 100644
--- a/c/src/lib/libbsp/sparc/Makefile.am
+++ b/c/src/lib/libbsp/sparc/Makefile.am
@@ -191,3 +191,4 @@ EXTRA_DIST += shared/include/l4stat.h
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/sparc/headers.am
diff --git a/c/src/lib/libbsp/sparc/configure.ac b/c/src/lib/libbsp/sparc/configure.ac
index a3adc18..29b7f84 100644
--- a/c/src/lib/libbsp/sparc/configure.ac
+++ b/c/src/lib/libbsp/sparc/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc],
[_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])
@@ -12,6 +14,8 @@ AM_MAINTAINER_MODE
RTEMS_ENV_RTEMSBSP
RTEMS_PROJECT_ROOT
+AC_SUBST(RTEMS_CPU)
+AC_SUBST(RTEMS_BSP_FAMILIY)
RTEMS_CHECK_BSPDIR([$RTEMS_BSP_FAMILY])
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index cf019fa..cf499de 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -4,27 +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 =
-include_HEADERS += include/erc32.h
EXTRA_DIST += ../../sparc/shared/start/start.S
start.$(OBJEXT): ../../sparc/shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds ../shared/startup/linkcmds.base
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -51,7 +44,6 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
# gnatsupp
libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS = ../shared/include/gnatcommon.h
# console
libbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c \
../../shared/console_select.c ../../shared/console_control.c \
@@ -65,10 +57,6 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h
libbsp_a_SOURCES += timer/timer.c
# IRQ
-include_bsp_HEADERS += \
- ../../shared/include/irq-generic.h \
- ../../shared/include/irq-info.h \
- include/bsp/irq.h
libbsp_a_SOURCES += \
../../sparc/shared/irq/irq-shared.c \
../../sparc/shared/irq/bsp_isr_handler.c \
@@ -103,5 +91,5 @@ endif
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc/erc32/headers.am
diff --git a/c/src/lib/libbsp/sparc/erc32/configure.ac b/c/src/lib/libbsp/sparc/erc32/configure.ac
index 566a959..6e58139 100644
--- a/c/src/lib/libbsp/sparc/erc32/configure.ac
+++ b/c/src/lib/libbsp/sparc/erc32/configure.ac
@@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-erc32],
[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/erc32.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/sparc/erc32/preinstall.am b/c/src/lib/libbsp/sparc/erc32/preinstall.am
deleted file mode 100644
index 831c8e4..0000000
--- a/c/src/lib/libbsp/sparc/erc32/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)/erc32.h: include/erc32.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/erc32.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/erc32.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)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.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/bfin/eZKit533/bsp_specs b/c/src/lib/libbsp/sparc/erc32/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/bfin/eZKit533/bsp_specs
rename to c/src/lib/libbsp/sparc/erc32/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 3a5845c..1914c69 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -4,31 +4,22 @@ 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 = ../../sparc/shared/include/debug_defs.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
-include_HEADERS += include/leon.h
EXTRA_DIST += ../../sparc/shared/start/start.S
start.$(OBJEXT): ../../sparc/shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
+project_lib_DATA += linkcmds
dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds
-dist_project_lib_DATA += startup/linkcmds.leon2
dist_project_lib_DATA += startup/linkcmds.at697f
+dist_project_lib_DATA += startup/linkcmds.leon2
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -54,19 +45,13 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
# gnatsupp
libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS += ../shared/include/gnatcommon.h
# console
libbsp_a_SOURCES += console/console.c console/debugputs.c
# clock
libbsp_a_SOURCES += clock/ckinit.c
libbsp_a_SOURCES += ../../shared/clockdrv_shell.h
# IRQ
-include_bsp_HEADERS += ../../sparc/shared/include/genirq.h
libbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c
-include_bsp_HEADERS += \
- ../../shared/include/irq-generic.h \
- ../../shared/include/irq-info.h \
- include/bsp/irq.h
libbsp_a_SOURCES += \
../../sparc/shared/irq/irq-shared.c \
../../sparc/shared/irq/bsp_isr_handler.c \
@@ -78,10 +63,6 @@ libbsp_a_SOURCES += \
../../shared/src/irq-shell.c
# AMBA bus
-include_HEADERS += ../../sparc/shared/include/ambapp.h
-include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
-include_HEADERS += ../../sparc/shared/include/grlib.h
-include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_count.c
@@ -95,17 +76,10 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
# Clock Driver and Timer Library
-include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h
-include_bsp_HEADERS += ../../sparc/shared/include/tlib.h
libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
# PCI
-include_bsp_HEADERS += ../../sparc/shared/include/grpci.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h
-include_bsp_HEADERS += ../../sparc/shared/include/pcif.h
-include_bsp_HEADERS += include/at697_pci.h
libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c
libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
@@ -115,13 +89,6 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_be.c
libbsp_a_SOURCES += pci/at697_pci.c
# PCI target devices
-include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h
libbsp_a_SOURCES += ../../sparc/shared/pci/gr_701.c
libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_adcdac.c
libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_io.c
@@ -131,104 +98,66 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/gr_leon4_n2x.c
libbsp_a_SOURCES += ../../sparc/shared/pci/gr_cpci_gr740.c
# B1553BRM
-include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h
-include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h
libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
# GR1553B
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h
libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
# CAN
-include_bsp_HEADERS += ../../sparc/shared/include/occan.h
-include_bsp_HEADERS += ../../sparc/shared/include/grcan.h
libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
../../sparc/shared/can/grcan.c
# SpaceWire
if !HAS_SMP
-include_bsp_HEADERS += ../../sparc/shared/include/grspw.h
libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
endif
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h
libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c
libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
# UART (RAW)
-include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h
-
# I2CMST
-include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
# SPI
-include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h
libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
# TIME
-include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grctm.h
libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
# GPIO
-include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h
-include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h
libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
# PWM
-include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h
libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
# ADC and DAC
-include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h
libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
# Memory controllers
libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
-include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h
-
# l2cache
libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c
-include_bsp_HEADERS += ../../sparc/shared/include/l2c.h
-
# griommu
libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c
-include_bsp_HEADERS += ../../sparc/shared/include/griommu.h
-
# timer
libbsp_a_SOURCES += timer/timer.c
# TM/TC
-include_bsp_HEADERS += ../../sparc/shared/include/grtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grtm.h
libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
# MEMSCRUB
libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c
-include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h
-
# L4STAT
libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c
-include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h
-
# Driver Manager
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/leon2_amba_bus.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h
libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c
libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_leon2.c
libbsp_a_SOURCES += ../../sparc/shared/drvmgr/leon2_amba_bus.c
@@ -258,13 +187,11 @@ endif
if HAS_NETWORKING
noinst_PROGRAMS += leon_greth.rel
leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-include_bsp_HEADERS += ../../sparc/shared/include/greth.h
leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# BSP Network configuration
-include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h
libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
endif
@@ -282,5 +209,5 @@ endif
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc/leon2/headers.am
diff --git a/c/src/lib/libbsp/sparc/leon2/configure.ac b/c/src/lib/libbsp/sparc/leon2/configure.ac
index 5ca4a13..cb12706 100644
--- a/c/src/lib/libbsp/sparc/leon2/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon2/configure.ac
@@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-leon2],
[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/leon2.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])
@@ -36,7 +39,6 @@ RTEMS_BSPOPTS_HELP([BSP_POWER_DOWN_AT_FATAL_HALT],
error which will hand over to debugger, simulator, etc.])
RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/sparc/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am
deleted file mode 100644
index 7f44269..0000000
--- a/c/src/lib/libbsp/sparc/leon2/preinstall.am
+++ /dev/null
@@ -1,314 +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/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.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)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.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.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.leon2: startup/linkcmds.leon2 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.leon2
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.leon2
-
-$(PROJECT_LIB)/linkcmds.at697f: startup/linkcmds.at697f $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.at697f
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.at697f
-
-$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-
-$(PROJECT_INCLUDE)/bsp/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/genirq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/genirq.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
-
-$(PROJECT_INCLUDE)/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h
-
-$(PROJECT_INCLUDE)/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp_ids.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp_ids.h
-
-$(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h
-
-$(PROJECT_INCLUDE)/bsp/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ahbstat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ahbstat.h
-
-$(PROJECT_INCLUDE)/bsp/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gptimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gptimer.h
-
-$(PROJECT_INCLUDE)/bsp/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tlib.h
-
-$(PROJECT_INCLUDE)/bsp/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci.h
-
-$(PROJECT_INCLUDE)/bsp/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2.h
-
-$(PROJECT_INCLUDE)/bsp/grpci2dma.h: ../../sparc/shared/include/grpci2dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2dma.h
-
-$(PROJECT_INCLUDE)/bsp/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcif.h
-
-$(PROJECT_INCLUDE)/bsp/at697_pci.h: include/at697_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/at697_pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/at697_pci.h
-
-$(PROJECT_INCLUDE)/bsp/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_701.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_701.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
-
-$(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
-
-$(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h: ../../sparc/shared/include/gr_cpci_gr740.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h
-
-$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h
-
-$(PROJECT_INCLUDE)/bsp/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553rt.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553b.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553b.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bm.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553rt.h
-
-$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h
-
-$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h
-
-if !HAS_SMP
-$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h
-endif
-$(PROJECT_INCLUDE)/bsp/grspw_pkt.h: ../../sparc/shared/include/grspw_pkt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
-
-$(PROJECT_INCLUDE)/bsp/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_router.h
-
-$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h
-
-$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h
-
-$(PROJECT_INCLUDE)/bsp/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spictrl.h
-
-$(PROJECT_INCLUDE)/bsp/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spwcuc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spwcuc.h
-
-$(PROJECT_INCLUDE)/bsp/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grctm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grctm.h
-
-$(PROJECT_INCLUDE)/bsp/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grgpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grgpio.h
-
-$(PROJECT_INCLUDE)/bsp/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpiolib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpiolib.h
-
-$(PROJECT_INCLUDE)/bsp/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpwm.h
-
-$(PROJECT_INCLUDE)/bsp/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gradcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gradcdac.h
-
-$(PROJECT_INCLUDE)/bsp/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mctrl.h
-
-$(PROJECT_INCLUDE)/bsp/l2c.h: ../../sparc/shared/include/l2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l2c.h
-
-$(PROJECT_INCLUDE)/bsp/griommu.h: ../../sparc/shared/include/griommu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/griommu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/griommu.h
-
-$(PROJECT_INCLUDE)/bsp/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtc.h
-
-$(PROJECT_INCLUDE)/bsp/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtm.h
-
-$(PROJECT_INCLUDE)/bsp/memscrub.h: ../../sparc/shared/include/memscrub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/memscrub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/memscrub.h
-
-$(PROJECT_INCLUDE)/bsp/l4stat.h: ../../sparc/shared/include/l4stat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l4stat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l4stat.h
-
-$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
- @: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-
-$(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h: ../../sparc/shared/include/drvmgr/ambapp_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h
-
-$(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h: ../../sparc/shared/include/drvmgr/leon2_amba_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h
-
-$(PROJECT_INCLUDE)/drvmgr/bspcommon.h: ../../sparc/shared/include/drvmgr/bspcommon.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/greth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/greth.h
-
-$(PROJECT_INCLUDE)/bsp/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/network_interface_add.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/network_interface_add.h
-endif
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs b/c/src/lib/libbsp/sparc/leon2/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/bfin/bf537Stamp/bsp_specs
rename to c/src/lib/libbsp/sparc/leon2/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index b73569d..60e2a90 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -4,34 +4,25 @@ 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 = ../../sparc/shared/include/debug_defs.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
-include_HEADERS += include/leon.h
EXTRA_DIST += ../../sparc/shared/start/start.S
start.$(OBJEXT): ../../sparc/shared/start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
+project_lib_DATA += linkcmds
dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.gr712rc
+dist_project_lib_DATA += startup/linkcmds.gr740
dist_project_lib_DATA += startup/linkcmds.leon3
dist_project_lib_DATA += startup/linkcmds.ut699
-dist_project_lib_DATA += startup/linkcmds.gr712rc
dist_project_lib_DATA += startup/linkcmds.ut700
-dist_project_lib_DATA += startup/linkcmds.gr740
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -55,13 +46,7 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c
libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S
# gnatsupp
libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
-include_bsp_HEADERS += ../shared/include/gnatcommon.h
# AMBA bus
-include_HEADERS += include/amba.h
-include_HEADERS += ../../sparc/shared/include/ambapp.h
-include_HEADERS += ../../sparc/shared/include/ambapp_ids.h
-include_HEADERS += ../../sparc/shared/include/grlib.h
-include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h
libbsp_a_SOURCES += amba/amba.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c
@@ -76,8 +61,6 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c
libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c
# Clock Driver and Timer Library
-include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h
-include_bsp_HEADERS += ../../sparc/shared/include/tlib.h
libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c
libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c
libbsp_a_SOURCES += ../../sparc/shared/timer/tlib_ckinit.c
@@ -90,17 +73,10 @@ libbsp_a_SOURCES += ../../shared/console-termios.c
libbsp_a_SOURCES += console/console.c
libbsp_a_SOURCES += ../../sparc/shared/uart/cons.c
libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_cons.c
-include_bsp_HEADERS += ../../sparc/shared/include/cons.h
-include_bsp_HEADERS += ../../sparc/shared/include/apbuart_cons.h
# debugio
libbsp_a_SOURCES += console/printk_support.c
# IRQ
-include_bsp_HEADERS += ../../sparc/shared/include/genirq.h
-include_bsp_HEADERS += \
- ../../shared/include/irq-generic.h \
- ../../shared/include/irq-info.h \
- include/bsp/irq.h
libbsp_a_SOURCES += \
startup/eirq.c \
../../sparc/shared/irq/genirq.c \
@@ -114,10 +90,6 @@ libbsp_a_SOURCES += \
../../shared/src/irq-shell.c
# PCI
-include_bsp_HEADERS += ../../sparc/shared/include/grpci.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h
-include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h
-include_bsp_HEADERS += ../../sparc/shared/include/pcif.h
libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c
@@ -126,14 +98,6 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_le.c
libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_be.c
# PCI target devices
-include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_tmtc_1553.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h
libbsp_a_SOURCES += ../../sparc/shared/pci/gr_701.c
libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_adcdac.c
libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_io.c
@@ -144,122 +108,78 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/gr_leon4_n2x.c
libbsp_a_SOURCES += ../../sparc/shared/pci/gr_cpci_gr740.c
# B1553BRM
-include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h
-include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h
libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c
libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c
# GR1553B
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h
-include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h
libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c
libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c
libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c
libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c
# CAN
-include_bsp_HEADERS += ../../sparc/shared/include/occan.h \
- ../../sparc/shared/include/grcan.h
libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \
../../sparc/shared/can/grcan.c
# SpaceWire
if !HAS_SMP
-include_bsp_HEADERS += ../../sparc/shared/include/grspw.h
libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c
endif
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h
-include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h
libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c
libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c
# UART
-include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h \
- ../../sparc/shared/include/apbuart_termios.h
libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_termios.c
# I2CMST
-include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h
libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c
# SPI
-include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h
libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c
# TIME
-include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grctm.h
libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c
libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c
# GPIO
-include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h
-include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h
libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c
libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c
# PWM
-include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h
libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c
# ADC and DAC
-include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h
libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c
# Memory controllers
libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c
-include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h
-
# l2cache
libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c
-include_bsp_HEADERS += ../../sparc/shared/include/l2c.h
-
# griommu
libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c
-include_bsp_HEADERS += ../../sparc/shared/include/griommu.h
-
# timer
libbsp_a_SOURCES += timer/timer.c
libbsp_a_SOURCES += timer/watchdog.c
-include_bsp_HEADERS += include/watchdog.h
-
# Cache
libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
libbsp_a_SOURCES += include/cache_.h
libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include
# GR712
-include_bsp_HEADERS += ../../sparc/shared/include/grascs.h
-include_bsp_HEADERS += ../../sparc/shared/include/satcan.h
-include_bsp_HEADERS += ../../sparc/shared/include/canmux.h
-include_bsp_HEADERS += ../../sparc/shared/include/grslink.h
libbsp_a_SOURCES += ../../sparc/shared/ascs/grascs.c
libbsp_a_SOURCES += ../../sparc/shared/can/satcan.c
libbsp_a_SOURCES += ../../sparc/shared/can/canmux.c
libbsp_a_SOURCES += ../../sparc/shared/slink/grslink.c
# TM/TC
-include_bsp_HEADERS += ../../sparc/shared/include/grtc.h
-include_bsp_HEADERS += ../../sparc/shared/include/grtm.h
libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c
libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c
# MEMSCRUB
libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c
-include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h
-
# L4STAT
libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c
-include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h
-
# Driver Manager
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus_grlib.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/ambapp_bus.h
-include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h
libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c
libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_grlib.c
libbsp_a_SOURCES += ../../sparc/shared/drvmgr/get_resarray_count.c
@@ -290,7 +210,6 @@ if !HAS_SMP
libbsp_a_SOURCES += leon_greth/leon_greth.c
endif
leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-include_bsp_HEADERS += ../../sparc/shared/include/greth.h
leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -298,7 +217,6 @@ endif
# BSP Network configuration
if HAS_NETWORKING
-include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h
libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
endif
@@ -322,5 +240,5 @@ endif
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc/leon3/headers.am
diff --git a/c/src/lib/libbsp/sparc/leon3/configure.ac b/c/src/lib/libbsp/sparc/leon3/configure.ac
index 83e7546..c972868 100644
--- a/c/src/lib/libbsp/sparc/leon3/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon3/configure.ac
@@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-leon3],
[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/leon3.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])
@@ -38,7 +41,6 @@ RTEMS_BSPOPTS_HELP([BSP_POWER_DOWN_AT_FATAL_HALT],
error which will hand over to debugger, simulator, etc.])
RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am
deleted file mode 100644
index 4d00a43..0000000
--- a/c/src/lib/libbsp/sparc/leon3/preinstall.am
+++ /dev/null
@@ -1,363 +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/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.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)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.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.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.leon3: startup/linkcmds.leon3 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.leon3
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.leon3
-
-$(PROJECT_LIB)/linkcmds.ut699: startup/linkcmds.ut699 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ut699
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ut699
-
-$(PROJECT_LIB)/linkcmds.gr712rc: startup/linkcmds.gr712rc $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gr712rc
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gr712rc
-
-$(PROJECT_LIB)/linkcmds.ut700: startup/linkcmds.ut700 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ut700
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ut700
-
-$(PROJECT_LIB)/linkcmds.gr740: startup/linkcmds.gr740 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gr740
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gr740
-
-$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h
-
-$(PROJECT_INCLUDE)/amba.h: include/amba.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/amba.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/amba.h
-
-$(PROJECT_INCLUDE)/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h
-
-$(PROJECT_INCLUDE)/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp_ids.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp_ids.h
-
-$(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h
-
-$(PROJECT_INCLUDE)/bsp/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ahbstat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ahbstat.h
-
-$(PROJECT_INCLUDE)/bsp/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gptimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gptimer.h
-
-$(PROJECT_INCLUDE)/bsp/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tlib.h
-
-$(PROJECT_INCLUDE)/bsp/cons.h: ../../sparc/shared/include/cons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cons.h
-
-$(PROJECT_INCLUDE)/bsp/apbuart_cons.h: ../../sparc/shared/include/apbuart_cons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_cons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_cons.h
-
-$(PROJECT_INCLUDE)/bsp/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/genirq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/genirq.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
-
-$(PROJECT_INCLUDE)/bsp/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci.h
-
-$(PROJECT_INCLUDE)/bsp/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2.h
-
-$(PROJECT_INCLUDE)/bsp/grpci2dma.h: ../../sparc/shared/include/grpci2dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2dma.h
-
-$(PROJECT_INCLUDE)/bsp/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcif.h
-
-$(PROJECT_INCLUDE)/bsp/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_701.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_701.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h
-
-$(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h
-
-$(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h: ../../sparc/shared/include/gr_tmtc_1553.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h
-
-$(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h
-
-$(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h: ../../sparc/shared/include/gr_cpci_gr740.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h
-
-$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h
-
-$(PROJECT_INCLUDE)/bsp/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553rt.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553b.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553b.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bm.h
-
-$(PROJECT_INCLUDE)/bsp/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553rt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553rt.h
-
-$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h
-
-$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h
-
-if !HAS_SMP
-$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h
-endif
-$(PROJECT_INCLUDE)/bsp/grspw_pkt.h: ../../sparc/shared/include/grspw_pkt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pkt.h
-
-$(PROJECT_INCLUDE)/bsp/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_router.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_router.h
-
-$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h
-
-$(PROJECT_INCLUDE)/bsp/apbuart_termios.h: ../../sparc/shared/include/apbuart_termios.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_termios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_termios.h
-
-$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h
-
-$(PROJECT_INCLUDE)/bsp/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spictrl.h
-
-$(PROJECT_INCLUDE)/bsp/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spwcuc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spwcuc.h
-
-$(PROJECT_INCLUDE)/bsp/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grctm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grctm.h
-
-$(PROJECT_INCLUDE)/bsp/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grgpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grgpio.h
-
-$(PROJECT_INCLUDE)/bsp/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpiolib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpiolib.h
-
-$(PROJECT_INCLUDE)/bsp/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpwm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpwm.h
-
-$(PROJECT_INCLUDE)/bsp/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gradcdac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gradcdac.h
-
-$(PROJECT_INCLUDE)/bsp/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mctrl.h
-
-$(PROJECT_INCLUDE)/bsp/l2c.h: ../../sparc/shared/include/l2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l2c.h
-
-$(PROJECT_INCLUDE)/bsp/griommu.h: ../../sparc/shared/include/griommu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/griommu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/griommu.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/grascs.h: ../../sparc/shared/include/grascs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grascs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grascs.h
-
-$(PROJECT_INCLUDE)/bsp/satcan.h: ../../sparc/shared/include/satcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/satcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/satcan.h
-
-$(PROJECT_INCLUDE)/bsp/canmux.h: ../../sparc/shared/include/canmux.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/canmux.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/canmux.h
-
-$(PROJECT_INCLUDE)/bsp/grslink.h: ../../sparc/shared/include/grslink.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grslink.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grslink.h
-
-$(PROJECT_INCLUDE)/bsp/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtc.h
-
-$(PROJECT_INCLUDE)/bsp/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtm.h
-
-$(PROJECT_INCLUDE)/bsp/memscrub.h: ../../sparc/shared/include/memscrub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/memscrub.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/memscrub.h
-
-$(PROJECT_INCLUDE)/bsp/l4stat.h: ../../sparc/shared/include/l4stat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l4stat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l4stat.h
-
-$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
- @: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-
-$(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h: ../../sparc/shared/include/drvmgr/ambapp_bus_grlib.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h
-
-$(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h: ../../sparc/shared/include/drvmgr/ambapp_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h
-
-$(PROJECT_INCLUDE)/drvmgr/bspcommon.h: ../../sparc/shared/include/drvmgr/bspcommon.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/bspcommon.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/greth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/greth.h
-endif
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/bsp/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/network_interface_add.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/network_interface_add.h
-endif
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/bsp_specs b/c/src/lib/libbsp/sparc/leon3/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/bfin/TLL6527M/bsp_specs
rename to c/src/lib/libbsp/sparc/leon3/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc64/Makefile.am b/c/src/lib/libbsp/sparc64/Makefile.am
index 5264530..b0e0689 100644
--- a/c/src/lib/libbsp/sparc64/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/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/sparc64/headers.am
diff --git a/c/src/lib/libbsp/sparc64/configure.ac b/c/src/lib/libbsp/sparc64/configure.ac
index dc62789..4c69689 100644
--- a/c/src/lib/libbsp/sparc64/configure.ac
+++ b/c/src/lib/libbsp/sparc64/configure.ac
@@ -7,6 +7,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc64],[_RTEMS_VERSION],[https://devel.rtems.o
# 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/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index 0267cc9..717dfdc 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -4,28 +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 += ../shared/include/asm.h
-
-include_bootdir = $(includedir)/boot
-include_boot_HEADERS = ../shared/helenos/boot/include/align.h \
- ../shared/helenos/boot/include/balloc.h \
- ../shared/helenos/boot/include/gentypes.h \
- ../shared/helenos/boot/include/main.h \
- ../shared/helenos/boot/include/ofwarch.h \
- ../shared/helenos/boot/include/ofw.h \
- ../shared/helenos/boot/include/ofw_tree.h \
- ../shared/helenos/boot/include/register.h \
- ../shared/helenos/boot/include/stack.h \
- ../shared/helenos/boot/include/types.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
@@ -75,5 +55,5 @@ libbsp_a_LIBADD = \
../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc64/niagara/headers.am
diff --git a/c/src/lib/libbsp/sparc64/niagara/configure.ac b/c/src/lib/libbsp/sparc64/niagara/configure.ac
index 7617001..cd5d261 100644
--- a/c/src/lib/libbsp/sparc64/niagara/configure.ac
+++ b/c/src/lib/libbsp/sparc64/niagara/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4v],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/niagara.cfg])
RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc64/niagara/preinstall.am b/c/src/lib/libbsp/sparc64/niagara/preinstall.am
deleted file mode 100644
index d2c8f3b..0000000
--- a/c/src/lib/libbsp/sparc64/niagara/preinstall.am
+++ /dev/null
@@ -1,112 +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)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
-
-$(PROJECT_INCLUDE)/boot/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/boot
- @: > $(PROJECT_INCLUDE)/boot/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/boot/$(dirstamp)
-
-$(PROJECT_INCLUDE)/boot/align.h: ../shared/helenos/boot/include/align.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/align.h
-
-$(PROJECT_INCLUDE)/boot/balloc.h: ../shared/helenos/boot/include/balloc.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/balloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/balloc.h
-
-$(PROJECT_INCLUDE)/boot/gentypes.h: ../shared/helenos/boot/include/gentypes.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/gentypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/gentypes.h
-
-$(PROJECT_INCLUDE)/boot/main.h: ../shared/helenos/boot/include/main.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/main.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/main.h
-
-$(PROJECT_INCLUDE)/boot/ofwarch.h: ../shared/helenos/boot/include/ofwarch.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofwarch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofwarch.h
-
-$(PROJECT_INCLUDE)/boot/ofw.h: ../shared/helenos/boot/include/ofw.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw.h
-
-$(PROJECT_INCLUDE)/boot/ofw_tree.h: ../shared/helenos/boot/include/ofw_tree.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw_tree.h
-
-$(PROJECT_INCLUDE)/boot/register.h: ../shared/helenos/boot/include/register.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/register.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/register.h
-
-$(PROJECT_INCLUDE)/boot/stack.h: ../shared/helenos/boot/include/stack.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/stack.h
-
-$(PROJECT_INCLUDE)/boot/types.h: ../shared/helenos/boot/include/types.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/types.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: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sparc64/usiii/bsp_specs b/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sparc64/usiii/bsp_specs
rename to c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 90be322..cf2828a 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -4,74 +4,16 @@ 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 += ../shared/include/asm.h
-include_HEADERS += ../shared/include/traptable.h
+dist_project_lib_DATA = startup/bsp_specs
## these are the include files used by the boot process from HelenOS Sparc64
-include_bootdir = $(includedir)/boot
-include_boot_HEADERS = \
- ../shared/helenos/boot/include/align.h \
- ../shared/helenos/boot/include/balloc.h \
- ../shared/helenos/boot/include/gentypes.h \
- ../shared/helenos/boot/include/main.h \
- ../shared/helenos/boot/include/ofwarch.h \
- ../shared/helenos/boot/include/ofw.h \
- ../shared/helenos/boot/include/ofw_tree.h \
- ../shared/helenos/boot/include/register.h \
- ../shared/helenos/boot/include/stack.h \
- ../shared/helenos/boot/include/types.h
-
## These include files mimic the HelenOS kernel include layout, which
## in HelenOS-0.4.2 is more complicated than the boot include dirs.
# assumed by the HelenOS sources to be in the root includedir. We place them
# in a kernel include directory.
-include_kerneldir = $(includedir)/kernel
-include_kernel_HEADERS = \
- ../shared/helenos/kernel/generic/include/align.h
-
-include_archdir = $(includedir)/arch
-include_arch_HEADERS = \
- ../shared/helenos/kernel/sparc64/include/arch.h \
- ../shared/helenos/kernel/sparc64/include/boot.h \
- ../shared/helenos/kernel/sparc64/include/regdef.h \
- ../shared/helenos/kernel/sparc64/include/stack.h
-
-include_arch_sun4udir = $(includedir)/arch/sun4u
-include_arch_sun4u_HEADERS = \
- ../shared/helenos/kernel/sparc64/include/sun4u/arch.h
-
-include_arch_mmdir = $(includedir)/arch/mm
-include_arch_mm_HEADERS = \
- ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h \
- ../shared/helenos/kernel/sparc64/include/mm/frame.h \
- ../shared/helenos/kernel/sparc64/include/mm/mmu.h \
- ../shared/helenos/kernel/sparc64/include/mm/page.h \
- ../shared/helenos/kernel/sparc64/include/mm/tlb.h \
- ../shared/helenos/kernel/sparc64/include/mm/tte.h
-
-
-include_arch_mm_sun4udir = $(includedir)/arch/mm/sun4u
-include_arch_mm_sun4u_HEADERS = \
- ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h \
- ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h \
- ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h \
- ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h \
- ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h
-
-include_genarch_ofwdir = $(includedir)/genarch/ofw
-include_genarch_ofw_HEADERS = \
- ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h
-
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
+
+
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
@@ -127,5 +69,5 @@ libbsp_a_LIBADD = \
../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc64/usiii/headers.am
diff --git a/c/src/lib/libbsp/sparc64/usiii/configure.ac b/c/src/lib/libbsp/sparc64/usiii/configure.ac
index 1d183d2..a95c48f 100644
--- a/c/src/lib/libbsp/sparc64/usiii/configure.ac
+++ b/c/src/lib/libbsp/sparc64/usiii/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4u],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/usiii.cfg])
RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc64/usiii/preinstall.am b/c/src/lib/libbsp/sparc64/usiii/preinstall.am
deleted file mode 100644
index fa403a3..0000000
--- a/c/src/lib/libbsp/sparc64/usiii/preinstall.am
+++ /dev/null
@@ -1,218 +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)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
-
-$(PROJECT_INCLUDE)/traptable.h: ../shared/include/traptable.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/traptable.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/traptable.h
-
-$(PROJECT_INCLUDE)/boot/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/boot
- @: > $(PROJECT_INCLUDE)/boot/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/boot/$(dirstamp)
-
-$(PROJECT_INCLUDE)/boot/align.h: ../shared/helenos/boot/include/align.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/align.h
-
-$(PROJECT_INCLUDE)/boot/balloc.h: ../shared/helenos/boot/include/balloc.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/balloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/balloc.h
-
-$(PROJECT_INCLUDE)/boot/gentypes.h: ../shared/helenos/boot/include/gentypes.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/gentypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/gentypes.h
-
-$(PROJECT_INCLUDE)/boot/main.h: ../shared/helenos/boot/include/main.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/main.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/main.h
-
-$(PROJECT_INCLUDE)/boot/ofwarch.h: ../shared/helenos/boot/include/ofwarch.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofwarch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofwarch.h
-
-$(PROJECT_INCLUDE)/boot/ofw.h: ../shared/helenos/boot/include/ofw.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw.h
-
-$(PROJECT_INCLUDE)/boot/ofw_tree.h: ../shared/helenos/boot/include/ofw_tree.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw_tree.h
-
-$(PROJECT_INCLUDE)/boot/register.h: ../shared/helenos/boot/include/register.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/register.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/register.h
-
-$(PROJECT_INCLUDE)/boot/stack.h: ../shared/helenos/boot/include/stack.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/stack.h
-
-$(PROJECT_INCLUDE)/boot/types.h: ../shared/helenos/boot/include/types.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/types.h
-
-$(PROJECT_INCLUDE)/kernel/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/kernel
- @: > $(PROJECT_INCLUDE)/kernel/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/kernel/$(dirstamp)
-
-$(PROJECT_INCLUDE)/kernel/align.h: ../shared/helenos/kernel/generic/include/align.h $(PROJECT_INCLUDE)/kernel/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/kernel/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/kernel/align.h
-
-$(PROJECT_INCLUDE)/arch/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/arch
- @: > $(PROJECT_INCLUDE)/arch/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/arch.h: ../shared/helenos/kernel/sparc64/include/arch.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/arch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/arch.h
-
-$(PROJECT_INCLUDE)/arch/boot.h: ../shared/helenos/kernel/sparc64/include/boot.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/boot.h
-
-$(PROJECT_INCLUDE)/arch/regdef.h: ../shared/helenos/kernel/sparc64/include/regdef.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/regdef.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/regdef.h
-
-$(PROJECT_INCLUDE)/arch/stack.h: ../shared/helenos/kernel/sparc64/include/stack.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/stack.h
-
-$(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/arch/sun4u
- @: > $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/sun4u/arch.h: ../shared/helenos/kernel/sparc64/include/sun4u/arch.h $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/sun4u/arch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/sun4u/arch.h
-
-$(PROJECT_INCLUDE)/arch/mm/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/arch/mm
- @: > $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/mm/cache_spec.h: ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/cache_spec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/cache_spec.h
-
-$(PROJECT_INCLUDE)/arch/mm/frame.h: ../shared/helenos/kernel/sparc64/include/mm/frame.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/frame.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/frame.h
-
-$(PROJECT_INCLUDE)/arch/mm/mmu.h: ../shared/helenos/kernel/sparc64/include/mm/mmu.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/mmu.h
-
-$(PROJECT_INCLUDE)/arch/mm/page.h: ../shared/helenos/kernel/sparc64/include/mm/page.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/page.h
-
-$(PROJECT_INCLUDE)/arch/mm/tlb.h: ../shared/helenos/kernel/sparc64/include/mm/tlb.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/tlb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/tlb.h
-
-$(PROJECT_INCLUDE)/arch/mm/tte.h: ../shared/helenos/kernel/sparc64/include/mm/tte.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/tte.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/tte.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/arch/mm/sun4u
- @: > $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/page.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/page.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h
-
-$(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/genarch/ofw
- @: > $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
-
-$(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h: ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.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: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sparc64/niagara/bsp_specs b/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/sparc64/niagara/bsp_specs
rename to c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs
diff --git a/c/src/lib/libbsp/v850/Makefile.am b/c/src/lib/libbsp/v850/Makefile.am
index 15054fe..169d11d 100644
--- a/c/src/lib/libbsp/v850/Makefile.am
+++ b/c/src/lib/libbsp/v850/Makefile.am
@@ -10,6 +10,5 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
EXTRA_DIST =
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/v850/configure.ac b/c/src/lib/libbsp/v850/configure.ac
index 0c9d1ea..01b8360 100644
--- a/c/src/lib/libbsp/v850/configure.ac
+++ b/c/src/lib/libbsp/v850/configure.ac
@@ -5,6 +5,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-v850],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([gdbv850sim])
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/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index ebddaf8..2f06d2c 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -7,17 +7,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/syscall.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 =
@@ -27,7 +18,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
libbsp_a_SOURCES = ../../shared/bspclean.c
libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
@@ -53,5 +44,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include
noinst_LIBRARIES = libbsp.a
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/v850/gdbv850sim/headers.am
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/configure.ac b/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
index 26d8fa4..a22f163 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
+++ b/c/src/lib/libbsp/v850/gdbv850sim/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-v850-gdbv850sim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/v850e1sim.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/v850/gdbv850sim/preinstall.am b/c/src/lib/libbsp/v850/gdbv850sim/preinstall.am
deleted file mode 100644
index 32e0c26..0000000
--- a/c/src/lib/libbsp/v850/gdbv850sim/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)/bsp/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscall.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/v850/gdbv850sim/bsp_specs b/c/src/lib/libbsp/v850/gdbv850sim/startup/bsp_specs
similarity index 100%
rename from c/src/lib/libbsp/v850/gdbv850sim/bsp_specs
rename to c/src/lib/libbsp/v850/gdbv850sim/startup/bsp_specs
diff --git a/c/src/lib/libbsp/v850/preinstall.am b/c/src/lib/libbsp/v850/preinstall.am
deleted file mode 100644
index dba6cc4..0000000
--- a/c/src/lib/libbsp/v850/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/libcpu/Makefile.am b/c/src/lib/libcpu/Makefile.am
index 38de255..9cc2ece 100644
--- a/c/src/lib/libcpu/Makefile.am
+++ b/c/src/lib/libcpu/Makefile.am
@@ -1,5 +1,3 @@
-include_libcpudir = $(includedir)/libcpu
-
EXTRA_DIST =
EXTRA_DIST += shared/include/cache.h
EXTRA_DIST += shared/src/cache_manager.c
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 7f76673..35b08e2 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -6,17 +6,9 @@ EXTRA_DIST =
noinst_PROGRAMS =
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-include_bsp_HEADERS =
-include_libcpu_HEADERS =
-
## shared/include
if shared
-include_libcpu_HEADERS += shared/include/mmu.h
-
## shared/arm920
noinst_PROGRAMS += shared/arm920.rel
shared_arm920_rel_SOURCES = shared/arm920/mmu.c
@@ -24,5 +16,4 @@ shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src
shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac
index c72c34e..a5e3e1c 100644
--- a/c/src/lib/libcpu/arm/configure.ac
+++ b/c/src/lib/libcpu/arm/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-arm],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([shared])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am
deleted file mode 100644
index 31e0da2..0000000
--- a/c/src/lib/libcpu/arm/preinstall.am
+++ /dev/null
@@ -1,30 +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_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)
-
-if shared
-$(PROJECT_INCLUDE)/libcpu/mmu.h: shared/include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
-endif
diff --git a/c/src/lib/libcpu/bfin/Makefile.am b/c/src/lib/libcpu/bfin/Makefile.am
index 1dc90d4..5f98165 100644
--- a/c/src/lib/libcpu/bfin/Makefile.am
+++ b/c/src/lib/libcpu/bfin/Makefile.am
@@ -6,21 +6,12 @@ EXTRA_DIST =
noinst_PROGRAMS =
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-include_bsp_HEADERS =
-include_libcpu_HEADERS =
-
############
# Start of bf52x files
if bf52x
-include_HEADERS = bf52x/include/bf52x.h
-
## INTERRUPT
-include_bsp_HEADERS += bf52x/interrupt/interrupt.h
noinst_PROGRAMS += bf52x/interrupt.rel
bf52x_interrupt_rel_SOURCES = bf52x/interrupt/interrupt.c \
bf52x/interrupt/interrupt.h
@@ -31,33 +22,12 @@ endif
# endof bf52x
############
-include_libcpu_HEADERS += include/bf533.h
-include_libcpu_HEADERS += include/bf537.h
-include_libcpu_HEADERS += include/cecRegs.h
-include_libcpu_HEADERS += include/memoryRegs.h
-include_libcpu_HEADERS += include/mmuRegs.h
-include_libcpu_HEADERS += include/sicRegs.h
-include_libcpu_HEADERS += include/ebiuRegs.h
-include_libcpu_HEADERS += include/ppiRegs.h
-include_libcpu_HEADERS += include/coreTimerRegs.h
-include_libcpu_HEADERS += include/wdogRegs.h
-include_libcpu_HEADERS += include/timerRegs.h
-include_libcpu_HEADERS += include/dmaRegs.h
-include_libcpu_HEADERS += include/ethernetRegs.h
-include_libcpu_HEADERS += include/uartRegs.h
-include_libcpu_HEADERS += include/sportRegs.h
-include_libcpu_HEADERS += include/twiRegs.h
-include_libcpu_HEADERS += include/spiRegs.h
-include_libcpu_HEADERS += include/rtcRegs.h
-include_libcpu_HEADERS += include/gpioRegs.h
-
noinst_PROGRAMS += cache.rel
cache_rel_SOURCES = cache/cache.c \
../shared/src/cache_manager.c cache/cache_.h
cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache
cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += mmu/mmu.h
noinst_PROGRAMS += mmu.rel
mmu_rel_SOURCES = mmu/mmu.c
mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -66,7 +36,6 @@ mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
if bf52x
else
-include_libcpu_HEADERS += interrupt/interrupt.h
noinst_PROGRAMS += interrupt.rel
interrupt_rel_SOURCES = interrupt/interrupt.c
interrupt_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -84,25 +53,21 @@ rtc_rel_SOURCES = clock/rtc.c clock/rtc.h
rtc_rel_CPPFLAGS = $(AM_CPPFLAGS)
rtc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += serial/uart.h
noinst_PROGRAMS += uart.rel
uart_rel_SOURCES = serial/uart.c
uart_rel_CPPFLAGS = $(AM_CPPFLAGS)
uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += serial/sport.h
noinst_PROGRAMS += sport.rel
sport_rel_SOURCES = serial/sport.c
sport_rel_CPPFLAGS = $(AM_CPPFLAGS)
sport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += serial/spi.h
noinst_PROGRAMS += spi.rel
spi_rel_SOURCES = serial/spi.c
spi_rel_CPPFLAGS = $(AM_CPPFLAGS)
spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += serial/twi.h
noinst_PROGRAMS += twi.rel
twi_rel_SOURCES = serial/twi.c
twi_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -115,7 +80,6 @@ timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
if HAS_NETWORKING
## network
-include_libcpu_HEADERS += network/ethernet.h
network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
noinst_PROGRAMS += network.rel
network_rel_SOURCES = network/ethernet.c
@@ -123,5 +87,4 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/bfin/configure.ac b/c/src/lib/libcpu/bfin/configure.ac
index 7888b08..4330957 100644
--- a/c/src/lib/libcpu/bfin/configure.ac
+++ b/c/src/lib/libcpu/bfin/configure.ac
@@ -3,6 +3,8 @@
AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-bfin],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/bfin/preinstall.am b/c/src/lib/libcpu/bfin/preinstall.am
deleted file mode 100644
index c729874..0000000
--- a/c/src/lib/libcpu/bfin/preinstall.am
+++ /dev/null
@@ -1,146 +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_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)
-
-if bf52x
-$(PROJECT_INCLUDE)/bf52x.h: bf52x/include/bf52x.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bf52x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bf52x.h
-
-$(PROJECT_INCLUDE)/bsp/interrupt.h: bf52x/interrupt/interrupt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/interrupt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/interrupt.h
-endif
-$(PROJECT_INCLUDE)/libcpu/bf533.h: include/bf533.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bf533.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bf533.h
-
-$(PROJECT_INCLUDE)/libcpu/bf537.h: include/bf537.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bf537.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bf537.h
-
-$(PROJECT_INCLUDE)/libcpu/cecRegs.h: include/cecRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cecRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cecRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/memoryRegs.h: include/memoryRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/memoryRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/memoryRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/mmuRegs.h: include/mmuRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmuRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmuRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/sicRegs.h: include/sicRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sicRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sicRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/ebiuRegs.h: include/ebiuRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ebiuRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ebiuRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/ppiRegs.h: include/ppiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ppiRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ppiRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h: include/coreTimerRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/coreTimerRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/wdogRegs.h: include/wdogRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/wdogRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/wdogRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/timerRegs.h: include/timerRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/timerRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/timerRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/dmaRegs.h: include/dmaRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/dmaRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/dmaRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/ethernetRegs.h: include/ethernetRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ethernetRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ethernetRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/uartRegs.h: include/uartRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/uartRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/uartRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/sportRegs.h: include/sportRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sportRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sportRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/twiRegs.h: include/twiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/twiRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/twiRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/spiRegs.h: include/spiRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spiRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spiRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/rtcRegs.h: include/rtcRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/rtcRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/rtcRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/gpioRegs.h: include/gpioRegs.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/gpioRegs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/gpioRegs.h
-
-$(PROJECT_INCLUDE)/libcpu/mmu.h: mmu/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
-
-if bf52x
-else
-$(PROJECT_INCLUDE)/libcpu/interrupt.h: interrupt/interrupt.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/interrupt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/interrupt.h
-endif
-$(PROJECT_INCLUDE)/libcpu/uart.h: serial/uart.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/uart.h
-
-$(PROJECT_INCLUDE)/libcpu/sport.h: serial/sport.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/sport.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/sport.h
-
-$(PROJECT_INCLUDE)/libcpu/spi.h: serial/spi.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spi.h
-
-$(PROJECT_INCLUDE)/libcpu/twi.h: serial/twi.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/twi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/twi.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/libcpu/ethernet.h: network/ethernet.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/ethernet.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/ethernet.h
-endif
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index c47b9df..6f1e9fe 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -4,11 +4,6 @@ noinst_PROGRAMS =
include $(top_srcdir)/../../../automake/compile.am
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS = page.h cpuModel.h
-include_libcpu_HEADERS += byteorder.h
-
noinst_PROGRAMS += cache.rel
cache_rel_SOURCES = cache.c cache_.h \
../shared/src/cache_manager.c ../shared/include/cache.h
@@ -25,5 +20,4 @@ page_rel_SOURCES = page.c page.h
page_rel_CPPFLAGS = $(AM_CPPFLAGS)
page_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/i386/configure.ac b/c/src/lib/libcpu/i386/configure.ac
index e03af48..3f0f595 100644
--- a/c/src/lib/libcpu/i386/configure.ac
+++ b/c/src/lib/libcpu/i386/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-i386],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([idtr.S])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/i386/preinstall.am b/c/src/lib/libcpu/i386/preinstall.am
deleted file mode 100644
index 1e6c1df..0000000
--- a/c/src/lib/libcpu/i386/preinstall.am
+++ /dev/null
@@ -1,32 +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_INCLUDE)/libcpu/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
- @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/page.h: page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h
-
-$(PROJECT_INCLUDE)/libcpu/cpuModel.h: cpuModel.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuModel.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuModel.h
-
-$(PROJECT_INCLUDE)/libcpu/byteorder.h: byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
-
diff --git a/c/src/lib/libcpu/lm32/Makefile.am b/c/src/lib/libcpu/lm32/Makefile.am
index 5de23de..1e609ca 100644
--- a/c/src/lib/libcpu/lm32/Makefile.am
+++ b/c/src/lib/libcpu/lm32/Makefile.am
@@ -21,6 +21,5 @@ shared_misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(LM32_CPPFLAGS)
shared_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/lm32/configure.ac b/c/src/lib/libcpu/lm32/configure.ac
index 53a2e4b..295ae91 100644
--- a/c/src/lib/libcpu/lm32/configure.ac
+++ b/c/src/lib/libcpu/lm32/configure.ac
@@ -3,6 +3,8 @@
AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-lm32],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/lm32/preinstall.am b/c/src/lib/libcpu/lm32/preinstall.am
deleted file mode 100644
index dba6cc4..0000000
--- a/c/src/lib/libcpu/lm32/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/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am
index 1872435..2800e42 100644
--- a/c/src/lib/libcpu/m68k/Makefile.am
+++ b/c/src/lib/libcpu/m68k/Makefile.am
@@ -67,10 +67,6 @@ EXTRA_DIST = m68040/fpsp/README
if mcf5206
# mcf5206/include
-include_mcf5206dir = $(includedir)/mcf5206
-include_mcf5206_HEADERS = mcf5206/include/mcf5206e.h mcf5206/include/mcfmbus.h \
- mcf5206/include/mcfuart.h
-
## mcf5206/clock
noinst_PROGRAMS += mcf5206/clock.rel
mcf5206_clock_rel_SOURCES = mcf5206/clock/ckinit.c
@@ -98,9 +94,6 @@ endif
if mcf5223x
## mcf5223x/include
-include_mcf5223xdir = $(includedir)/mcf5223x
-include_mcf5223x_HEADERS = mcf5223x/include/mcf5223x.h
-
## mcf5223x/cache
noinst_PROGRAMS += mcf5223x/cachepd.rel
mcf5223x_cachepd_rel_SOURCES = mcf5223x/cache/cachepd.c
@@ -110,9 +103,6 @@ endif
if mcf5225x
## mcf5225x/include
-include_mcf5225xdir = $(includedir)/mcf5225x
-include_mcf5225x_HEADERS = mcf5225x/include/mcf5225x.h
-
# mcf5225x/cache
noinst_PROGRAMS += mcf5225x/cachepd.rel
mcf5225x_cachepd_rel_SOURCES = mcf5225x/cache/cachepd.c
@@ -121,15 +111,11 @@ mcf5225x_cachepd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# Network
if HAS_NETWORKING
-include_mcf5225x_HEADERS += mcf5225x/include/fec.h
endif ## HAS_NETWORKING
endif
if mcf5235
## mcf5235/include
-include_mcf5235dir = $(includedir)/mcf5235
-include_mcf5235_HEADERS = mcf5235/include/mcf5235.h
-
## mcf5235/cache
noinst_PROGRAMS += mcf5235/cachepd.rel
mcf5235_cachepd_rel_SOURCES = mcf5235/cache/cachepd.c
@@ -139,9 +125,6 @@ endif
if mcf532x
## mcf532x/include
-include_mcf532xdir = $(includedir)/mcf532x
-include_mcf532x_HEADERS = mcf532x/include/mcf532x.h
-
## mcf532x/cache
noinst_PROGRAMS += mcf532x/cachepd.rel
mcf532x_cachepd_rel_SOURCES = mcf532x/cache/cachepd.c
@@ -151,9 +134,6 @@ endif
if mcf5272
## mcf5272/include
-include_mcf5272dir = $(includedir)/mcf5272
-include_mcf5272_HEADERS = mcf5272/include/mcf5272.h
-
## clock
noinst_PROGRAMS += mcf5272/clock.rel
mcf5272_clock_rel_SOURCES = mcf5272/clock/ckinit.c
@@ -169,9 +149,6 @@ endif
if mcf5282
## mcf5282/include
-include_mcf5282dir = $(includedir)/mcf5282
-include_mcf5282_HEADERS = mcf5282/include/mcf5282.h
-
noinst_PROGRAMS += mcf5282/cachepd.rel
mcf5282_cachepd_rel_SOURCES = mcf5282/cache/cachepd.c
mcf5282_cachepd_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache
@@ -180,13 +157,8 @@ endif
if mcf548x
## mcf548x/include
-include_mcf548xdir = $(includedir)/mcf548x
-include_mcf548x_HEADERS = mcf548x/include/mcf548x.h
-
## mcf548x/mcdma
noinst_PROGRAMS += mcf548x/mcdma.rel
-include_mcf548x_HEADERS += mcf548x/mcdma/MCD_progCheck.h mcf548x/mcdma/MCD_dma.h \
- mcf548x/mcdma/MCD_tasksInit.h mcf548x/mcdma/mcdma_glue.h
mcf548x_mcdma_rel_SOURCES = mcf548x/mcdma/MCD_dmaApi.c mcf548x/mcdma/MCD_tasksInit.c \
mcf548x/mcdma/MCD_tasks.c mcf548x/mcdma/mcdma_glue.c
@@ -194,5 +166,4 @@ mcf548x_mcdma_rel_CPPFLAGS = $(AM_CPPFLAGS)
mcf548x_mcdma_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/m68k/configure.ac b/c/src/lib/libcpu/m68k/configure.ac
index 99596c1..5f24e9e 100644
--- a/c/src/lib/libcpu/m68k/configure.ac
+++ b/c/src/lib/libcpu/m68k/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([m68040])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/m68k/preinstall.am b/c/src/lib/libcpu/m68k/preinstall.am
deleted file mode 100644
index 258f0cb..0000000
--- a/c/src/lib/libcpu/m68k/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)
-
-if shared
-endif
-if mcf5206
-$(PROJECT_INCLUDE)/mcf5206/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5206
- @: > $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5206/mcf5206e.h: mcf5206/include/mcf5206e.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h
-
-$(PROJECT_INCLUDE)/mcf5206/mcfmbus.h: mcf5206/include/mcfmbus.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfmbus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfmbus.h
-
-$(PROJECT_INCLUDE)/mcf5206/mcfuart.h: mcf5206/include/mcfuart.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfuart.h
-endif
-if mcf5223x
-$(PROJECT_INCLUDE)/mcf5223x/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5223x
- @: > $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h: mcf5223x/include/mcf5223x.h $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h
-endif
-if mcf5225x
-$(PROJECT_INCLUDE)/mcf5225x/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5225x
- @: > $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h: mcf5225x/include/mcf5225x.h $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/mcf5225x/fec.h: mcf5225x/include/fec.h $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5225x/fec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5225x/fec.h
-endif ## HAS_NETWORKING
-endif
-if mcf5235
-$(PROJECT_INCLUDE)/mcf5235/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5235
- @: > $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5235/mcf5235.h: mcf5235/include/mcf5235.h $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5235/mcf5235.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5235/mcf5235.h
-endif
-if mcf532x
-$(PROJECT_INCLUDE)/mcf532x/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf532x
- @: > $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf532x/mcf532x.h: mcf532x/include/mcf532x.h $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf532x/mcf532x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf532x/mcf532x.h
-endif
-if mcf5272
-$(PROJECT_INCLUDE)/mcf5272/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5272
- @: > $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5272/mcf5272.h: mcf5272/include/mcf5272.h $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5272/mcf5272.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5272/mcf5272.h
-endif
-if mcf5282
-$(PROJECT_INCLUDE)/mcf5282/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5282
- @: > $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5282/mcf5282.h: mcf5282/include/mcf5282.h $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5282/mcf5282.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5282/mcf5282.h
-endif
-if mcf548x
-$(PROJECT_INCLUDE)/mcf548x/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mcf548x
- @: > $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf548x/mcf548x.h: mcf548x/include/mcf548x.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/mcf548x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/mcf548x.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h: mcf548x/mcdma/MCD_progCheck.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_dma.h: mcf548x/mcdma/MCD_dma.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_dma.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h: mcf548x/mcdma/MCD_tasksInit.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h
-
-$(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h: mcf548x/mcdma/mcdma_glue.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h
-endif
diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am
index 2630fc2..84dc521 100644
--- a/c/src/lib/libcpu/mips/Makefile.am
+++ b/c/src/lib/libcpu/mips/Makefile.am
@@ -7,10 +7,6 @@ EXTRA_DIST =
noinst_PROGRAMS =
## cache
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS =
-
noinst_PROGRAMS += shared/cache.rel
shared_cache_rel_SOURCES = shared/cache/cache.c \
../shared/src/cache_manager.c shared/cache/cache_.h
@@ -36,15 +32,10 @@ shared_interrupts_rel_SOURCES = shared/interrupts/installisrentries.c \
shared/interrupts/isr_entries.S shared/interrupts/isr_entries.h
shared_interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(interrupts_CPPFLAGS)
shared_interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += shared/interrupts/isr_entries.h
-
if tx39
-include_libcpu_HEADERS += tx39/include/tx3904.h
endif
if tx49
-include_libcpu_HEADERS += tx49/include/tx4925.h tx49/include/tx4938.h
-
noinst_PROGRAMS += tx49/timer.rel
tx49_timer_rel_SOURCES = timer/timer.c timer/gettime.S
tx49_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -52,18 +43,13 @@ tx49_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
if au1x00
-include_libcpu_HEADERS += au1x00/include/au1x00.h
-
endif
if rm52xx
-include_libcpu_HEADERS += rm52xx/include/rm5231.h
-
noinst_PROGRAMS += rm52xx/timer.rel
rm52xx_timer_rel_SOURCES = timer/timer.c timer/gettime.S
rm52xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
rm52xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac
index 324dd31..6a9e266 100644
--- a/c/src/lib/libcpu/mips/configure.ac
+++ b/c/src/lib/libcpu/mips/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([timer])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/mips/preinstall.am b/c/src/lib/libcpu/mips/preinstall.am
deleted file mode 100644
index 6d302e5..0000000
--- a/c/src/lib/libcpu/mips/preinstall.am
+++ /dev/null
@@ -1,48 +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_INCLUDE)/libcpu/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
- @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/isr_entries.h: shared/interrupts/isr_entries.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/isr_entries.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/isr_entries.h
-
-if tx39
-$(PROJECT_INCLUDE)/libcpu/tx3904.h: tx39/include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
-endif
-if tx49
-$(PROJECT_INCLUDE)/libcpu/tx4925.h: tx49/include/tx4925.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx4925.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx4925.h
-
-$(PROJECT_INCLUDE)/libcpu/tx4938.h: tx49/include/tx4938.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx4938.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx4938.h
-endif
-if au1x00
-$(PROJECT_INCLUDE)/libcpu/au1x00.h: au1x00/include/au1x00.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/au1x00.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/au1x00.h
-endif
-if rm52xx
-$(PROJECT_INCLUDE)/libcpu/rm5231.h: rm52xx/include/rm5231.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/rm5231.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/rm5231.h
-endif
diff --git a/c/src/lib/libcpu/nios2/Makefile.am b/c/src/lib/libcpu/nios2/Makefile.am
index fee8825..7641afb 100644
--- a/c/src/lib/libcpu/nios2/Makefile.am
+++ b/c/src/lib/libcpu/nios2/Makefile.am
@@ -22,6 +22,5 @@ shared_misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(NIOS2_CPPFLAGS)
shared_misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/nios2/configure.ac b/c/src/lib/libcpu/nios2/configure.ac
index c37ad55..ce7fe1b 100644
--- a/c/src/lib/libcpu/nios2/configure.ac
+++ b/c/src/lib/libcpu/nios2/configure.ac
@@ -3,6 +3,8 @@
AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/nios2/preinstall.am b/c/src/lib/libcpu/nios2/preinstall.am
deleted file mode 100644
index dba6cc4..0000000
--- a/c/src/lib/libcpu/nios2/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/libcpu/or1k/Makefile.am b/c/src/lib/libcpu/or1k/Makefile.am
index 9c9921a..e34d580 100644
--- a/c/src/lib/libcpu/or1k/Makefile.am
+++ b/c/src/lib/libcpu/or1k/Makefile.am
@@ -12,6 +12,5 @@ shared_cache_rel_SOURCES = shared/cache/cache.c ../shared/src/cache_manager.c
shared_cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache
shared_cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/or1k/configure.ac b/c/src/lib/libcpu/or1k/configure.ac
index a089a82..80c67b6 100644
--- a/c/src/lib/libcpu/or1k/configure.ac
+++ b/c/src/lib/libcpu/or1k/configure.ac
@@ -3,6 +3,8 @@
AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-or1k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/or1k/preinstall.am b/c/src/lib/libcpu/or1k/preinstall.am
deleted file mode 100644
index dba6cc4..0000000
--- a/c/src/lib/libcpu/or1k/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/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 5f8ee9f..b56ce69 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -2,26 +2,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
include $(top_srcdir)/../../../automake/compile.am
-include_rtems_powerpcdir = $(includedir)/rtems/powerpc
-include_rtems_powerpc_HEADERS = rtems/powerpc/cache.h \
- rtems/powerpc/debugmod.h rtems/powerpc/powerpc.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS = shared/include/powerpc-utility.h
-
-include_bspdir = $(includedir)/bsp
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += new-exceptions/bspsupport/irq_supp.h
-include_bsp_HEADERS += new-exceptions/bspsupport/vectors.h
-
-include_mpc83xxdir = $(includedir)/mpc83xx
-
-include_mpc83xx_HEADERS =
-include_mpc83xx_HEADERS += mpc83xx/i2c/mpc83xx_i2cdrv.h
-
EXTRA_DIST =
noinst_PROGRAMS = new-exceptions/rtems-cpu.rel
@@ -66,17 +46,11 @@ EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_test.c
# shared/include
if shared
-include_libcpu_HEADERS += shared/include/io.h shared/include/mmu.h \
- shared/include/page.h \
- shared/include/byteorder.h shared/include/pgtable.h
-
noinst_PROGRAMS += shared/cpuIdent.rel
shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c shared/include/cpuIdent.h
shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS)
shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += shared/include/cpuIdent.h
-
# shared/cache
noinst_PROGRAMS += shared/cache.rel
shared_cache_rel_SOURCES = shared/src/cache_.h \
@@ -91,8 +65,6 @@ shared_stack_rel_SOURCES = shared/src/stack.c shared/include/spr.h shared/src/st
shared_stack_rel_CPPFLAGS = $(AM_CPPFLAGS)
shared_stack_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += shared/include/spr.h
-include_libcpu_HEADERS += shared/src/stackTrace.h
endif
EXTRA_DIST += ppc403/README ppc403/vectors/README
@@ -113,7 +85,6 @@ endif
ppc403_console_rel_CPPFLAGS = $(AM_CPPFLAGS)
ppc403_console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_HEADERS =
shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c
shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS)
shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -126,8 +97,6 @@ ppc403_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# ppc403/tty_drv
if ppc405
-include_HEADERS += ppc403/tty_drv/tty_drv.h
-
noinst_PROGRAMS += ppc403/tty_drv.rel
ppc403_tty_drv_rel_SOURCES = ppc403/tty_drv/tty_drv.c ppc403/tty_drv/tty_drv.h
ppc403_tty_drv_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -139,20 +108,12 @@ endif # ppc4xx
if ppc405
## ppc4xx/include
-include_ppc4xxdir = $(includedir)/ppc4xx
-include_ppc4xx_HEADERS = ppc403/include/ppc405gp.h \
- ppc403/include/ppc405ex.h
-
endif # ppc405
## mpc5xx
EXTRA_DIST += mpc5xx/README
if mpc5xx
-include_mpc5xxdir = $(includedir)/mpc5xx
-
-include_HEADERS = mpc5xx/include/mpc5xx.h
-
# mpc5xx/clock
noinst_PROGRAMS += mpc5xx/clock.rel
mpc5xx_clock_rel_SOURCES = mpc5xx/clock/clock.c
@@ -160,24 +121,18 @@ mpc5xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc5xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc5xx/console-generic
-include_mpc5xx_HEADERS = mpc5xx/include/console.h
-
noinst_PROGRAMS += mpc5xx/console-generic.rel
mpc5xx_console_generic_rel_SOURCES = mpc5xx/console-generic/console-generic.c
mpc5xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc5xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc5xx/exceptions
-include_libcpu_HEADERS += mpc5xx/exceptions/raw_exception.h
-
noinst_PROGRAMS += mpc5xx/exceptions.rel
mpc5xx_exceptions_rel_SOURCES = mpc5xx/exceptions/raw_exception.c
mpc5xx_exceptions_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc5xx_exceptions_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc5xx/irq
-include_libcpu_HEADERS += mpc5xx/irq/irq.h
-
noinst_PROGRAMS += mpc5xx/irq.rel
mpc5xx_irq_rel_SOURCES = mpc5xx/irq/irq.c mpc5xx/irq/irq_init.c mpc5xx/irq/irq_asm.S
mpc5xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -190,8 +145,6 @@ mpc5xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc5xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc5xx/vectors
-include_libcpu_HEADERS += mpc5xx/vectors/vectors.h
-
noinst_PROGRAMS += mpc5xx/vectors.rel
mpc5xx_vectors_rel_SOURCES = mpc5xx/vectors/vectors_init.c mpc5xx/vectors/vectors.S \
new-exceptions/bspsupport/ppc_exc_print.c
@@ -201,8 +154,6 @@ endif
if mpc505
# mpc505/ictrl
-include_HEADERS = mpc505/ictrl/ictrl.h
-
noinst_PROGRAMS += mpc505/ictrl.rel
mpc505_ictrl_rel_SOURCES = mpc505/ictrl/ictrl.c
mpc505_ictrl_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -224,8 +175,6 @@ endif
if mpc6xx
# mpc6xx/mmu
-include_libcpu_HEADERS += mpc6xx/mmu/bat.h mpc6xx/mmu/pte121.h
-
noinst_PROGRAMS += mpc6xx/mmu.rel
mpc6xx_mmu_rel_SOURCES = mpc6xx/mmu/bat.c mpc6xx/mmu/bat.h \
mpc6xx/mmu/pte121.c mpc6xx/mmu/pte121.h \
@@ -234,8 +183,6 @@ mpc6xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc6xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc6xx/clock
-include_libcpu_HEADERS += mpc6xx/clock/c_clock.h
-
noinst_PROGRAMS += mpc6xx/clock.rel
mpc6xx_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h
mpc6xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -257,8 +204,6 @@ EXTRA_DIST += mpc6xx/altivec/README
# e500/clock
if e500_clock
-include_libcpu_HEADERS += mpc6xx/clock/c_clock.h
-
noinst_PROGRAMS += e500/clock.rel
e500_clock_rel_SOURCES = mpc6xx/clock/c_clock.c mpc6xx/clock/c_clock.h
e500_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -275,7 +220,6 @@ endif
# e500/mmu
if e500_mmu
-include_libcpu_HEADERS += e500/mmu/e500_mmu.h
noinst_PROGRAMS += e500/mmu.rel
e500_mmu_rel_SOURCES = e500/mmu/mmu.c e500/mmu/e500_mmu.h
e500_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -284,10 +228,6 @@ endif
EXTRA_DIST += mpc8xx/README
if mpc8xx
-include_mpc8xxdir = $(includedir)/mpc8xx
-
-include_HEADERS = mpc8xx/include/mpc8xx.h
-
# mpc8xx/clock
noinst_PROGRAMS += mpc8xx/clock.rel
mpc8xx_clock_rel_SOURCES = mpc8xx/clock/clock.c
@@ -295,24 +235,18 @@ mpc8xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc8xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc8xx/console-generic
-include_mpc8xx_HEADERS = mpc8xx/include/console.h
-
noinst_PROGRAMS += mpc8xx/console-generic.rel
mpc8xx_console_generic_rel_SOURCES = mpc8xx/console-generic/console-generic.c
mpc8xx_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc8xx_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc8xx/cpm
-include_mpc8xx_HEADERS += mpc8xx/include/cpm.h
-
noinst_PROGRAMS += mpc8xx/cpm.rel
mpc8xx_cpm_rel_SOURCES = mpc8xx/cpm/cp.c mpc8xx/cpm/dpram.c
mpc8xx_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc8xx_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc8xx/mmu
-include_mpc8xx_HEADERS += mpc8xx/include/mmu.h
-
noinst_PROGRAMS += mpc8xx/mmu.rel
mpc8xx_mmu_rel_SOURCES = mpc8xx/mmu/mmu.c
mpc8xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -327,13 +261,7 @@ endif
EXTRA_DIST += mpc8260/README
if mpc8260
-include_mpc8260dir = $(includedir)/mpc8260
-
-include_HEADERS = mpc8260/include/mpc8260.h
-
# mpc8260/console-generic
-include_mpc8260_HEADERS = mpc8260/include/console.h
-
noinst_PROGRAMS += mpc8260/console-generic.rel
mpc8260_console_generic_rel_SOURCES = mpc8260/console-generic/console-generic.c \
mpc8260/include/console.h
@@ -341,8 +269,6 @@ mpc8260_console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc8260_console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc8260/cpm
-include_mpc8260_HEADERS += mpc8260/include/cpm.h
-
noinst_PROGRAMS += mpc8260/cpm.rel
mpc8260_cpm_rel_SOURCES = mpc8260/cpm/cp.c mpc8260/cpm/dpram.c mpc8260/cpm/brg.c \
mpc8260/include/cpm.h
@@ -350,8 +276,6 @@ mpc8260_cpm_rel_CPPFLAGS = $(AM_CPPFLAGS)
mpc8260_cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# mpc8260/mmu
-include_mpc8260_HEADERS += mpc8260/include/mmu.h
-
noinst_PROGRAMS += mpc8260/mmu.rel
mpc8260_mmu_rel_SOURCES = mpc8260/mmu/mmu.c \
mpc8260/include/mmu.h
@@ -372,10 +296,7 @@ if mpc83xx
# Includes
-include_mpc83xx_HEADERS += mpc83xx/include/mpc83xx.h
-
# Network
-include_bsp_HEADERS += mpc83xx/network/tsec.h
if HAS_NETWORKING
noinst_PROGRAMS += mpc83xx/tsec.rel
mpc83xx_tsec_rel_SOURCES = mpc83xx/network/tsec.c
@@ -390,14 +311,12 @@ mpc83xx_i2c_rel_SOURCES = mpc83xx/i2c/mpc83xx_i2cdrv.c \
mpc83xx_i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# SPI
-include_mpc83xx_HEADERS += mpc83xx/spi/mpc83xx_spidrv.h
noinst_PROGRAMS += mpc83xx/spi.rel
mpc83xx_spi_rel_SOURCES = mpc83xx/spi/mpc83xx_spidrv.c \
mpc83xx/spi/mpc83xx_spidrv.h
mpc83xx_spi_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# GTM
-include_mpc83xx_HEADERS += mpc83xx/include/gtm.h
noinst_PROGRAMS += mpc83xx/gtm.rel
mpc83xx_gtm_rel_SOURCES = mpc83xx/gtm/gtm.c \
mpc83xx/include/gtm.h
@@ -413,27 +332,6 @@ endif
##############################################################################
if mpc55xx
-# Includes
-include_mpc55xxdir = $(includedir)/mpc55xx
-
-include_mpc55xx_HEADERS =
-include_mpc55xx_HEADERS += mpc55xx/include/regs.h
-include_mpc55xx_HEADERS += mpc55xx/include/reg-defs.h
-include_mpc55xx_HEADERS += mpc55xx/include/dspi.h
-include_mpc55xx_HEADERS += mpc55xx/include/edma.h
-include_mpc55xx_HEADERS += mpc55xx/include/emios.h
-include_mpc55xx_HEADERS += mpc55xx/include/mpc55xx.h
-include_mpc55xx_HEADERS += mpc55xx/include/siu.h
-include_mpc55xx_HEADERS += mpc55xx/include/watchdog.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc551x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc555x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc556x.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc564xL.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc5668.h
-include_mpc55xx_HEADERS += mpc55xx/include/fsl-mpc567x.h
-include_mpc55xx_HEADERS += mpc55xx/include/regs-edma.h
-include_mpc55xx_HEADERS += mpc55xx/include/regs-mmu.h
-
# IRQ
noinst_PROGRAMS += mpc55xx/irq.rel
mpc55xx_irq_rel_SOURCES = mpc55xx/irq/irq.c
@@ -487,7 +385,6 @@ endif
if qoriq
# Network
-include_bsp_HEADERS += mpc83xx/network/tsec.h
if HAS_NETWORKING
noinst_PROGRAMS += tsec.rel
tsec_rel_SOURCES = mpc83xx/network/tsec.c
@@ -500,5 +397,4 @@ endif
# END: QorIQ #
##############################################################################
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac
index 81e6bfa..ba65437 100644
--- a/c/src/lib/libcpu/powerpc/configure.ac
+++ b/c/src/lib/libcpu/powerpc/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-powerpc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([mpc6xx])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/powerpc/preinstall.am b/c/src/lib/libcpu/powerpc/preinstall.am
deleted file mode 100644
index 178763b..0000000
--- a/c/src/lib/libcpu/powerpc/preinstall.am
+++ /dev/null
@@ -1,320 +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_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/powerpc
- @: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/powerpc/cache.h: rtems/powerpc/cache.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/cache.h
-
-$(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h: rtems/powerpc/debugmod.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h
-
-$(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h: rtems/powerpc/powerpc.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
- @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/powerpc-utility.h: shared/include/powerpc-utility.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/powerpc-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/powerpc-utility.h
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/irq_supp.h: new-exceptions/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h
-
-$(PROJECT_INCLUDE)/bsp/vectors.h: new-exceptions/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
-
-$(PROJECT_INCLUDE)/mpc83xx/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc83xx
- @: > $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h: mpc83xx/i2c/mpc83xx_i2cdrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_i2cdrv.h
-
-if !mpc5xx
-endif
-if shared
-$(PROJECT_INCLUDE)/libcpu/io.h: shared/include/io.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/io.h
-
-$(PROJECT_INCLUDE)/libcpu/mmu.h: shared/include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
-
-$(PROJECT_INCLUDE)/libcpu/page.h: shared/include/page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h
-
-$(PROJECT_INCLUDE)/libcpu/byteorder.h: shared/include/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
-
-$(PROJECT_INCLUDE)/libcpu/pgtable.h: shared/include/pgtable.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pgtable.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pgtable.h
-
-$(PROJECT_INCLUDE)/libcpu/cpuIdent.h: shared/include/cpuIdent.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.h
-
-$(PROJECT_INCLUDE)/libcpu/spr.h: shared/include/spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spr.h
-
-$(PROJECT_INCLUDE)/libcpu/stackTrace.h: shared/src/stackTrace.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/stackTrace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/stackTrace.h
-endif
-if ppc4xx
-if ppc405
-$(PROJECT_INCLUDE)/tty_drv.h: ppc403/tty_drv/tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tty_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tty_drv.h
-endif
-endif # ppc4xx
-if ppc405
-$(PROJECT_INCLUDE)/ppc4xx/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/ppc4xx
- @: > $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h: ppc403/include/ppc405gp.h $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ppc4xx/ppc405gp.h
-
-$(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h: ppc403/include/ppc405ex.h $(PROJECT_INCLUDE)/ppc4xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ppc4xx/ppc405ex.h
-endif # ppc405
-if mpc5xx
-$(PROJECT_INCLUDE)/mpc5xx/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc5xx
- @: > $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc5xx.h: mpc5xx/include/mpc5xx.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc5xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc5xx.h
-
-$(PROJECT_INCLUDE)/mpc5xx/console.h: mpc5xx/include/console.h $(PROJECT_INCLUDE)/mpc5xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc5xx/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc5xx/console.h
-
-$(PROJECT_INCLUDE)/libcpu/raw_exception.h: mpc5xx/exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h
-
-$(PROJECT_INCLUDE)/libcpu/irq.h: mpc5xx/irq/irq.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/irq.h
-
-$(PROJECT_INCLUDE)/libcpu/vectors.h: mpc5xx/vectors/vectors.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/vectors.h
-endif
-if mpc505
-$(PROJECT_INCLUDE)/ictrl.h: mpc505/ictrl/ictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h
-endif
-if mpc6xx
-$(PROJECT_INCLUDE)/libcpu/bat.h: mpc6xx/mmu/bat.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bat.h
-
-$(PROJECT_INCLUDE)/libcpu/pte121.h: mpc6xx/mmu/pte121.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pte121.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pte121.h
-
-$(PROJECT_INCLUDE)/libcpu/c_clock.h: mpc6xx/clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h
-endif
-if e500_clock
-$(PROJECT_INCLUDE)/libcpu/c_clock.h: mpc6xx/clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h
-endif
-if e500_mmu
-$(PROJECT_INCLUDE)/libcpu/e500_mmu.h: e500/mmu/e500_mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/e500_mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/e500_mmu.h
-endif
-if mpc8xx
-$(PROJECT_INCLUDE)/mpc8xx/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc8xx
- @: > $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc8xx.h: mpc8xx/include/mpc8xx.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx.h
-
-$(PROJECT_INCLUDE)/mpc8xx/console.h: mpc8xx/include/console.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/console.h
-
-$(PROJECT_INCLUDE)/mpc8xx/cpm.h: mpc8xx/include/cpm.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/cpm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/cpm.h
-
-$(PROJECT_INCLUDE)/mpc8xx/mmu.h: mpc8xx/include/mmu.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/mmu.h
-endif
-if mpc8260
-$(PROJECT_INCLUDE)/mpc8260/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc8260
- @: > $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc8260.h: mpc8260/include/mpc8260.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260.h
-
-$(PROJECT_INCLUDE)/mpc8260/console.h: mpc8260/include/console.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/console.h
-
-$(PROJECT_INCLUDE)/mpc8260/cpm.h: mpc8260/include/cpm.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/cpm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/cpm.h
-
-$(PROJECT_INCLUDE)/mpc8260/mmu.h: mpc8260/include/mmu.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/mmu.h
-endif
-if mpc83xx
-$(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h: mpc83xx/include/mpc83xx.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx.h
-
-$(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h
-
-$(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h: mpc83xx/spi/mpc83xx_spidrv.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/mpc83xx_spidrv.h
-
-$(PROJECT_INCLUDE)/mpc83xx/gtm.h: mpc83xx/include/gtm.h $(PROJECT_INCLUDE)/mpc83xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc83xx/gtm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc83xx/gtm.h
-endif
-if mpc55xx
-$(PROJECT_INCLUDE)/mpc55xx/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mpc55xx
- @: > $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mpc55xx/regs.h: mpc55xx/include/regs.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs.h
-
-$(PROJECT_INCLUDE)/mpc55xx/reg-defs.h: mpc55xx/include/reg-defs.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/reg-defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/reg-defs.h
-
-$(PROJECT_INCLUDE)/mpc55xx/dspi.h: mpc55xx/include/dspi.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/dspi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/dspi.h
-
-$(PROJECT_INCLUDE)/mpc55xx/edma.h: mpc55xx/include/edma.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/edma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/edma.h
-
-$(PROJECT_INCLUDE)/mpc55xx/emios.h: mpc55xx/include/emios.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/emios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/emios.h
-
-$(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h: mpc55xx/include/mpc55xx.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/mpc55xx.h
-
-$(PROJECT_INCLUDE)/mpc55xx/siu.h: mpc55xx/include/siu.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/siu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/siu.h
-
-$(PROJECT_INCLUDE)/mpc55xx/watchdog.h: mpc55xx/include/watchdog.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/watchdog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/watchdog.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h: mpc55xx/include/fsl-mpc551x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc551x.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h: mpc55xx/include/fsl-mpc555x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc555x.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h: mpc55xx/include/fsl-mpc556x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc556x.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h: mpc55xx/include/fsl-mpc564xL.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc564xL.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h: mpc55xx/include/fsl-mpc5668.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc5668.h
-
-$(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h: mpc55xx/include/fsl-mpc567x.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/fsl-mpc567x.h
-
-$(PROJECT_INCLUDE)/mpc55xx/regs-edma.h: mpc55xx/include/regs-edma.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs-edma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs-edma.h
-
-$(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h: mpc55xx/include/regs-mmu.h $(PROJECT_INCLUDE)/mpc55xx/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc55xx/regs-mmu.h
-endif
-if qoriq
-$(PROJECT_INCLUDE)/bsp/tsec.h: mpc83xx/network/tsec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec.h
-
-endif
diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am
index 67a35ee..4d957da 100644
--- a/c/src/lib/libcpu/sparc/Makefile.am
+++ b/c/src/lib/libcpu/sparc/Makefile.am
@@ -4,10 +4,6 @@ include $(top_srcdir)/../../../automake/compile.am
noinst_PROGRAMS =
-include_libcpudir = $(includedir)/libcpu
-include_libcpu_HEADERS =
-include_libcpu_HEADERS += include/libcpu/access.h
-
noinst_PROGRAMS += cache.rel
cache_rel_SOURCES = cache/cache_.h \
../shared/src/cache_manager.c
@@ -33,5 +29,4 @@ access_rel_SOURCES = access/access.S access/access_le.c
access_rel_CPPFLAGS = $(AM_CPPFLAGS)
access_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/configure.ac b/c/src/lib/libcpu/sparc/configure.ac
index 40085ad..98b2ce8 100644
--- a/c/src/lib/libcpu/sparc/configure.ac
+++ b/c/src/lib/libcpu/sparc/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-sparc],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([reg_win])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/sparc/preinstall.am b/c/src/lib/libcpu/sparc/preinstall.am
deleted file mode 100644
index ec35254..0000000
--- a/c/src/lib/libcpu/sparc/preinstall.am
+++ /dev/null
@@ -1,24 +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_INCLUDE)/libcpu/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
- @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/access.h: include/libcpu/access.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/access.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/access.h
-
diff --git a/c/src/lib/libcpu/sparc64/Makefile.am b/c/src/lib/libcpu/sparc64/Makefile.am
index f7b3beb..81d07d4 100644
--- a/c/src/lib/libcpu/sparc64/Makefile.am
+++ b/c/src/lib/libcpu/sparc64/Makefile.am
@@ -56,5 +56,4 @@ endif
#endif
### End of example.
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc64/configure.ac b/c/src/lib/libcpu/sparc64/configure.ac
index 5604c42..08607a5 100644
--- a/c/src/lib/libcpu/sparc64/configure.ac
+++ b/c/src/lib/libcpu/sparc64/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-sparc64],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([shared])
RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/lib/libcpu/sparc64/preinstall.am b/c/src/lib/libcpu/sparc64/preinstall.am
deleted file mode 100644
index dba6cc4..0000000
--- a/c/src/lib/libcpu/sparc64/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/libchip/Makefile.am b/c/src/libchip/Makefile.am
index 3eab714..21892f1 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -1,30 +1,20 @@
include $(top_srcdir)/automake/compile.am
-include_libchipdir = $(includedir)/libchip
-include_libchip_HEADERS =
-
EXTRA_DIST =
noinst_LIBRARIES =
noinst_PROGRAMS =
# display
-include_libchip_HEADERS += display/disp_hcms29xx.h
-
noinst_LIBRARIES += libdisplay.a
libdisplay_a_SOURCES = display/disp_hcms29xx.c display/font_hcms29xx.c
libdisplay_a_CPPFLAGS = $(AM_CPPFLAGS)
# flash
-include_libchip_HEADERS += flash/am29lv160.h
-
noinst_LIBRARIES += libflash.a
libflash_a_SOURCES = flash/am29lv160.c
libflash_a_CPPFLAGS = $(AM_CPPFLAGS)
# ide
-include_libchip_HEADERS += ide/ata.h ide/ide_ctrl_cfg.h ide/ide_ctrl.h \
- ide/ide_ctrl_io.h ide/ata_internal.h
-
noinst_LIBRARIES += libide.a
libide_a_SOURCES = ide/ata.c ide/ata_util.c ide/ide_controller.c
libide_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -34,17 +24,12 @@ if HAS_NETWORKING
noinst_LIBRARIES += libnetchip.a
libnetchip_a_CPPFLAGS = $(AM_CPPFLAGS)
libnetchip_a_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-include_libchip_HEADERS += network/cs8900.h network/i82586var.h \
- network/if_fxpvar.h network/sonic.h network/wd80x3.h
-include_libchip_HEADERS += network/open_eth.h network/if_dcreg.h
libnetchip_a_SOURCES = network/cs8900.c network/dec21140.c network/i82586.c \
network/sonic.c network/if_fxp.c network/elnk.c network/open_eth.c \
network/if_dc.c
if !HAS_SMP
libnetchip_a_SOURCES += network/greth.c
-include_libchip_HEADERS += network/greth.h
endif
-include_libchip_HEADERS += network/smc91111.h network/smc91111exp.h
libnetchip_a_SOURCES += network/smc91111.c network/smc91111config.h
endif
@@ -53,9 +38,6 @@ EXTRA_DIST += network/README network/README.cs8900 network/README.dec21140 \
network/cs8900.c.bsp network/README.tulipclone
# rtc
-include_libchip_HEADERS += rtc/rtc.h rtc/icm7170.h rtc/m48t08.h \
- rtc/mc146818a.h rtc/ds1375-rtc.h
-
noinst_LIBRARIES += librtcio.a
librtcio_a_CPPFLAGS = $(AM_CPPFLAGS)
librtcio_a_SOURCES = rtc/rtcprobe.c rtc/icm7170.c rtc/icm7170_reg.c \
@@ -67,14 +49,6 @@ EXTRA_DIST += rtc/README.ds1643 rtc/README.icm7170 rtc/README.m48t08 \
rtc/README.m48t18 rtc/STATUS
# i2c
-include_libchip_HEADERS += i2c/i2c-ds1621.h \
- i2c/i2c-2b-eeprom.h \
- i2c/i2c-sc620.h \
- i2c/spi-memdrv.h \
- i2c/spi-flash-m25p40.h \
- i2c/spi-fram-fm25l256.h \
- i2c/spi-sd-card.h
-
noinst_LIBRARIES += libi2cio.a
libi2cio_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -92,10 +66,6 @@ libi2cio_a_SOURCES = i2c/i2c-ds1621.h \
i2c/spi-sd-card.c
# serial
-include_libchip_HEADERS += serial/mc68681.h serial/ns16550.h serial/z85c30.h \
- serial/serial.h serial/sersupp.h
-include_libchip_HEADERS += serial/ns16550_p.h
-
noinst_LIBRARIES += libserialio.a
libserialio_a_CPPFLAGS = $(AM_CPPFLAGS)
libserialio_a_SOURCES = serial/mc68681.c serial/mc68681_baud.c \
@@ -110,8 +80,6 @@ EXTRA_DIST += serial/README.mc68681 serial/README.ns16550 \
## shmdr
if HAS_MP
-include_HEADERS = shmdr/shm_driver.h shmdr/mpci.h
-
project_lib_PROGRAMS = shmdr.rel
shmdr_rel_SOURCES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \
shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \
@@ -124,5 +92,4 @@ EXTRA_DIST += shmdr/README
## --
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/c/src/libchip/preinstall.am b/c/src/libchip/preinstall.am
deleted file mode 100644
index 82bb281..0000000
--- a/c/src/libchip/preinstall.am
+++ /dev/null
@@ -1,190 +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)/libchip/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/libchip
- @: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libchip/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libchip/disp_hcms29xx.h: display/disp_hcms29xx.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/disp_hcms29xx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/disp_hcms29xx.h
-
-$(PROJECT_INCLUDE)/libchip/am29lv160.h: flash/am29lv160.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/am29lv160.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/am29lv160.h
-
-$(PROJECT_INCLUDE)/libchip/ata.h: ide/ata.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ata.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ata.h
-
-$(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h: ide/ide_ctrl_cfg.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl_cfg.h
-
-$(PROJECT_INCLUDE)/libchip/ide_ctrl.h: ide/ide_ctrl.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl.h
-
-$(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h: ide/ide_ctrl_io.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ide_ctrl_io.h
-
-$(PROJECT_INCLUDE)/libchip/ata_internal.h: ide/ata_internal.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ata_internal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ata_internal.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/libchip/cs8900.h: network/cs8900.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/cs8900.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/cs8900.h
-
-$(PROJECT_INCLUDE)/libchip/i82586var.h: network/i82586var.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i82586var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i82586var.h
-
-$(PROJECT_INCLUDE)/libchip/if_fxpvar.h: network/if_fxpvar.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/if_fxpvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/if_fxpvar.h
-
-$(PROJECT_INCLUDE)/libchip/sonic.h: network/sonic.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/sonic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/sonic.h
-
-$(PROJECT_INCLUDE)/libchip/wd80x3.h: network/wd80x3.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/wd80x3.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/wd80x3.h
-
-$(PROJECT_INCLUDE)/libchip/open_eth.h: network/open_eth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h
-
-$(PROJECT_INCLUDE)/libchip/if_dcreg.h: network/if_dcreg.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/if_dcreg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/if_dcreg.h
-
-if !HAS_SMP
-$(PROJECT_INCLUDE)/libchip/greth.h: network/greth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/greth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/greth.h
-endif
-$(PROJECT_INCLUDE)/libchip/smc91111.h: network/smc91111.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/smc91111.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/smc91111.h
-
-$(PROJECT_INCLUDE)/libchip/smc91111exp.h: network/smc91111exp.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/smc91111exp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/smc91111exp.h
-endif
-$(PROJECT_INCLUDE)/libchip/rtc.h: rtc/rtc.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/rtc.h
-
-$(PROJECT_INCLUDE)/libchip/icm7170.h: rtc/icm7170.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/icm7170.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/icm7170.h
-
-$(PROJECT_INCLUDE)/libchip/m48t08.h: rtc/m48t08.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/m48t08.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/m48t08.h
-
-$(PROJECT_INCLUDE)/libchip/mc146818a.h: rtc/mc146818a.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mc146818a.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mc146818a.h
-
-$(PROJECT_INCLUDE)/libchip/ds1375-rtc.h: rtc/ds1375-rtc.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ds1375-rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ds1375-rtc.h
-
-$(PROJECT_INCLUDE)/libchip/i2c-ds1621.h: i2c/i2c-ds1621.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i2c-ds1621.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i2c-ds1621.h
-
-$(PROJECT_INCLUDE)/libchip/i2c-2b-eeprom.h: i2c/i2c-2b-eeprom.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i2c-2b-eeprom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i2c-2b-eeprom.h
-
-$(PROJECT_INCLUDE)/libchip/i2c-sc620.h: i2c/i2c-sc620.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/i2c-sc620.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/i2c-sc620.h
-
-$(PROJECT_INCLUDE)/libchip/spi-memdrv.h: i2c/spi-memdrv.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-memdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-memdrv.h
-
-$(PROJECT_INCLUDE)/libchip/spi-flash-m25p40.h: i2c/spi-flash-m25p40.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-flash-m25p40.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-flash-m25p40.h
-
-$(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h: i2c/spi-fram-fm25l256.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-fram-fm25l256.h
-
-$(PROJECT_INCLUDE)/libchip/spi-sd-card.h: i2c/spi-sd-card.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/spi-sd-card.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/spi-sd-card.h
-
-$(PROJECT_INCLUDE)/libchip/mc68681.h: serial/mc68681.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mc68681.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mc68681.h
-
-$(PROJECT_INCLUDE)/libchip/ns16550.h: serial/ns16550.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ns16550.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ns16550.h
-
-$(PROJECT_INCLUDE)/libchip/z85c30.h: serial/z85c30.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/z85c30.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/z85c30.h
-
-$(PROJECT_INCLUDE)/libchip/serial.h: serial/serial.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/serial.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/serial.h
-
-$(PROJECT_INCLUDE)/libchip/sersupp.h: serial/sersupp.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/sersupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/sersupp.h
-
-$(PROJECT_INCLUDE)/libchip/ns16550_p.h: serial/ns16550_p.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/ns16550_p.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/ns16550_p.h
-
-if HAS_MP
-$(PROJECT_INCLUDE)/shm_driver.h: shmdr/shm_driver.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/shm_driver.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/shm_driver.h
-
-$(PROJECT_INCLUDE)/mpci.h: shmdr/mpci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpci.h
-
-$(PROJECT_LIB)/shmdr.rel: shmdr.rel $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/shmdr.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr.rel
-endif
diff --git a/c/src/make/configure.ac b/c/src/make/configure.ac
index 10c47a0..11f2102 100644
--- a/c/src/make/configure.ac
+++ b/c/src/make/configure.ac
@@ -8,6 +8,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-make],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([bsp.cfg.in])
RTEMS_TOP(../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
AC_SUBST(RTEMS_TOPdir,../../..)
RTEMS_CANONICAL_TARGET_CPU
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index b6760dd..02713d7 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -6,6 +6,11 @@ include $(top_srcdir)/automake/compile.am
## Setup the variant build subdirectory
project_lib_DATA = o-optimize/librtemsbsp.a
+
+$(PROJECT_LIB)/librtemsbsp.a: o-optimize/librtemsbsp.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/librtemsbsp.a
+
CLEANFILES = o-optimize/librtemsbsp.a
SRCS = ../support/libsupport.a
@@ -62,5 +67,4 @@ o-optimize/librtemsbsp.a: $(SRCS)
rm -f $@-list o-optimize/*.$(OBJEXT) o-optimize/*.rel
$(RANLIB) $@
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/c/src/wrapup/preinstall.am b/c/src/wrapup/preinstall.am
deleted file mode 100644
index 6bc2534..0000000
--- a/c/src/wrapup/preinstall.am
+++ /dev/null
@@ -1,24 +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-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/librtemsbsp.a: o-optimize/librtemsbsp.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp.a
-
diff --git a/configure.ac b/configure.ac
index 941455f..2d1842e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([c])
RTEMS_TOP([.])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
# Abort if trying to build inside of the source tree.
AS_IF([test -f aclocal/version.m4],[
@@ -26,7 +28,6 @@ RTEMS_ENABLE_CXX
RTEMS_ENABLE_TESTS
RTEMS_ENABLE_RTEMS_DEBUG
RTEMS_ENABLE_RTEMSBSP
-RTEMS_ENABLE_MULTILIB
RTEMS_ENABLE_PARAVIRT
RTEMS_ENABLE_DRVMGR
@@ -48,9 +49,6 @@ AS_IF([test $host != $build],[
RTEMS_HOST_CONFIG_SUBDIRS([tools/build])
])
-AS_IF([test x"$enable_multilib" = x"yes"],[
- RTEMS_TARGET_CONFIG_SUBDIRS([cpukit])
-])
RTEMS_TARGET_CONFIG_SUBDIRS([c])
AC_CONFIG_FILES([Makefile])
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index d317fbb..636663e 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -29,292 +29,67 @@ _SUBDIRS += telnetd
_SUBDIRS += pppd
_SUBDIRS += mghttpd
-noinst_DATA = preinstall-stamp
-preinstall-stamp:
- $(MAKE) $(AM_MAKEFLAGS) preinstall
- touch preinstall-stamp
-CLEANFILES = preinstall-stamp
-
-include_HEADERS =
-include_HEADERS += include/endian.h
-include_HEADERS += include/zconf.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS =
-
-include_rtems_rtemsdir = $(includedir)/rtems/rtems
-include_rtems_rtems_HEADERS =
-
-include_uuiddir = $(includedir)/uuid
-include_uuid_HEADERS = libmisc/uuid/uuid.h
-
-include_utf8procdir = $(includedir)/utf8proc
-include_utf8proc_HEADERS = libmisc/utf8proc/utf8proc.h
-
-include_sysdir = $(includedir)/sys
-include_sys_HEADERS =
-
-include_HEADERS += include/crypt.h
-include_HEADERS += include/memory.h
-
-include_HEADERS += libmisc/xz/xz.h
-
-include_sys_HEADERS += libcsupport/include/sys/event.h
-include_sys_HEADERS += libcsupport/include/sys/poll.h
-include_sys_HEADERS += libcsupport/include/sys/statvfs.h
-include_sys_HEADERS += libcsupport/include/sys/utsname.h
-
-include_sys_HEADERS += include/sys/endian.h
-include_sys_HEADERS += include/sys/priority.h
-
if LIBNETWORKING
-include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet
-include_rtems_bsdnet_HEADERS = libnetworking/rtems/bsdnet/servers.h
-include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/_types.h
endif
if LIBDL
-include_HEADERS += libdl/dlfcn.h
-include_HEADERS += libdl/include/link.h
-include_HEADERS += libdl/include/link_elf.h
-include_sys_HEADERS += libdl/include/sys/cdefs_elf.h
-include_sys_HEADERS += libdl/include/sys/exec_elf.h
-include_arch_machinedir = $(includedir)/machine
-include_arch_machine_HEADERS =
-include_arch_machine_HEADERS += libdl/include/arch/@RTEMS_CPU@/machine/elf_machdep.h
-include_rtems_rtldir = $(includedir)/rtems/rtl
-include_rtems_rtl_HEADERS =
-include_rtems_rtl_HEADERS += libdl/dlfcn-shell.h
-include_rtems_rtl_HEADERS += libdl/rtl.h libdl/rtl-allocator.h libdl/rtl-obj-fwd.h
-include_rtems_rtl_HEADERS += libdl/rtl-fwd.h libdl/rtl-obj.h libdl/rtl-obj-cache.h
-include_rtems_rtl_HEADERS += libdl/rtl-obj-comp.h libdl/rtl-unresolved.h
-include_rtems_rtl_HEADERS += libdl/rtl-indirect-ptr.h libdl/rtl-sym.h libdl/rtl-trace.h
-include_rtems_rtl_HEADERS += libdl/rap.h libdl/rap-shell.h
endif
if LIBDEBUGGER
-include_rtems_HEADERS += libdebugger/rtems-debugger.h
-include_rtems_debuggerdir = $(includedir)/rtems/debugger
-include_rtems_debugger_HEADERS =
-include_rtems_debugger_HEADERS += libdebugger/rtems-debugger-server.h
-include_rtems_debugger_HEADERS += libdebugger/rtems-debugger-remote.h
endif
-include_rtems_HEADERS += include/rtems/bspIo.h
-include_rtems_HEADERS += include/rtems/inttypes.h
-include_rtems_HEADERS += include/rtems/print.h
-include_rtems_HEADERS += include/rtems/printer.h
-include_rtems_HEADERS += include/rtems/userenv.h
-include_rtems_HEADERS += include/rtems/fs.h
if !LIBPCI
-include_rtems_HEADERS += include/rtems/pci.h
endif
-include_rtems_HEADERS += include/rtems/concat.h
-include_rtems_HEADERS += include/rtems/status-checks.h
-
-include_rtems_HEADERS += include/rtems/endian.h
-
-include_rtems_HEADERS += include/rtems/btimer.h
-include_rtems_HEADERS += include/rtems/console.h
-include_rtems_HEADERS += include/rtems/clockdrv.h
-include_rtems_HEADERS += include/rtems/framebuffer.h
-include_rtems_HEADERS += include/rtems/rtc.h
-include_rtems_HEADERS += include/rtems/watchdogdrv.h
-
## should be conditional and only installed for PowerPC, x86, and ARM
-include_rtems_HEADERS += include/rtems/irq.h
-
-include_rtems_HEADERS += include/rtems/irq-extension.h
-
## libfs
-include_rtems_HEADERS += libfs/src/imfs/imfs.h
-
## POSIX FIFO/pipe
-include_rtems_HEADERS += libfs/src/pipe/pipe.h
-
## devfs
-include_rtems_HEADERS += libfs/src/devfs/devfs.h
-
if LIBDOSFS
-include_rtems_HEADERS += libfs/src/dosfs/dosfs.h
endif
# RFS
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs.h
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs-format.h
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs-shell.h
-
-include_rtems_rfsdir = $(include_rtemsdir)/rfs
-include_rtems_rfs_HEADERS =
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-bitmaps.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-block-pos.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-block.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-buffer.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-data.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-dir.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-dir-hash.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file-system-fwd.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file-system.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-group.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-inode.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-link.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-mutex.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-trace.h
-
# JFFS2
-include_rtems_HEADERS += libfs/src/jffs2/include/rtems/jffs2.h
-
## libblock
-include_rtems_HEADERS += libblock/include/rtems/bdbuf.h
-include_rtems_HEADERS += libblock/include/rtems/blkdev.h
-include_rtems_HEADERS += libblock/include/rtems/diskdevs.h
-include_rtems_HEADERS += libblock/include/rtems/flashdisk.h
-include_rtems_HEADERS += libblock/include/rtems/ramdisk.h
-include_rtems_HEADERS += libblock/include/rtems/nvdisk.h
-include_rtems_HEADERS += libblock/include/rtems/nvdisk-sram.h
-include_rtems_HEADERS += libblock/include/rtems/sparse-disk.h
-include_rtems_HEADERS += libblock/include/rtems/ide_part_table.h
-include_rtems_HEADERS += libblock/include/rtems/bdpart.h
-include_rtems_HEADERS += libblock/include/rtems/media.h
-
## ftpd
if LIBNETWORKING
-include_rtems_HEADERS += ftpd/ftpd.h
endif
## bspcmdline
-include_rtems_HEADERS += libmisc/bspcmdline/bspcmdline.h
-
## capture
-include_rtems_HEADERS += libmisc/capture/capture.h
-include_rtems_HEADERS += libmisc/capture/capture-cli.h
-include_rtems_HEADERS += libmisc/capture/captureimpl.h
-
# tracing headers
-include_rtems_tracedir = $(include_rtemsdir)/trace
-include_rtems_trace_HEADERS =
-include_rtems_trace_HEADERS += libmisc/capture/rtems-trace-buffer-vars.h
-
## cpuuse
-include_rtems_HEADERS += libmisc/cpuuse/cpuuse.h
-
## devnull
-include_rtems_HEADERS += libmisc/devnull/devnull.h
-include_rtems_HEADERS += libmisc/devnull/devzero.h
-
## dumpbuf
-include_rtems_HEADERS += libmisc/dumpbuf/dumpbuf.h
-
## rtemsfdt
-include_rtems_HEADERS += libmisc/rtems-fdt/rtems-fdt.h
-include_rtems_HEADERS += libmisc/rtems-fdt/rtems-fdt-shell.h
-
## monitor
-include_rtems_HEADERS += libmisc/monitor/monitor.h
-
## fb
-include_rtems_HEADERS += libmisc/fb/fb.h
-include_rtems_HEADERS += libmisc/fb/mw_uid.h
-
## mouse
-include_rtems_HEADERS += libmisc/mouse/mouse_parser.h
-include_rtems_HEADERS += libmisc/mouse/serial_mouse.h
-
## libqos
-include_rtems_HEADERS += libqos/qreslib.h
-
## redirector
-include_rtems_HEADERS += libmisc/redirector/stdio-redirect.h
## shell
if LIBSHELL
-include_rtems_HEADERS += libmisc/shell/shell.h
-include_rtems_HEADERS += libmisc/shell/shellconfig.h
endif
## stringto
-include_rtems_HEADERS += libmisc/stringto/stringto.h
-
## testsupport
-include_rtems_HEADERS += libmisc/testsupport/test.h
-
## i2c
-include_rtems_HEADERS += libi2c/libi2c.h
-
## serdbg
if LIBSERDBG
-include_rtems_HEADERS += libmisc/serdbg/serdbgcnf.h
-include_rtems_HEADERS += libmisc/serdbg/serdbg.h
-include_rtems_HEADERS += libmisc/serdbg/termios_printk_cnf.h
-include_rtems_HEADERS += libmisc/serdbg/termios_printk.h
endif
## stackchk
-include_rtems_HEADERS += libmisc/stackchk/stackchk.h
-
## libuntar
-include_rtems_HEADERS += libmisc/untar/untar.h
-
## fsmount
-include_rtems_HEADERS += libmisc/fsmount/fsmount.h
-
-include_rtems_HEADERS += include/rtems/tm27-default.h
-
## Driver manager
if LIBDRVMGR
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = libdrvmgr/drvmgr.h
-include_drvmgr_HEADERS += libdrvmgr/drvmgr_confdefs.h
-include_drvmgr_HEADERS += libdrvmgr/drvmgr_list.h
endif
if LIBGNAT
-include_adaincludedir = $(includedir)/adainclude
-include_adainclude_HEADERS =
-include_adainclude_HEADERS += include/adainclude/rtems.adb
-include_adainclude_HEADERS += include/adainclude/rtems.ads
-include_adainclude_HEADERS += include/adainclude/rtems-barrier.adb
-include_adainclude_HEADERS += include/adainclude/rtems-barrier.ads
-include_adainclude_HEADERS += include/adainclude/rtems-clock.adb
-include_adainclude_HEADERS += include/adainclude/rtems-clock.ads
-include_adainclude_HEADERS += include/adainclude/rtems-cpu_usage.ads
-include_adainclude_HEADERS += include/adainclude/rtems-event.adb
-include_adainclude_HEADERS += include/adainclude/rtems-event.ads
-include_adainclude_HEADERS += include/adainclude/rtems-extension.adb
-include_adainclude_HEADERS += include/adainclude/rtems-extension.ads
-include_adainclude_HEADERS += include/adainclude/rtems-fatal.adb
-include_adainclude_HEADERS += include/adainclude/rtems-fatal.ads
-include_adainclude_HEADERS += include/adainclude/rtems-interrupt.ads
-include_adainclude_HEADERS += include/adainclude/rtems-io.adb
-include_adainclude_HEADERS += include/adainclude/rtems-io.ads
-include_adainclude_HEADERS += include/adainclude/rtems-message_queue.adb
-include_adainclude_HEADERS += include/adainclude/rtems-message_queue.ads
-include_adainclude_HEADERS += include/adainclude/rtems-multiprocessing.adb
-include_adainclude_HEADERS += include/adainclude/rtems-multiprocessing.ads
-include_adainclude_HEADERS += include/adainclude/rtems-object.adb
-include_adainclude_HEADERS += include/adainclude/rtems-object.ads
-include_adainclude_HEADERS += include/adainclude/rtems-partition.adb
-include_adainclude_HEADERS += include/adainclude/rtems-partition.ads
-include_adainclude_HEADERS += include/adainclude/rtems-port.adb
-include_adainclude_HEADERS += include/adainclude/rtems-port.ads
-include_adainclude_HEADERS += include/adainclude/rtems-rate_monotonic.adb
-include_adainclude_HEADERS += include/adainclude/rtems-rate_monotonic.ads
-include_adainclude_HEADERS += include/adainclude/rtems-region.adb
-include_adainclude_HEADERS += include/adainclude/rtems-region.ads
-include_adainclude_HEADERS += include/adainclude/rtems-semaphore.adb
-include_adainclude_HEADERS += include/adainclude/rtems-semaphore.ads
-include_adainclude_HEADERS += include/adainclude/rtems-signal.adb
-include_adainclude_HEADERS += include/adainclude/rtems-signal.ads
-include_adainclude_HEADERS += include/adainclude/rtems-stack_checker.ads
-include_adainclude_HEADERS += include/adainclude/rtems-tasks.adb
-include_adainclude_HEADERS += include/adainclude/rtems-tasks.ads
-include_adainclude_HEADERS += include/adainclude/rtems-timer.adb
-include_adainclude_HEADERS += include/adainclude/rtems-timer.ads
endif
## HACK: doxygen filter.
EXTRA_DIST = doxy-filter
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/acinclude.m4 b/cpukit/acinclude.m4
index da6084d..f1889b6 100644
--- a/cpukit/acinclude.m4
+++ b/cpukit/acinclude.m4
@@ -36,26 +36,27 @@ _ACEOF
])
AC_DEFUN([_RTEMS_CPUOPT_FINI],[
+AC_REQUIRE([RTEMS_BUILD_TOP])
cat >>cpuopts.tmp <<\_ACEOF
#endif /* _RTEMS_SCORE_CPUOPTS_H */
_ACEOF
-AS_MKDIR_P(score/include/rtems/score)
-AS_IF([test -f score/include/rtems/score/cpuopts.h],
+AS_MKDIR_P(${RTEMS_BUILD_ROOT}/include/rtems/score)
+AS_IF([test -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h],
[
- AS_IF([cmp -s score/include/rtems/score/cpuopts.h cpuopts.tmp 2>/dev/null],
+ AS_IF([cmp -s ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h cpuopts.tmp 2>/dev/null],
[
- AC_MSG_NOTICE([score/include/rtems/score/cpuopts.h is unchanged])
+ AC_MSG_NOTICE([${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h is unchanged])
rm -f cpuopts.tmp
],[
- AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
- rm -f score/include/rtems/score/cpuopts.h
- mv cpuopts.tmp score/include/rtems/score/cpuopts.h
+ AC_MSG_NOTICE([creating ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h])
+ rm -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h
+ mv cpuopts.tmp ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h
])
],[
- AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
- rm -f score/include/rtems/score/cpuopts.h
- mv cpuopts.tmp score/include/rtems/score/cpuopts.h
+ AC_MSG_NOTICE([creating ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h])
+ rm -f ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h
+ mv cpuopts.tmp ${RTEMS_BUILD_ROOT}/include/rtems/score/cpuopts.h
])
])
diff --git a/cpukit/aclocal/check-networking.m4 b/cpukit/aclocal/check-networking.m4
index e15cf05..72730d2 100644
--- a/cpukit/aclocal/check-networking.m4
+++ b/cpukit/aclocal/check-networking.m4
@@ -3,6 +3,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 CPU supports networking],
rtems_cv_HAS_NETWORKING,
@@ -23,7 +24,8 @@ AC_CACHE_CHECK([whether CPU supports networking],
&& test x"$ac_cv_type_uint32_t" = xyes \
&& test x"$ac_cv_type_int64_t" = xyes \
&& test x"$ac_cv_type_uint64_t" = xyes],
- [rtems_cv_HAS_NETWORKING=yes],
+ [rtems_cv_HAS_NETWORKING=yes
+ RTEMS_CPPFLAGS="${RTEMS_CPPFLAGS} -I${RTEMS_SOURCE_ROOT}/cpukit/libnetworking"],
[rtems_cv_HAS_NETWORKING=no])
],[
rtems_cv_HAS_NETWORKING=disabled
diff --git a/cpukit/aclocal/prog-cc.m4 b/cpukit/aclocal/prog-cc.m4
index 659a682..9006e0e 100644
--- a/cpukit/aclocal/prog-cc.m4
+++ b/cpukit/aclocal/prog-cc.m4
@@ -29,11 +29,10 @@ test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
AS_IF([test "$GCC" = yes && test "$rtems_cv_CFLAGS_set" != set],
[CFLAGS="$CFLAGS -Wall -Wimplicit-function-declaration -Wstrict-prototypes -Wnested-externs"])
-RTEMS_CPPFLAGS="-I\$(top_builddir) -I\$(PROJECT_INCLUDE)"
-AC_SUBST(RTEMS_CPPFLAGS)
-
AS_IF([test "$GCC" = yes],[
RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -r"
])
AC_SUBST(RTEMS_RELLDFLAGS)
+
+RTEMS_INCLUDES
])
diff --git a/cpukit/aclocal/rtems-bsp-includes.m4 b/cpukit/aclocal/rtems-bsp-includes.m4
new file mode 100644
index 0000000..2248211
--- /dev/null
+++ b/cpukit/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/cpukit/aclocal/rtems-build-top.m4 b/cpukit/aclocal/rtems-build-top.m4
new file mode 100644
index 0000000..5708119
--- /dev/null
+++ b/cpukit/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/cpukit/aclocal/rtems-includes.m4 b/cpukit/aclocal/rtems-includes.m4
new file mode 100644
index 0000000..ca4ebed
--- /dev/null
+++ b/cpukit/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/cpukit/aclocal/rtems-source-top.m4 b/cpukit/aclocal/rtems-source-top.m4
new file mode 100644
index 0000000..d1460ae
--- /dev/null
+++ b/cpukit/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/cpukit/automake/compile.am b/cpukit/automake/compile.am
index ace3d90..4fc133e 100644
--- a/cpukit/automake/compile.am
+++ b/cpukit/automake/compile.am
@@ -1,3 +1,5 @@
AM_CPPFLAGS = @RTEMS_CPPFLAGS@
AM_CFLAGS =
AM_CCASFLAGS = @RTEMS_CCASFLAGS@
+
+ARFLAGS = crD
diff --git a/cpukit/automake/local.am b/cpukit/automake/local.am
index c2bfbfd..3815a7d 100644
--- a/cpukit/automake/local.am
+++ b/cpukit/automake/local.am
@@ -1,3 +1,2 @@
-preinstall-am: $(PREINSTALL_FILES)
-preinstall: preinstall-am
-.PHONY: preinstall preinstall-am
+
+all-local: $(TMPINSTALL_FILES)
diff --git a/cpukit/automake/subdirs.am b/cpukit/automake/subdirs.am
index 8677044..8c7be70 100644
--- a/cpukit/automake/subdirs.am
+++ b/cpukit/automake/subdirs.am
@@ -14,29 +14,7 @@ SUBDIRS_no_dot = $(filter-out .,$(_SUBDIRS))
SUBDIRS_no_dot_no_wrapup = $(filter-out wrapup,$(SUBDIRS_no_dot))
SUBDIRS_wrapup = $(filter wrapup,$(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
@@ -71,4 +49,4 @@ $(foreach D,$(SUBDIRS_no_dot),$(eval $(call CPUKITDIR,$(D),$(D))))
#
$(if "$(SUBDIRS_wrapup)" "wrapup",wrapup: dot $(foreach D,$(SUBDIRS_no_dot_no_wrapup),$(D)),)
-all-local: preinstall $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
+all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot)
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 382fee6..8435e13 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -4,13 +4,14 @@ AC_PREREQ([2.69])
AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([score])
RTEMS_TOP([..],[])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc subdir-objects foreign 1.12.2])
AM_MAINTAINER_MODE
-RTEMS_ENABLE_MULTILIB
RTEMS_ENABLE_MULTIPROCESSING
RTEMS_ENABLE_POSIX
RTEMS_ENABLE_RTEMS_DEBUG
@@ -489,9 +490,4 @@ pppd/Makefile
mghttpd/Makefile
wrapup/Makefile])
-AC_CONFIG_COMMANDS([preinstall-stamp],
-[test -z "$with_multisubdir" && ${MAKE} preinstall-stamp],
-[MAKE=${MAKE}
-with_multisubdir="$with_multisubdir"])
-
AC_OUTPUT
diff --git a/cpukit/dev/Makefile.am b/cpukit/dev/Makefile.am
index b60e035..f499bbb 100644
--- a/cpukit/dev/Makefile.am
+++ b/cpukit/dev/Makefile.am
@@ -1,39 +1,6 @@
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/multilib.am
-include_devdir = $(includedir)/dev
-include_dev_HEADERS =
-
-include_dev_i2cdir = $(includedir)/dev/i2c
-include_dev_i2c_HEADERS =
-include_dev_i2c_HEADERS += include/dev/i2c/eeprom.h
-include_dev_i2c_HEADERS += include/dev/i2c/fpga-i2c-slave.h
-include_dev_i2c_HEADERS += include/dev/i2c/gpio-nxp-pca9535.h
-include_dev_i2c_HEADERS += include/dev/i2c/i2c.h
-include_dev_i2c_HEADERS += include/dev/i2c/sensor-lm75a.h
-include_dev_i2c_HEADERS += include/dev/i2c/switch-nxp-pca9548a.h
-include_dev_i2c_HEADERS += include/dev/i2c/xilinx-axi-i2c.h
-include_dev_i2c_HEADERS += include/dev/i2c/ti-ads-16bit-adc.h
-include_dev_i2c_HEADERS += include/dev/i2c/ti-lm25066a.h
-include_dev_i2c_HEADERS += include/dev/i2c/ti-tmp112.h
-
-include_dev_spidir = $(includedir)/dev/spi
-include_dev_spi_HEADERS =
-include_dev_spi_HEADERS += include/dev/spi/spi.h
-
-include_dev_serialdir = $(includedir)/dev/serial
-include_dev_serial_HEADERS =
-include_dev_serial_HEADERS += include/dev/serial/sc16is752.h
-
-include_linuxdir = $(includedir)/linux
-include_linux_HEADERS =
-include_linux_HEADERS += include/linux/i2c.h
-include_linux_HEADERS += include/linux/i2c-dev.h
-
-include_linux_spidir = $(includedir)/linux/spi
-include_linux_spi_HEADERS =
-include_linux_spi_HEADERS += include/linux/spi/spidev.h
-
noinst_LIBRARIES = libdev.a
libdev_a_SOURCES =
@@ -53,5 +20,4 @@ libdev_a_SOURCES += serial/sc16is752.c
libdev_a_SOURCES += serial/sc16is752-spi.c
libdev_a_SOURCES += serial/sc16is752-regs.h
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/dev/preinstall.am b/cpukit/dev/preinstall.am
deleted file mode 100644
index 4cb1dce..0000000
--- a/cpukit/dev/preinstall.am
+++ /dev/null
@@ -1,105 +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_INCLUDE)/dev/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/dev
- @: > $(PROJECT_INCLUDE)/dev/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/i2c/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/dev/i2c
- @: > $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/i2c/eeprom.h: include/dev/i2c/eeprom.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/eeprom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/eeprom.h
-
-$(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h: include/dev/i2c/fpga-i2c-slave.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/fpga-i2c-slave.h
-
-$(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h: include/dev/i2c/gpio-nxp-pca9535.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/gpio-nxp-pca9535.h
-
-$(PROJECT_INCLUDE)/dev/i2c/i2c.h: include/dev/i2c/i2c.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/i2c.h
-
-$(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h: include/dev/i2c/sensor-lm75a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/sensor-lm75a.h
-
-$(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h: include/dev/i2c/switch-nxp-pca9548a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/switch-nxp-pca9548a.h
-
-$(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h: include/dev/i2c/xilinx-axi-i2c.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/xilinx-axi-i2c.h
-
-$(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h: include/dev/i2c/ti-ads-16bit-adc.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-ads-16bit-adc.h
-
-$(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h: include/dev/i2c/ti-lm25066a.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-lm25066a.h
-
-$(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h: include/dev/i2c/ti-tmp112.h $(PROJECT_INCLUDE)/dev/i2c/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/i2c/ti-tmp112.h
-
-$(PROJECT_INCLUDE)/dev/spi/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/dev/spi
- @: > $(PROJECT_INCLUDE)/dev/spi/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/spi/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/spi/spi.h: include/dev/spi/spi.h $(PROJECT_INCLUDE)/dev/spi/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/spi/spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/spi/spi.h
-
-$(PROJECT_INCLUDE)/dev/serial/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/dev/serial
- @: > $(PROJECT_INCLUDE)/dev/serial/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/serial/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/serial/sc16is752.h: include/dev/serial/sc16is752.h $(PROJECT_INCLUDE)/dev/serial/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/serial/sc16is752.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/serial/sc16is752.h
-
-$(PROJECT_INCLUDE)/linux/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/linux
- @: > $(PROJECT_INCLUDE)/linux/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/linux/$(dirstamp)
-
-$(PROJECT_INCLUDE)/linux/i2c.h: include/linux/i2c.h $(PROJECT_INCLUDE)/linux/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/i2c.h
-
-$(PROJECT_INCLUDE)/linux/i2c-dev.h: include/linux/i2c-dev.h $(PROJECT_INCLUDE)/linux/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/i2c-dev.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/i2c-dev.h
-
-$(PROJECT_INCLUDE)/linux/spi/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/linux/spi
- @: > $(PROJECT_INCLUDE)/linux/spi/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/linux/spi/$(dirstamp)
-
-$(PROJECT_INCLUDE)/linux/spi/spidev.h: include/linux/spi/spidev.h $(PROJECT_INCLUDE)/linux/spi/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/linux/spi/spidev.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/linux/spi/spidev.h
-
diff --git a/cpukit/dtc/libfdt/Makefile.am b/cpukit/dtc/libfdt/Makefile.am
index 687d226..0782303 100644
--- a/cpukit/dtc/libfdt/Makefile.am
+++ b/cpukit/dtc/libfdt/Makefile.am
@@ -1,7 +1,5 @@
include $(top_srcdir)/automake/compile.am
-include_HEADERS = fdt.h libfdt.h libfdt_env.h
-
noinst_LIBRARIES = libfdt.a
libfdt_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)
@@ -15,5 +13,4 @@ libfdt_a_SOURCES += fdt_strerror.c
libfdt_a_SOURCES += fdt_sw.c
libfdt_a_SOURCES += fdt_wip.c
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/dtc/libfdt/preinstall.am b/cpukit/dtc/libfdt/preinstall.am
deleted file mode 100644
index 36b61f2..0000000
--- a/cpukit/dtc/libfdt/preinstall.am
+++ /dev/null
@@ -1,32 +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_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/fdt.h: fdt.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/fdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/fdt.h
-
-$(PROJECT_INCLUDE)/libfdt.h: libfdt.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libfdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libfdt.h
-
-$(PROJECT_INCLUDE)/libfdt_env.h: libfdt_env.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libfdt_env.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libfdt_env.h
-
diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
index 24a2815..fbb7865 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -2,8 +2,12 @@ include $(top_srcdir)/automake/compile.am
if LIBNETWORKING
project_lib_LIBRARIES = libftpd.a
+
+$(PROJECT_LIB)/libftpd.a: libftpd.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libftpd.a
+
libftpd_a_SOURCES = ftpd.c ftpd.h
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/ftpd/preinstall.am b/cpukit/ftpd/preinstall.am
deleted file mode 100644
index 85ae87d..0000000
--- a/cpukit/ftpd/preinstall.am
+++ /dev/null
@@ -1,25 +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-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES = $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-if LIBNETWORKING
-$(PROJECT_LIB)/libftpd.a: libftpd.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libftpd.a
-endif
diff --git a/cpukit/headers.am b/cpukit/headers.am
new file mode 100644
index 0000000..c486c3f
--- /dev/null
+++ b/cpukit/headers.am
@@ -0,0 +1,474 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += include/aio.h
+include_HEADERS += include/crypt.h
+include_HEADERS += include/dlfcn.h
+include_HEADERS += include/endian.h
+include_HEADERS += include/fdt.h
+include_HEADERS += include/libfdt.h
+include_HEADERS += include/libfdt_env.h
+include_HEADERS += include/librtemsNfs.h
+include_HEADERS += include/link.h
+include_HEADERS += include/link_elf.h
+include_HEADERS += include/md4.h
+include_HEADERS += include/md5.h
+include_HEADERS += include/memory.h
+include_HEADERS += include/mqueue.h
+include_HEADERS += include/pci.h
+include_HEADERS += include/rtems.h
+include_HEADERS += include/sha256.h
+include_HEADERS += include/sha512.h
+include_HEADERS += include/xz.h
+include_HEADERS += include/zconf.h
+include_HEADERS += include/zlib.h
+
+include_dev_i2cdir = $(includedir)/dev/i2c
+include_dev_i2c_HEADERS =
+include_dev_i2c_HEADERS += include/dev/i2c/eeprom.h
+include_dev_i2c_HEADERS += include/dev/i2c/fpga-i2c-slave.h
+include_dev_i2c_HEADERS += include/dev/i2c/gpio-nxp-pca9535.h
+include_dev_i2c_HEADERS += include/dev/i2c/i2c.h
+include_dev_i2c_HEADERS += include/dev/i2c/sensor-lm75a.h
+include_dev_i2c_HEADERS += include/dev/i2c/switch-nxp-pca9548a.h
+include_dev_i2c_HEADERS += include/dev/i2c/ti-ads-16bit-adc.h
+include_dev_i2c_HEADERS += include/dev/i2c/ti-lm25066a.h
+include_dev_i2c_HEADERS += include/dev/i2c/ti-tmp112.h
+include_dev_i2c_HEADERS += include/dev/i2c/xilinx-axi-i2c.h
+
+include_dev_serialdir = $(includedir)/dev/serial
+include_dev_serial_HEADERS =
+include_dev_serial_HEADERS += include/dev/serial/sc16is752.h
+
+include_dev_spidir = $(includedir)/dev/spi
+include_dev_spi_HEADERS =
+include_dev_spi_HEADERS += include/dev/spi/spi.h
+
+include_drvmgrdir = $(includedir)/drvmgr
+include_drvmgr_HEADERS =
+include_drvmgr_HEADERS += include/drvmgr/drvmgr.h
+include_drvmgr_HEADERS += include/drvmgr/drvmgr_confdefs.h
+include_drvmgr_HEADERS += include/drvmgr/drvmgr_list.h
+include_drvmgr_HEADERS += include/drvmgr/pci_bus.h
+
+include_linuxdir = $(includedir)/linux
+include_linux_HEADERS =
+include_linux_HEADERS += include/linux/i2c-dev.h
+include_linux_HEADERS += include/linux/i2c.h
+
+include_linux_spidir = $(includedir)/linux/spi
+include_linux_spi_HEADERS =
+include_linux_spi_HEADERS += include/linux/spi/spidev.h
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/_kernel_cpuset.h
+include_machine_HEADERS += include/machine/_kernel_param.h
+include_machine_HEADERS += include/machine/_kernel_time.h
+include_machine_HEADERS += include/machine/_kernel_types.h
+include_machine_HEADERS += include/machine/_timecounter.h
+
+include_mghttpddir = $(includedir)/mghttpd
+include_mghttpd_HEADERS =
+include_mghttpd_HEADERS += include/mghttpd/mongoose.h
+
+include_pcidir = $(includedir)/pci
+include_pci_HEADERS =
+include_pci_HEADERS += include/pci/access.h
+include_pci_HEADERS += include/pci/cfg.h
+include_pci_HEADERS += include/pci/cfg_auto.h
+include_pci_HEADERS += include/pci/cfg_peripheral.h
+include_pci_HEADERS += include/pci/cfg_read.h
+include_pci_HEADERS += include/pci/cfg_static.h
+include_pci_HEADERS += include/pci/ids.h
+include_pci_HEADERS += include/pci/ids_extra.h
+include_pci_HEADERS += include/pci/irq.h
+include_pci_HEADERS += include/pci/pcireg.h
+
+include_rpcdir = $(includedir)/rpc
+include_rpc_HEADERS =
+include_rpc_HEADERS += include/rpc/auth.h
+include_rpc_HEADERS += include/rpc/auth_unix.h
+include_rpc_HEADERS += include/rpc/clnt.h
+include_rpc_HEADERS += include/rpc/clnt_soc.h
+include_rpc_HEADERS += include/rpc/clnt_stat.h
+include_rpc_HEADERS += include/rpc/pmap_clnt.h
+include_rpc_HEADERS += include/rpc/pmap_prot.h
+include_rpc_HEADERS += include/rpc/pmap_rmt.h
+include_rpc_HEADERS += include/rpc/rpc.h
+include_rpc_HEADERS += include/rpc/rpc_com.h
+include_rpc_HEADERS += include/rpc/rpc_msg.h
+include_rpc_HEADERS += include/rpc/rpcent.h
+include_rpc_HEADERS += include/rpc/svc.h
+include_rpc_HEADERS += include/rpc/svc_auth.h
+include_rpc_HEADERS += include/rpc/svc_soc.h
+include_rpc_HEADERS += include/rpc/types.h
+include_rpc_HEADERS += include/rpc/xdr.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/assoc.h
+include_rtems_HEADERS += include/rtems/bdbuf.h
+include_rtems_HEADERS += include/rtems/bdpart.h
+include_rtems_HEADERS += include/rtems/blkdev.h
+include_rtems_HEADERS += include/rtems/bsd.h
+include_rtems_HEADERS += include/rtems/bspIo.h
+include_rtems_HEADERS += include/rtems/bspcmdline.h
+include_rtems_HEADERS += include/rtems/btimer.h
+include_rtems_HEADERS += include/rtems/capture-cli.h
+include_rtems_HEADERS += include/rtems/capture.h
+include_rtems_HEADERS += include/rtems/captureimpl.h
+include_rtems_HEADERS += include/rtems/cbs.h
+include_rtems_HEADERS += include/rtems/chain.h
+include_rtems_HEADERS += include/rtems/clockdrv.h
+include_rtems_HEADERS += include/rtems/concat.h
+include_rtems_HEADERS += include/rtems/confdefs.h
+include_rtems_HEADERS += include/rtems/config.h
+include_rtems_HEADERS += include/rtems/console.h
+include_rtems_HEADERS += include/rtems/counter.h
+include_rtems_HEADERS += include/rtems/cpuuse.h
+include_rtems_HEADERS += include/rtems/devfs.h
+include_rtems_HEADERS += include/rtems/deviceio.h
+include_rtems_HEADERS += include/rtems/devnull.h
+include_rtems_HEADERS += include/rtems/devzero.h
+include_rtems_HEADERS += include/rtems/diskdevs.h
+include_rtems_HEADERS += include/rtems/dosfs.h
+include_rtems_HEADERS += include/rtems/dumpbuf.h
+include_rtems_HEADERS += include/rtems/endian.h
+include_rtems_HEADERS += include/rtems/error.h
+include_rtems_HEADERS += include/rtems/extension.h
+include_rtems_HEADERS += include/rtems/extensionimpl.h
+include_rtems_HEADERS += include/rtems/fatal.h
+include_rtems_HEADERS += include/rtems/fb.h
+include_rtems_HEADERS += include/rtems/flashdisk.h
+include_rtems_HEADERS += include/rtems/framebuffer.h
+include_rtems_HEADERS += include/rtems/fs.h
+include_rtems_HEADERS += include/rtems/fsmount.h
+include_rtems_HEADERS += include/rtems/ftpd.h
+include_rtems_HEADERS += include/rtems/gxx_wrappers.h
+include_rtems_HEADERS += include/rtems/ide_part_table.h
+include_rtems_HEADERS += include/rtems/imfs.h
+include_rtems_HEADERS += include/rtems/init.h
+include_rtems_HEADERS += include/rtems/inttypes.h
+include_rtems_HEADERS += include/rtems/io.h
+include_rtems_HEADERS += include/rtems/ioimpl.h
+include_rtems_HEADERS += include/rtems/iosupp.h
+include_rtems_HEADERS += include/rtems/irq-extension.h
+include_rtems_HEADERS += include/rtems/irq.h
+include_rtems_HEADERS += include/rtems/jffs2.h
+include_rtems_HEADERS += include/rtems/libcsupport.h
+include_rtems_HEADERS += include/rtems/libi2c.h
+include_rtems_HEADERS += include/rtems/libio.h
+include_rtems_HEADERS += include/rtems/libio_.h
+include_rtems_HEADERS += include/rtems/linkersets.h
+include_rtems_HEADERS += include/rtems/malloc.h
+include_rtems_HEADERS += include/rtems/media.h
+include_rtems_HEADERS += include/rtems/monitor.h
+include_rtems_HEADERS += include/rtems/mouse_parser.h
+include_rtems_HEADERS += include/rtems/mptables.h
+include_rtems_HEADERS += include/rtems/mw_uid.h
+include_rtems_HEADERS += include/rtems/nvdisk-sram.h
+include_rtems_HEADERS += include/rtems/nvdisk.h
+include_rtems_HEADERS += include/rtems/passwd.h
+include_rtems_HEADERS += include/rtems/pci.h
+include_rtems_HEADERS += include/rtems/pipe.h
+include_rtems_HEADERS += include/rtems/print.h
+include_rtems_HEADERS += include/rtems/printer.h
+include_rtems_HEADERS += include/rtems/profiling.h
+include_rtems_HEADERS += include/rtems/pty.h
+include_rtems_HEADERS += include/rtems/qreslib.h
+include_rtems_HEADERS += include/rtems/ramdisk.h
+include_rtems_HEADERS += include/rtems/rbheap.h
+include_rtems_HEADERS += include/rtems/rbtree.h
+include_rtems_HEADERS += include/rtems/ringbuf.h
+include_rtems_HEADERS += include/rtems/rtc.h
+include_rtems_HEADERS += include/rtems/rtems-debugger.h
+include_rtems_HEADERS += include/rtems/rtems-fdt-shell.h
+include_rtems_HEADERS += include/rtems/rtems-fdt.h
+include_rtems_HEADERS += include/rtems/rtems-rfs-format.h
+include_rtems_HEADERS += include/rtems/rtems-rfs-shell.h
+include_rtems_HEADERS += include/rtems/rtems-rfs.h
+include_rtems_HEADERS += include/rtems/rtemsdialer.h
+include_rtems_HEADERS += include/rtems/rtemspppd.h
+include_rtems_HEADERS += include/rtems/scheduler.h
+include_rtems_HEADERS += include/rtems/serdbg.h
+include_rtems_HEADERS += include/rtems/serdbgcnf.h
+include_rtems_HEADERS += include/rtems/serial_mouse.h
+include_rtems_HEADERS += include/rtems/seterr.h
+include_rtems_HEADERS += include/rtems/shell.h
+include_rtems_HEADERS += include/rtems/shellconfig.h
+include_rtems_HEADERS += include/rtems/sparse-disk.h
+include_rtems_HEADERS += include/rtems/spurious.h
+include_rtems_HEADERS += include/rtems/stackchk.h
+include_rtems_HEADERS += include/rtems/status-checks.h
+include_rtems_HEADERS += include/rtems/stdio-redirect.h
+include_rtems_HEADERS += include/rtems/stringto.h
+include_rtems_HEADERS += include/rtems/sysinit.h
+include_rtems_HEADERS += include/rtems/system.h
+include_rtems_HEADERS += include/rtems/telnetd.h
+include_rtems_HEADERS += include/rtems/termios_printk.h
+include_rtems_HEADERS += include/rtems/termios_printk_cnf.h
+include_rtems_HEADERS += include/rtems/termiostypes.h
+include_rtems_HEADERS += include/rtems/test.h
+include_rtems_HEADERS += include/rtems/timecounter.h
+include_rtems_HEADERS += include/rtems/timespec.h
+include_rtems_HEADERS += include/rtems/tm27-default.h
+include_rtems_HEADERS += include/rtems/tod.h
+include_rtems_HEADERS += include/rtems/untar.h
+include_rtems_HEADERS += include/rtems/userenv.h
+include_rtems_HEADERS += include/rtems/version.h
+include_rtems_HEADERS += include/rtems/vmeintr.h
+include_rtems_HEADERS += include/rtems/watchdogdrv.h
+
+include_rtems_debuggerdir = $(includedir)/rtems/debugger
+include_rtems_debugger_HEADERS =
+include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-remote.h
+include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-server.h
+
+include_rtems_posixdir = $(includedir)/rtems/posix
+include_rtems_posix_HEADERS =
+include_rtems_posix_HEADERS += include/rtems/posix/aio_misc.h
+include_rtems_posix_HEADERS += include/rtems/posix/barrierimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/condimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/config.h
+include_rtems_posix_HEADERS += include/rtems/posix/key.h
+include_rtems_posix_HEADERS += include/rtems/posix/keyimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/mmanimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/mqueue.h
+include_rtems_posix_HEADERS += include/rtems/posix/mqueueimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/muteximpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h
+include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/psignal.h
+include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/pthread.h
+include_rtems_posix_HEADERS += include/rtems/posix/pthreadattrimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/pthreadimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/ptimer.h
+include_rtems_posix_HEADERS += include/rtems/posix/rwlockimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/semaphore.h
+include_rtems_posix_HEADERS += include/rtems/posix/semaphoreimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/shm.h
+include_rtems_posix_HEADERS += include/rtems/posix/shmimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/sigset.h
+include_rtems_posix_HEADERS += include/rtems/posix/spinlockimpl.h
+include_rtems_posix_HEADERS += include/rtems/posix/threadsup.h
+include_rtems_posix_HEADERS += include/rtems/posix/timer.h
+include_rtems_posix_HEADERS += include/rtems/posix/timerimpl.h
+
+include_rtems_rfsdir = $(includedir)/rtems/rfs
+include_rtems_rfs_HEADERS =
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-bitmaps.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-block-pos.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-block.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-buffer.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-data.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-dir-hash.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-dir.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-file-system-fwd.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-file-system.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-file.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-group.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-inode.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-link.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-mutex.h
+include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-trace.h
+
+include_rtems_rtemsdir = $(includedir)/rtems/rtems
+include_rtems_rtems_HEADERS =
+include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/asrimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/attrimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/barrier.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/barrierimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/cache.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/clock.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/config.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/dpmem.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/dpmemimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/event.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/eventimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/eventmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/intr.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/mainpage.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/message.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/messageimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/modes.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/modesimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/mp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/msgmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/object.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/options.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/optionsimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/part.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/partimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/partmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/ratemon.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/ratemonimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/region.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/regionimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/sem.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/semimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/semmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/signal.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/signalimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/signalmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/smp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/status.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/statusimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/support.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/taskmp.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/tasks.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/tasksimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/timerimpl.h
+include_rtems_rtems_HEADERS += include/rtems/rtems/types.h
+
+include_rtems_rtldir = $(includedir)/rtems/rtl
+include_rtems_rtl_HEADERS =
+include_rtems_rtl_HEADERS += include/rtems/rtl/dlfcn-shell.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rap-shell.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rap.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-allocator.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-fwd.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-indirect-ptr.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-obj-cache.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-obj-comp.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-obj-fwd.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-obj.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-sym.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-trace.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-unresolved.h
+include_rtems_rtl_HEADERS += include/rtems/rtl/rtl.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/address.h
+include_rtems_score_HEADERS += include/rtems/score/apimutex.h
+include_rtems_score_HEADERS += include/rtems/score/assert.h
+include_rtems_score_HEADERS += include/rtems/score/atomic.h
+include_rtems_score_HEADERS += include/rtems/score/basedefs.h
+include_rtems_score_HEADERS += include/rtems/score/chain.h
+include_rtems_score_HEADERS += include/rtems/score/chainimpl.h
+include_rtems_score_HEADERS += include/rtems/score/context.h
+include_rtems_score_HEADERS += include/rtems/score/copyrt.h
+include_rtems_score_HEADERS += include/rtems/score/corebarrier.h
+include_rtems_score_HEADERS += include/rtems/score/corebarrierimpl.h
+include_rtems_score_HEADERS += include/rtems/score/coremsg.h
+include_rtems_score_HEADERS += include/rtems/score/coremsgimpl.h
+include_rtems_score_HEADERS += include/rtems/score/coremutex.h
+include_rtems_score_HEADERS += include/rtems/score/coremuteximpl.h
+include_rtems_score_HEADERS += include/rtems/score/corerwlockimpl.h
+include_rtems_score_HEADERS += include/rtems/score/coresem.h
+include_rtems_score_HEADERS += include/rtems/score/coresemimpl.h
+include_rtems_score_HEADERS += include/rtems/score/cpustdatomic.h
+include_rtems_score_HEADERS += include/rtems/score/freechain.h
+include_rtems_score_HEADERS += include/rtems/score/heap.h
+include_rtems_score_HEADERS += include/rtems/score/heapimpl.h
+include_rtems_score_HEADERS += include/rtems/score/interr.h
+include_rtems_score_HEADERS += include/rtems/score/io.h
+include_rtems_score_HEADERS += include/rtems/score/isr.h
+include_rtems_score_HEADERS += include/rtems/score/isrlevel.h
+include_rtems_score_HEADERS += include/rtems/score/isrlock.h
+include_rtems_score_HEADERS += include/rtems/score/mpci.h
+include_rtems_score_HEADERS += include/rtems/score/mpciimpl.h
+include_rtems_score_HEADERS += include/rtems/score/mppkt.h
+include_rtems_score_HEADERS += include/rtems/score/mrsp.h
+include_rtems_score_HEADERS += include/rtems/score/mrspimpl.h
+include_rtems_score_HEADERS += include/rtems/score/muteximpl.h
+include_rtems_score_HEADERS += include/rtems/score/object.h
+include_rtems_score_HEADERS += include/rtems/score/objectimpl.h
+include_rtems_score_HEADERS += include/rtems/score/objectmp.h
+include_rtems_score_HEADERS += include/rtems/score/onceimpl.h
+include_rtems_score_HEADERS += include/rtems/score/percpu.h
+include_rtems_score_HEADERS += include/rtems/score/priority.h
+include_rtems_score_HEADERS += include/rtems/score/prioritybitmap.h
+include_rtems_score_HEADERS += include/rtems/score/prioritybitmapimpl.h
+include_rtems_score_HEADERS += include/rtems/score/priorityimpl.h
+include_rtems_score_HEADERS += include/rtems/score/processormask.h
+include_rtems_score_HEADERS += include/rtems/score/profiling.h
+include_rtems_score_HEADERS += include/rtems/score/protectedheap.h
+include_rtems_score_HEADERS += include/rtems/score/rbtree.h
+include_rtems_score_HEADERS += include/rtems/score/rbtreeimpl.h
+include_rtems_score_HEADERS += include/rtems/score/scheduler.h
+include_rtems_score_HEADERS += include/rtems/score/schedulercbs.h
+include_rtems_score_HEADERS += include/rtems/score/schedulercbsimpl.h
+include_rtems_score_HEADERS += include/rtems/score/scheduleredf.h
+include_rtems_score_HEADERS += include/rtems/score/scheduleredfimpl.h
+include_rtems_score_HEADERS += include/rtems/score/scheduleredfsmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulernode.h
+include_rtems_score_HEADERS += include/rtems/score/schedulernodeimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerpriority.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityaffinitysmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmpimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersimple.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersimpleimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersimplesmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersmp.h
+include_rtems_score_HEADERS += include/rtems/score/schedulersmpimpl.h
+include_rtems_score_HEADERS += include/rtems/score/schedulerstrongapa.h
+include_rtems_score_HEADERS += include/rtems/score/semaphoreimpl.h
+include_rtems_score_HEADERS += include/rtems/score/smp.h
+include_rtems_score_HEADERS += include/rtems/score/smpbarrier.h
+include_rtems_score_HEADERS += include/rtems/score/smpimpl.h
+include_rtems_score_HEADERS += include/rtems/score/smplock.h
+include_rtems_score_HEADERS += include/rtems/score/smplockmcs.h
+include_rtems_score_HEADERS += include/rtems/score/smplockseq.h
+include_rtems_score_HEADERS += include/rtems/score/smplockstats.h
+include_rtems_score_HEADERS += include/rtems/score/smplockticket.h
+include_rtems_score_HEADERS += include/rtems/score/stack.h
+include_rtems_score_HEADERS += include/rtems/score/stackimpl.h
+include_rtems_score_HEADERS += include/rtems/score/states.h
+include_rtems_score_HEADERS += include/rtems/score/statesimpl.h
+include_rtems_score_HEADERS += include/rtems/score/status.h
+include_rtems_score_HEADERS += include/rtems/score/sysstate.h
+include_rtems_score_HEADERS += include/rtems/score/thread.h
+include_rtems_score_HEADERS += include/rtems/score/threaddispatch.h
+include_rtems_score_HEADERS += include/rtems/score/threadimpl.h
+include_rtems_score_HEADERS += include/rtems/score/threadmp.h
+include_rtems_score_HEADERS += include/rtems/score/threadq.h
+include_rtems_score_HEADERS += include/rtems/score/threadqimpl.h
+include_rtems_score_HEADERS += include/rtems/score/timecounter.h
+include_rtems_score_HEADERS += include/rtems/score/timecounterimpl.h
+include_rtems_score_HEADERS += include/rtems/score/timespec.h
+include_rtems_score_HEADERS += include/rtems/score/timestamp.h
+include_rtems_score_HEADERS += include/rtems/score/tls.h
+include_rtems_score_HEADERS += include/rtems/score/tod.h
+include_rtems_score_HEADERS += include/rtems/score/todimpl.h
+include_rtems_score_HEADERS += include/rtems/score/userext.h
+include_rtems_score_HEADERS += include/rtems/score/userextimpl.h
+include_rtems_score_HEADERS += include/rtems/score/watchdog.h
+include_rtems_score_HEADERS += include/rtems/score/watchdogimpl.h
+include_rtems_score_HEADERS += include/rtems/score/wkspace.h
+
+include_rtems_tracedir = $(includedir)/rtems/trace
+include_rtems_trace_HEADERS =
+include_rtems_trace_HEADERS += include/rtems/trace/rtems-trace-buffer-vars.h
+
+include_sysdir = $(includedir)/sys
+include_sys_HEADERS =
+include_sys_HEADERS += include/sys/_ffcounter.h
+include_sys_HEADERS += include/sys/cdefs_elf.h
+include_sys_HEADERS += include/sys/endian.h
+include_sys_HEADERS += include/sys/event.h
+include_sys_HEADERS += include/sys/exec_elf.h
+include_sys_HEADERS += include/sys/poll.h
+include_sys_HEADERS += include/sys/priority.h
+include_sys_HEADERS += include/sys/statvfs.h
+include_sys_HEADERS += include/sys/timeffc.h
+include_sys_HEADERS += include/sys/timepps.h
+include_sys_HEADERS += include/sys/timetc.h
+include_sys_HEADERS += include/sys/timex.h
+include_sys_HEADERS += include/sys/utsname.h
+
+include_utf8procdir = $(includedir)/utf8proc
+include_utf8proc_HEADERS =
+include_utf8proc_HEADERS += include/utf8proc/utf8proc.h
+
+include_uuiddir = $(includedir)/uuid
+include_uuid_HEADERS =
+include_uuid_HEADERS += include/uuid/uuid.h
diff --git a/cpukit/include/adainclude/preinstall.am b/cpukit/include/adainclude/preinstall.am
deleted file mode 100644
index e41443a..0000000
--- a/cpukit/include/adainclude/preinstall.am
+++ /dev/null
@@ -1,177 +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)
-
-if RTEMS_ADA
-$(PROJECT_INCLUDE)/adainclude/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/adainclude
- @: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-
-$(PROJECT_INCLUDE)/adainclude/rtems.adb: rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems.ads: rtems.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb: rtems-barrier.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads: rtems-barrier.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-clock.adb: rtems-clock.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-clock.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-clock.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-clock.ads: rtems-clock.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-clock.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-clock.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads: rtems-cpu_usage.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-event.adb: rtems-event.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-event.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-event.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-event.ads: rtems-event.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-event.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-event.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-extension.adb: rtems-extension.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-extension.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-extension.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-extension.ads: rtems-extension.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-extension.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-extension.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb: rtems-fatal.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads: rtems-fatal.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads: rtems-interrupt.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-io.adb: rtems-io.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-io.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-io.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-io.ads: rtems-io.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-io.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-io.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb: rtems-message_queue.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads: rtems-message_queue.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb: rtems-multiprocessing.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads: rtems-multiprocessing.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-object.adb: rtems-object.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-object.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-object.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-object.ads: rtems-object.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-object.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-object.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-partition.adb: rtems-partition.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-partition.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-partition.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-partition.ads: rtems-partition.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-partition.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-partition.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-port.adb: rtems-port.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-port.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-port.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-port.ads: rtems-port.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-port.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-port.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb: rtems-rate_monotonic.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads: rtems-rate_monotonic.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-region.adb: rtems-region.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-region.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-region.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-region.ads: rtems-region.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-region.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-region.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb: rtems-semaphore.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads: rtems-semaphore.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-signal.adb: rtems-signal.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-signal.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-signal.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-signal.ads: rtems-signal.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-signal.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-signal.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads: rtems-stack_checker.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb: rtems-tasks.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads: rtems-tasks.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-timer.adb: rtems-timer.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-timer.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-timer.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-timer.ads: rtems-timer.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-timer.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-timer.ads
-endif
diff --git a/cpukit/posix/include/aio.h b/cpukit/include/aio.h
similarity index 100%
rename from cpukit/posix/include/aio.h
rename to cpukit/include/aio.h
diff --git a/cpukit/dev/include/dev/i2c/eeprom.h b/cpukit/include/dev/i2c/eeprom.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/eeprom.h
rename to cpukit/include/dev/i2c/eeprom.h
diff --git a/cpukit/dev/include/dev/i2c/fpga-i2c-slave.h b/cpukit/include/dev/i2c/fpga-i2c-slave.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/fpga-i2c-slave.h
rename to cpukit/include/dev/i2c/fpga-i2c-slave.h
diff --git a/cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h b/cpukit/include/dev/i2c/gpio-nxp-pca9535.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/gpio-nxp-pca9535.h
rename to cpukit/include/dev/i2c/gpio-nxp-pca9535.h
diff --git a/cpukit/dev/include/dev/i2c/i2c.h b/cpukit/include/dev/i2c/i2c.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/i2c.h
rename to cpukit/include/dev/i2c/i2c.h
diff --git a/cpukit/dev/include/dev/i2c/sensor-lm75a.h b/cpukit/include/dev/i2c/sensor-lm75a.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/sensor-lm75a.h
rename to cpukit/include/dev/i2c/sensor-lm75a.h
diff --git a/cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h b/cpukit/include/dev/i2c/switch-nxp-pca9548a.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/switch-nxp-pca9548a.h
rename to cpukit/include/dev/i2c/switch-nxp-pca9548a.h
diff --git a/cpukit/dev/include/dev/i2c/ti-ads-16bit-adc.h b/cpukit/include/dev/i2c/ti-ads-16bit-adc.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/ti-ads-16bit-adc.h
rename to cpukit/include/dev/i2c/ti-ads-16bit-adc.h
diff --git a/cpukit/dev/include/dev/i2c/ti-lm25066a.h b/cpukit/include/dev/i2c/ti-lm25066a.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/ti-lm25066a.h
rename to cpukit/include/dev/i2c/ti-lm25066a.h
diff --git a/cpukit/dev/include/dev/i2c/ti-tmp112.h b/cpukit/include/dev/i2c/ti-tmp112.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/ti-tmp112.h
rename to cpukit/include/dev/i2c/ti-tmp112.h
diff --git a/cpukit/dev/include/dev/i2c/xilinx-axi-i2c.h b/cpukit/include/dev/i2c/xilinx-axi-i2c.h
similarity index 100%
rename from cpukit/dev/include/dev/i2c/xilinx-axi-i2c.h
rename to cpukit/include/dev/i2c/xilinx-axi-i2c.h
diff --git a/cpukit/dev/include/dev/serial/sc16is752.h b/cpukit/include/dev/serial/sc16is752.h
similarity index 100%
rename from cpukit/dev/include/dev/serial/sc16is752.h
rename to cpukit/include/dev/serial/sc16is752.h
diff --git a/cpukit/dev/include/dev/spi/spi.h b/cpukit/include/dev/spi/spi.h
similarity index 100%
rename from cpukit/dev/include/dev/spi/spi.h
rename to cpukit/include/dev/spi/spi.h
diff --git a/cpukit/libdl/dlfcn.h b/cpukit/include/dlfcn.h
similarity index 100%
rename from cpukit/libdl/dlfcn.h
rename to cpukit/include/dlfcn.h
diff --git a/cpukit/libdrvmgr/drvmgr.h b/cpukit/include/drvmgr/drvmgr.h
similarity index 100%
rename from cpukit/libdrvmgr/drvmgr.h
rename to cpukit/include/drvmgr/drvmgr.h
diff --git a/cpukit/libdrvmgr/drvmgr_confdefs.h b/cpukit/include/drvmgr/drvmgr_confdefs.h
similarity index 100%
rename from cpukit/libdrvmgr/drvmgr_confdefs.h
rename to cpukit/include/drvmgr/drvmgr_confdefs.h
diff --git a/cpukit/libdrvmgr/drvmgr_list.h b/cpukit/include/drvmgr/drvmgr_list.h
similarity index 100%
rename from cpukit/libdrvmgr/drvmgr_list.h
rename to cpukit/include/drvmgr/drvmgr_list.h
diff --git a/cpukit/libpci/pci_bus.h b/cpukit/include/drvmgr/pci_bus.h
similarity index 100%
rename from cpukit/libpci/pci_bus.h
rename to cpukit/include/drvmgr/pci_bus.h
diff --git a/cpukit/dtc/libfdt/fdt.h b/cpukit/include/fdt.h
similarity index 100%
rename from cpukit/dtc/libfdt/fdt.h
rename to cpukit/include/fdt.h
diff --git a/cpukit/dtc/libfdt/libfdt.h b/cpukit/include/libfdt.h
similarity index 100%
rename from cpukit/dtc/libfdt/libfdt.h
rename to cpukit/include/libfdt.h
diff --git a/cpukit/dtc/libfdt/libfdt_env.h b/cpukit/include/libfdt_env.h
similarity index 100%
rename from cpukit/dtc/libfdt/libfdt_env.h
rename to cpukit/include/libfdt_env.h
diff --git a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h b/cpukit/include/librtemsNfs.h
similarity index 100%
rename from cpukit/libfs/src/nfsclient/src/librtemsNfs.h
rename to cpukit/include/librtemsNfs.h
diff --git a/cpukit/libdl/include/link.h b/cpukit/include/link.h
similarity index 100%
rename from cpukit/libdl/include/link.h
rename to cpukit/include/link.h
diff --git a/cpukit/libdl/include/link_elf.h b/cpukit/include/link_elf.h
similarity index 100%
rename from cpukit/libdl/include/link_elf.h
rename to cpukit/include/link_elf.h
diff --git a/cpukit/dev/include/linux/i2c-dev.h b/cpukit/include/linux/i2c-dev.h
similarity index 100%
rename from cpukit/dev/include/linux/i2c-dev.h
rename to cpukit/include/linux/i2c-dev.h
diff --git a/cpukit/dev/include/linux/i2c.h b/cpukit/include/linux/i2c.h
similarity index 100%
rename from cpukit/dev/include/linux/i2c.h
rename to cpukit/include/linux/i2c.h
diff --git a/cpukit/dev/include/linux/spi/spidev.h b/cpukit/include/linux/spi/spidev.h
similarity index 100%
rename from cpukit/dev/include/linux/spi/spidev.h
rename to cpukit/include/linux/spi/spidev.h
diff --git a/cpukit/libcsupport/include/machine/_kernel_cpuset.h b/cpukit/include/machine/_kernel_cpuset.h
similarity index 100%
rename from cpukit/libcsupport/include/machine/_kernel_cpuset.h
rename to cpukit/include/machine/_kernel_cpuset.h
diff --git a/cpukit/libcsupport/include/machine/_kernel_param.h b/cpukit/include/machine/_kernel_param.h
similarity index 100%
rename from cpukit/libcsupport/include/machine/_kernel_param.h
rename to cpukit/include/machine/_kernel_param.h
diff --git a/cpukit/libcsupport/include/machine/_kernel_time.h b/cpukit/include/machine/_kernel_time.h
similarity index 100%
rename from cpukit/libcsupport/include/machine/_kernel_time.h
rename to cpukit/include/machine/_kernel_time.h
diff --git a/cpukit/libcsupport/include/machine/_kernel_types.h b/cpukit/include/machine/_kernel_types.h
similarity index 100%
rename from cpukit/libcsupport/include/machine/_kernel_types.h
rename to cpukit/include/machine/_kernel_types.h
diff --git a/cpukit/libcsupport/include/machine/_timecounter.h b/cpukit/include/machine/_timecounter.h
similarity index 100%
rename from cpukit/libcsupport/include/machine/_timecounter.h
rename to cpukit/include/machine/_timecounter.h
diff --git a/cpukit/libmd/md4.h b/cpukit/include/md4.h
similarity index 100%
rename from cpukit/libmd/md4.h
rename to cpukit/include/md4.h
diff --git a/cpukit/libmd/md5.h b/cpukit/include/md5.h
similarity index 100%
rename from cpukit/libmd/md5.h
rename to cpukit/include/md5.h
diff --git a/cpukit/mghttpd/mongoose.h b/cpukit/include/mghttpd/mongoose.h
similarity index 100%
rename from cpukit/mghttpd/mongoose.h
rename to cpukit/include/mghttpd/mongoose.h
diff --git a/cpukit/posix/include/mqueue.h b/cpukit/include/mqueue.h
similarity index 100%
rename from cpukit/posix/include/mqueue.h
rename to cpukit/include/mqueue.h
diff --git a/cpukit/libpci/pci.h b/cpukit/include/pci.h
similarity index 100%
rename from cpukit/libpci/pci.h
rename to cpukit/include/pci.h
diff --git a/cpukit/libpci/pci/access.h b/cpukit/include/pci/access.h
similarity index 100%
rename from cpukit/libpci/pci/access.h
rename to cpukit/include/pci/access.h
diff --git a/cpukit/libpci/pci/cfg.h b/cpukit/include/pci/cfg.h
similarity index 100%
rename from cpukit/libpci/pci/cfg.h
rename to cpukit/include/pci/cfg.h
diff --git a/cpukit/libpci/pci/cfg_auto.h b/cpukit/include/pci/cfg_auto.h
similarity index 100%
rename from cpukit/libpci/pci/cfg_auto.h
rename to cpukit/include/pci/cfg_auto.h
diff --git a/cpukit/libpci/pci/cfg_peripheral.h b/cpukit/include/pci/cfg_peripheral.h
similarity index 100%
rename from cpukit/libpci/pci/cfg_peripheral.h
rename to cpukit/include/pci/cfg_peripheral.h
diff --git a/cpukit/libpci/pci/cfg_read.h b/cpukit/include/pci/cfg_read.h
similarity index 100%
rename from cpukit/libpci/pci/cfg_read.h
rename to cpukit/include/pci/cfg_read.h
diff --git a/cpukit/libpci/pci/cfg_static.h b/cpukit/include/pci/cfg_static.h
similarity index 100%
rename from cpukit/libpci/pci/cfg_static.h
rename to cpukit/include/pci/cfg_static.h
diff --git a/cpukit/libpci/pci/ids.h b/cpukit/include/pci/ids.h
similarity index 100%
rename from cpukit/libpci/pci/ids.h
rename to cpukit/include/pci/ids.h
diff --git a/cpukit/libpci/pci/ids_extra.h b/cpukit/include/pci/ids_extra.h
similarity index 100%
rename from cpukit/libpci/pci/ids_extra.h
rename to cpukit/include/pci/ids_extra.h
diff --git a/cpukit/libpci/pci/irq.h b/cpukit/include/pci/irq.h
similarity index 100%
rename from cpukit/libpci/pci/irq.h
rename to cpukit/include/pci/irq.h
diff --git a/cpukit/libpci/pci/pcireg.h b/cpukit/include/pci/pcireg.h
similarity index 100%
rename from cpukit/libpci/pci/pcireg.h
rename to cpukit/include/pci/pcireg.h
diff --git a/cpukit/librpc/include/rpc/auth.h b/cpukit/include/rpc/auth.h
similarity index 100%
rename from cpukit/librpc/include/rpc/auth.h
rename to cpukit/include/rpc/auth.h
diff --git a/cpukit/librpc/include/rpc/auth_unix.h b/cpukit/include/rpc/auth_unix.h
similarity index 100%
rename from cpukit/librpc/include/rpc/auth_unix.h
rename to cpukit/include/rpc/auth_unix.h
diff --git a/cpukit/librpc/include/rpc/clnt.h b/cpukit/include/rpc/clnt.h
similarity index 100%
rename from cpukit/librpc/include/rpc/clnt.h
rename to cpukit/include/rpc/clnt.h
diff --git a/cpukit/librpc/include/rpc/clnt_soc.h b/cpukit/include/rpc/clnt_soc.h
similarity index 100%
rename from cpukit/librpc/include/rpc/clnt_soc.h
rename to cpukit/include/rpc/clnt_soc.h
diff --git a/cpukit/librpc/include/rpc/clnt_stat.h b/cpukit/include/rpc/clnt_stat.h
similarity index 100%
rename from cpukit/librpc/include/rpc/clnt_stat.h
rename to cpukit/include/rpc/clnt_stat.h
diff --git a/cpukit/librpc/include/rpc/pmap_clnt.h b/cpukit/include/rpc/pmap_clnt.h
similarity index 100%
rename from cpukit/librpc/include/rpc/pmap_clnt.h
rename to cpukit/include/rpc/pmap_clnt.h
diff --git a/cpukit/librpc/include/rpc/pmap_prot.h b/cpukit/include/rpc/pmap_prot.h
similarity index 100%
rename from cpukit/librpc/include/rpc/pmap_prot.h
rename to cpukit/include/rpc/pmap_prot.h
diff --git a/cpukit/librpc/include/rpc/pmap_rmt.h b/cpukit/include/rpc/pmap_rmt.h
similarity index 100%
rename from cpukit/librpc/include/rpc/pmap_rmt.h
rename to cpukit/include/rpc/pmap_rmt.h
diff --git a/cpukit/librpc/include/rpc/rpc.h b/cpukit/include/rpc/rpc.h
similarity index 100%
rename from cpukit/librpc/include/rpc/rpc.h
rename to cpukit/include/rpc/rpc.h
diff --git a/cpukit/librpc/include/rpc/rpc_com.h b/cpukit/include/rpc/rpc_com.h
similarity index 100%
rename from cpukit/librpc/include/rpc/rpc_com.h
rename to cpukit/include/rpc/rpc_com.h
diff --git a/cpukit/librpc/include/rpc/rpc_msg.h b/cpukit/include/rpc/rpc_msg.h
similarity index 100%
rename from cpukit/librpc/include/rpc/rpc_msg.h
rename to cpukit/include/rpc/rpc_msg.h
diff --git a/cpukit/librpc/include/rpc/rpcent.h b/cpukit/include/rpc/rpcent.h
similarity index 100%
rename from cpukit/librpc/include/rpc/rpcent.h
rename to cpukit/include/rpc/rpcent.h
diff --git a/cpukit/librpc/include/rpc/svc.h b/cpukit/include/rpc/svc.h
similarity index 100%
rename from cpukit/librpc/include/rpc/svc.h
rename to cpukit/include/rpc/svc.h
diff --git a/cpukit/librpc/include/rpc/svc_auth.h b/cpukit/include/rpc/svc_auth.h
similarity index 100%
rename from cpukit/librpc/include/rpc/svc_auth.h
rename to cpukit/include/rpc/svc_auth.h
diff --git a/cpukit/librpc/include/rpc/svc_soc.h b/cpukit/include/rpc/svc_soc.h
similarity index 100%
rename from cpukit/librpc/include/rpc/svc_soc.h
rename to cpukit/include/rpc/svc_soc.h
diff --git a/cpukit/librpc/include/rpc/types.h b/cpukit/include/rpc/types.h
similarity index 100%
rename from cpukit/librpc/include/rpc/types.h
rename to cpukit/include/rpc/types.h
diff --git a/cpukit/librpc/include/rpc/xdr.h b/cpukit/include/rpc/xdr.h
similarity index 100%
rename from cpukit/librpc/include/rpc/xdr.h
rename to cpukit/include/rpc/xdr.h
diff --git a/cpukit/rtems/include/rtems.h b/cpukit/include/rtems.h
similarity index 100%
rename from cpukit/rtems/include/rtems.h
rename to cpukit/include/rtems.h
diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/cpukit/include/rtems/assoc.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/assoc.h
rename to cpukit/include/rtems/assoc.h
diff --git a/cpukit/libblock/include/rtems/bdbuf.h b/cpukit/include/rtems/bdbuf.h
similarity index 100%
rename from cpukit/libblock/include/rtems/bdbuf.h
rename to cpukit/include/rtems/bdbuf.h
diff --git a/cpukit/libblock/include/rtems/bdpart.h b/cpukit/include/rtems/bdpart.h
similarity index 100%
rename from cpukit/libblock/include/rtems/bdpart.h
rename to cpukit/include/rtems/bdpart.h
diff --git a/cpukit/libblock/include/rtems/blkdev.h b/cpukit/include/rtems/blkdev.h
similarity index 100%
rename from cpukit/libblock/include/rtems/blkdev.h
rename to cpukit/include/rtems/blkdev.h
diff --git a/cpukit/sapi/include/rtems/bsd.h b/cpukit/include/rtems/bsd.h
similarity index 100%
rename from cpukit/sapi/include/rtems/bsd.h
rename to cpukit/include/rtems/bsd.h
diff --git a/cpukit/libmisc/bspcmdline/bspcmdline.h b/cpukit/include/rtems/bspcmdline.h
similarity index 100%
rename from cpukit/libmisc/bspcmdline/bspcmdline.h
rename to cpukit/include/rtems/bspcmdline.h
diff --git a/cpukit/libmisc/capture/capture-cli.h b/cpukit/include/rtems/capture-cli.h
similarity index 100%
rename from cpukit/libmisc/capture/capture-cli.h
rename to cpukit/include/rtems/capture-cli.h
diff --git a/cpukit/libmisc/capture/capture.h b/cpukit/include/rtems/capture.h
similarity index 100%
rename from cpukit/libmisc/capture/capture.h
rename to cpukit/include/rtems/capture.h
diff --git a/cpukit/libmisc/capture/captureimpl.h b/cpukit/include/rtems/captureimpl.h
similarity index 100%
rename from cpukit/libmisc/capture/captureimpl.h
rename to cpukit/include/rtems/captureimpl.h
diff --git a/cpukit/sapi/include/rtems/cbs.h b/cpukit/include/rtems/cbs.h
similarity index 100%
rename from cpukit/sapi/include/rtems/cbs.h
rename to cpukit/include/rtems/cbs.h
diff --git a/cpukit/sapi/include/rtems/chain.h b/cpukit/include/rtems/chain.h
similarity index 100%
rename from cpukit/sapi/include/rtems/chain.h
rename to cpukit/include/rtems/chain.h
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/include/rtems/confdefs.h
similarity index 100%
rename from cpukit/sapi/include/confdefs.h
rename to cpukit/include/rtems/confdefs.h
diff --git a/cpukit/sapi/include/rtems/config.h b/cpukit/include/rtems/config.h
similarity index 100%
rename from cpukit/sapi/include/rtems/config.h
rename to cpukit/include/rtems/config.h
diff --git a/cpukit/sapi/include/rtems/counter.h b/cpukit/include/rtems/counter.h
similarity index 100%
rename from cpukit/sapi/include/rtems/counter.h
rename to cpukit/include/rtems/counter.h
diff --git a/cpukit/libmisc/cpuuse/cpuuse.h b/cpukit/include/rtems/cpuuse.h
similarity index 100%
rename from cpukit/libmisc/cpuuse/cpuuse.h
rename to cpukit/include/rtems/cpuuse.h
diff --git a/cpukit/libdebugger/rtems-debugger-remote.h b/cpukit/include/rtems/debugger/rtems-debugger-remote.h
similarity index 100%
rename from cpukit/libdebugger/rtems-debugger-remote.h
rename to cpukit/include/rtems/debugger/rtems-debugger-remote.h
diff --git a/cpukit/libdebugger/rtems-debugger-server.h b/cpukit/include/rtems/debugger/rtems-debugger-server.h
similarity index 100%
rename from cpukit/libdebugger/rtems-debugger-server.h
rename to cpukit/include/rtems/debugger/rtems-debugger-server.h
diff --git a/cpukit/libfs/src/devfs/devfs.h b/cpukit/include/rtems/devfs.h
similarity index 100%
rename from cpukit/libfs/src/devfs/devfs.h
rename to cpukit/include/rtems/devfs.h
diff --git a/cpukit/libcsupport/include/rtems/deviceio.h b/cpukit/include/rtems/deviceio.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/deviceio.h
rename to cpukit/include/rtems/deviceio.h
diff --git a/cpukit/libmisc/devnull/devnull.h b/cpukit/include/rtems/devnull.h
similarity index 100%
rename from cpukit/libmisc/devnull/devnull.h
rename to cpukit/include/rtems/devnull.h
diff --git a/cpukit/libmisc/devnull/devzero.h b/cpukit/include/rtems/devzero.h
similarity index 100%
rename from cpukit/libmisc/devnull/devzero.h
rename to cpukit/include/rtems/devzero.h
diff --git a/cpukit/libblock/include/rtems/diskdevs.h b/cpukit/include/rtems/diskdevs.h
similarity index 100%
rename from cpukit/libblock/include/rtems/diskdevs.h
rename to cpukit/include/rtems/diskdevs.h
diff --git a/cpukit/libfs/src/dosfs/dosfs.h b/cpukit/include/rtems/dosfs.h
similarity index 100%
rename from cpukit/libfs/src/dosfs/dosfs.h
rename to cpukit/include/rtems/dosfs.h
diff --git a/cpukit/libmisc/dumpbuf/dumpbuf.h b/cpukit/include/rtems/dumpbuf.h
similarity index 100%
rename from cpukit/libmisc/dumpbuf/dumpbuf.h
rename to cpukit/include/rtems/dumpbuf.h
diff --git a/cpukit/libcsupport/include/rtems/error.h b/cpukit/include/rtems/error.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/error.h
rename to cpukit/include/rtems/error.h
diff --git a/cpukit/sapi/include/rtems/extension.h b/cpukit/include/rtems/extension.h
similarity index 100%
rename from cpukit/sapi/include/rtems/extension.h
rename to cpukit/include/rtems/extension.h
diff --git a/cpukit/sapi/include/rtems/extensionimpl.h b/cpukit/include/rtems/extensionimpl.h
similarity index 100%
rename from cpukit/sapi/include/rtems/extensionimpl.h
rename to cpukit/include/rtems/extensionimpl.h
diff --git a/cpukit/sapi/include/rtems/fatal.h b/cpukit/include/rtems/fatal.h
similarity index 100%
rename from cpukit/sapi/include/rtems/fatal.h
rename to cpukit/include/rtems/fatal.h
diff --git a/cpukit/libmisc/fb/fb.h b/cpukit/include/rtems/fb.h
similarity index 100%
rename from cpukit/libmisc/fb/fb.h
rename to cpukit/include/rtems/fb.h
diff --git a/cpukit/libblock/include/rtems/flashdisk.h b/cpukit/include/rtems/flashdisk.h
similarity index 100%
rename from cpukit/libblock/include/rtems/flashdisk.h
rename to cpukit/include/rtems/flashdisk.h
diff --git a/cpukit/libmisc/fsmount/fsmount.h b/cpukit/include/rtems/fsmount.h
similarity index 100%
rename from cpukit/libmisc/fsmount/fsmount.h
rename to cpukit/include/rtems/fsmount.h
diff --git a/cpukit/ftpd/ftpd.h b/cpukit/include/rtems/ftpd.h
similarity index 100%
rename from cpukit/ftpd/ftpd.h
rename to cpukit/include/rtems/ftpd.h
diff --git a/cpukit/libcsupport/include/rtems/gxx_wrappers.h b/cpukit/include/rtems/gxx_wrappers.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/gxx_wrappers.h
rename to cpukit/include/rtems/gxx_wrappers.h
diff --git a/cpukit/libblock/include/rtems/ide_part_table.h b/cpukit/include/rtems/ide_part_table.h
similarity index 100%
rename from cpukit/libblock/include/rtems/ide_part_table.h
rename to cpukit/include/rtems/ide_part_table.h
diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/include/rtems/imfs.h
similarity index 100%
rename from cpukit/libfs/src/imfs/imfs.h
rename to cpukit/include/rtems/imfs.h
diff --git a/cpukit/sapi/include/rtems/init.h b/cpukit/include/rtems/init.h
similarity index 100%
rename from cpukit/sapi/include/rtems/init.h
rename to cpukit/include/rtems/init.h
diff --git a/cpukit/sapi/include/rtems/io.h b/cpukit/include/rtems/io.h
similarity index 100%
rename from cpukit/sapi/include/rtems/io.h
rename to cpukit/include/rtems/io.h
diff --git a/cpukit/sapi/include/rtems/ioimpl.h b/cpukit/include/rtems/ioimpl.h
similarity index 100%
rename from cpukit/sapi/include/rtems/ioimpl.h
rename to cpukit/include/rtems/ioimpl.h
diff --git a/cpukit/libcsupport/include/iosupp.h b/cpukit/include/rtems/iosupp.h
similarity index 100%
rename from cpukit/libcsupport/include/iosupp.h
rename to cpukit/include/rtems/iosupp.h
diff --git a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h b/cpukit/include/rtems/jffs2.h
similarity index 100%
rename from cpukit/libfs/src/jffs2/include/rtems/jffs2.h
rename to cpukit/include/rtems/jffs2.h
diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/cpukit/include/rtems/libcsupport.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/libcsupport.h
rename to cpukit/include/rtems/libcsupport.h
diff --git a/cpukit/libi2c/libi2c.h b/cpukit/include/rtems/libi2c.h
similarity index 100%
rename from cpukit/libi2c/libi2c.h
rename to cpukit/include/rtems/libi2c.h
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/include/rtems/libio.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/libio.h
rename to cpukit/include/rtems/libio.h
diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/include/rtems/libio_.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/libio_.h
rename to cpukit/include/rtems/libio_.h
diff --git a/cpukit/score/include/rtems/linkersets.h b/cpukit/include/rtems/linkersets.h
similarity index 100%
rename from cpukit/score/include/rtems/linkersets.h
rename to cpukit/include/rtems/linkersets.h
diff --git a/cpukit/libcsupport/include/rtems/malloc.h b/cpukit/include/rtems/malloc.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/malloc.h
rename to cpukit/include/rtems/malloc.h
diff --git a/cpukit/libblock/include/rtems/media.h b/cpukit/include/rtems/media.h
similarity index 100%
rename from cpukit/libblock/include/rtems/media.h
rename to cpukit/include/rtems/media.h
diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/include/rtems/monitor.h
similarity index 100%
rename from cpukit/libmisc/monitor/monitor.h
rename to cpukit/include/rtems/monitor.h
diff --git a/cpukit/libmisc/mouse/mouse_parser.h b/cpukit/include/rtems/mouse_parser.h
similarity index 100%
rename from cpukit/libmisc/mouse/mouse_parser.h
rename to cpukit/include/rtems/mouse_parser.h
diff --git a/cpukit/sapi/include/rtems/mptables.h b/cpukit/include/rtems/mptables.h
similarity index 100%
rename from cpukit/sapi/include/rtems/mptables.h
rename to cpukit/include/rtems/mptables.h
diff --git a/cpukit/libmisc/fb/mw_uid.h b/cpukit/include/rtems/mw_uid.h
similarity index 100%
rename from cpukit/libmisc/fb/mw_uid.h
rename to cpukit/include/rtems/mw_uid.h
diff --git a/cpukit/libblock/include/rtems/nvdisk-sram.h b/cpukit/include/rtems/nvdisk-sram.h
similarity index 100%
rename from cpukit/libblock/include/rtems/nvdisk-sram.h
rename to cpukit/include/rtems/nvdisk-sram.h
diff --git a/cpukit/libblock/include/rtems/nvdisk.h b/cpukit/include/rtems/nvdisk.h
similarity index 100%
rename from cpukit/libblock/include/rtems/nvdisk.h
rename to cpukit/include/rtems/nvdisk.h
diff --git a/cpukit/telnetd/passwd.h b/cpukit/include/rtems/passwd.h
similarity index 100%
rename from cpukit/telnetd/passwd.h
rename to cpukit/include/rtems/passwd.h
diff --git a/cpukit/libfs/src/pipe/pipe.h b/cpukit/include/rtems/pipe.h
similarity index 100%
rename from cpukit/libfs/src/pipe/pipe.h
rename to cpukit/include/rtems/pipe.h
diff --git a/cpukit/posix/include/rtems/posix/aio_misc.h b/cpukit/include/rtems/posix/aio_misc.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/aio_misc.h
rename to cpukit/include/rtems/posix/aio_misc.h
diff --git a/cpukit/posix/include/rtems/posix/barrierimpl.h b/cpukit/include/rtems/posix/barrierimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/barrierimpl.h
rename to cpukit/include/rtems/posix/barrierimpl.h
diff --git a/cpukit/posix/include/rtems/posix/condimpl.h b/cpukit/include/rtems/posix/condimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/condimpl.h
rename to cpukit/include/rtems/posix/condimpl.h
diff --git a/cpukit/posix/include/rtems/posix/config.h b/cpukit/include/rtems/posix/config.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/config.h
rename to cpukit/include/rtems/posix/config.h
diff --git a/cpukit/posix/include/rtems/posix/key.h b/cpukit/include/rtems/posix/key.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/key.h
rename to cpukit/include/rtems/posix/key.h
diff --git a/cpukit/posix/include/rtems/posix/keyimpl.h b/cpukit/include/rtems/posix/keyimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/keyimpl.h
rename to cpukit/include/rtems/posix/keyimpl.h
diff --git a/cpukit/posix/include/rtems/posix/mmanimpl.h b/cpukit/include/rtems/posix/mmanimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/mmanimpl.h
rename to cpukit/include/rtems/posix/mmanimpl.h
diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/cpukit/include/rtems/posix/mqueue.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/mqueue.h
rename to cpukit/include/rtems/posix/mqueue.h
diff --git a/cpukit/posix/include/rtems/posix/mqueueimpl.h b/cpukit/include/rtems/posix/mqueueimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/mqueueimpl.h
rename to cpukit/include/rtems/posix/mqueueimpl.h
diff --git a/cpukit/posix/include/rtems/posix/muteximpl.h b/cpukit/include/rtems/posix/muteximpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/muteximpl.h
rename to cpukit/include/rtems/posix/muteximpl.h
diff --git a/cpukit/posix/include/rtems/posix/posixapi.h b/cpukit/include/rtems/posix/posixapi.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/posixapi.h
rename to cpukit/include/rtems/posix/posixapi.h
diff --git a/cpukit/posix/include/rtems/posix/priorityimpl.h b/cpukit/include/rtems/posix/priorityimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/priorityimpl.h
rename to cpukit/include/rtems/posix/priorityimpl.h
diff --git a/cpukit/posix/include/rtems/posix/psignal.h b/cpukit/include/rtems/posix/psignal.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/psignal.h
rename to cpukit/include/rtems/posix/psignal.h
diff --git a/cpukit/posix/include/rtems/posix/psignalimpl.h b/cpukit/include/rtems/posix/psignalimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/psignalimpl.h
rename to cpukit/include/rtems/posix/psignalimpl.h
diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/cpukit/include/rtems/posix/pthread.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/pthread.h
rename to cpukit/include/rtems/posix/pthread.h
diff --git a/cpukit/posix/include/rtems/posix/pthreadattrimpl.h b/cpukit/include/rtems/posix/pthreadattrimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/pthreadattrimpl.h
rename to cpukit/include/rtems/posix/pthreadattrimpl.h
diff --git a/cpukit/posix/include/rtems/posix/pthreadimpl.h b/cpukit/include/rtems/posix/pthreadimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/pthreadimpl.h
rename to cpukit/include/rtems/posix/pthreadimpl.h
diff --git a/cpukit/posix/include/rtems/posix/ptimer.h b/cpukit/include/rtems/posix/ptimer.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/ptimer.h
rename to cpukit/include/rtems/posix/ptimer.h
diff --git a/cpukit/posix/include/rtems/posix/rwlockimpl.h b/cpukit/include/rtems/posix/rwlockimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/rwlockimpl.h
rename to cpukit/include/rtems/posix/rwlockimpl.h
diff --git a/cpukit/posix/include/rtems/posix/semaphore.h b/cpukit/include/rtems/posix/semaphore.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/semaphore.h
rename to cpukit/include/rtems/posix/semaphore.h
diff --git a/cpukit/posix/include/rtems/posix/semaphoreimpl.h b/cpukit/include/rtems/posix/semaphoreimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/semaphoreimpl.h
rename to cpukit/include/rtems/posix/semaphoreimpl.h
diff --git a/cpukit/posix/include/rtems/posix/shm.h b/cpukit/include/rtems/posix/shm.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/shm.h
rename to cpukit/include/rtems/posix/shm.h
diff --git a/cpukit/posix/include/rtems/posix/shmimpl.h b/cpukit/include/rtems/posix/shmimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/shmimpl.h
rename to cpukit/include/rtems/posix/shmimpl.h
diff --git a/cpukit/posix/include/rtems/posix/sigset.h b/cpukit/include/rtems/posix/sigset.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/sigset.h
rename to cpukit/include/rtems/posix/sigset.h
diff --git a/cpukit/posix/include/rtems/posix/spinlockimpl.h b/cpukit/include/rtems/posix/spinlockimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/spinlockimpl.h
rename to cpukit/include/rtems/posix/spinlockimpl.h
diff --git a/cpukit/posix/include/rtems/posix/threadsup.h b/cpukit/include/rtems/posix/threadsup.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/threadsup.h
rename to cpukit/include/rtems/posix/threadsup.h
diff --git a/cpukit/posix/include/rtems/posix/timer.h b/cpukit/include/rtems/posix/timer.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/timer.h
rename to cpukit/include/rtems/posix/timer.h
diff --git a/cpukit/posix/include/rtems/posix/timerimpl.h b/cpukit/include/rtems/posix/timerimpl.h
similarity index 100%
rename from cpukit/posix/include/rtems/posix/timerimpl.h
rename to cpukit/include/rtems/posix/timerimpl.h
diff --git a/cpukit/sapi/include/rtems/profiling.h b/cpukit/include/rtems/profiling.h
similarity index 100%
rename from cpukit/sapi/include/rtems/profiling.h
rename to cpukit/include/rtems/profiling.h
diff --git a/cpukit/telnetd/pty.h b/cpukit/include/rtems/pty.h
similarity index 100%
rename from cpukit/telnetd/pty.h
rename to cpukit/include/rtems/pty.h
diff --git a/cpukit/libqos/qreslib.h b/cpukit/include/rtems/qreslib.h
similarity index 100%
rename from cpukit/libqos/qreslib.h
rename to cpukit/include/rtems/qreslib.h
diff --git a/cpukit/libblock/include/rtems/ramdisk.h b/cpukit/include/rtems/ramdisk.h
similarity index 100%
rename from cpukit/libblock/include/rtems/ramdisk.h
rename to cpukit/include/rtems/ramdisk.h
diff --git a/cpukit/sapi/include/rtems/rbheap.h b/cpukit/include/rtems/rbheap.h
similarity index 100%
rename from cpukit/sapi/include/rtems/rbheap.h
rename to cpukit/include/rtems/rbheap.h
diff --git a/cpukit/sapi/include/rtems/rbtree.h b/cpukit/include/rtems/rbtree.h
similarity index 100%
rename from cpukit/sapi/include/rtems/rbtree.h
rename to cpukit/include/rtems/rbtree.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h b/cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h
rename to cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h b/cpukit/include/rtems/rfs/rtems-rfs-block-pos.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-block-pos.h
rename to cpukit/include/rtems/rfs/rtems-rfs-block-pos.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.h b/cpukit/include/rtems/rfs/rtems-rfs-block.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-block.h
rename to cpukit/include/rtems/rfs/rtems-rfs-block.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h b/cpukit/include/rtems/rfs/rtems-rfs-buffer.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-buffer.h
rename to cpukit/include/rtems/rfs/rtems-rfs-buffer.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-data.h b/cpukit/include/rtems/rfs/rtems-rfs-data.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-data.h
rename to cpukit/include/rtems/rfs/rtems-rfs-data.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h b/cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h
rename to cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir.h b/cpukit/include/rtems/rfs/rtems-rfs-dir.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-dir.h
rename to cpukit/include/rtems/rfs/rtems-rfs-dir.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h b/cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h
rename to cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h b/cpukit/include/rtems/rfs/rtems-rfs-file-system.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-file-system.h
rename to cpukit/include/rtems/rfs/rtems-rfs-file-system.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file.h b/cpukit/include/rtems/rfs/rtems-rfs-file.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-file.h
rename to cpukit/include/rtems/rfs/rtems-rfs-file.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-group.h b/cpukit/include/rtems/rfs/rtems-rfs-group.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-group.h
rename to cpukit/include/rtems/rfs/rtems-rfs-group.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-inode.h b/cpukit/include/rtems/rfs/rtems-rfs-inode.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-inode.h
rename to cpukit/include/rtems/rfs/rtems-rfs-inode.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-link.h b/cpukit/include/rtems/rfs/rtems-rfs-link.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-link.h
rename to cpukit/include/rtems/rfs/rtems-rfs-link.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h b/cpukit/include/rtems/rfs/rtems-rfs-mutex.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-mutex.h
rename to cpukit/include/rtems/rfs/rtems-rfs-mutex.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-trace.h b/cpukit/include/rtems/rfs/rtems-rfs-trace.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-trace.h
rename to cpukit/include/rtems/rfs/rtems-rfs-trace.h
diff --git a/cpukit/libcsupport/include/ringbuf.h b/cpukit/include/rtems/ringbuf.h
similarity index 100%
rename from cpukit/libcsupport/include/ringbuf.h
rename to cpukit/include/rtems/ringbuf.h
diff --git a/cpukit/libdebugger/rtems-debugger.h b/cpukit/include/rtems/rtems-debugger.h
similarity index 100%
rename from cpukit/libdebugger/rtems-debugger.h
rename to cpukit/include/rtems/rtems-debugger.h
diff --git a/cpukit/libmisc/rtems-fdt/rtems-fdt-shell.h b/cpukit/include/rtems/rtems-fdt-shell.h
similarity index 100%
rename from cpukit/libmisc/rtems-fdt/rtems-fdt-shell.h
rename to cpukit/include/rtems/rtems-fdt-shell.h
diff --git a/cpukit/libmisc/rtems-fdt/rtems-fdt.h b/cpukit/include/rtems/rtems-fdt.h
similarity index 100%
rename from cpukit/libmisc/rtems-fdt/rtems-fdt.h
rename to cpukit/include/rtems/rtems-fdt.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-format.h b/cpukit/include/rtems/rtems-rfs-format.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-format.h
rename to cpukit/include/rtems/rtems-rfs-format.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-shell.h b/cpukit/include/rtems/rtems-rfs-shell.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs-shell.h
rename to cpukit/include/rtems/rtems-rfs-shell.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs.h b/cpukit/include/rtems/rtems-rfs.h
similarity index 100%
rename from cpukit/libfs/src/rfs/rtems-rfs.h
rename to cpukit/include/rtems/rtems-rfs.h
diff --git a/cpukit/rtems/include/rtems/rtems/asr.h b/cpukit/include/rtems/rtems/asr.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/asr.h
rename to cpukit/include/rtems/rtems/asr.h
diff --git a/cpukit/rtems/include/rtems/rtems/asrimpl.h b/cpukit/include/rtems/rtems/asrimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/asrimpl.h
rename to cpukit/include/rtems/rtems/asrimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/attr.h b/cpukit/include/rtems/rtems/attr.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/attr.h
rename to cpukit/include/rtems/rtems/attr.h
diff --git a/cpukit/rtems/include/rtems/rtems/attrimpl.h b/cpukit/include/rtems/rtems/attrimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/attrimpl.h
rename to cpukit/include/rtems/rtems/attrimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/barrier.h b/cpukit/include/rtems/rtems/barrier.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/barrier.h
rename to cpukit/include/rtems/rtems/barrier.h
diff --git a/cpukit/rtems/include/rtems/rtems/barrierimpl.h b/cpukit/include/rtems/rtems/barrierimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/barrierimpl.h
rename to cpukit/include/rtems/rtems/barrierimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/cache.h b/cpukit/include/rtems/rtems/cache.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/cache.h
rename to cpukit/include/rtems/rtems/cache.h
diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/include/rtems/rtems/clock.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/clock.h
rename to cpukit/include/rtems/rtems/clock.h
diff --git a/cpukit/rtems/include/rtems/rtems/config.h b/cpukit/include/rtems/rtems/config.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/config.h
rename to cpukit/include/rtems/rtems/config.h
diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/include/rtems/rtems/dpmem.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/dpmem.h
rename to cpukit/include/rtems/rtems/dpmem.h
diff --git a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h b/cpukit/include/rtems/rtems/dpmemimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/dpmemimpl.h
rename to cpukit/include/rtems/rtems/dpmemimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/include/rtems/rtems/event.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/event.h
rename to cpukit/include/rtems/rtems/event.h
diff --git a/cpukit/rtems/include/rtems/rtems/eventimpl.h b/cpukit/include/rtems/rtems/eventimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/eventimpl.h
rename to cpukit/include/rtems/rtems/eventimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/eventmp.h b/cpukit/include/rtems/rtems/eventmp.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/eventmp.h
rename to cpukit/include/rtems/rtems/eventmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/intr.h b/cpukit/include/rtems/rtems/intr.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/intr.h
rename to cpukit/include/rtems/rtems/intr.h
diff --git a/cpukit/rtems/mainpage.h b/cpukit/include/rtems/rtems/mainpage.h
similarity index 100%
rename from cpukit/rtems/mainpage.h
rename to cpukit/include/rtems/rtems/mainpage.h
diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/include/rtems/rtems/message.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/message.h
rename to cpukit/include/rtems/rtems/message.h
diff --git a/cpukit/rtems/include/rtems/rtems/messageimpl.h b/cpukit/include/rtems/rtems/messageimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/messageimpl.h
rename to cpukit/include/rtems/rtems/messageimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/modes.h b/cpukit/include/rtems/rtems/modes.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/modes.h
rename to cpukit/include/rtems/rtems/modes.h
diff --git a/cpukit/rtems/include/rtems/rtems/modesimpl.h b/cpukit/include/rtems/rtems/modesimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/modesimpl.h
rename to cpukit/include/rtems/rtems/modesimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/mp.h b/cpukit/include/rtems/rtems/mp.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/mp.h
rename to cpukit/include/rtems/rtems/mp.h
diff --git a/cpukit/rtems/include/rtems/rtems/msgmp.h b/cpukit/include/rtems/rtems/msgmp.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/msgmp.h
rename to cpukit/include/rtems/rtems/msgmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/object.h b/cpukit/include/rtems/rtems/object.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/object.h
rename to cpukit/include/rtems/rtems/object.h
diff --git a/cpukit/rtems/include/rtems/rtems/options.h b/cpukit/include/rtems/rtems/options.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/options.h
rename to cpukit/include/rtems/rtems/options.h
diff --git a/cpukit/rtems/include/rtems/rtems/optionsimpl.h b/cpukit/include/rtems/rtems/optionsimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/optionsimpl.h
rename to cpukit/include/rtems/rtems/optionsimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/cpukit/include/rtems/rtems/part.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/part.h
rename to cpukit/include/rtems/rtems/part.h
diff --git a/cpukit/rtems/include/rtems/rtems/partimpl.h b/cpukit/include/rtems/rtems/partimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/partimpl.h
rename to cpukit/include/rtems/rtems/partimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/partmp.h b/cpukit/include/rtems/rtems/partmp.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/partmp.h
rename to cpukit/include/rtems/rtems/partmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/include/rtems/rtems/ratemon.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/ratemon.h
rename to cpukit/include/rtems/rtems/ratemon.h
diff --git a/cpukit/rtems/include/rtems/rtems/ratemonimpl.h b/cpukit/include/rtems/rtems/ratemonimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/ratemonimpl.h
rename to cpukit/include/rtems/rtems/ratemonimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/include/rtems/rtems/region.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/region.h
rename to cpukit/include/rtems/rtems/region.h
diff --git a/cpukit/rtems/include/rtems/rtems/regionimpl.h b/cpukit/include/rtems/rtems/regionimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/regionimpl.h
rename to cpukit/include/rtems/rtems/regionimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/include/rtems/rtems/sem.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/sem.h
rename to cpukit/include/rtems/rtems/sem.h
diff --git a/cpukit/rtems/include/rtems/rtems/semimpl.h b/cpukit/include/rtems/rtems/semimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/semimpl.h
rename to cpukit/include/rtems/rtems/semimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/semmp.h b/cpukit/include/rtems/rtems/semmp.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/semmp.h
rename to cpukit/include/rtems/rtems/semmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/signal.h b/cpukit/include/rtems/rtems/signal.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/signal.h
rename to cpukit/include/rtems/rtems/signal.h
diff --git a/cpukit/rtems/include/rtems/rtems/signalimpl.h b/cpukit/include/rtems/rtems/signalimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/signalimpl.h
rename to cpukit/include/rtems/rtems/signalimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/signalmp.h b/cpukit/include/rtems/rtems/signalmp.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/signalmp.h
rename to cpukit/include/rtems/rtems/signalmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/smp.h b/cpukit/include/rtems/rtems/smp.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/smp.h
rename to cpukit/include/rtems/rtems/smp.h
diff --git a/cpukit/rtems/include/rtems/rtems/status.h b/cpukit/include/rtems/rtems/status.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/status.h
rename to cpukit/include/rtems/rtems/status.h
diff --git a/cpukit/rtems/include/rtems/rtems/statusimpl.h b/cpukit/include/rtems/rtems/statusimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/statusimpl.h
rename to cpukit/include/rtems/rtems/statusimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/include/rtems/rtems/support.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/support.h
rename to cpukit/include/rtems/rtems/support.h
diff --git a/cpukit/rtems/include/rtems/rtems/taskmp.h b/cpukit/include/rtems/rtems/taskmp.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/taskmp.h
rename to cpukit/include/rtems/rtems/taskmp.h
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/include/rtems/rtems/tasks.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/tasks.h
rename to cpukit/include/rtems/rtems/tasks.h
diff --git a/cpukit/rtems/include/rtems/rtems/tasksimpl.h b/cpukit/include/rtems/rtems/tasksimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/tasksimpl.h
rename to cpukit/include/rtems/rtems/tasksimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/include/rtems/rtems/timer.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/timer.h
rename to cpukit/include/rtems/rtems/timer.h
diff --git a/cpukit/rtems/include/rtems/rtems/timerimpl.h b/cpukit/include/rtems/rtems/timerimpl.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/timerimpl.h
rename to cpukit/include/rtems/rtems/timerimpl.h
diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/include/rtems/rtems/types.h
similarity index 100%
rename from cpukit/rtems/include/rtems/rtems/types.h
rename to cpukit/include/rtems/rtems/types.h
diff --git a/cpukit/pppd/rtemsdialer.h b/cpukit/include/rtems/rtemsdialer.h
similarity index 100%
rename from cpukit/pppd/rtemsdialer.h
rename to cpukit/include/rtems/rtemsdialer.h
diff --git a/cpukit/pppd/rtemspppd.h b/cpukit/include/rtems/rtemspppd.h
similarity index 100%
rename from cpukit/pppd/rtemspppd.h
rename to cpukit/include/rtems/rtemspppd.h
diff --git a/cpukit/libdl/dlfcn-shell.h b/cpukit/include/rtems/rtl/dlfcn-shell.h
similarity index 100%
rename from cpukit/libdl/dlfcn-shell.h
rename to cpukit/include/rtems/rtl/dlfcn-shell.h
diff --git a/cpukit/libdl/rap-shell.h b/cpukit/include/rtems/rtl/rap-shell.h
similarity index 100%
rename from cpukit/libdl/rap-shell.h
rename to cpukit/include/rtems/rtl/rap-shell.h
diff --git a/cpukit/libdl/rap.h b/cpukit/include/rtems/rtl/rap.h
similarity index 100%
rename from cpukit/libdl/rap.h
rename to cpukit/include/rtems/rtl/rap.h
diff --git a/cpukit/libdl/rtl-allocator.h b/cpukit/include/rtems/rtl/rtl-allocator.h
similarity index 100%
rename from cpukit/libdl/rtl-allocator.h
rename to cpukit/include/rtems/rtl/rtl-allocator.h
diff --git a/cpukit/libdl/rtl-fwd.h b/cpukit/include/rtems/rtl/rtl-fwd.h
similarity index 100%
rename from cpukit/libdl/rtl-fwd.h
rename to cpukit/include/rtems/rtl/rtl-fwd.h
diff --git a/cpukit/libdl/rtl-indirect-ptr.h b/cpukit/include/rtems/rtl/rtl-indirect-ptr.h
similarity index 100%
rename from cpukit/libdl/rtl-indirect-ptr.h
rename to cpukit/include/rtems/rtl/rtl-indirect-ptr.h
diff --git a/cpukit/libdl/rtl-obj-cache.h b/cpukit/include/rtems/rtl/rtl-obj-cache.h
similarity index 100%
rename from cpukit/libdl/rtl-obj-cache.h
rename to cpukit/include/rtems/rtl/rtl-obj-cache.h
diff --git a/cpukit/libdl/rtl-obj-comp.h b/cpukit/include/rtems/rtl/rtl-obj-comp.h
similarity index 100%
rename from cpukit/libdl/rtl-obj-comp.h
rename to cpukit/include/rtems/rtl/rtl-obj-comp.h
diff --git a/cpukit/libdl/rtl-obj-fwd.h b/cpukit/include/rtems/rtl/rtl-obj-fwd.h
similarity index 100%
rename from cpukit/libdl/rtl-obj-fwd.h
rename to cpukit/include/rtems/rtl/rtl-obj-fwd.h
diff --git a/cpukit/libdl/rtl-obj.h b/cpukit/include/rtems/rtl/rtl-obj.h
similarity index 100%
rename from cpukit/libdl/rtl-obj.h
rename to cpukit/include/rtems/rtl/rtl-obj.h
diff --git a/cpukit/libdl/rtl-sym.h b/cpukit/include/rtems/rtl/rtl-sym.h
similarity index 100%
rename from cpukit/libdl/rtl-sym.h
rename to cpukit/include/rtems/rtl/rtl-sym.h
diff --git a/cpukit/libdl/rtl-trace.h b/cpukit/include/rtems/rtl/rtl-trace.h
similarity index 100%
rename from cpukit/libdl/rtl-trace.h
rename to cpukit/include/rtems/rtl/rtl-trace.h
diff --git a/cpukit/libdl/rtl-unresolved.h b/cpukit/include/rtems/rtl/rtl-unresolved.h
similarity index 100%
rename from cpukit/libdl/rtl-unresolved.h
rename to cpukit/include/rtems/rtl/rtl-unresolved.h
diff --git a/cpukit/libdl/rtl.h b/cpukit/include/rtems/rtl/rtl.h
similarity index 100%
rename from cpukit/libdl/rtl.h
rename to cpukit/include/rtems/rtl/rtl.h
diff --git a/cpukit/sapi/include/rtems/scheduler.h b/cpukit/include/rtems/scheduler.h
similarity index 100%
rename from cpukit/sapi/include/rtems/scheduler.h
rename to cpukit/include/rtems/scheduler.h
diff --git a/cpukit/score/include/rtems/score/address.h b/cpukit/include/rtems/score/address.h
similarity index 100%
rename from cpukit/score/include/rtems/score/address.h
rename to cpukit/include/rtems/score/address.h
diff --git a/cpukit/score/include/rtems/score/apimutex.h b/cpukit/include/rtems/score/apimutex.h
similarity index 100%
rename from cpukit/score/include/rtems/score/apimutex.h
rename to cpukit/include/rtems/score/apimutex.h
diff --git a/cpukit/score/include/rtems/score/assert.h b/cpukit/include/rtems/score/assert.h
similarity index 100%
rename from cpukit/score/include/rtems/score/assert.h
rename to cpukit/include/rtems/score/assert.h
diff --git a/cpukit/score/include/rtems/score/atomic.h b/cpukit/include/rtems/score/atomic.h
similarity index 100%
rename from cpukit/score/include/rtems/score/atomic.h
rename to cpukit/include/rtems/score/atomic.h
diff --git a/cpukit/score/include/rtems/score/basedefs.h b/cpukit/include/rtems/score/basedefs.h
similarity index 100%
rename from cpukit/score/include/rtems/score/basedefs.h
rename to cpukit/include/rtems/score/basedefs.h
diff --git a/cpukit/score/include/rtems/score/chain.h b/cpukit/include/rtems/score/chain.h
similarity index 100%
rename from cpukit/score/include/rtems/score/chain.h
rename to cpukit/include/rtems/score/chain.h
diff --git a/cpukit/score/include/rtems/score/chainimpl.h b/cpukit/include/rtems/score/chainimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/chainimpl.h
rename to cpukit/include/rtems/score/chainimpl.h
diff --git a/cpukit/score/include/rtems/score/context.h b/cpukit/include/rtems/score/context.h
similarity index 100%
rename from cpukit/score/include/rtems/score/context.h
rename to cpukit/include/rtems/score/context.h
diff --git a/cpukit/score/include/rtems/score/copyrt.h b/cpukit/include/rtems/score/copyrt.h
similarity index 100%
rename from cpukit/score/include/rtems/score/copyrt.h
rename to cpukit/include/rtems/score/copyrt.h
diff --git a/cpukit/score/include/rtems/score/corebarrier.h b/cpukit/include/rtems/score/corebarrier.h
similarity index 100%
rename from cpukit/score/include/rtems/score/corebarrier.h
rename to cpukit/include/rtems/score/corebarrier.h
diff --git a/cpukit/score/include/rtems/score/corebarrierimpl.h b/cpukit/include/rtems/score/corebarrierimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/corebarrierimpl.h
rename to cpukit/include/rtems/score/corebarrierimpl.h
diff --git a/cpukit/score/include/rtems/score/coremsg.h b/cpukit/include/rtems/score/coremsg.h
similarity index 100%
rename from cpukit/score/include/rtems/score/coremsg.h
rename to cpukit/include/rtems/score/coremsg.h
diff --git a/cpukit/score/include/rtems/score/coremsgimpl.h b/cpukit/include/rtems/score/coremsgimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/coremsgimpl.h
rename to cpukit/include/rtems/score/coremsgimpl.h
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/include/rtems/score/coremutex.h
similarity index 100%
rename from cpukit/score/include/rtems/score/coremutex.h
rename to cpukit/include/rtems/score/coremutex.h
diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/include/rtems/score/coremuteximpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/coremuteximpl.h
rename to cpukit/include/rtems/score/coremuteximpl.h
diff --git a/cpukit/score/include/rtems/score/corerwlockimpl.h b/cpukit/include/rtems/score/corerwlockimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/corerwlockimpl.h
rename to cpukit/include/rtems/score/corerwlockimpl.h
diff --git a/cpukit/score/include/rtems/score/coresem.h b/cpukit/include/rtems/score/coresem.h
similarity index 100%
rename from cpukit/score/include/rtems/score/coresem.h
rename to cpukit/include/rtems/score/coresem.h
diff --git a/cpukit/score/include/rtems/score/coresemimpl.h b/cpukit/include/rtems/score/coresemimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/coresemimpl.h
rename to cpukit/include/rtems/score/coresemimpl.h
diff --git a/cpukit/score/include/rtems/score/cpustdatomic.h b/cpukit/include/rtems/score/cpustdatomic.h
similarity index 100%
rename from cpukit/score/include/rtems/score/cpustdatomic.h
rename to cpukit/include/rtems/score/cpustdatomic.h
diff --git a/cpukit/score/include/rtems/score/freechain.h b/cpukit/include/rtems/score/freechain.h
similarity index 100%
rename from cpukit/score/include/rtems/score/freechain.h
rename to cpukit/include/rtems/score/freechain.h
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/include/rtems/score/heap.h
similarity index 100%
rename from cpukit/score/include/rtems/score/heap.h
rename to cpukit/include/rtems/score/heap.h
diff --git a/cpukit/score/include/rtems/score/heapimpl.h b/cpukit/include/rtems/score/heapimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/heapimpl.h
rename to cpukit/include/rtems/score/heapimpl.h
diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/include/rtems/score/interr.h
similarity index 100%
rename from cpukit/score/include/rtems/score/interr.h
rename to cpukit/include/rtems/score/interr.h
diff --git a/cpukit/score/include/rtems/score/io.h b/cpukit/include/rtems/score/io.h
similarity index 100%
rename from cpukit/score/include/rtems/score/io.h
rename to cpukit/include/rtems/score/io.h
diff --git a/cpukit/score/include/rtems/score/isr.h b/cpukit/include/rtems/score/isr.h
similarity index 100%
rename from cpukit/score/include/rtems/score/isr.h
rename to cpukit/include/rtems/score/isr.h
diff --git a/cpukit/score/include/rtems/score/isrlevel.h b/cpukit/include/rtems/score/isrlevel.h
similarity index 100%
rename from cpukit/score/include/rtems/score/isrlevel.h
rename to cpukit/include/rtems/score/isrlevel.h
diff --git a/cpukit/score/include/rtems/score/isrlock.h b/cpukit/include/rtems/score/isrlock.h
similarity index 100%
rename from cpukit/score/include/rtems/score/isrlock.h
rename to cpukit/include/rtems/score/isrlock.h
diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/include/rtems/score/mpci.h
similarity index 100%
rename from cpukit/score/include/rtems/score/mpci.h
rename to cpukit/include/rtems/score/mpci.h
diff --git a/cpukit/score/include/rtems/score/mpciimpl.h b/cpukit/include/rtems/score/mpciimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/mpciimpl.h
rename to cpukit/include/rtems/score/mpciimpl.h
diff --git a/cpukit/score/include/rtems/score/mppkt.h b/cpukit/include/rtems/score/mppkt.h
similarity index 100%
rename from cpukit/score/include/rtems/score/mppkt.h
rename to cpukit/include/rtems/score/mppkt.h
diff --git a/cpukit/score/include/rtems/score/mrsp.h b/cpukit/include/rtems/score/mrsp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/mrsp.h
rename to cpukit/include/rtems/score/mrsp.h
diff --git a/cpukit/score/include/rtems/score/mrspimpl.h b/cpukit/include/rtems/score/mrspimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/mrspimpl.h
rename to cpukit/include/rtems/score/mrspimpl.h
diff --git a/cpukit/score/include/rtems/score/muteximpl.h b/cpukit/include/rtems/score/muteximpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/muteximpl.h
rename to cpukit/include/rtems/score/muteximpl.h
diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/include/rtems/score/object.h
similarity index 100%
rename from cpukit/score/include/rtems/score/object.h
rename to cpukit/include/rtems/score/object.h
diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/include/rtems/score/objectimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/objectimpl.h
rename to cpukit/include/rtems/score/objectimpl.h
diff --git a/cpukit/score/include/rtems/score/objectmp.h b/cpukit/include/rtems/score/objectmp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/objectmp.h
rename to cpukit/include/rtems/score/objectmp.h
diff --git a/cpukit/score/include/rtems/score/onceimpl.h b/cpukit/include/rtems/score/onceimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/onceimpl.h
rename to cpukit/include/rtems/score/onceimpl.h
diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/include/rtems/score/percpu.h
similarity index 100%
rename from cpukit/score/include/rtems/score/percpu.h
rename to cpukit/include/rtems/score/percpu.h
diff --git a/cpukit/score/include/rtems/score/priority.h b/cpukit/include/rtems/score/priority.h
similarity index 100%
rename from cpukit/score/include/rtems/score/priority.h
rename to cpukit/include/rtems/score/priority.h
diff --git a/cpukit/score/include/rtems/score/prioritybitmap.h b/cpukit/include/rtems/score/prioritybitmap.h
similarity index 100%
rename from cpukit/score/include/rtems/score/prioritybitmap.h
rename to cpukit/include/rtems/score/prioritybitmap.h
diff --git a/cpukit/score/include/rtems/score/prioritybitmapimpl.h b/cpukit/include/rtems/score/prioritybitmapimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/prioritybitmapimpl.h
rename to cpukit/include/rtems/score/prioritybitmapimpl.h
diff --git a/cpukit/score/include/rtems/score/priorityimpl.h b/cpukit/include/rtems/score/priorityimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/priorityimpl.h
rename to cpukit/include/rtems/score/priorityimpl.h
diff --git a/cpukit/score/include/rtems/score/processormask.h b/cpukit/include/rtems/score/processormask.h
similarity index 100%
rename from cpukit/score/include/rtems/score/processormask.h
rename to cpukit/include/rtems/score/processormask.h
diff --git a/cpukit/score/include/rtems/score/profiling.h b/cpukit/include/rtems/score/profiling.h
similarity index 100%
rename from cpukit/score/include/rtems/score/profiling.h
rename to cpukit/include/rtems/score/profiling.h
diff --git a/cpukit/score/include/rtems/score/protectedheap.h b/cpukit/include/rtems/score/protectedheap.h
similarity index 100%
rename from cpukit/score/include/rtems/score/protectedheap.h
rename to cpukit/include/rtems/score/protectedheap.h
diff --git a/cpukit/score/include/rtems/score/rbtree.h b/cpukit/include/rtems/score/rbtree.h
similarity index 100%
rename from cpukit/score/include/rtems/score/rbtree.h
rename to cpukit/include/rtems/score/rbtree.h
diff --git a/cpukit/score/include/rtems/score/rbtreeimpl.h b/cpukit/include/rtems/score/rbtreeimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/rbtreeimpl.h
rename to cpukit/include/rtems/score/rbtreeimpl.h
diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/include/rtems/score/scheduler.h
similarity index 100%
rename from cpukit/score/include/rtems/score/scheduler.h
rename to cpukit/include/rtems/score/scheduler.h
diff --git a/cpukit/score/include/rtems/score/schedulercbs.h b/cpukit/include/rtems/score/schedulercbs.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulercbs.h
rename to cpukit/include/rtems/score/schedulercbs.h
diff --git a/cpukit/score/include/rtems/score/schedulercbsimpl.h b/cpukit/include/rtems/score/schedulercbsimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulercbsimpl.h
rename to cpukit/include/rtems/score/schedulercbsimpl.h
diff --git a/cpukit/score/include/rtems/score/scheduleredf.h b/cpukit/include/rtems/score/scheduleredf.h
similarity index 100%
rename from cpukit/score/include/rtems/score/scheduleredf.h
rename to cpukit/include/rtems/score/scheduleredf.h
diff --git a/cpukit/score/include/rtems/score/scheduleredfimpl.h b/cpukit/include/rtems/score/scheduleredfimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/scheduleredfimpl.h
rename to cpukit/include/rtems/score/scheduleredfimpl.h
diff --git a/cpukit/score/include/rtems/score/scheduleredfsmp.h b/cpukit/include/rtems/score/scheduleredfsmp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/scheduleredfsmp.h
rename to cpukit/include/rtems/score/scheduleredfsmp.h
diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/include/rtems/score/schedulerimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulerimpl.h
rename to cpukit/include/rtems/score/schedulerimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulernode.h b/cpukit/include/rtems/score/schedulernode.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulernode.h
rename to cpukit/include/rtems/score/schedulernode.h
diff --git a/cpukit/score/include/rtems/score/schedulernodeimpl.h b/cpukit/include/rtems/score/schedulernodeimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulernodeimpl.h
rename to cpukit/include/rtems/score/schedulernodeimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerpriority.h b/cpukit/include/rtems/score/schedulerpriority.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulerpriority.h
rename to cpukit/include/rtems/score/schedulerpriority.h
diff --git a/cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h b/cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulerpriorityaffinitysmp.h
rename to cpukit/include/rtems/score/schedulerpriorityaffinitysmp.h
diff --git a/cpukit/score/include/rtems/score/schedulerpriorityimpl.h b/cpukit/include/rtems/score/schedulerpriorityimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulerpriorityimpl.h
rename to cpukit/include/rtems/score/schedulerpriorityimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerprioritysmp.h b/cpukit/include/rtems/score/schedulerprioritysmp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulerprioritysmp.h
rename to cpukit/include/rtems/score/schedulerprioritysmp.h
diff --git a/cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h b/cpukit/include/rtems/score/schedulerprioritysmpimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulerprioritysmpimpl.h
rename to cpukit/include/rtems/score/schedulerprioritysmpimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulersimple.h b/cpukit/include/rtems/score/schedulersimple.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulersimple.h
rename to cpukit/include/rtems/score/schedulersimple.h
diff --git a/cpukit/score/include/rtems/score/schedulersimpleimpl.h b/cpukit/include/rtems/score/schedulersimpleimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulersimpleimpl.h
rename to cpukit/include/rtems/score/schedulersimpleimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulersimplesmp.h b/cpukit/include/rtems/score/schedulersimplesmp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulersimplesmp.h
rename to cpukit/include/rtems/score/schedulersimplesmp.h
diff --git a/cpukit/score/include/rtems/score/schedulersmp.h b/cpukit/include/rtems/score/schedulersmp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulersmp.h
rename to cpukit/include/rtems/score/schedulersmp.h
diff --git a/cpukit/score/include/rtems/score/schedulersmpimpl.h b/cpukit/include/rtems/score/schedulersmpimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulersmpimpl.h
rename to cpukit/include/rtems/score/schedulersmpimpl.h
diff --git a/cpukit/score/include/rtems/score/schedulerstrongapa.h b/cpukit/include/rtems/score/schedulerstrongapa.h
similarity index 100%
rename from cpukit/score/include/rtems/score/schedulerstrongapa.h
rename to cpukit/include/rtems/score/schedulerstrongapa.h
diff --git a/cpukit/score/include/rtems/score/semaphoreimpl.h b/cpukit/include/rtems/score/semaphoreimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/semaphoreimpl.h
rename to cpukit/include/rtems/score/semaphoreimpl.h
diff --git a/cpukit/score/include/rtems/score/smp.h b/cpukit/include/rtems/score/smp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/smp.h
rename to cpukit/include/rtems/score/smp.h
diff --git a/cpukit/score/include/rtems/score/smpbarrier.h b/cpukit/include/rtems/score/smpbarrier.h
similarity index 100%
rename from cpukit/score/include/rtems/score/smpbarrier.h
rename to cpukit/include/rtems/score/smpbarrier.h
diff --git a/cpukit/score/include/rtems/score/smpimpl.h b/cpukit/include/rtems/score/smpimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/smpimpl.h
rename to cpukit/include/rtems/score/smpimpl.h
diff --git a/cpukit/score/include/rtems/score/smplock.h b/cpukit/include/rtems/score/smplock.h
similarity index 100%
rename from cpukit/score/include/rtems/score/smplock.h
rename to cpukit/include/rtems/score/smplock.h
diff --git a/cpukit/score/include/rtems/score/smplockmcs.h b/cpukit/include/rtems/score/smplockmcs.h
similarity index 100%
rename from cpukit/score/include/rtems/score/smplockmcs.h
rename to cpukit/include/rtems/score/smplockmcs.h
diff --git a/cpukit/score/include/rtems/score/smplockseq.h b/cpukit/include/rtems/score/smplockseq.h
similarity index 100%
rename from cpukit/score/include/rtems/score/smplockseq.h
rename to cpukit/include/rtems/score/smplockseq.h
diff --git a/cpukit/score/include/rtems/score/smplockstats.h b/cpukit/include/rtems/score/smplockstats.h
similarity index 100%
rename from cpukit/score/include/rtems/score/smplockstats.h
rename to cpukit/include/rtems/score/smplockstats.h
diff --git a/cpukit/score/include/rtems/score/smplockticket.h b/cpukit/include/rtems/score/smplockticket.h
similarity index 100%
rename from cpukit/score/include/rtems/score/smplockticket.h
rename to cpukit/include/rtems/score/smplockticket.h
diff --git a/cpukit/score/include/rtems/score/stack.h b/cpukit/include/rtems/score/stack.h
similarity index 100%
rename from cpukit/score/include/rtems/score/stack.h
rename to cpukit/include/rtems/score/stack.h
diff --git a/cpukit/score/include/rtems/score/stackimpl.h b/cpukit/include/rtems/score/stackimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/stackimpl.h
rename to cpukit/include/rtems/score/stackimpl.h
diff --git a/cpukit/score/include/rtems/score/states.h b/cpukit/include/rtems/score/states.h
similarity index 100%
rename from cpukit/score/include/rtems/score/states.h
rename to cpukit/include/rtems/score/states.h
diff --git a/cpukit/score/include/rtems/score/statesimpl.h b/cpukit/include/rtems/score/statesimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/statesimpl.h
rename to cpukit/include/rtems/score/statesimpl.h
diff --git a/cpukit/score/include/rtems/score/status.h b/cpukit/include/rtems/score/status.h
similarity index 100%
rename from cpukit/score/include/rtems/score/status.h
rename to cpukit/include/rtems/score/status.h
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/include/rtems/score/sysstate.h
similarity index 100%
rename from cpukit/score/include/rtems/score/sysstate.h
rename to cpukit/include/rtems/score/sysstate.h
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/include/rtems/score/thread.h
similarity index 100%
rename from cpukit/score/include/rtems/score/thread.h
rename to cpukit/include/rtems/score/thread.h
diff --git a/cpukit/score/include/rtems/score/threaddispatch.h b/cpukit/include/rtems/score/threaddispatch.h
similarity index 100%
rename from cpukit/score/include/rtems/score/threaddispatch.h
rename to cpukit/include/rtems/score/threaddispatch.h
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/include/rtems/score/threadimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/threadimpl.h
rename to cpukit/include/rtems/score/threadimpl.h
diff --git a/cpukit/score/include/rtems/score/threadmp.h b/cpukit/include/rtems/score/threadmp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/threadmp.h
rename to cpukit/include/rtems/score/threadmp.h
diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/include/rtems/score/threadq.h
similarity index 100%
rename from cpukit/score/include/rtems/score/threadq.h
rename to cpukit/include/rtems/score/threadq.h
diff --git a/cpukit/score/include/rtems/score/threadqimpl.h b/cpukit/include/rtems/score/threadqimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/threadqimpl.h
rename to cpukit/include/rtems/score/threadqimpl.h
diff --git a/cpukit/score/include/rtems/score/timecounter.h b/cpukit/include/rtems/score/timecounter.h
similarity index 100%
rename from cpukit/score/include/rtems/score/timecounter.h
rename to cpukit/include/rtems/score/timecounter.h
diff --git a/cpukit/score/include/rtems/score/timecounterimpl.h b/cpukit/include/rtems/score/timecounterimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/timecounterimpl.h
rename to cpukit/include/rtems/score/timecounterimpl.h
diff --git a/cpukit/score/include/rtems/score/timespec.h b/cpukit/include/rtems/score/timespec.h
similarity index 100%
rename from cpukit/score/include/rtems/score/timespec.h
rename to cpukit/include/rtems/score/timespec.h
diff --git a/cpukit/score/include/rtems/score/timestamp.h b/cpukit/include/rtems/score/timestamp.h
similarity index 100%
rename from cpukit/score/include/rtems/score/timestamp.h
rename to cpukit/include/rtems/score/timestamp.h
diff --git a/cpukit/score/include/rtems/score/tls.h b/cpukit/include/rtems/score/tls.h
similarity index 100%
rename from cpukit/score/include/rtems/score/tls.h
rename to cpukit/include/rtems/score/tls.h
diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/include/rtems/score/tod.h
similarity index 100%
rename from cpukit/score/include/rtems/score/tod.h
rename to cpukit/include/rtems/score/tod.h
diff --git a/cpukit/score/include/rtems/score/todimpl.h b/cpukit/include/rtems/score/todimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/todimpl.h
rename to cpukit/include/rtems/score/todimpl.h
diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/include/rtems/score/userext.h
similarity index 100%
rename from cpukit/score/include/rtems/score/userext.h
rename to cpukit/include/rtems/score/userext.h
diff --git a/cpukit/score/include/rtems/score/userextimpl.h b/cpukit/include/rtems/score/userextimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/userextimpl.h
rename to cpukit/include/rtems/score/userextimpl.h
diff --git a/cpukit/score/include/rtems/score/watchdog.h b/cpukit/include/rtems/score/watchdog.h
similarity index 100%
rename from cpukit/score/include/rtems/score/watchdog.h
rename to cpukit/include/rtems/score/watchdog.h
diff --git a/cpukit/score/include/rtems/score/watchdogimpl.h b/cpukit/include/rtems/score/watchdogimpl.h
similarity index 100%
rename from cpukit/score/include/rtems/score/watchdogimpl.h
rename to cpukit/include/rtems/score/watchdogimpl.h
diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/include/rtems/score/wkspace.h
similarity index 100%
rename from cpukit/score/include/rtems/score/wkspace.h
rename to cpukit/include/rtems/score/wkspace.h
diff --git a/cpukit/libmisc/serdbg/serdbg.h b/cpukit/include/rtems/serdbg.h
similarity index 100%
rename from cpukit/libmisc/serdbg/serdbg.h
rename to cpukit/include/rtems/serdbg.h
diff --git a/cpukit/libmisc/serdbg/serdbgcnf.h b/cpukit/include/rtems/serdbgcnf.h
similarity index 100%
rename from cpukit/libmisc/serdbg/serdbgcnf.h
rename to cpukit/include/rtems/serdbgcnf.h
diff --git a/cpukit/libmisc/mouse/serial_mouse.h b/cpukit/include/rtems/serial_mouse.h
similarity index 100%
rename from cpukit/libmisc/mouse/serial_mouse.h
rename to cpukit/include/rtems/serial_mouse.h
diff --git a/cpukit/score/include/rtems/seterr.h b/cpukit/include/rtems/seterr.h
similarity index 100%
rename from cpukit/score/include/rtems/seterr.h
rename to cpukit/include/rtems/seterr.h
diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/include/rtems/shell.h
similarity index 100%
rename from cpukit/libmisc/shell/shell.h
rename to cpukit/include/rtems/shell.h
diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/include/rtems/shellconfig.h
similarity index 100%
rename from cpukit/libmisc/shell/shellconfig.h
rename to cpukit/include/rtems/shellconfig.h
diff --git a/cpukit/libblock/include/rtems/sparse-disk.h b/cpukit/include/rtems/sparse-disk.h
similarity index 100%
rename from cpukit/libblock/include/rtems/sparse-disk.h
rename to cpukit/include/rtems/sparse-disk.h
diff --git a/cpukit/libcsupport/include/spurious.h b/cpukit/include/rtems/spurious.h
similarity index 100%
rename from cpukit/libcsupport/include/spurious.h
rename to cpukit/include/rtems/spurious.h
diff --git a/cpukit/libmisc/stackchk/stackchk.h b/cpukit/include/rtems/stackchk.h
similarity index 100%
rename from cpukit/libmisc/stackchk/stackchk.h
rename to cpukit/include/rtems/stackchk.h
diff --git a/cpukit/libmisc/redirector/stdio-redirect.h b/cpukit/include/rtems/stdio-redirect.h
similarity index 100%
rename from cpukit/libmisc/redirector/stdio-redirect.h
rename to cpukit/include/rtems/stdio-redirect.h
diff --git a/cpukit/libmisc/stringto/stringto.h b/cpukit/include/rtems/stringto.h
similarity index 100%
rename from cpukit/libmisc/stringto/stringto.h
rename to cpukit/include/rtems/stringto.h
diff --git a/cpukit/score/include/rtems/sysinit.h b/cpukit/include/rtems/sysinit.h
similarity index 100%
rename from cpukit/score/include/rtems/sysinit.h
rename to cpukit/include/rtems/sysinit.h
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/include/rtems/system.h
similarity index 100%
rename from cpukit/score/include/rtems/system.h
rename to cpukit/include/rtems/system.h
diff --git a/cpukit/telnetd/telnetd.h b/cpukit/include/rtems/telnetd.h
similarity index 100%
rename from cpukit/telnetd/telnetd.h
rename to cpukit/include/rtems/telnetd.h
diff --git a/cpukit/libmisc/serdbg/termios_printk.h b/cpukit/include/rtems/termios_printk.h
similarity index 100%
rename from cpukit/libmisc/serdbg/termios_printk.h
rename to cpukit/include/rtems/termios_printk.h
diff --git a/cpukit/libmisc/serdbg/termios_printk_cnf.h b/cpukit/include/rtems/termios_printk_cnf.h
similarity index 100%
rename from cpukit/libmisc/serdbg/termios_printk_cnf.h
rename to cpukit/include/rtems/termios_printk_cnf.h
diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/cpukit/include/rtems/termiostypes.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/termiostypes.h
rename to cpukit/include/rtems/termiostypes.h
diff --git a/cpukit/libmisc/testsupport/test.h b/cpukit/include/rtems/test.h
similarity index 100%
rename from cpukit/libmisc/testsupport/test.h
rename to cpukit/include/rtems/test.h
diff --git a/cpukit/sapi/include/rtems/timecounter.h b/cpukit/include/rtems/timecounter.h
similarity index 100%
rename from cpukit/sapi/include/rtems/timecounter.h
rename to cpukit/include/rtems/timecounter.h
diff --git a/cpukit/sapi/include/rtems/timespec.h b/cpukit/include/rtems/timespec.h
similarity index 100%
rename from cpukit/sapi/include/rtems/timespec.h
rename to cpukit/include/rtems/timespec.h
diff --git a/cpukit/libcsupport/include/rtems/tod.h b/cpukit/include/rtems/tod.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/tod.h
rename to cpukit/include/rtems/tod.h
diff --git a/cpukit/libmisc/capture/rtems-trace-buffer-vars.h b/cpukit/include/rtems/trace/rtems-trace-buffer-vars.h
similarity index 100%
rename from cpukit/libmisc/capture/rtems-trace-buffer-vars.h
rename to cpukit/include/rtems/trace/rtems-trace-buffer-vars.h
diff --git a/cpukit/libmisc/untar/untar.h b/cpukit/include/rtems/untar.h
similarity index 100%
rename from cpukit/libmisc/untar/untar.h
rename to cpukit/include/rtems/untar.h
diff --git a/cpukit/sapi/include/rtems/version.h b/cpukit/include/rtems/version.h
similarity index 100%
rename from cpukit/sapi/include/rtems/version.h
rename to cpukit/include/rtems/version.h
diff --git a/cpukit/libcsupport/include/vmeintr.h b/cpukit/include/rtems/vmeintr.h
similarity index 100%
rename from cpukit/libcsupport/include/vmeintr.h
rename to cpukit/include/rtems/vmeintr.h
diff --git a/cpukit/libmd/sha256.h b/cpukit/include/sha256.h
similarity index 100%
rename from cpukit/libmd/sha256.h
rename to cpukit/include/sha256.h
diff --git a/cpukit/libmd/sha512.h b/cpukit/include/sha512.h
similarity index 100%
rename from cpukit/libmd/sha512.h
rename to cpukit/include/sha512.h
diff --git a/cpukit/score/include/sys/_ffcounter.h b/cpukit/include/sys/_ffcounter.h
similarity index 100%
rename from cpukit/score/include/sys/_ffcounter.h
rename to cpukit/include/sys/_ffcounter.h
diff --git a/cpukit/libdl/include/sys/cdefs_elf.h b/cpukit/include/sys/cdefs_elf.h
similarity index 100%
rename from cpukit/libdl/include/sys/cdefs_elf.h
rename to cpukit/include/sys/cdefs_elf.h
diff --git a/cpukit/libcsupport/include/sys/event.h b/cpukit/include/sys/event.h
similarity index 100%
rename from cpukit/libcsupport/include/sys/event.h
rename to cpukit/include/sys/event.h
diff --git a/cpukit/libdl/include/sys/exec_elf.h b/cpukit/include/sys/exec_elf.h
similarity index 100%
rename from cpukit/libdl/include/sys/exec_elf.h
rename to cpukit/include/sys/exec_elf.h
diff --git a/cpukit/libcsupport/include/sys/poll.h b/cpukit/include/sys/poll.h
similarity index 100%
rename from cpukit/libcsupport/include/sys/poll.h
rename to cpukit/include/sys/poll.h
diff --git a/cpukit/libcsupport/include/sys/statvfs.h b/cpukit/include/sys/statvfs.h
similarity index 100%
rename from cpukit/libcsupport/include/sys/statvfs.h
rename to cpukit/include/sys/statvfs.h
diff --git a/cpukit/score/include/sys/timeffc.h b/cpukit/include/sys/timeffc.h
similarity index 100%
rename from cpukit/score/include/sys/timeffc.h
rename to cpukit/include/sys/timeffc.h
diff --git a/cpukit/score/include/sys/timepps.h b/cpukit/include/sys/timepps.h
similarity index 100%
rename from cpukit/score/include/sys/timepps.h
rename to cpukit/include/sys/timepps.h
diff --git a/cpukit/score/include/sys/timetc.h b/cpukit/include/sys/timetc.h
similarity index 100%
rename from cpukit/score/include/sys/timetc.h
rename to cpukit/include/sys/timetc.h
diff --git a/cpukit/score/include/sys/timex.h b/cpukit/include/sys/timex.h
similarity index 100%
rename from cpukit/score/include/sys/timex.h
rename to cpukit/include/sys/timex.h
diff --git a/cpukit/libcsupport/include/sys/utsname.h b/cpukit/include/sys/utsname.h
similarity index 100%
rename from cpukit/libcsupport/include/sys/utsname.h
rename to cpukit/include/sys/utsname.h
diff --git a/cpukit/libmisc/utf8proc/utf8proc.h b/cpukit/include/utf8proc/utf8proc.h
similarity index 100%
rename from cpukit/libmisc/utf8proc/utf8proc.h
rename to cpukit/include/utf8proc/utf8proc.h
diff --git a/cpukit/libmisc/uuid/uuid.h b/cpukit/include/uuid/uuid.h
similarity index 100%
rename from cpukit/libmisc/uuid/uuid.h
rename to cpukit/include/uuid/uuid.h
diff --git a/cpukit/libmisc/xz/xz.h b/cpukit/include/xz.h
similarity index 100%
rename from cpukit/libmisc/xz/xz.h
rename to cpukit/include/xz.h
diff --git a/cpukit/zlib/zlib.h b/cpukit/include/zlib.h
similarity index 100%
rename from cpukit/zlib/zlib.h
rename to cpukit/include/zlib.h
diff --git a/cpukit/libcrypt/Makefile.am b/cpukit/libcrypt/Makefile.am
index fe174d4..cb8dbe1 100644
--- a/cpukit/libcrypt/Makefile.am
+++ b/cpukit/libcrypt/Makefile.am
@@ -1,7 +1,5 @@
include $(top_srcdir)/automake/compile.am
-include_HEADERS =
-
noinst_LIBRARIES = libcrypt.a
libcrypt_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -13,5 +11,4 @@ libcrypt_a_SOURCES += crypt-sha256.c
libcrypt_a_SOURCES += crypt-sha512.c
libcrypt_a_SOURCES += misc.c
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libcrypt/preinstall.am b/cpukit/libcrypt/preinstall.am
deleted file mode 100644
index feb5d1d..0000000
--- a/cpukit/libcrypt/preinstall.am
+++ /dev/null
@@ -1,15 +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)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 038ac93..253c2c9 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -5,32 +5,7 @@ noinst_LIBRARIES = libcsupport.a libcalloc.a
libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS)
libcalloc_a_CPPFLAGS = $(AM_CPPFLAGS)
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = include/iosupp.h
-include_rtems_HEADERS += include/ringbuf.h
-include_rtems_HEADERS += include/rtems/tod.h
-include_rtems_HEADERS += include/spurious.h
-include_rtems_HEADERS += include/vmeintr.h
-
## rtems
-include_rtems_HEADERS += include/rtems/assoc.h
-include_rtems_HEADERS += include/rtems/deviceio.h
-include_rtems_HEADERS += include/rtems/error.h
-include_rtems_HEADERS += include/rtems/libcsupport.h
-include_rtems_HEADERS += include/rtems/libio.h
-include_rtems_HEADERS += include/rtems/libio_.h
-include_rtems_HEADERS += include/rtems/malloc.h
-include_rtems_HEADERS += include/rtems/termiostypes.h
-include_rtems_HEADERS += include/rtems/gxx_wrappers.h
-
-include_machinedir = $(includedir)/machine
-include_machine_HEADERS =
-include_machine_HEADERS += include/machine/_kernel_cpuset.h
-include_machine_HEADERS += include/machine/_kernel_param.h
-include_machine_HEADERS += include/machine/_kernel_time.h
-include_machine_HEADERS += include/machine/_kernel_types.h
-include_machine_HEADERS += include/machine/_timecounter.h
-
## General stuff
ERROR_C_FILES = src/error.c src/__assert.c
@@ -157,5 +132,4 @@ libcalloc_a_CFLAGS = -fno-builtin
EXTRA_DIST = src/TODO src/CASES src/README
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am
deleted file mode 100644
index 01a128e..0000000
--- a/cpukit/libcsupport/preinstall.am
+++ /dev/null
@@ -1,101 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/iosupp.h: include/iosupp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/iosupp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/iosupp.h
-
-$(PROJECT_INCLUDE)/rtems/ringbuf.h: include/ringbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ringbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ringbuf.h
-
-$(PROJECT_INCLUDE)/rtems/tod.h: include/rtems/tod.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tod.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tod.h
-
-$(PROJECT_INCLUDE)/rtems/spurious.h: include/spurious.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/spurious.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/spurious.h
-
-$(PROJECT_INCLUDE)/rtems/vmeintr.h: include/vmeintr.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vmeintr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vmeintr.h
-
-$(PROJECT_INCLUDE)/rtems/assoc.h: include/rtems/assoc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/assoc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/assoc.h
-
-$(PROJECT_INCLUDE)/rtems/deviceio.h: include/rtems/deviceio.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/deviceio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/deviceio.h
-
-$(PROJECT_INCLUDE)/rtems/error.h: include/rtems/error.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/error.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/error.h
-
-$(PROJECT_INCLUDE)/rtems/libcsupport.h: include/rtems/libcsupport.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libcsupport.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libcsupport.h
-
-$(PROJECT_INCLUDE)/rtems/libio.h: include/rtems/libio.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libio.h
-
-$(PROJECT_INCLUDE)/rtems/libio_.h: include/rtems/libio_.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libio_.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libio_.h
-
-$(PROJECT_INCLUDE)/rtems/malloc.h: include/rtems/malloc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/malloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/malloc.h
-
-$(PROJECT_INCLUDE)/rtems/termiostypes.h: include/rtems/termiostypes.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termiostypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termiostypes.h
-
-$(PROJECT_INCLUDE)/rtems/gxx_wrappers.h: include/rtems/gxx_wrappers.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h
-
-$(PROJECT_INCLUDE)/machine/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/machine
- @: > $(PROJECT_INCLUDE)/machine/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/machine/$(dirstamp)
-
-$(PROJECT_INCLUDE)/machine/_kernel_cpuset.h: include/machine/_kernel_cpuset.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_cpuset.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_cpuset.h
-
-$(PROJECT_INCLUDE)/machine/_kernel_param.h: include/machine/_kernel_param.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_param.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_param.h
-
-$(PROJECT_INCLUDE)/machine/_kernel_time.h: include/machine/_kernel_time.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_time.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_time.h
-
-$(PROJECT_INCLUDE)/machine/_kernel_types.h: include/machine/_kernel_types.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_types.h
-
-$(PROJECT_INCLUDE)/machine/_timecounter.h: include/machine/_timecounter.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_timecounter.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_timecounter.h
-
diff --git a/cpukit/libdebugger/Makefile.am b/cpukit/libdebugger/Makefile.am
index 72a8944..b202003 100644
--- a/cpukit/libdebugger/Makefile.am
+++ b/cpukit/libdebugger/Makefile.am
@@ -1,7 +1,7 @@
-if LIBDEBUGGER
-
include $(top_srcdir)/automake/compile.am
+if LIBDEBUGGER
+
noinst_LIBRARIES = libdebugger.a
libdebugger_a_SOURCES = \
rtems-debugger-block.c \
@@ -19,5 +19,4 @@ endif
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libdebugger/preinstall.am b/cpukit/libdebugger/preinstall.am
deleted file mode 100644
index 695eb30..0000000
--- a/cpukit/libdebugger/preinstall.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
- $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-if LIBDEBUGGER
-endif
diff --git a/cpukit/libdl/Makefile.am b/cpukit/libdl/Makefile.am
index b21c167..8b95a7d 100644
--- a/cpukit/libdl/Makefile.am
+++ b/cpukit/libdl/Makefile.am
@@ -1,7 +1,7 @@
-if LIBDL
-
include $(top_srcdir)/automake/compile.am
+if LIBDL
+
noinst_LIBRARIES = libdl.a
libdl_a_SOURCES = \
dlfcn-shell.c \
@@ -33,5 +33,4 @@ libdl_a_CPPFLAGS = $(AM_CPPFLAGS) -DRTEMS_RTL_RAP_LOADER=1 -DRTEMS_RTL_ELF_LOADE
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libdl/preinstall.am b/cpukit/libdl/preinstall.am
deleted file mode 100644
index dba6cc4..0000000
--- a/cpukit/libdl/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/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index 0985b2f..a76fa8a 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -112,6 +112,11 @@ librfs_a_SOURCES = \
# JFFS2
project_lib_LIBRARIES = libjffs2.a
+
+$(PROJECT_LIB)/libjffs2.a: libjffs2.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libjffs2.a
+
libjffs2_a_SOURCES =
libjffs2_a_SOURCES += src/jffs2/src/build.c
libjffs2_a_SOURCES += src/jffs2/src/compat-crc32.c
@@ -139,6 +144,5 @@ libjffs2_a_CPPFLAGS += -D__ECOS
libjffs2_a_CPPFLAGS += '-DKBUILD_MODNAME="JFFS2"'
# ---
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/preinstall.am b/cpukit/libfs/preinstall.am
deleted file mode 100644
index 2aca1ef..0000000
--- a/cpukit/libfs/preinstall.am
+++ /dev/null
@@ -1,24 +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-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES = $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/libjffs2.a: libjffs2.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libjffs2.a
-
diff --git a/cpukit/libfs/src/nfsclient/Makefile.am b/cpukit/libfs/src/nfsclient/Makefile.am
index 85f4a71..04d840f 100644
--- a/cpukit/libfs/src/nfsclient/Makefile.am
+++ b/cpukit/libfs/src/nfsclient/Makefile.am
@@ -10,6 +10,11 @@ dirutils_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
if LIBNETWORKING
project_lib_LIBRARIES = libnfs.a
+$(PROJECT_LIB)/libnfs.a: libnfs.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libnfs.a
+
+
# if you have CEXP set this variable to 'YES'
# and some "help" info will be compiled in.
libnfs_a_SOURCES = src/rpcio.c src/rpcio.h
@@ -19,8 +24,6 @@ libnfs_a_SOURCES += proto/mount_prot.h proto/nfs_prot.h
# With CEXP
# libnfs_a_SOURCES += dirutils.c rpcio.modini.c nfs.modini.c cexphelp.c
-include_HEADERS = src/librtemsNfs.h
-
# PGMS=${ARCH}/nfs.obj ${ARCH}/rpcio.obj ${ARCH}/dirutils.obj
libnfs_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -66,5 +69,4 @@ $(srcdir)/proto/nfs_prot_xdr.c: proto/nfs_prot.x proto/nfs_prot.h
> nfs_prot_xdr.c)
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/src/nfsclient/preinstall.am b/cpukit/libfs/src/nfsclient/preinstall.am
deleted file mode 100644
index 593fc03..0000000
--- a/cpukit/libfs/src/nfsclient/preinstall.am
+++ /dev/null
@@ -1,51 +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)/dirutils.rel: dirutils.rel $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/dirutils.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/dirutils.rel
-
-if LIBNETWORKING
-$(PROJECT_LIB)/libnfs.a: libnfs.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libnfs.a
-
-$(PROJECT_INCLUDE)/librtemsNfs.h: src/librtemsNfs.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/librtemsNfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/librtemsNfs.h
-
-$(PROJECT_LIB)/nfs.rel: nfs.rel $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/nfs.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/nfs.rel
-
-$(PROJECT_LIB)/rpcio.rel: rpcio.rel $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_PROGRAM) $< $(PROJECT_LIB)/rpcio.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/rpcio.rel
-endif
diff --git a/cpukit/libmd/Makefile.am b/cpukit/libmd/Makefile.am
index 2d3f2e1..b56aff7 100644
--- a/cpukit/libmd/Makefile.am
+++ b/cpukit/libmd/Makefile.am
@@ -1,12 +1,6 @@
include $(top_srcdir)/automake/compile.am
if NEWLIB
-include_HEADERS =
-include_HEADERS += md4.h
-include_HEADERS += md5.h
-include_HEADERS += sha256.h
-include_HEADERS += sha512.h
-
noinst_LIBRARIES = libmd.a
libmd_a_SOURCES =
libmd_a_SOURCES += md4.c
@@ -18,5 +12,4 @@ endif
libmd_a_CPPFLAGS = $(AM_CPPFLAGS)
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libmd/preinstall.am b/cpukit/libmd/preinstall.am
deleted file mode 100644
index f4462f4..0000000
--- a/cpukit/libmd/preinstall.am
+++ /dev/null
@@ -1,38 +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_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-if NEWLIB
-$(PROJECT_INCLUDE)/md4.h: md4.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/md4.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/md4.h
-
-$(PROJECT_INCLUDE)/md5.h: md5.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/md5.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/md5.h
-
-$(PROJECT_INCLUDE)/sha256.h: sha256.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sha256.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sha256.h
-
-$(PROJECT_INCLUDE)/sha512.h: sha512.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sha512.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sha512.h
-
-endif
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index e1343dd..ca4686a 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -208,5 +208,4 @@ libxz_a_SOURCES = xz/xz/h xz/xz_crc32.c \
EXTRA_DIST += xz/README xz/COPING
## ---
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libmisc/preinstall.am b/cpukit/libmisc/preinstall.am
deleted file mode 100644
index f6a7e76..0000000
--- a/cpukit/libmisc/preinstall.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
- $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-if LIBSHELL
-endif
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index d6c8af8..7ff7057 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -1,8 +1,6 @@
include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am
-AM_CPPFLAGS += -I$(srcdir)
-
EXTRA_DIST = README
EXTRA_DIST += rtems/bootp.h
@@ -22,8 +20,6 @@ libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(libnetworking_CPPFLAGS)
## poll.h is not in the list because RTEMS does not have poll()
## and installing poll.h confuses autoconf.
-include_HEADERS = resolv.h
-
libnetworking_a_SOURCES = opt_atalk.h opt_bdg.h opt_compat.h opt_inet6.h \
opt_inet.h opt_ipfw.h opt_ipx.h opt_mac.h opt_mrouting.h opt_netgraph.h \
opt_tcpdebug.h opt_ipsec.h loop.h
@@ -32,12 +28,6 @@ libnetworking_a_SOURCES += bpfilter.h
# arpa
-include_arpadir = $(includedir)/arpa
-
-include_arpa_HEADERS = arpa/ftp.h
-include_arpa_HEADERS += arpa/nameser.h
-include_arpa_HEADERS += arpa/nameser_compat.h
-
## kern
libnetworking_a_SOURCES += kern/kern_mib.c kern/kern_subr.c \
@@ -46,68 +36,16 @@ libnetworking_a_SOURCES += kern/kern_mib.c kern/kern_subr.c \
## machine
-include_machinedir = $(includedir)/machine
-
-include_machine_HEADERS = machine/_align.h
-include_machine_HEADERS += machine/cpu.h
-include_machine_HEADERS += machine/cpufunc.h
-include_machine_HEADERS += machine/in_cksum.h
-include_machine_HEADERS += machine/_kernel_lock.h
-include_machine_HEADERS += machine/vmparam.h
-
libnetworking_a_SOURCES += machine/limits.h
## net
-include_netdir = $(includedir)/net
-
-include_net_HEADERS = net/bpf.h
-include_net_HEADERS += net/ethernet.h
-include_net_HEADERS += net/if_arp.h
-include_net_HEADERS += net/if_dl.h
-include_net_HEADERS += net/if_llc.h
-include_net_HEADERS += net/if_ppp.h
-include_net_HEADERS += net/if_types.h
-include_net_HEADERS += net/if_var.h
-include_net_HEADERS += net/netisr.h
-include_net_HEADERS += net/ppp_defs.h
-include_net_HEADERS += net/radix.h
-include_net_HEADERS += net/raw_cb.h
-include_net_HEADERS += net/route.h
-include_net_HEADERS += net/if_pppvar.h
-include_net_HEADERS += net/slcompress.h
-include_net_HEADERS += net/if_media.h
-include_net_HEADERS += net/ppp_comp.h
-
libnetworking_a_SOURCES += net/if.c net/if_ethersubr.c net/if_loop.c \
net/radix.c net/route.c net/rtsock.c net/raw_cb.c net/raw_usrreq.c \
net/if_ppp.c net/ppp_tty.c net/slcompress.c
## netinet
-include_netinetdir = $(includedir)/netinet
-
-include_netinet_HEADERS = netinet/icmp_var.h
-include_netinet_HEADERS += netinet/if_ether.h
-include_netinet_HEADERS += netinet/igmp.h
-include_netinet_HEADERS += netinet/igmp_var.h
-include_netinet_HEADERS += netinet/in_pcb.h
-include_netinet_HEADERS += netinet/in_systm.h
-include_netinet_HEADERS += netinet/in_var.h
-include_netinet_HEADERS += netinet/ip.h
-include_netinet_HEADERS += netinet/ip_fw.h
-include_netinet_HEADERS += netinet/ip_icmp.h
-include_netinet_HEADERS += netinet/ip_mroute.h
-include_netinet_HEADERS += netinet/ip_var.h
-include_netinet_HEADERS += netinet/tcp_debug.h
-include_netinet_HEADERS += netinet/tcp_fsm.h
-include_netinet_HEADERS += netinet/tcp_seq.h
-include_netinet_HEADERS += netinet/tcp_timer.h
-include_netinet_HEADERS += netinet/tcp_var.h
-include_netinet_HEADERS += netinet/tcpip.h
-include_netinet_HEADERS += netinet/udp.h
-include_netinet_HEADERS += netinet/udp_var.h
-
libnetworking_a_SOURCES += netinet/if_ether.c netinet/igmp.c netinet/in.c \
netinet/in_cksum.c netinet/in_pcb.c netinet/in_proto.c netinet/in_rmx.c \
netinet/ip_divert.c netinet/ip_fw.c netinet/ip_icmp.c netinet/ip_input.c \
@@ -119,40 +57,14 @@ libnetworking_a_SOURCES += netinet/if_ether.c netinet/igmp.c netinet/in.c \
## netinet6
-include_netinet6dir = $(includedir)/netinet6
-
## nfs
-include_nfsdir = $(includedir)/nfs
-
-include_nfs_HEADERS = nfs/nfsproto.h
-include_nfs_HEADERS += nfs/rpcv2.h
-include_nfs_HEADERS += nfs/xdr_subs.h
-
libnetworking_a_SOURCES += nfs/bootp_subr.c
## nfsclient
-include_nfsclientdir = $(includedir)/nfsclient
-
-include_nfsclient_HEADERS = nfsclient/nfsargs.h
-include_nfsclient_HEADERS += nfsclient/nfsdiskless.h
-
## rtems
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/rtems_bsdnet.h
-include_rtems_HEADERS += rtems/rtems_bsdnet_internal.h
-include_rtems_HEADERS += rtems/dhcp.h
-include_rtems_HEADERS += rtems/rtems_dhcp_failsafe.h
-include_rtems_HEADERS += rtems/tftp.h
-include_rtems_HEADERS += rtems/ftpfs.h
-include_rtems_HEADERS += rtems/mkrootfs.h
-include_rtems_HEADERS += rtems/rtems_mii_ioctl.h
-include_rtems_HEADERS += rtems/rtems_netdb.h
-include_rtems_HEADERS += rtems/rtems_netinet_in.h
-
libnetworking_a_SOURCES += rtems/sghostname.c \
rtems/rtems_glue.c rtems/rtems_malloc_mbuf.c rtems/rtems_syscall.c \
rtems/rtems_bootp.c rtems/rtems_dhcp.c rtems/rtems_dhcp_failsafe.c \
@@ -165,41 +77,9 @@ libnetworking_a_SOURCES += rtems/sghostname.c \
## sys
-include_sysdir = $(includedir)/sys
-
-include_sys_HEADERS = sys/callout.h
-include_sys_HEADERS += sys/conf.h
-include_sys_HEADERS += sys/domain.h
-include_sys_HEADERS += sys/kernel.h
-include_sys_HEADERS += sys/libkern.h
-include_sys_HEADERS += sys/linker_set.h
-include_sys_HEADERS += sys/malloc.h
-include_sys_HEADERS += sys/mbuf.h
-include_sys_HEADERS += sys/mount.h
-include_sys_HEADERS += sys/proc.h
-include_sys_HEADERS += sys/protosw.h
-include_sys_HEADERS += sys/reboot.h
-include_sys_HEADERS += sys/resourcevar.h
-include_sys_HEADERS += sys/selinfo.h
-include_sys_HEADERS += sys/signalvar.h
-include_sys_HEADERS += sys/socketvar.h
-include_sys_HEADERS += sys/sysctl.h
-include_sys_HEADERS += sys/systm.h
-include_sys_HEADERS += sys/ucred.h
-
# vm
-include_vmdir = $(includedir)/vm
-
-include_vm_HEADERS = vm/vm.h
-include_vm_HEADERS += vm/vm_extern.h
-include_vm_HEADERS += vm/vm_kern.h
-include_vm_HEADERS += vm/vm_param.h
-
# dev
-include_dev_miidir = $(includedir)/dev/mii
-include_dev_mii_HEADERS = dev/mii/mii.h
-
## libc
libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE -D_THREAD_SAFE
@@ -207,8 +87,6 @@ libc_CPPFLAGS = -DNOPOLL -DNOSELECT -D__BSD_VISIBLE -D_THREAD_SAFE
noinst_LIBRARIES += libc.a
libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(libc_CPPFLAGS)
-include_HEADERS += ifaddrs.h
-
libc_a_SOURCES = libc/base64.c \
libc/gethostbydns.c libc/gethostbyht.c libc/gethostbynis.c \
libc/gethostnamadr.c libc/getnetbydns.c libc/getnetbyht.c \
@@ -259,5 +137,5 @@ endif
EXTRA_DIST += $(UNUSED_FILES)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/libnetworking/headers.am b/cpukit/libnetworking/headers.am
new file mode 100644
index 0000000..62e9e27
--- /dev/null
+++ b/cpukit/libnetworking/headers.am
@@ -0,0 +1,131 @@
+## In contrast to the other headers.am files, this file must be maintained by
+## hand.
+
+include_HEADERS =
+include_HEADERS += ifaddrs.h
+include_HEADERS += loop.h
+include_HEADERS += poll.h
+include_HEADERS += resolv.h
+
+include_arpadir = $(includedir)/arpa
+include_arpa_HEADERS =
+include_arpa_HEADERS += arpa/ftp.h
+include_arpa_HEADERS += arpa/nameser.h
+include_arpa_HEADERS += arpa/nameser_compat.h
+
+include_dev_miidir = $(includedir)/dev/mii
+include_dev_mii_HEADERS =
+include_dev_mii_HEADERS += dev/mii/mii.h
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += machine/_align.h
+include_machine_HEADERS += machine/_kernel_lock.h
+include_machine_HEADERS += machine/cpu.h
+include_machine_HEADERS += machine/cpufunc.h
+include_machine_HEADERS += machine/in_cksum.h
+include_machine_HEADERS += machine/limits.h
+include_machine_HEADERS += machine/vmparam.h
+
+include_netdir = $(includedir)/net
+include_net_HEADERS =
+include_net_HEADERS += net/bpf.h
+include_net_HEADERS += net/ethernet.h
+include_net_HEADERS += net/if_arp.h
+include_net_HEADERS += net/if_dl.h
+include_net_HEADERS += net/if_llc.h
+include_net_HEADERS += net/if_media.h
+include_net_HEADERS += net/if_ppp.h
+include_net_HEADERS += net/if_pppvar.h
+include_net_HEADERS += net/if_types.h
+include_net_HEADERS += net/if_var.h
+include_net_HEADERS += net/netisr.h
+include_net_HEADERS += net/ppp_comp.h
+include_net_HEADERS += net/ppp_defs.h
+include_net_HEADERS += net/radix.h
+include_net_HEADERS += net/raw_cb.h
+include_net_HEADERS += net/route.h
+include_net_HEADERS += net/slcompress.h
+
+include_netinetdir = $(includedir)/netinet
+include_netinet_HEADERS =
+include_netinet_HEADERS += netinet/icmp_var.h
+include_netinet_HEADERS += netinet/if_ether.h
+include_netinet_HEADERS += netinet/igmp.h
+include_netinet_HEADERS += netinet/igmp_var.h
+include_netinet_HEADERS += netinet/in_pcb.h
+include_netinet_HEADERS += netinet/in_systm.h
+include_netinet_HEADERS += netinet/in_var.h
+include_netinet_HEADERS += netinet/ip.h
+include_netinet_HEADERS += netinet/ip_fw.h
+include_netinet_HEADERS += netinet/ip_icmp.h
+include_netinet_HEADERS += netinet/ip_mroute.h
+include_netinet_HEADERS += netinet/ip_var.h
+include_netinet_HEADERS += netinet/tcp_debug.h
+include_netinet_HEADERS += netinet/tcp_fsm.h
+include_netinet_HEADERS += netinet/tcp_seq.h
+include_netinet_HEADERS += netinet/tcp_timer.h
+include_netinet_HEADERS += netinet/tcp_var.h
+include_netinet_HEADERS += netinet/tcpip.h
+include_netinet_HEADERS += netinet/udp.h
+include_netinet_HEADERS += netinet/udp_var.h
+
+include_nfsdir = $(includedir)/nfs
+include_nfs_HEADERS =
+include_nfs_HEADERS += nfs/nfsproto.h
+include_nfs_HEADERS += nfs/rpcv2.h
+include_nfs_HEADERS += nfs/xdr_subs.h
+
+include_nfsclientdir = $(includedir)/nfsclient
+include_nfsclient_HEADERS =
+include_nfsclient_HEADERS += nfsclient/nfsargs.h
+include_nfsclient_HEADERS += nfsclient/nfsdiskless.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += rtems/bootp.h
+include_rtems_HEADERS += rtems/dhcp.h
+include_rtems_HEADERS += rtems/ftpfs.h
+include_rtems_HEADERS += rtems/mkrootfs.h
+include_rtems_HEADERS += rtems/rtems_bsdnet.h
+include_rtems_HEADERS += rtems/rtems_bsdnet_internal.h
+include_rtems_HEADERS += rtems/rtems_dhcp_failsafe.h
+include_rtems_HEADERS += rtems/rtems_mii_ioctl.h
+include_rtems_HEADERS += rtems/rtems_netdb.h
+include_rtems_HEADERS += rtems/rtems_netinet_in.h
+include_rtems_HEADERS += rtems/rtems_syscall.h
+include_rtems_HEADERS += rtems/tftp.h
+
+include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet
+include_rtems_bsdnet_HEADERS =
+include_rtems_bsdnet_HEADERS += rtems/bsdnet/_types.h
+include_rtems_bsdnet_HEADERS += rtems/bsdnet/servers.h
+
+include_sysdir = $(includedir)/sys
+include_sys_HEADERS =
+include_sys_HEADERS += sys/callout.h
+include_sys_HEADERS += sys/conf.h
+include_sys_HEADERS += sys/domain.h
+include_sys_HEADERS += sys/kernel.h
+include_sys_HEADERS += sys/libkern.h
+include_sys_HEADERS += sys/linker_set.h
+include_sys_HEADERS += sys/malloc.h
+include_sys_HEADERS += sys/mbuf.h
+include_sys_HEADERS += sys/mount.h
+include_sys_HEADERS += sys/proc.h
+include_sys_HEADERS += sys/protosw.h
+include_sys_HEADERS += sys/reboot.h
+include_sys_HEADERS += sys/resourcevar.h
+include_sys_HEADERS += sys/selinfo.h
+include_sys_HEADERS += sys/signalvar.h
+include_sys_HEADERS += sys/socketvar.h
+include_sys_HEADERS += sys/sysctl.h
+include_sys_HEADERS += sys/systm.h
+include_sys_HEADERS += sys/ucred.h
+
+include_vmdir = $(includedir)/vm
+include_vm_HEADERS =
+include_vm_HEADERS += vm/vm.h
+include_vm_HEADERS += vm/vm_extern.h
+include_vm_HEADERS += vm/vm_kern.h
+include_vm_HEADERS += vm/vm_param.h
diff --git a/cpukit/libnetworking/preinstall.am b/cpukit/libnetworking/preinstall.am
deleted file mode 100644
index 66d0183..0000000
--- a/cpukit/libnetworking/preinstall.am
+++ /dev/null
@@ -1,424 +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_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-if LIBNETWORKING
-$(PROJECT_INCLUDE)/resolv.h: resolv.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/resolv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/resolv.h
-
-$(PROJECT_INCLUDE)/arpa/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/arpa
- @: > $(PROJECT_INCLUDE)/arpa/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arpa/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arpa/ftp.h: arpa/ftp.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/ftp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/ftp.h
-
-$(PROJECT_INCLUDE)/arpa/nameser.h: arpa/nameser.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/nameser.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/nameser.h
-
-$(PROJECT_INCLUDE)/arpa/nameser_compat.h: arpa/nameser_compat.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/nameser_compat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/nameser_compat.h
-
-$(PROJECT_INCLUDE)/machine/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/machine
- @: > $(PROJECT_INCLUDE)/machine/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/machine/$(dirstamp)
-
-$(PROJECT_INCLUDE)/machine/_align.h: machine/_align.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_align.h
-
-$(PROJECT_INCLUDE)/machine/cpu.h: machine/cpu.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/cpu.h
-
-$(PROJECT_INCLUDE)/machine/cpufunc.h: machine/cpufunc.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/cpufunc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/cpufunc.h
-
-$(PROJECT_INCLUDE)/machine/in_cksum.h: machine/in_cksum.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/in_cksum.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/in_cksum.h
-
-$(PROJECT_INCLUDE)/machine/_kernel_lock.h: machine/_kernel_lock.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/_kernel_lock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/_kernel_lock.h
-
-$(PROJECT_INCLUDE)/machine/vmparam.h: machine/vmparam.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/vmparam.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/vmparam.h
-
-$(PROJECT_INCLUDE)/net/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/net
- @: > $(PROJECT_INCLUDE)/net/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/net/$(dirstamp)
-
-$(PROJECT_INCLUDE)/net/bpf.h: net/bpf.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/bpf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/bpf.h
-
-$(PROJECT_INCLUDE)/net/ethernet.h: net/ethernet.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/ethernet.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/ethernet.h
-
-$(PROJECT_INCLUDE)/net/if_arp.h: net/if_arp.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_arp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_arp.h
-
-$(PROJECT_INCLUDE)/net/if_dl.h: net/if_dl.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_dl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_dl.h
-
-$(PROJECT_INCLUDE)/net/if_llc.h: net/if_llc.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_llc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_llc.h
-
-$(PROJECT_INCLUDE)/net/if_ppp.h: net/if_ppp.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_ppp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_ppp.h
-
-$(PROJECT_INCLUDE)/net/if_types.h: net/if_types.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_types.h
-
-$(PROJECT_INCLUDE)/net/if_var.h: net/if_var.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_var.h
-
-$(PROJECT_INCLUDE)/net/netisr.h: net/netisr.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/netisr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/netisr.h
-
-$(PROJECT_INCLUDE)/net/ppp_defs.h: net/ppp_defs.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/ppp_defs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/ppp_defs.h
-
-$(PROJECT_INCLUDE)/net/radix.h: net/radix.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/radix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/radix.h
-
-$(PROJECT_INCLUDE)/net/raw_cb.h: net/raw_cb.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/raw_cb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/raw_cb.h
-
-$(PROJECT_INCLUDE)/net/route.h: net/route.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/route.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/route.h
-
-$(PROJECT_INCLUDE)/net/if_pppvar.h: net/if_pppvar.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_pppvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_pppvar.h
-
-$(PROJECT_INCLUDE)/net/slcompress.h: net/slcompress.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/slcompress.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/slcompress.h
-
-$(PROJECT_INCLUDE)/net/if_media.h: net/if_media.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if_media.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if_media.h
-
-$(PROJECT_INCLUDE)/net/ppp_comp.h: net/ppp_comp.h $(PROJECT_INCLUDE)/net/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/ppp_comp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/ppp_comp.h
-
-$(PROJECT_INCLUDE)/netinet/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/netinet
- @: > $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/netinet/$(dirstamp)
-
-$(PROJECT_INCLUDE)/netinet/icmp_var.h: netinet/icmp_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/icmp_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/icmp_var.h
-
-$(PROJECT_INCLUDE)/netinet/if_ether.h: netinet/if_ether.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/if_ether.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/if_ether.h
-
-$(PROJECT_INCLUDE)/netinet/igmp.h: netinet/igmp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/igmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/igmp.h
-
-$(PROJECT_INCLUDE)/netinet/igmp_var.h: netinet/igmp_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/igmp_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/igmp_var.h
-
-$(PROJECT_INCLUDE)/netinet/in_pcb.h: netinet/in_pcb.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in_pcb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in_pcb.h
-
-$(PROJECT_INCLUDE)/netinet/in_systm.h: netinet/in_systm.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in_systm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in_systm.h
-
-$(PROJECT_INCLUDE)/netinet/in_var.h: netinet/in_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in_var.h
-
-$(PROJECT_INCLUDE)/netinet/ip.h: netinet/ip.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip.h
-
-$(PROJECT_INCLUDE)/netinet/ip_fw.h: netinet/ip_fw.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_fw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_fw.h
-
-$(PROJECT_INCLUDE)/netinet/ip_icmp.h: netinet/ip_icmp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_icmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_icmp.h
-
-$(PROJECT_INCLUDE)/netinet/ip_mroute.h: netinet/ip_mroute.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_mroute.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_mroute.h
-
-$(PROJECT_INCLUDE)/netinet/ip_var.h: netinet/ip_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/ip_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/ip_var.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_debug.h: netinet/tcp_debug.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_debug.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_debug.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_fsm.h: netinet/tcp_fsm.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_fsm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_fsm.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_seq.h: netinet/tcp_seq.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_seq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_seq.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_timer.h: netinet/tcp_timer.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_timer.h
-
-$(PROJECT_INCLUDE)/netinet/tcp_var.h: netinet/tcp_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp_var.h
-
-$(PROJECT_INCLUDE)/netinet/tcpip.h: netinet/tcpip.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcpip.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcpip.h
-
-$(PROJECT_INCLUDE)/netinet/udp.h: netinet/udp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/udp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/udp.h
-
-$(PROJECT_INCLUDE)/netinet/udp_var.h: netinet/udp_var.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/udp_var.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/udp_var.h
-
-$(PROJECT_INCLUDE)/netinet6/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/netinet6
- @: > $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
-
-$(PROJECT_INCLUDE)/nfs/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/nfs
- @: > $(PROJECT_INCLUDE)/nfs/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/nfs/$(dirstamp)
-
-$(PROJECT_INCLUDE)/nfs/nfsproto.h: nfs/nfsproto.h $(PROJECT_INCLUDE)/nfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfs/nfsproto.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs/nfsproto.h
-
-$(PROJECT_INCLUDE)/nfs/rpcv2.h: nfs/rpcv2.h $(PROJECT_INCLUDE)/nfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfs/rpcv2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs/rpcv2.h
-
-$(PROJECT_INCLUDE)/nfs/xdr_subs.h: nfs/xdr_subs.h $(PROJECT_INCLUDE)/nfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfs/xdr_subs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs/xdr_subs.h
-
-$(PROJECT_INCLUDE)/nfsclient/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/nfsclient
- @: > $(PROJECT_INCLUDE)/nfsclient/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/nfsclient/$(dirstamp)
-
-$(PROJECT_INCLUDE)/nfsclient/nfsargs.h: nfsclient/nfsargs.h $(PROJECT_INCLUDE)/nfsclient/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfsclient/nfsargs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfsclient/nfsargs.h
-
-$(PROJECT_INCLUDE)/nfsclient/nfsdiskless.h: nfsclient/nfsdiskless.h $(PROJECT_INCLUDE)/nfsclient/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nfsclient/nfsdiskless.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfsclient/nfsdiskless.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h: rtems/rtems_bsdnet.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_bsdnet.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h: rtems/rtems_bsdnet_internal.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_bsdnet_internal.h
-
-$(PROJECT_INCLUDE)/rtems/dhcp.h: rtems/dhcp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dhcp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dhcp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_dhcp_failsafe.h: rtems/rtems_dhcp_failsafe.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_dhcp_failsafe.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_dhcp_failsafe.h
-
-$(PROJECT_INCLUDE)/rtems/tftp.h: rtems/tftp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tftp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tftp.h
-
-$(PROJECT_INCLUDE)/rtems/ftpfs.h: rtems/ftpfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpfs.h
-
-$(PROJECT_INCLUDE)/rtems/mkrootfs.h: rtems/mkrootfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mkrootfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mkrootfs.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_mii_ioctl.h: rtems/rtems_mii_ioctl.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_mii_ioctl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_mii_ioctl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_netdb.h: rtems/rtems_netdb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_netdb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_netdb.h
-
-$(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h: rtems/rtems_netinet_in.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems_netinet_in.h
-
-$(PROJECT_INCLUDE)/sys/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/sys
- @: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp)
-
-$(PROJECT_INCLUDE)/sys/callout.h: sys/callout.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/callout.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/callout.h
-
-$(PROJECT_INCLUDE)/sys/conf.h: sys/conf.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/conf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/conf.h
-
-$(PROJECT_INCLUDE)/sys/domain.h: sys/domain.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/domain.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/domain.h
-
-$(PROJECT_INCLUDE)/sys/kernel.h: sys/kernel.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/kernel.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/kernel.h
-
-$(PROJECT_INCLUDE)/sys/libkern.h: sys/libkern.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/libkern.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/libkern.h
-
-$(PROJECT_INCLUDE)/sys/linker_set.h: sys/linker_set.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/linker_set.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/linker_set.h
-
-$(PROJECT_INCLUDE)/sys/malloc.h: sys/malloc.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/malloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/malloc.h
-
-$(PROJECT_INCLUDE)/sys/mbuf.h: sys/mbuf.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/mbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/mbuf.h
-
-$(PROJECT_INCLUDE)/sys/mount.h: sys/mount.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/mount.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/mount.h
-
-$(PROJECT_INCLUDE)/sys/proc.h: sys/proc.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/proc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/proc.h
-
-$(PROJECT_INCLUDE)/sys/protosw.h: sys/protosw.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/protosw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/protosw.h
-
-$(PROJECT_INCLUDE)/sys/reboot.h: sys/reboot.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/reboot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/reboot.h
-
-$(PROJECT_INCLUDE)/sys/resourcevar.h: sys/resourcevar.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/resourcevar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/resourcevar.h
-
-$(PROJECT_INCLUDE)/sys/selinfo.h: sys/selinfo.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/selinfo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/selinfo.h
-
-$(PROJECT_INCLUDE)/sys/signalvar.h: sys/signalvar.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/signalvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/signalvar.h
-
-$(PROJECT_INCLUDE)/sys/socketvar.h: sys/socketvar.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/socketvar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/socketvar.h
-
-$(PROJECT_INCLUDE)/sys/sysctl.h: sys/sysctl.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/sysctl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/sysctl.h
-
-$(PROJECT_INCLUDE)/sys/systm.h: sys/systm.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/systm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/systm.h
-
-$(PROJECT_INCLUDE)/sys/ucred.h: sys/ucred.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ucred.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ucred.h
-
-$(PROJECT_INCLUDE)/vm/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/vm
- @: > $(PROJECT_INCLUDE)/vm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/vm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/vm/vm.h: vm/vm.h $(PROJECT_INCLUDE)/vm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vm/vm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm/vm.h
-
-$(PROJECT_INCLUDE)/vm/vm_extern.h: vm/vm_extern.h $(PROJECT_INCLUDE)/vm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vm/vm_extern.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm/vm_extern.h
-
-$(PROJECT_INCLUDE)/vm/vm_kern.h: vm/vm_kern.h $(PROJECT_INCLUDE)/vm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vm/vm_kern.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm/vm_kern.h
-
-$(PROJECT_INCLUDE)/vm/vm_param.h: vm/vm_param.h $(PROJECT_INCLUDE)/vm/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vm/vm_param.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/vm/vm_param.h
-
-$(PROJECT_INCLUDE)/dev/mii/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/dev/mii
- @: > $(PROJECT_INCLUDE)/dev/mii/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/dev/mii/$(dirstamp)
-
-$(PROJECT_INCLUDE)/dev/mii/mii.h: dev/mii/mii.h $(PROJECT_INCLUDE)/dev/mii/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dev/mii/mii.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/mii/mii.h
-
-$(PROJECT_INCLUDE)/ifaddrs.h: ifaddrs.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ifaddrs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ifaddrs.h
-endif
diff --git a/cpukit/libnetworking/sys/poll.h b/cpukit/libnetworking/sys/poll.h
deleted file mode 100644
index 9ea42b9..0000000
--- a/cpukit/libnetworking/sys/poll.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1997 Peter Wemm <peter at freebsd.org>
- * All rights reserved.
- *
- * 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.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * 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.
- *
- * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $
- */
-
-#ifndef _SYS_POLL_H_
-#define _SYS_POLL_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file is intended to be compatible with the traditional poll.h.
- */
-
-typedef unsigned int nfds_t;
-
-/*
- * This structure is passed as an array to poll(2).
- */
-struct pollfd {
- int fd; /* which file descriptor to poll */
- short events; /* events we are interested in */
- short revents; /* events found on return */
-};
-
-/*
- * Requestable events. If poll(2) finds any of these set, they are
- * copied to revents on return.
- * XXX Note that FreeBSD doesn't make much distinction between POLLPRI
- * and POLLRDBAND since none of the file types have distinct priority
- * bands - and only some have an urgent "mode".
- * XXX Note POLLIN isn't really supported in true SVSV terms. Under SYSV
- * POLLIN includes all of normal, band and urgent data. Most poll handlers
- * on FreeBSD only treat it as "normal" data.
- */
-#define POLLIN 0x0001 /* any readable data available */
-#define POLLPRI 0x0002 /* OOB/Urgent readable data */
-#define POLLOUT 0x0004 /* file descriptor is writeable */
-#define POLLRDNORM 0x0040 /* non-OOB/URG data available */
-#define POLLWRNORM POLLOUT /* no write type differentiation */
-#define POLLRDBAND 0x0080 /* OOB/Urgent readable data */
-#define POLLWRBAND 0x0100 /* OOB/Urgent data can be written */
-
-#if __BSD_VISIBLE
-/* General FreeBSD extension (currently only supported for sockets): */
-#define POLLINIGNEOF 0x2000 /* like POLLIN, except ignore EOF */
-#endif
-
-/*
- * These events are set if they occur regardless of whether they were
- * requested.
- */
-#define POLLERR 0x0008 /* some poll error occurred */
-#define POLLHUP 0x0010 /* file descriptor was "hung up" */
-#define POLLNVAL 0x0020 /* requested events "invalid" */
-
-#if __BSD_VISIBLE
-
-#define POLLSTANDARD (POLLIN|POLLPRI|POLLOUT|POLLRDNORM|POLLRDBAND|\
- POLLWRBAND|POLLERR|POLLHUP|POLLNVAL)
-
-/*
- * Request that poll() wait forever.
- * XXX in SYSV, this is defined in stropts.h, which is not included
- * by poll.h.
- */
-#define INFTIM (-1)
-
-#endif
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-int poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_POLL_H_ */
diff --git a/cpukit/libpci/Makefile.am b/cpukit/libpci/Makefile.am
index cff25b3..f762d39 100644
--- a/cpukit/libpci/Makefile.am
+++ b/cpukit/libpci/Makefile.am
@@ -6,14 +6,6 @@ if LIBPCI
EXTRA_DIST=
## PCI Library
-include_HEADERS = pci.h
-include_pcidir = $(includedir)/pci
-include_pci_HEADERS = pci/access.h pci/cfg.h \
- pci/cfg_auto.h pci/cfg_static.h \
- pci/cfg_peripheral.h pci/cfg_read.h \
- pci/ids.h pci/ids_extra.h pci/irq.h \
- pci/pcireg.h
-
noinst_LIBRARIES = libpci.a
libpci_a_SOURCES = pci_access.c
@@ -39,10 +31,6 @@ libpci_a_SOURCES += pci_print.c
# Driver manager PCI bus
libpci_a_SOURCES += pci_bus.c
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = pci_bus.h
-
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libpci/preinstall.am b/cpukit/libpci/preinstall.am
deleted file mode 100644
index b9a8dd0..0000000
--- a/cpukit/libpci/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)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-if LIBPCI
-$(PROJECT_INCLUDE)/pci.h: pci.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h
-
-$(PROJECT_INCLUDE)/pci/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/pci
- @: > $(PROJECT_INCLUDE)/pci/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/pci/$(dirstamp)
-
-$(PROJECT_INCLUDE)/pci/access.h: pci/access.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/access.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/access.h
-
-$(PROJECT_INCLUDE)/pci/cfg.h: pci/cfg.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg.h
-
-$(PROJECT_INCLUDE)/pci/cfg_auto.h: pci/cfg_auto.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg_auto.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg_auto.h
-
-$(PROJECT_INCLUDE)/pci/cfg_static.h: pci/cfg_static.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg_static.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg_static.h
-
-$(PROJECT_INCLUDE)/pci/cfg_peripheral.h: pci/cfg_peripheral.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg_peripheral.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg_peripheral.h
-
-$(PROJECT_INCLUDE)/pci/cfg_read.h: pci/cfg_read.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/cfg_read.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/cfg_read.h
-
-$(PROJECT_INCLUDE)/pci/ids.h: pci/ids.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/ids.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/ids.h
-
-$(PROJECT_INCLUDE)/pci/ids_extra.h: pci/ids_extra.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/ids_extra.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/ids_extra.h
-
-$(PROJECT_INCLUDE)/pci/irq.h: pci/irq.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/irq.h
-
-$(PROJECT_INCLUDE)/pci/pcireg.h: pci/pcireg.h $(PROJECT_INCLUDE)/pci/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci/pcireg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci/pcireg.h
-
-$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
- @: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-
-$(PROJECT_INCLUDE)/drvmgr/pci_bus.h: pci_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/pci_bus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/pci_bus.h
-endif
diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am
index edc760f..92a76ba 100644
--- a/cpukit/librpc/Makefile.am
+++ b/cpukit/librpc/Makefile.am
@@ -4,26 +4,6 @@ include $(top_srcdir)/automake/compile.am
EXTRA_DIST =
if LIBRPC
-include_rpcdir = $(includedir)/rpc
-
-include_rpc_HEADERS = include/rpc/auth.h
-include_rpc_HEADERS += include/rpc/auth_unix.h
-include_rpc_HEADERS += include/rpc/clnt.h
-include_rpc_HEADERS += include/rpc/clnt_stat.h
-include_rpc_HEADERS += include/rpc/clnt_soc.h
-include_rpc_HEADERS += include/rpc/svc.h
-include_rpc_HEADERS += include/rpc/svc_auth.h
-include_rpc_HEADERS += include/rpc/svc_soc.h
-include_rpc_HEADERS += include/rpc/pmap_clnt.h
-include_rpc_HEADERS += include/rpc/pmap_prot.h
-include_rpc_HEADERS += include/rpc/pmap_rmt.h
-include_rpc_HEADERS += include/rpc/rpc.h
-include_rpc_HEADERS += include/rpc/types.h
-include_rpc_HEADERS += include/rpc/xdr.h
-include_rpc_HEADERS += include/rpc/rpc_com.h
-include_rpc_HEADERS += include/rpc/rpc_msg.h
-include_rpc_HEADERS += include/rpc/rpcent.h
-
man_MANS =
noinst_LIBRARIES = libxdr.a
@@ -90,5 +70,4 @@ EXTRA_DIST += include/rpcsvc/bootparam_prot.x include/rpcsvc/crypt.x \
include/rpcsvc/ypupdate_prot.x include/rpcsvc/yp.x \
include/rpcsvc/ypxfrd.x
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/librpc/preinstall.am b/cpukit/librpc/preinstall.am
deleted file mode 100644
index 9dd5969..0000000
--- a/cpukit/librpc/preinstall.am
+++ /dev/null
@@ -1,89 +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)
-
-if LIBRPC
-$(PROJECT_INCLUDE)/rpc/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rpc
- @: > $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rpc/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rpc/auth.h: include/rpc/auth.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/auth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth.h
-
-$(PROJECT_INCLUDE)/rpc/auth_unix.h: include/rpc/auth_unix.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/auth_unix.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/auth_unix.h
-
-$(PROJECT_INCLUDE)/rpc/clnt.h: include/rpc/clnt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/clnt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/clnt.h
-
-$(PROJECT_INCLUDE)/rpc/clnt_stat.h: include/rpc/clnt_stat.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/clnt_stat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/clnt_stat.h
-
-$(PROJECT_INCLUDE)/rpc/clnt_soc.h: include/rpc/clnt_soc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/clnt_soc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/clnt_soc.h
-
-$(PROJECT_INCLUDE)/rpc/svc.h: include/rpc/svc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/svc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc.h
-
-$(PROJECT_INCLUDE)/rpc/svc_auth.h: include/rpc/svc_auth.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/svc_auth.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc_auth.h
-
-$(PROJECT_INCLUDE)/rpc/svc_soc.h: include/rpc/svc_soc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/svc_soc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/svc_soc.h
-
-$(PROJECT_INCLUDE)/rpc/pmap_clnt.h: include/rpc/pmap_clnt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_clnt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_clnt.h
-
-$(PROJECT_INCLUDE)/rpc/pmap_prot.h: include/rpc/pmap_prot.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_prot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_prot.h
-
-$(PROJECT_INCLUDE)/rpc/pmap_rmt.h: include/rpc/pmap_rmt.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/pmap_rmt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/pmap_rmt.h
-
-$(PROJECT_INCLUDE)/rpc/rpc.h: include/rpc/rpc.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc.h
-
-$(PROJECT_INCLUDE)/rpc/types.h: include/rpc/types.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/types.h
-
-$(PROJECT_INCLUDE)/rpc/xdr.h: include/rpc/xdr.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/xdr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/xdr.h
-
-$(PROJECT_INCLUDE)/rpc/rpc_com.h: include/rpc/rpc_com.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc_com.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc_com.h
-
-$(PROJECT_INCLUDE)/rpc/rpc_msg.h: include/rpc/rpc_msg.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpc_msg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpc_msg.h
-
-$(PROJECT_INCLUDE)/rpc/rpcent.h: include/rpc/rpcent.h $(PROJECT_INCLUDE)/rpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rpc/rpcent.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rpc/rpcent.h
-endif
diff --git a/cpukit/libstdthreads/Makefile.am b/cpukit/libstdthreads/Makefile.am
index b6b9138..7d61927 100644
--- a/cpukit/libstdthreads/Makefile.am
+++ b/cpukit/libstdthreads/Makefile.am
@@ -1,7 +1,5 @@
include $(top_srcdir)/automake/compile.am
-include_HEADERS =
-
noinst_LIBRARIES = libstdthreads.a
libstdthreads_a_CFLAGS = -std=c11
diff --git a/cpukit/mghttpd/Makefile.am b/cpukit/mghttpd/Makefile.am
index bb5f84b..c3e605c 100644
--- a/cpukit/mghttpd/Makefile.am
+++ b/cpukit/mghttpd/Makefile.am
@@ -2,17 +2,18 @@ include $(top_srcdir)/automake/compile.am
if LIBNETWORKING
if HAS_PTHREADS
-include_mghttpddir = $(includedir)/mghttpd
-
project_lib_LIBRARIES = libmghttpd.a
+
+$(PROJECT_LIB)/libmghttpd.a: libmghttpd.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libmghttpd.a
+
libmghttpd_a_CPPFLAGS = $(AM_CPPFLAGS)
# libmghttpd_a_CPPFLAGS += -DHAVE_MD5
libmghttpd_a_CPPFLAGS += -DNO_SSL -DNO_POPEN -DNO_CGI -DUSE_WEBSOCKET
libmghttpd_a_SOURCES = mongoose.c mongoose.h
-include_mghttpd_HEADERS = mongoose.h
endif
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/mghttpd/preinstall.am b/cpukit/mghttpd/preinstall.am
deleted file mode 100644
index b63c988..0000000
--- a/cpukit/mghttpd/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)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-if LIBNETWORKING
-if HAS_PTHREADS
-$(PROJECT_INCLUDE)/mghttpd/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/mghttpd
- @: > $(PROJECT_INCLUDE)/mghttpd/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mghttpd/$(dirstamp)
-
-$(PROJECT_LIB)/libmghttpd.a: libmghttpd.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libmghttpd.a
-
-$(PROJECT_INCLUDE)/mghttpd/mongoose.h: mongoose.h $(PROJECT_INCLUDE)/mghttpd/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mghttpd/mongoose.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mghttpd/mongoose.h
-endif
-endif
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index 351dc71..1c127e1 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -11,46 +11,10 @@ libposix_a_SOURCES =
libposix_a_SOURCES += src/nanosleep.c src/clockgettime.c src/clocksettime.c \
src/clockgetres.c src/sysconf.c
-include_rtems_posixdir = $(includedir)/rtems/posix
-
-include_rtems_posix_HEADERS = include/rtems/posix/sigset.h
-
## Some POSIX threads features are needed all the time
-include_rtems_posix_HEADERS += include/rtems/posix/barrierimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/condimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/key.h
-include_rtems_posix_HEADERS += include/rtems/posix/keyimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/config.h
-include_rtems_posix_HEADERS += include/rtems/posix/muteximpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/posixapi.h
-include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/pthreadattrimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/rwlockimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/semaphore.h
-include_rtems_posix_HEADERS += include/rtems/posix/semaphoreimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/spinlockimpl.h
-
if HAS_PTHREADS
# include
-include_HEADERS = include/aio.h
-include_HEADERS += include/mqueue.h
-
# include/rtems/posix
-include_rtems_posix_HEADERS += include/rtems/posix/aio_misc.h
-include_rtems_posix_HEADERS += include/rtems/posix/mmanimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/mqueue.h
-include_rtems_posix_HEADERS += include/rtems/posix/mqueueimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/psignal.h
-include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/pthread.h
-include_rtems_posix_HEADERS += include/rtems/posix/pthreadimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/ptimer.h
-include_rtems_posix_HEADERS += include/rtems/posix/shm.h
-include_rtems_posix_HEADERS += include/rtems/posix/shmimpl.h
-include_rtems_posix_HEADERS += include/rtems/posix/threadsup.h
-include_rtems_posix_HEADERS += include/rtems/posix/timer.h
-include_rtems_posix_HEADERS += include/rtems/posix/timerimpl.h
-
## src
libposix_a_SOURCES += src/aio_cancel.c src/aio_error.c src/aio_fsync.c \
src/aio_read.c src/aio_return.c src/aio_suspend.c src/aio_write.c \
@@ -236,5 +200,4 @@ endif
libposix_a_SOURCES += src/sched_getprioritymin.c
libposix_a_SOURCES += src/sched_getprioritymax.c
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am
deleted file mode 100644
index d96cbf7..0000000
--- a/cpukit/posix/preinstall.am
+++ /dev/null
@@ -1,146 +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_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/posix/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/posix
- @: > $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/posix/sigset.h: include/rtems/posix/sigset.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/sigset.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/sigset.h
-
-$(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h: include/rtems/posix/barrierimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/condimpl.h: include/rtems/posix/condimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/condimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/condimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/key.h: include/rtems/posix/key.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.h
-
-$(PROJECT_INCLUDE)/rtems/posix/keyimpl.h: include/rtems/posix/keyimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/keyimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/keyimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/config.h: include/rtems/posix/config.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/config.h
-
-$(PROJECT_INCLUDE)/rtems/posix/muteximpl.h: include/rtems/posix/muteximpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/muteximpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/muteximpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/posixapi.h: include/rtems/posix/posixapi.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
-
-$(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h: include/rtems/posix/priorityimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priorityimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/pthreadattrimpl.h: include/rtems/posix/pthreadattrimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthreadattrimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthreadattrimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/rwlockimpl.h: include/rtems/posix/rwlockimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/rwlockimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/rwlockimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/semaphore.h: include/rtems/posix/semaphore.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphore.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphore.h
-
-$(PROJECT_INCLUDE)/rtems/posix/semaphoreimpl.h: include/rtems/posix/semaphoreimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphoreimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphoreimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/spinlockimpl.h: include/rtems/posix/spinlockimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/spinlockimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/spinlockimpl.h
-
-if HAS_PTHREADS
-$(PROJECT_INCLUDE)/aio.h: include/aio.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/aio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/aio.h
-
-$(PROJECT_INCLUDE)/mqueue.h: include/mqueue.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mqueue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mqueue.h
-
-$(PROJECT_INCLUDE)/rtems/posix/aio_misc.h: include/rtems/posix/aio_misc.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/aio_misc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/aio_misc.h
-
-$(PROJECT_INCLUDE)/rtems/posix/mmanimpl.h: include/rtems/posix/mmanimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mmanimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mmanimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/mqueue.h: include/rtems/posix/mqueue.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueue.h
-
-$(PROJECT_INCLUDE)/rtems/posix/mqueueimpl.h: include/rtems/posix/mqueueimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueueimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueueimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/psignal.h: include/rtems/posix/psignal.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/psignal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/psignal.h
-
-$(PROJECT_INCLUDE)/rtems/posix/psignalimpl.h: include/rtems/posix/psignalimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/psignalimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/psignalimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/pthread.h: include/rtems/posix/pthread.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.h
-
-$(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h: include/rtems/posix/pthreadimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/ptimer.h: include/rtems/posix/ptimer.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/ptimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/ptimer.h
-
-$(PROJECT_INCLUDE)/rtems/posix/shm.h: include/rtems/posix/shm.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/shm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/shm.h
-
-$(PROJECT_INCLUDE)/rtems/posix/shmimpl.h: include/rtems/posix/shmimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/shmimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/shmimpl.h
-
-$(PROJECT_INCLUDE)/rtems/posix/threadsup.h: include/rtems/posix/threadsup.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/threadsup.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/threadsup.h
-
-$(PROJECT_INCLUDE)/rtems/posix/timer.h: include/rtems/posix/timer.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.h
-
-$(PROJECT_INCLUDE)/rtems/posix/timerimpl.h: include/rtems/posix/timerimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timerimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timerimpl.h
-endif
diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
index 2cf38ed..53a0576 100644
--- a/cpukit/pppd/Makefile.am
+++ b/cpukit/pppd/Makefile.am
@@ -1,10 +1,12 @@
include $(top_srcdir)/automake/compile.am
if LIBNETWORKING
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtemspppd.h rtemsdialer.h
-
project_lib_LIBRARIES = libpppd.a
+
+$(PROJECT_LIB)/libpppd.a: libpppd.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libpppd.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libpppd.a
+
libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \
chat.c demand.c fsm.c fsm.h ipcp.c ipcp.h lcp.c lcp.h magic.c magic.h \
options.c upap.c upap.h utils.c sys-rtems.c \
@@ -13,5 +15,4 @@ libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \
libpppd_a_CPPFLAGS = $(AM_CPPFLAGS) -D__BSD_VISIBLE -I$(srcdir)/../libmd
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/pppd/preinstall.am b/cpukit/pppd/preinstall.am
deleted file mode 100644
index 19f4bc1..0000000
--- a/cpukit/pppd/preinstall.am
+++ /dev/null
@@ -1,43 +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)
-
-if LIBNETWORKING
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtemspppd.h: rtemspppd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtemspppd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtemspppd.h
-
-$(PROJECT_INCLUDE)/rtems/rtemsdialer.h: rtemsdialer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtemsdialer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtemsdialer.h
-
-$(PROJECT_LIB)/libpppd.a: libpppd.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/libpppd.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libpppd.a
-endif
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am
deleted file mode 100644
index fd26535..0000000
--- a/cpukit/preinstall.am
+++ /dev/null
@@ -1,751 +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_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/endian.h: include/endian.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/endian.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/endian.h
-
-$(PROJECT_INCLUDE)/zconf.h: include/zconf.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zconf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/zconf.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/rtems
- @: > $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/uuid/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/uuid
- @: > $(PROJECT_INCLUDE)/uuid/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/uuid/$(dirstamp)
-
-$(PROJECT_INCLUDE)/uuid/uuid.h: libmisc/uuid/uuid.h $(PROJECT_INCLUDE)/uuid/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uuid/uuid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/uuid/uuid.h
-
-$(PROJECT_INCLUDE)/utf8proc/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/utf8proc
- @: > $(PROJECT_INCLUDE)/utf8proc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/utf8proc/$(dirstamp)
-
-$(PROJECT_INCLUDE)/utf8proc/utf8proc.h: libmisc/utf8proc/utf8proc.h $(PROJECT_INCLUDE)/utf8proc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/utf8proc/utf8proc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/utf8proc/utf8proc.h
-
-$(PROJECT_INCLUDE)/sys/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/sys
- @: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp)
-
-$(PROJECT_INCLUDE)/crypt.h: include/crypt.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crypt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/crypt.h
-
-$(PROJECT_INCLUDE)/memory.h: include/memory.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/memory.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/memory.h
-
-$(PROJECT_INCLUDE)/xz.h: libmisc/xz/xz.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/xz.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/xz.h
-
-$(PROJECT_INCLUDE)/sys/event.h: libcsupport/include/sys/event.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/event.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/event.h
-
-$(PROJECT_INCLUDE)/sys/poll.h: libcsupport/include/sys/poll.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/poll.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/poll.h
-
-$(PROJECT_INCLUDE)/sys/statvfs.h: libcsupport/include/sys/statvfs.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/statvfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/statvfs.h
-
-$(PROJECT_INCLUDE)/sys/utsname.h: libcsupport/include/sys/utsname.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/utsname.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/utsname.h
-
-$(PROJECT_INCLUDE)/sys/endian.h: include/sys/endian.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/endian.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/endian.h
-
-$(PROJECT_INCLUDE)/sys/priority.h: include/sys/priority.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/priority.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/priority.h
-
-if LIBNETWORKING
-$(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/bsdnet
- @: > $(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/bsdnet/servers.h: libnetworking/rtems/bsdnet/servers.h $(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsdnet/servers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsdnet/servers.h
-
-$(PROJECT_INCLUDE)/rtems/bsdnet/_types.h: libnetworking/rtems/bsdnet/_types.h $(PROJECT_INCLUDE)/rtems/bsdnet/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsdnet/_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsdnet/_types.h
-endif
-if LIBDL
-$(PROJECT_INCLUDE)/dlfcn.h: libdl/dlfcn.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dlfcn.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/dlfcn.h
-
-$(PROJECT_INCLUDE)/link.h: libdl/include/link.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/link.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/link.h
-
-$(PROJECT_INCLUDE)/link_elf.h: libdl/include/link_elf.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/link_elf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/link_elf.h
-
-$(PROJECT_INCLUDE)/sys/cdefs_elf.h: libdl/include/sys/cdefs_elf.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/cdefs_elf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/cdefs_elf.h
-
-$(PROJECT_INCLUDE)/sys/exec_elf.h: libdl/include/sys/exec_elf.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/exec_elf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/exec_elf.h
-
-$(PROJECT_INCLUDE)/machine/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/machine
- @: > $(PROJECT_INCLUDE)/machine/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/machine/$(dirstamp)
-
-$(PROJECT_INCLUDE)/machine/elf_machdep.h: libdl/include/arch/@RTEMS_CPU@/machine/elf_machdep.h $(PROJECT_INCLUDE)/machine/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/machine/elf_machdep.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/machine/elf_machdep.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/rtl
- @: > $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtl/dlfcn-shell.h: libdl/dlfcn-shell.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/dlfcn-shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/dlfcn-shell.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl.h: libdl/rtl.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-allocator.h: libdl/rtl-allocator.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-allocator.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-allocator.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-fwd.h: libdl/rtl-obj-fwd.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-fwd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-fwd.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-fwd.h: libdl/rtl-fwd.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-fwd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-fwd.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-obj.h: libdl/rtl-obj.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-cache.h: libdl/rtl-obj-cache.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-cache.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-comp.h: libdl/rtl-obj-comp.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-comp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-obj-comp.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-unresolved.h: libdl/rtl-unresolved.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-unresolved.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-unresolved.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-indirect-ptr.h: libdl/rtl-indirect-ptr.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-indirect-ptr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-indirect-ptr.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-sym.h: libdl/rtl-sym.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-sym.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-sym.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rtl-trace.h: libdl/rtl-trace.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rtl-trace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rtl-trace.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rap.h: libdl/rap.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rap.h
-
-$(PROJECT_INCLUDE)/rtems/rtl/rap-shell.h: libdl/rap-shell.h $(PROJECT_INCLUDE)/rtems/rtl/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtl/rap-shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtl/rap-shell.h
-endif
-if LIBDEBUGGER
-$(PROJECT_INCLUDE)/rtems/rtems-debugger.h: libdebugger/rtems-debugger.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-debugger.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-debugger.h
-
-$(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/debugger
- @: > $(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-server.h: libdebugger/rtems-debugger-server.h $(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-server.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-server.h
-
-$(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-remote.h: libdebugger/rtems-debugger-remote.h $(PROJECT_INCLUDE)/rtems/debugger/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-remote.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/debugger/rtems-debugger-remote.h
-endif
-$(PROJECT_INCLUDE)/rtems/bspIo.h: include/rtems/bspIo.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bspIo.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bspIo.h
-
-$(PROJECT_INCLUDE)/rtems/inttypes.h: include/rtems/inttypes.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/inttypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/inttypes.h
-
-$(PROJECT_INCLUDE)/rtems/print.h: include/rtems/print.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/print.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/print.h
-
-$(PROJECT_INCLUDE)/rtems/printer.h: include/rtems/printer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/printer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/printer.h
-
-$(PROJECT_INCLUDE)/rtems/userenv.h: include/rtems/userenv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/userenv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/userenv.h
-
-$(PROJECT_INCLUDE)/rtems/fs.h: include/rtems/fs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fs.h
-
-if !LIBPCI
-$(PROJECT_INCLUDE)/rtems/pci.h: include/rtems/pci.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/pci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/pci.h
-endif
-$(PROJECT_INCLUDE)/rtems/concat.h: include/rtems/concat.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/concat.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/concat.h
-
-$(PROJECT_INCLUDE)/rtems/status-checks.h: include/rtems/status-checks.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/status-checks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/status-checks.h
-
-$(PROJECT_INCLUDE)/rtems/endian.h: include/rtems/endian.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/endian.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/endian.h
-
-$(PROJECT_INCLUDE)/rtems/btimer.h: include/rtems/btimer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/btimer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/btimer.h
-
-$(PROJECT_INCLUDE)/rtems/console.h: include/rtems/console.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/console.h
-
-$(PROJECT_INCLUDE)/rtems/clockdrv.h: include/rtems/clockdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/clockdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/clockdrv.h
-
-$(PROJECT_INCLUDE)/rtems/framebuffer.h: include/rtems/framebuffer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/framebuffer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/framebuffer.h
-
-$(PROJECT_INCLUDE)/rtems/rtc.h: include/rtems/rtc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtc.h
-
-$(PROJECT_INCLUDE)/rtems/watchdogdrv.h: include/rtems/watchdogdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/watchdogdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/watchdogdrv.h
-
-$(PROJECT_INCLUDE)/rtems/irq.h: include/rtems/irq.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/irq.h
-
-$(PROJECT_INCLUDE)/rtems/irq-extension.h: include/rtems/irq-extension.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/irq-extension.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/irq-extension.h
-
-$(PROJECT_INCLUDE)/rtems/imfs.h: libfs/src/imfs/imfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/imfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/imfs.h
-
-$(PROJECT_INCLUDE)/rtems/pipe.h: libfs/src/pipe/pipe.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/pipe.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/pipe.h
-
-$(PROJECT_INCLUDE)/rtems/devfs.h: libfs/src/devfs/devfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/devfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/devfs.h
-
-if LIBDOSFS
-$(PROJECT_INCLUDE)/rtems/dosfs.h: libfs/src/dosfs/dosfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dosfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dosfs.h
-endif
-$(PROJECT_INCLUDE)/rtems/rtems-rfs.h: libfs/src/rfs/rtems-rfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-rfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-rfs.h
-
-$(PROJECT_INCLUDE)/rtems/rtems-rfs-format.h: libfs/src/rfs/rtems-rfs-format.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-rfs-format.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-rfs-format.h
-
-$(PROJECT_INCLUDE)/rtems/rtems-rfs-shell.h: libfs/src/rfs/rtems-rfs-shell.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-rfs-shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-rfs-shell.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/rfs
- @: > $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-bitmaps.h: libfs/src/rfs/rtems-rfs-bitmaps.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-bitmaps.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-bitmaps.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block-pos.h: libfs/src/rfs/rtems-rfs-block-pos.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block-pos.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block-pos.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block.h: libfs/src/rfs/rtems-rfs-block.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-block.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-buffer.h: libfs/src/rfs/rtems-rfs-buffer.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-buffer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-buffer.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-data.h: libfs/src/rfs/rtems-rfs-data.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-data.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-data.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir.h: libfs/src/rfs/rtems-rfs-dir.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir-hash.h: libfs/src/rfs/rtems-rfs-dir-hash.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir-hash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-dir-hash.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file.h: libfs/src/rfs/rtems-rfs-file.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system-fwd.h: libfs/src/rfs/rtems-rfs-file-system-fwd.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system-fwd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system-fwd.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system.h: libfs/src/rfs/rtems-rfs-file-system.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-file-system.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-group.h: libfs/src/rfs/rtems-rfs-group.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-group.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-group.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-inode.h: libfs/src/rfs/rtems-rfs-inode.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-inode.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-inode.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-link.h: libfs/src/rfs/rtems-rfs-link.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-link.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-link.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-mutex.h: libfs/src/rfs/rtems-rfs-mutex.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-mutex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-mutex.h
-
-$(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-trace.h: libfs/src/rfs/rtems-rfs-trace.h $(PROJECT_INCLUDE)/rtems/rfs/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-trace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rfs/rtems-rfs-trace.h
-
-$(PROJECT_INCLUDE)/rtems/jffs2.h: libfs/src/jffs2/include/rtems/jffs2.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/jffs2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/jffs2.h
-
-$(PROJECT_INCLUDE)/rtems/bdbuf.h: libblock/include/rtems/bdbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdbuf.h
-
-$(PROJECT_INCLUDE)/rtems/blkdev.h: libblock/include/rtems/blkdev.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/blkdev.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/blkdev.h
-
-$(PROJECT_INCLUDE)/rtems/diskdevs.h: libblock/include/rtems/diskdevs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/diskdevs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/diskdevs.h
-
-$(PROJECT_INCLUDE)/rtems/flashdisk.h: libblock/include/rtems/flashdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/flashdisk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/flashdisk.h
-
-$(PROJECT_INCLUDE)/rtems/ramdisk.h: libblock/include/rtems/ramdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ramdisk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h
-
-$(PROJECT_INCLUDE)/rtems/nvdisk.h: libblock/include/rtems/nvdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/nvdisk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/nvdisk.h
-
-$(PROJECT_INCLUDE)/rtems/nvdisk-sram.h: libblock/include/rtems/nvdisk-sram.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/nvdisk-sram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/nvdisk-sram.h
-
-$(PROJECT_INCLUDE)/rtems/sparse-disk.h: libblock/include/rtems/sparse-disk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sparse-disk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sparse-disk.h
-
-$(PROJECT_INCLUDE)/rtems/ide_part_table.h: libblock/include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
-
-$(PROJECT_INCLUDE)/rtems/bdpart.h: libblock/include/rtems/bdpart.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdpart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdpart.h
-
-$(PROJECT_INCLUDE)/rtems/media.h: libblock/include/rtems/media.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/media.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/media.h
-
-if LIBNETWORKING
-$(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd/ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpd.h
-endif
-$(PROJECT_INCLUDE)/rtems/bspcmdline.h: libmisc/bspcmdline/bspcmdline.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bspcmdline.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bspcmdline.h
-
-$(PROJECT_INCLUDE)/rtems/capture.h: libmisc/capture/capture.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/capture.h
-
-$(PROJECT_INCLUDE)/rtems/capture-cli.h: libmisc/capture/capture-cli.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture-cli.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/capture-cli.h
-
-$(PROJECT_INCLUDE)/rtems/captureimpl.h: libmisc/capture/captureimpl.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/captureimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/captureimpl.h
-
-$(PROJECT_INCLUDE)/rtems/trace/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/trace
- @: > $(PROJECT_INCLUDE)/rtems/trace/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/trace/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/trace/rtems-trace-buffer-vars.h: libmisc/capture/rtems-trace-buffer-vars.h $(PROJECT_INCLUDE)/rtems/trace/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/trace/rtems-trace-buffer-vars.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/trace/rtems-trace-buffer-vars.h
-
-$(PROJECT_INCLUDE)/rtems/cpuuse.h: libmisc/cpuuse/cpuuse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/cpuuse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/cpuuse.h
-
-$(PROJECT_INCLUDE)/rtems/devnull.h: libmisc/devnull/devnull.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/devnull.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/devnull.h
-
-$(PROJECT_INCLUDE)/rtems/devzero.h: libmisc/devnull/devzero.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/devzero.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/devzero.h
-
-$(PROJECT_INCLUDE)/rtems/dumpbuf.h: libmisc/dumpbuf/dumpbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dumpbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dumpbuf.h
-
-$(PROJECT_INCLUDE)/rtems/rtems-fdt.h: libmisc/rtems-fdt/rtems-fdt.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-fdt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-fdt.h
-
-$(PROJECT_INCLUDE)/rtems/rtems-fdt-shell.h: libmisc/rtems-fdt/rtems-fdt-shell.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems-fdt-shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems-fdt-shell.h
-
-$(PROJECT_INCLUDE)/rtems/monitor.h: libmisc/monitor/monitor.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/monitor.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/monitor.h
-
-$(PROJECT_INCLUDE)/rtems/fb.h: libmisc/fb/fb.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb.h
-
-$(PROJECT_INCLUDE)/rtems/mw_uid.h: libmisc/fb/mw_uid.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mw_uid.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mw_uid.h
-
-$(PROJECT_INCLUDE)/rtems/mouse_parser.h: libmisc/mouse/mouse_parser.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mouse_parser.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mouse_parser.h
-
-$(PROJECT_INCLUDE)/rtems/serial_mouse.h: libmisc/mouse/serial_mouse.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serial_mouse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serial_mouse.h
-
-$(PROJECT_INCLUDE)/rtems/qreslib.h: libqos/qreslib.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/qreslib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/qreslib.h
-
-$(PROJECT_INCLUDE)/rtems/stdio-redirect.h: libmisc/redirector/stdio-redirect.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stdio-redirect.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stdio-redirect.h
-
-if LIBSHELL
-$(PROJECT_INCLUDE)/rtems/shell.h: libmisc/shell/shell.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/shell.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/shell.h
-
-$(PROJECT_INCLUDE)/rtems/shellconfig.h: libmisc/shell/shellconfig.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/shellconfig.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/shellconfig.h
-endif
-$(PROJECT_INCLUDE)/rtems/stringto.h: libmisc/stringto/stringto.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stringto.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stringto.h
-
-$(PROJECT_INCLUDE)/rtems/test.h: libmisc/testsupport/test.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/test.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/test.h
-
-$(PROJECT_INCLUDE)/rtems/libi2c.h: libi2c/libi2c.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/libi2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/libi2c.h
-
-if LIBSERDBG
-$(PROJECT_INCLUDE)/rtems/serdbgcnf.h: libmisc/serdbg/serdbgcnf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serdbgcnf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serdbgcnf.h
-
-$(PROJECT_INCLUDE)/rtems/serdbg.h: libmisc/serdbg/serdbg.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serdbg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serdbg.h
-
-$(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h: libmisc/serdbg/termios_printk_cnf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h
-
-$(PROJECT_INCLUDE)/rtems/termios_printk.h: libmisc/serdbg/termios_printk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termios_printk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termios_printk.h
-endif
-$(PROJECT_INCLUDE)/rtems/stackchk.h: libmisc/stackchk/stackchk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stackchk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stackchk.h
-
-$(PROJECT_INCLUDE)/rtems/untar.h: libmisc/untar/untar.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/untar.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/untar.h
-
-$(PROJECT_INCLUDE)/rtems/fsmount.h: libmisc/fsmount/fsmount.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fsmount.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fsmount.h
-
-$(PROJECT_INCLUDE)/rtems/tm27-default.h: include/rtems/tm27-default.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tm27-default.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tm27-default.h
-
-if LIBDRVMGR
-$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
- @: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
-
-$(PROJECT_INCLUDE)/drvmgr/drvmgr.h: libdrvmgr/drvmgr.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/drvmgr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr.h
-
-$(PROJECT_INCLUDE)/drvmgr/drvmgr_confdefs.h: libdrvmgr/drvmgr_confdefs.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/drvmgr_confdefs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr_confdefs.h
-
-$(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h: libdrvmgr/drvmgr_list.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h
-endif
-if LIBGNAT
-$(PROJECT_INCLUDE)/adainclude/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/adainclude
- @: > $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
-
-$(PROJECT_INCLUDE)/adainclude/rtems.adb: include/adainclude/rtems.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems.ads: include/adainclude/rtems.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb: include/adainclude/rtems-barrier.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-barrier.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads: include/adainclude/rtems-barrier.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-barrier.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-clock.adb: include/adainclude/rtems-clock.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-clock.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-clock.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-clock.ads: include/adainclude/rtems-clock.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-clock.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-clock.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads: include/adainclude/rtems-cpu_usage.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-cpu_usage.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-event.adb: include/adainclude/rtems-event.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-event.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-event.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-event.ads: include/adainclude/rtems-event.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-event.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-event.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-extension.adb: include/adainclude/rtems-extension.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-extension.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-extension.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-extension.ads: include/adainclude/rtems-extension.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-extension.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-extension.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb: include/adainclude/rtems-fatal.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-fatal.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads: include/adainclude/rtems-fatal.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-fatal.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads: include/adainclude/rtems-interrupt.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-interrupt.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-io.adb: include/adainclude/rtems-io.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-io.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-io.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-io.ads: include/adainclude/rtems-io.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-io.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-io.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb: include/adainclude/rtems-message_queue.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads: include/adainclude/rtems-message_queue.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-message_queue.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb: include/adainclude/rtems-multiprocessing.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads: include/adainclude/rtems-multiprocessing.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-multiprocessing.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-object.adb: include/adainclude/rtems-object.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-object.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-object.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-object.ads: include/adainclude/rtems-object.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-object.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-object.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-partition.adb: include/adainclude/rtems-partition.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-partition.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-partition.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-partition.ads: include/adainclude/rtems-partition.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-partition.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-partition.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-port.adb: include/adainclude/rtems-port.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-port.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-port.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-port.ads: include/adainclude/rtems-port.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-port.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-port.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb: include/adainclude/rtems-rate_monotonic.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads: include/adainclude/rtems-rate_monotonic.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-rate_monotonic.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-region.adb: include/adainclude/rtems-region.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-region.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-region.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-region.ads: include/adainclude/rtems-region.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-region.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-region.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb: include/adainclude/rtems-semaphore.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads: include/adainclude/rtems-semaphore.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-semaphore.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-signal.adb: include/adainclude/rtems-signal.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-signal.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-signal.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-signal.ads: include/adainclude/rtems-signal.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-signal.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-signal.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads: include/adainclude/rtems-stack_checker.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-stack_checker.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb: include/adainclude/rtems-tasks.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-tasks.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads: include/adainclude/rtems-tasks.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-tasks.ads
-
-$(PROJECT_INCLUDE)/adainclude/rtems-timer.adb: include/adainclude/rtems-timer.adb $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-timer.adb
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-timer.adb
-
-$(PROJECT_INCLUDE)/adainclude/rtems-timer.ads: include/adainclude/rtems-timer.ads $(PROJECT_INCLUDE)/adainclude/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/adainclude/rtems-timer.ads
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/adainclude/rtems-timer.ads
-endif
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index da6e302..b8694b8 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -6,63 +6,9 @@ librtems_a_CPPFLAGS = $(AM_CPPFLAGS)
# include
-include_HEADERS = include/rtems.h
-
# include/rtems/rtems
-include_rtems_rtemsdir = $(includedir)/rtems/rtems
-include_rtems_rtems_HEADERS =
-
-include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/asrimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/attrimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/barrier.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/barrierimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/cache.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/clock.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/config.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/dpmem.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/dpmemimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/event.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/eventimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/intr.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/message.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/messageimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/modes.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/modesimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/object.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/options.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/optionsimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/part.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/partimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/ratemon.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/ratemonimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/region.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/regionimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/sem.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/semimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/signal.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/signalimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/smp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/status.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/statusimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/support.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/tasks.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/tasksimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/timerimpl.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/types.h
-include_rtems_rtems_HEADERS += mainpage.h
-
if HAS_MP
## We only build multiprocessing related files if HAS_MP was defined
-include_rtems_rtems_HEADERS += include/rtems/rtems/eventmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/mp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/msgmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/partmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/semmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/signalmp.h
-include_rtems_rtems_HEADERS += include/rtems/rtems/taskmp.h
endif
## src
@@ -252,5 +198,4 @@ librtems_a_SOURCES += src/signalmp.c
librtems_a_SOURCES += src/taskmp.c
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am
deleted file mode 100644
index 35e78db..0000000
--- a/cpukit/rtems/preinstall.am
+++ /dev/null
@@ -1,222 +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_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems.h: include/rtems.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/rtems
- @: > $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/rtems/asr.h: include/rtems/rtems/asr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h: include/rtems/rtems/asrimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asrimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/attr.h: include/rtems/rtems/attr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h: include/rtems/rtems/attrimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attrimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/barrier.h: include/rtems/rtems/barrier.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/barrier.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/barrier.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/barrierimpl.h: include/rtems/rtems/barrierimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/barrierimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/barrierimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/cache.h: include/rtems/rtems/cache.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/cache.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/clock.h: include/rtems/rtems/clock.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/clock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/clock.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/config.h: include/rtems/rtems/config.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/config.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/dpmem.h: include/rtems/rtems/dpmem.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmem.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/dpmemimpl.h: include/rtems/rtems/dpmemimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmemimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmemimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/event.h: include/rtems/rtems/event.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/event.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/event.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/eventimpl.h: include/rtems/rtems/eventimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/intr.h: include/rtems/rtems/intr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/intr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/intr.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/message.h: include/rtems/rtems/message.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/message.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/message.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/messageimpl.h: include/rtems/rtems/messageimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/messageimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/messageimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/modes.h: include/rtems/rtems/modes.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modes.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/modesimpl.h: include/rtems/rtems/modesimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modesimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modesimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/object.h: include/rtems/rtems/object.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/object.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/object.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/options.h: include/rtems/rtems/options.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/options.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/options.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h: include/rtems/rtems/optionsimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/part.h: include/rtems/rtems/part.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/part.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/part.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/partimpl.h: include/rtems/rtems/partimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/partimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/partimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/ratemon.h: include/rtems/rtems/ratemon.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/ratemon.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/ratemon.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/ratemonimpl.h: include/rtems/rtems/ratemonimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/ratemonimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/ratemonimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/region.h: include/rtems/rtems/region.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/region.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/region.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h: include/rtems/rtems/regionimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/regionimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/sem.h: include/rtems/rtems/sem.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/sem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/sem.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/semimpl.h: include/rtems/rtems/semimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/semimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/semimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/signal.h: include/rtems/rtems/signal.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/signal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/signal.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/signalimpl.h: include/rtems/rtems/signalimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/signalimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/signalimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/smp.h: include/rtems/rtems/smp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/smp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/smp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/status.h: include/rtems/rtems/status.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/status.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/status.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/statusimpl.h: include/rtems/rtems/statusimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/statusimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/statusimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/support.h: include/rtems/rtems/support.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/support.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/support.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/tasks.h: include/rtems/rtems/tasks.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasks.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/tasksimpl.h: include/rtems/rtems/tasksimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasksimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasksimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/timer.h: include/rtems/rtems/timer.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/timer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timer.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/timerimpl.h: include/rtems/rtems/timerimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/timerimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timerimpl.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/types.h: include/rtems/rtems/types.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/types.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/mainpage.h: mainpage.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/mainpage.h
-
-if HAS_MP
-$(PROJECT_INCLUDE)/rtems/rtems/eventmp.h: include/rtems/rtems/eventmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/mp.h: include/rtems/rtems/mp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/mp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/mp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/msgmp.h: include/rtems/rtems/msgmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/msgmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/msgmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/partmp.h: include/rtems/rtems/partmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/partmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/partmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/semmp.h: include/rtems/rtems/semmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/semmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/semmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/signalmp.h: include/rtems/rtems/signalmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/signalmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/signalmp.h
-
-$(PROJECT_INCLUDE)/rtems/rtems/taskmp.h: include/rtems/rtems/taskmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
-endif
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 326d67f..4fb7c70 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -1,29 +1,6 @@
include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = include/confdefs.h
-include_rtems_HEADERS += include/rtems/bsd.h
-include_rtems_HEADERS += include/rtems/chain.h
-include_rtems_HEADERS += include/rtems/config.h
-include_rtems_HEADERS += include/rtems/counter.h
-include_rtems_HEADERS += include/rtems/extension.h
-include_rtems_HEADERS += include/rtems/extensionimpl.h
-include_rtems_HEADERS += include/rtems/fatal.h
-include_rtems_HEADERS += include/rtems/init.h
-include_rtems_HEADERS += include/rtems/io.h
-include_rtems_HEADERS += include/rtems/ioimpl.h
-include_rtems_HEADERS += include/rtems/mptables.h
-include_rtems_HEADERS += include/rtems/cbs.h
-include_rtems_HEADERS += include/rtems/profiling.h
-include_rtems_HEADERS += include/rtems/rbheap.h
-include_rtems_HEADERS += include/rtems/rbtree.h
-include_rtems_HEADERS += include/rtems/scheduler.h
-include_rtems_HEADERS += include/rtems/timecounter.h
-include_rtems_HEADERS += include/rtems/timespec.h
-include_rtems_HEADERS += include/rtems/version.h
-
EXTRA_DIST = include/rtems/README
noinst_LIBRARIES = libsapi.a
@@ -84,5 +61,4 @@ $(srcdir)/src/version.c: version-vc-key.h
all-local: generate-vc-key
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/sapi/preinstall.am b/cpukit/sapi/preinstall.am
deleted file mode 100644
index a6b0ba3..0000000
--- a/cpukit/sapi/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)
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/confdefs.h: include/confdefs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/confdefs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/confdefs.h
-
-$(PROJECT_INCLUDE)/rtems/bsd.h: include/rtems/bsd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsd.h
-
-$(PROJECT_INCLUDE)/rtems/chain.h: include/rtems/chain.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/chain.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/chain.h
-
-$(PROJECT_INCLUDE)/rtems/config.h: include/rtems/config.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/config.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/config.h
-
-$(PROJECT_INCLUDE)/rtems/counter.h: include/rtems/counter.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/counter.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/counter.h
-
-$(PROJECT_INCLUDE)/rtems/extension.h: include/rtems/extension.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.h
-
-$(PROJECT_INCLUDE)/rtems/extensionimpl.h: include/rtems/extensionimpl.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extensionimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extensionimpl.h
-
-$(PROJECT_INCLUDE)/rtems/fatal.h: include/rtems/fatal.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fatal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fatal.h
-
-$(PROJECT_INCLUDE)/rtems/init.h: include/rtems/init.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/init.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/init.h
-
-$(PROJECT_INCLUDE)/rtems/io.h: include/rtems/io.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/io.h
-
-$(PROJECT_INCLUDE)/rtems/ioimpl.h: include/rtems/ioimpl.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ioimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ioimpl.h
-
-$(PROJECT_INCLUDE)/rtems/mptables.h: include/rtems/mptables.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mptables.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mptables.h
-
-$(PROJECT_INCLUDE)/rtems/cbs.h: include/rtems/cbs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/cbs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/cbs.h
-
-$(PROJECT_INCLUDE)/rtems/profiling.h: include/rtems/profiling.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/profiling.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/profiling.h
-
-$(PROJECT_INCLUDE)/rtems/rbheap.h: include/rtems/rbheap.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rbheap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rbheap.h
-
-$(PROJECT_INCLUDE)/rtems/rbtree.h: include/rtems/rbtree.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rbtree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rbtree.h
-
-$(PROJECT_INCLUDE)/rtems/scheduler.h: include/rtems/scheduler.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/scheduler.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/scheduler.h
-
-$(PROJECT_INCLUDE)/rtems/timecounter.h: include/rtems/timecounter.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timecounter.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timecounter.h
-
-$(PROJECT_INCLUDE)/rtems/timespec.h: include/rtems/timespec.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timespec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timespec.h
-
-$(PROJECT_INCLUDE)/rtems/version.h: include/rtems/version.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/version.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/version.h
-
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index b7edf09..8054df1 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -5,132 +5,11 @@ _SUBDIRS = cpu
## include
-include_sysdir = $(includedir)/sys
-
-include_sys_HEADERS =
-include_sys_HEADERS += include/sys/_ffcounter.h
-include_sys_HEADERS += include/sys/timeffc.h
-include_sys_HEADERS += include/sys/timepps.h
-include_sys_HEADERS += include/sys/timetc.h
-include_sys_HEADERS += include/sys/timex.h
-
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS =
-include_rtems_HEADERS += include/rtems/linkersets.h
-include_rtems_HEADERS += include/rtems/sysinit.h
-include_rtems_HEADERS += include/rtems/system.h
-include_rtems_HEADERS += include/rtems/seterr.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_rtems_score_HEADERS = include/rtems/score/address.h
-include_rtems_score_HEADERS += include/rtems/score/apimutex.h
-include_rtems_score_HEADERS += include/rtems/score/assert.h
-include_rtems_score_HEADERS += include/rtems/score/atomic.h
-include_rtems_score_HEADERS += include/rtems/score/chain.h
-include_rtems_score_HEADERS += include/rtems/score/chainimpl.h
-include_rtems_score_HEADERS += include/rtems/score/context.h
-include_rtems_score_HEADERS += include/rtems/score/copyrt.h
-include_rtems_score_HEADERS += include/rtems/score/corebarrier.h
-include_rtems_score_HEADERS += include/rtems/score/corebarrierimpl.h
-include_rtems_score_HEADERS += include/rtems/score/coremsg.h
-include_rtems_score_HEADERS += include/rtems/score/coremsgimpl.h
-include_rtems_score_HEADERS += include/rtems/score/coremutex.h
-include_rtems_score_HEADERS += include/rtems/score/coremuteximpl.h
-include_rtems_score_HEADERS += include/rtems/score/corerwlockimpl.h
-include_rtems_score_HEADERS += include/rtems/score/coresem.h
-include_rtems_score_HEADERS += include/rtems/score/coresemimpl.h
-include_rtems_score_HEADERS += include/rtems/score/cpustdatomic.h
-include_rtems_score_HEADERS += include/rtems/score/heap.h
-include_rtems_score_HEADERS += include/rtems/score/heapimpl.h
-include_rtems_score_HEADERS += include/rtems/score/protectedheap.h
-include_rtems_score_HEADERS += include/rtems/score/interr.h
-include_rtems_score_HEADERS += include/rtems/score/io.h
-include_rtems_score_HEADERS += include/rtems/score/isr.h
-include_rtems_score_HEADERS += include/rtems/score/isrlevel.h
-include_rtems_score_HEADERS += include/rtems/score/isrlock.h
-include_rtems_score_HEADERS += include/rtems/score/freechain.h
-include_rtems_score_HEADERS += include/rtems/score/mrsp.h
-include_rtems_score_HEADERS += include/rtems/score/mrspimpl.h
-include_rtems_score_HEADERS += include/rtems/score/muteximpl.h
-include_rtems_score_HEADERS += include/rtems/score/object.h
-include_rtems_score_HEADERS += include/rtems/score/objectimpl.h
-include_rtems_score_HEADERS += include/rtems/score/onceimpl.h
-include_rtems_score_HEADERS += include/rtems/score/percpu.h
-include_rtems_score_HEADERS += include/rtems/score/priority.h
-include_rtems_score_HEADERS += include/rtems/score/priorityimpl.h
-include_rtems_score_HEADERS += include/rtems/score/prioritybitmap.h
-include_rtems_score_HEADERS += include/rtems/score/prioritybitmapimpl.h
-include_rtems_score_HEADERS += include/rtems/score/profiling.h
-include_rtems_score_HEADERS += include/rtems/score/processormask.h
-include_rtems_score_HEADERS += include/rtems/score/rbtree.h
-include_rtems_score_HEADERS += include/rtems/score/rbtreeimpl.h
-include_rtems_score_HEADERS += include/rtems/score/scheduler.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulercbs.h
-include_rtems_score_HEADERS += include/rtems/score/schedulercbsimpl.h
-include_rtems_score_HEADERS += include/rtems/score/scheduleredf.h
-include_rtems_score_HEADERS += include/rtems/score/scheduleredfimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulernode.h
-include_rtems_score_HEADERS += include/rtems/score/schedulernodeimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerpriority.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersimple.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersimpleimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersmpimpl.h
-include_rtems_score_HEADERS += include/rtems/score/semaphoreimpl.h
-include_rtems_score_HEADERS += include/rtems/score/smp.h
-include_rtems_score_HEADERS += include/rtems/score/smpbarrier.h
-include_rtems_score_HEADERS += include/rtems/score/smplock.h
-include_rtems_score_HEADERS += include/rtems/score/smplockseq.h
-include_rtems_score_HEADERS += include/rtems/score/smpimpl.h
-include_rtems_score_HEADERS += include/rtems/score/stack.h
-include_rtems_score_HEADERS += include/rtems/score/stackimpl.h
-include_rtems_score_HEADERS += include/rtems/score/states.h
-include_rtems_score_HEADERS += include/rtems/score/statesimpl.h
-include_rtems_score_HEADERS += include/rtems/score/status.h
-include_rtems_score_HEADERS += include/rtems/score/sysstate.h
-include_rtems_score_HEADERS += include/rtems/score/thread.h
-include_rtems_score_HEADERS += include/rtems/score/threadimpl.h
-include_rtems_score_HEADERS += include/rtems/score/threaddispatch.h
-include_rtems_score_HEADERS += include/rtems/score/threadq.h
-include_rtems_score_HEADERS += include/rtems/score/threadqimpl.h
-include_rtems_score_HEADERS += include/rtems/score/timespec.h
-include_rtems_score_HEADERS += include/rtems/score/timestamp.h
-include_rtems_score_HEADERS += include/rtems/score/timecounter.h
-include_rtems_score_HEADERS += include/rtems/score/timecounterimpl.h
-include_rtems_score_HEADERS += include/rtems/score/tls.h
-include_rtems_score_HEADERS += include/rtems/score/tod.h
-include_rtems_score_HEADERS += include/rtems/score/todimpl.h
-include_rtems_score_HEADERS += include/rtems/score/userext.h
-include_rtems_score_HEADERS += include/rtems/score/userextimpl.h
-include_rtems_score_HEADERS += include/rtems/score/watchdog.h
-include_rtems_score_HEADERS += include/rtems/score/watchdogimpl.h
-include_rtems_score_HEADERS += include/rtems/score/wkspace.h
-include_rtems_score_HEADERS += include/rtems/score/cpuopts.h
-include_rtems_score_HEADERS += include/rtems/score/basedefs.h
-
if HAS_MP
# We only build multiprocessing related files if HAS_MP was defined
-include_rtems_score_HEADERS += include/rtems/score/mpci.h
-include_rtems_score_HEADERS += include/rtems/score/mpciimpl.h
-include_rtems_score_HEADERS += include/rtems/score/mppkt.h
-include_rtems_score_HEADERS += include/rtems/score/objectmp.h
-include_rtems_score_HEADERS += include/rtems/score/threadmp.h
endif
if HAS_SMP
-include_rtems_score_HEADERS += include/rtems/score/scheduleredfsmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerprioritysmpimpl.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerpriorityaffinitysmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulersimplesmp.h
-include_rtems_score_HEADERS += include/rtems/score/schedulerstrongapa.h
-include_rtems_score_HEADERS += include/rtems/score/smplockmcs.h
-include_rtems_score_HEADERS += include/rtems/score/smplockstats.h
-include_rtems_score_HEADERS += include/rtems/score/smplockticket.h
endif
## src
@@ -352,8 +231,10 @@ libscore_a_SOURCES += src/processormaskcopy.c
EXTRA_DIST = src/Unlimited.txt
-DISTCLEANFILES = include/rtems/score/cpuopts.h
+# This file is in the build tree
+DISTCLEANFILES = ../..include/rtems/score/cpuopts.h
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = ../../include/rtems/score/cpuopts.h
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index a0881e8..865a750 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -1,20 +1,4 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/arm.h
-include_rtems_score_HEADERS += rtems/score/armv4.h
-include_rtems_score_HEADERS += rtems/score/armv7m.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
-include_libcpudir = $(includedir)/libcpu
-include_libcpu_HEADERS = include/libcpu/arm-cp15.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
libscorecpu_a_SOURCES =
@@ -48,5 +32,5 @@ libscorecpu_a_SOURCES += armv7m-isr-level-set.c
libscorecpu_a_SOURCES += armv7m-isr-vector-install.c
libscorecpu_a_SOURCES += armv7m-multitasking-start-stop.c
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/arm/headers.am b/cpukit/score/cpu/arm/headers.am
new file mode 100644
index 0000000..61a055f
--- /dev/null
+++ b/cpukit/score/cpu/arm/headers.am
@@ -0,0 +1,24 @@
+## This file was generated by "./boostrap -H".
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += include/libcpu/arm-cp15.h
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/arm.h
+include_rtems_score_HEADERS += include/rtems/score/armv4.h
+include_rtems_score_HEADERS += include/rtems/score/armv7m.h
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/arm/machine/elf_machdep.h b/cpukit/score/cpu/arm/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/arm/machine/elf_machdep.h
rename to cpukit/score/cpu/arm/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/arm/rtems/asm.h b/cpukit/score/cpu/arm/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/asm.h
rename to cpukit/score/cpu/arm/include/rtems/asm.h
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/include/rtems/score/arm.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/score/arm.h
rename to cpukit/score/cpu/arm/include/rtems/score/arm.h
diff --git a/cpukit/score/cpu/arm/rtems/score/armv4.h b/cpukit/score/cpu/arm/include/rtems/score/armv4.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/score/armv4.h
rename to cpukit/score/cpu/arm/include/rtems/score/armv4.h
diff --git a/cpukit/score/cpu/arm/rtems/score/armv7m.h b/cpukit/score/cpu/arm/include/rtems/score/armv7m.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/score/armv7m.h
rename to cpukit/score/cpu/arm/include/rtems/score/armv7m.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/score/cpu.h
rename to cpukit/score/cpu/arm/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu_asm.h b/cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/arm/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/v850/rtems/score/cpuatomic.h b/cpukit/score/cpu/arm/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/v850/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/arm/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpuimpl.h b/cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/arm/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/arm/rtems/score/types.h b/cpukit/score/cpu/arm/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/score/types.h
rename to cpukit/score/cpu/arm/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/arm/preinstall.am b/cpukit/score/cpu/arm/preinstall.am
deleted file mode 100644
index 3bdbb63..0000000
--- a/cpukit/score/cpu/arm/preinstall.am
+++ /dev/null
@@ -1,70 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/arm.h: rtems/score/arm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/arm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/arm.h
-
-$(PROJECT_INCLUDE)/rtems/score/armv4.h: rtems/score/armv4.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/armv4.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/armv4.h
-
-$(PROJECT_INCLUDE)/rtems/score/armv7m.h: rtems/score/armv7m.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/armv7m.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/armv7m.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
- @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/arm-cp15.h: include/libcpu/arm-cp15.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
-
diff --git a/cpukit/score/cpu/bfin/Makefile.am b/cpukit/score/cpu/bfin/Makefile.am
index 8fa75df..3d7483a 100644
--- a/cpukit/score/cpu/bfin/Makefile.am
+++ b/cpukit/score/cpu/bfin/Makefile.am
@@ -1,26 +1,10 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_bfindir = $(includedir)/rtems/bfin
-include_rtems_bfin_HEADERS = rtems/bfin/bfin.h
-include_rtems_bfin_HEADERS += rtems/bfin/bf533.h
-include_rtems_bfin_HEADERS += rtems/bfin/bf52x.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/bfin.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c cpu_asm.S
libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_SOURCES += bfin-exception-frame-print.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/bfin/headers.am b/cpukit/score/cpu/bfin/headers.am
new file mode 100644
index 0000000..b9eba7b
--- /dev/null
+++ b/cpukit/score/cpu/bfin/headers.am
@@ -0,0 +1,24 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_bfindir = $(includedir)/rtems/bfin
+include_rtems_bfin_HEADERS =
+include_rtems_bfin_HEADERS += include/rtems/bfin/bf52x.h
+include_rtems_bfin_HEADERS += include/rtems/bfin/bf533.h
+include_rtems_bfin_HEADERS += include/rtems/bfin/bfin.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/bfin.h
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/bfin/machine/elf_machdep.h b/cpukit/score/cpu/bfin/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/bfin/machine/elf_machdep.h
rename to cpukit/score/cpu/bfin/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/bfin/rtems/asm.h b/cpukit/score/cpu/bfin/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/asm.h
rename to cpukit/score/cpu/bfin/include/rtems/asm.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bf52x.h b/cpukit/score/cpu/bfin/include/rtems/bfin/bf52x.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/bfin/bf52x.h
rename to cpukit/score/cpu/bfin/include/rtems/bfin/bf52x.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bf533.h b/cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/bfin/bf533.h
rename to cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h
diff --git a/cpukit/score/cpu/bfin/rtems/bfin/bfin.h b/cpukit/score/cpu/bfin/include/rtems/bfin/bfin.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/bfin/bfin.h
rename to cpukit/score/cpu/bfin/include/rtems/bfin/bfin.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/bfin.h b/cpukit/score/cpu/bfin/include/rtems/score/bfin.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/score/bfin.h
rename to cpukit/score/cpu/bfin/include/rtems/score/bfin.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/score/cpu.h
rename to cpukit/score/cpu/bfin/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu_asm.h b/cpukit/score/cpu/bfin/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/bfin/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpuatomic.h b/cpukit/score/cpu/bfin/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/sparc64/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/bfin/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/v850/rtems/score/cpuimpl.h b/cpukit/score/cpu/bfin/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/v850/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/bfin/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/types.h b/cpukit/score/cpu/bfin/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/score/types.h
rename to cpukit/score/cpu/bfin/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/bfin/preinstall.am b/cpukit/score/cpu/bfin/preinstall.am
deleted file mode 100644
index 0ede1d7..0000000
--- a/cpukit/score/cpu/bfin/preinstall.am
+++ /dev/null
@@ -1,70 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/bfin
- @: > $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/bfin/bfin.h: rtems/bfin/bfin.h $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bfin/bfin.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bfin/bfin.h
-
-$(PROJECT_INCLUDE)/rtems/bfin/bf533.h: rtems/bfin/bf533.h $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bfin/bf533.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bfin/bf533.h
-
-$(PROJECT_INCLUDE)/rtems/bfin/bf52x.h: rtems/bfin/bf52x.h $(PROJECT_INCLUDE)/rtems/bfin/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bfin/bf52x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bfin/bf52x.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/bfin.h: rtems/score/bfin.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/bfin.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/bfin.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/epiphany/Makefile.am b/cpukit/score/cpu/epiphany/Makefile.am
index ed99b43..96b0de0 100644
--- a/cpukit/score/cpu/epiphany/Makefile.am
+++ b/cpukit/score/cpu/epiphany/Makefile.am
@@ -3,21 +3,6 @@ include $(top_srcdir)/automake/compile.am
CLEANFILES =
DISTCLEANFILES =
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_rtems_score_HEADERS =
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/epiphany.h
-include_rtems_score_HEADERS += rtems/score/epiphany-utility.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c
@@ -29,5 +14,5 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
all-local: $(PREINSTALL_FILES)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/epiphany/headers.am b/cpukit/score/cpu/epiphany/headers.am
new file mode 100644
index 0000000..125a88d
--- /dev/null
+++ b/cpukit/score/cpu/epiphany/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/epiphany-utility.h
+include_rtems_score_HEADERS += include/rtems/score/epiphany.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/epiphany/rtems/asm.h b/cpukit/score/cpu/epiphany/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/epiphany/rtems/asm.h
rename to cpukit/score/cpu/epiphany/include/rtems/asm.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpu.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/epiphany/rtems/score/cpu.h
rename to cpukit/score/cpu/epiphany/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpu_asm.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/epiphany/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/epiphany/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpuatomic.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/sparc/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/epiphany/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpuimpl.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/sparc64/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/epiphany/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/epiphany-utility.h b/cpukit/score/cpu/epiphany/include/rtems/score/epiphany-utility.h
similarity index 100%
rename from cpukit/score/cpu/epiphany/rtems/score/epiphany-utility.h
rename to cpukit/score/cpu/epiphany/include/rtems/score/epiphany-utility.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/epiphany.h b/cpukit/score/cpu/epiphany/include/rtems/score/epiphany.h
similarity index 100%
rename from cpukit/score/cpu/epiphany/rtems/score/epiphany.h
rename to cpukit/score/cpu/epiphany/include/rtems/score/epiphany.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/types.h b/cpukit/score/cpu/epiphany/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/epiphany/rtems/score/types.h
rename to cpukit/score/cpu/epiphany/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/epiphany/preinstall.am b/cpukit/score/cpu/epiphany/preinstall.am
deleted file mode 100644
index e12a516..0000000
--- a/cpukit/score/cpu/epiphany/preinstall.am
+++ /dev/null
@@ -1,57 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/epiphany.h: rtems/score/epiphany.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/epiphany.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/epiphany.h
-
-$(PROJECT_INCLUDE)/rtems/score/epiphany-utility.h: rtems/score/epiphany-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/epiphany-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/epiphany-utility.h
-
diff --git a/cpukit/score/cpu/h8300/headers.am b/cpukit/score/cpu/h8300/headers.am
new file mode 100644
index 0000000..6f43579
--- /dev/null
+++ b/cpukit/score/cpu/h8300/headers.am
@@ -0,0 +1,5 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/h8300/machine/elf_machdep.h b/cpukit/score/cpu/h8300/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/h8300/machine/elf_machdep.h
rename to cpukit/score/cpu/h8300/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am
index 7fb2a08..fe7fa55 100644
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/Makefile.am
@@ -1,22 +1,9 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS= rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/i386.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/interrupts.h
-include_rtems_score_HEADERS += rtems/score/registers.h
-include_rtems_score_HEADERS += rtems/score/idtr.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c cpu_asm.S
libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/i386/headers.am b/cpukit/score/cpu/i386/headers.am
new file mode 100644
index 0000000..ea07edc
--- /dev/null
+++ b/cpukit/score/cpu/i386/headers.am
@@ -0,0 +1,20 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/i386.h
+include_rtems_score_HEADERS += include/rtems/score/idtr.h
+include_rtems_score_HEADERS += include/rtems/score/interrupts.h
+include_rtems_score_HEADERS += include/rtems/score/registers.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/i386/machine/elf_machdep.h b/cpukit/score/cpu/i386/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/i386/machine/elf_machdep.h
rename to cpukit/score/cpu/i386/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/i386/rtems/asm.h b/cpukit/score/cpu/i386/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/asm.h
rename to cpukit/score/cpu/i386/include/rtems/asm.h
diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/cpukit/score/cpu/i386/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/score/cpu.h
rename to cpukit/score/cpu/i386/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/sh/rtems/score/cpuatomic.h b/cpukit/score/cpu/i386/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/sh/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/i386/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/sh/rtems/score/cpuimpl.h b/cpukit/score/cpu/i386/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/sh/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/i386/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/i386/rtems/score/i386.h b/cpukit/score/cpu/i386/include/rtems/score/i386.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/score/i386.h
rename to cpukit/score/cpu/i386/include/rtems/score/i386.h
diff --git a/cpukit/score/cpu/i386/rtems/score/idtr.h b/cpukit/score/cpu/i386/include/rtems/score/idtr.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/score/idtr.h
rename to cpukit/score/cpu/i386/include/rtems/score/idtr.h
diff --git a/cpukit/score/cpu/i386/rtems/score/interrupts.h b/cpukit/score/cpu/i386/include/rtems/score/interrupts.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/score/interrupts.h
rename to cpukit/score/cpu/i386/include/rtems/score/interrupts.h
diff --git a/cpukit/score/cpu/i386/rtems/score/registers.h b/cpukit/score/cpu/i386/include/rtems/score/registers.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/score/registers.h
rename to cpukit/score/cpu/i386/include/rtems/score/registers.h
diff --git a/cpukit/score/cpu/i386/rtems/score/types.h b/cpukit/score/cpu/i386/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/score/types.h
rename to cpukit/score/cpu/i386/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/i386/preinstall.am b/cpukit/score/cpu/i386/preinstall.am
deleted file mode 100644
index 6eda753..0000000
--- a/cpukit/score/cpu/i386/preinstall.am
+++ /dev/null
@@ -1,61 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/i386.h: rtems/score/i386.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/i386.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/i386.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/interrupts.h: rtems/score/interrupts.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/interrupts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/interrupts.h
-
-$(PROJECT_INCLUDE)/rtems/score/registers.h: rtems/score/registers.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/registers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/registers.h
-
-$(PROJECT_INCLUDE)/rtems/score/idtr.h: rtems/score/idtr.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/idtr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/idtr.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/lm32/Makefile.am b/cpukit/score/cpu/lm32/Makefile.am
index 72cb69a..75bcba5 100644
--- a/cpukit/score/cpu/lm32/Makefile.am
+++ b/cpukit/score/cpu/lm32/Makefile.am
@@ -1,21 +1,10 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/lm32.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c cpu_asm.S irq.c
libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_SOURCES += lm32-exception-frame-print.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/lm32/headers.am b/cpukit/score/cpu/lm32/headers.am
new file mode 100644
index 0000000..68128ca
--- /dev/null
+++ b/cpukit/score/cpu/lm32/headers.am
@@ -0,0 +1,18 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/lm32.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/lm32/machine/elf_machdep.h b/cpukit/score/cpu/lm32/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/lm32/machine/elf_machdep.h
rename to cpukit/score/cpu/lm32/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/lm32/rtems/asm.h b/cpukit/score/cpu/lm32/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/lm32/rtems/asm.h
rename to cpukit/score/cpu/lm32/include/rtems/asm.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu.h b/cpukit/score/cpu/lm32/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/lm32/rtems/score/cpu.h
rename to cpukit/score/cpu/lm32/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu_asm.h b/cpukit/score/cpu/lm32/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/lm32/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/lm32/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpuatomic.h b/cpukit/score/cpu/lm32/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/powerpc/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/lm32/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpuimpl.h b/cpukit/score/cpu/lm32/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/or1k/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/lm32/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/lm32.h b/cpukit/score/cpu/lm32/include/rtems/score/lm32.h
similarity index 100%
rename from cpukit/score/cpu/lm32/rtems/score/lm32.h
rename to cpukit/score/cpu/lm32/include/rtems/score/lm32.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/types.h b/cpukit/score/cpu/lm32/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/lm32/rtems/score/types.h
rename to cpukit/score/cpu/lm32/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/lm32/preinstall.am b/cpukit/score/cpu/lm32/preinstall.am
deleted file mode 100644
index 282353f..0000000
--- a/cpukit/score/cpu/lm32/preinstall.am
+++ /dev/null
@@ -1,53 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/lm32.h: rtems/score/lm32.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/lm32.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/lm32.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/m32c/Makefile.am b/cpukit/score/cpu/m32c/Makefile.am
index 993cf4b..22bec7f 100644
--- a/cpukit/score/cpu/m32c/Makefile.am
+++ b/cpukit/score/cpu/m32c/Makefile.am
@@ -1,18 +1,5 @@
include $(top_srcdir)/automake/compile.am
-include_HEADERS = varvects.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/m32c.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c cpu_asm.c context_switch.S context_init.c \
varvects.S
@@ -20,5 +7,5 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_SOURCES += m32c-exception-frame-print.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/m32c/headers.am b/cpukit/score/cpu/m32c/headers.am
new file mode 100644
index 0000000..f67d070
--- /dev/null
+++ b/cpukit/score/cpu/m32c/headers.am
@@ -0,0 +1,17 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += include/varvects.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/m32c.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/m32c/rtems/asm.h b/cpukit/score/cpu/m32c/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/m32c/rtems/asm.h
rename to cpukit/score/cpu/m32c/include/rtems/asm.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu.h b/cpukit/score/cpu/m32c/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/m32c/rtems/score/cpu.h
rename to cpukit/score/cpu/m32c/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu_asm.h b/cpukit/score/cpu/m32c/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/m32c/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/m32c/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpuatomic.h b/cpukit/score/cpu/m32c/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/or1k/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/m32c/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpuimpl.h b/cpukit/score/cpu/m32c/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/m32c/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/m32c.h b/cpukit/score/cpu/m32c/include/rtems/score/m32c.h
similarity index 100%
rename from cpukit/score/cpu/m32c/rtems/score/m32c.h
rename to cpukit/score/cpu/m32c/include/rtems/score/m32c.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/types.h b/cpukit/score/cpu/m32c/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/m32c/rtems/score/types.h
rename to cpukit/score/cpu/m32c/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/m32c/varvects.h b/cpukit/score/cpu/m32c/include/varvects.h
similarity index 100%
rename from cpukit/score/cpu/m32c/varvects.h
rename to cpukit/score/cpu/m32c/include/varvects.h
diff --git a/cpukit/score/cpu/m32c/preinstall.am b/cpukit/score/cpu/m32c/preinstall.am
deleted file mode 100644
index 3e12ca4..0000000
--- a/cpukit/score/cpu/m32c/preinstall.am
+++ /dev/null
@@ -1,62 +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_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/varvects.h: varvects.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/varvects.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/varvects.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/m32c.h: rtems/score/m32c.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/m32c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/m32c.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 04eebcb..68fd3a2 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -3,26 +3,10 @@ include $(top_srcdir)/automake/compile.am
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_m68kdir = $(includedir)/rtems/m68k
-include_rtems_m68k_HEADERS = rtems/m68k/m68302.h
-include_rtems_m68k_HEADERS += rtems/m68k/m68360.h
-include_rtems_m68k_HEADERS += rtems/m68k/qsm.h
-include_rtems_m68k_HEADERS += rtems/m68k/sim.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/m68k.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
libscorecpu_a_SOURCES = cpu.c cpu_asm.S
libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_SOURCES += m68k-exception-frame-print.c
libscorecpu_a_SOURCES += __m68k_read_tp.c
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/m68k/headers.am b/cpukit/score/cpu/m68k/headers.am
new file mode 100644
index 0000000..e02fad3
--- /dev/null
+++ b/cpukit/score/cpu/m68k/headers.am
@@ -0,0 +1,24 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_m68kdir = $(includedir)/rtems/m68k
+include_rtems_m68k_HEADERS =
+include_rtems_m68k_HEADERS += include/rtems/m68k/m68302.h
+include_rtems_m68k_HEADERS += include/rtems/m68k/m68360.h
+include_rtems_m68k_HEADERS += include/rtems/m68k/qsm.h
+include_rtems_m68k_HEADERS += include/rtems/m68k/sim.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/m68k.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/m68k/machine/elf_machdep.h b/cpukit/score/cpu/m68k/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/m68k/machine/elf_machdep.h
rename to cpukit/score/cpu/m68k/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/asm.h
rename to cpukit/score/cpu/m68k/include/rtems/asm.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68302.h b/cpukit/score/cpu/m68k/include/rtems/m68k/m68302.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/m68k/m68302.h
rename to cpukit/score/cpu/m68k/include/rtems/m68k/m68302.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/m68360.h b/cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/m68k/m68360.h
rename to cpukit/score/cpu/m68k/include/rtems/m68k/m68360.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h b/cpukit/score/cpu/m68k/include/rtems/m68k/qsm.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/m68k/qsm.h
rename to cpukit/score/cpu/m68k/include/rtems/m68k/qsm.h
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/sim.h b/cpukit/score/cpu/m68k/include/rtems/m68k/sim.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/m68k/sim.h
rename to cpukit/score/cpu/m68k/include/rtems/m68k/sim.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/score/cpu.h
rename to cpukit/score/cpu/m68k/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpuatomic.h b/cpukit/score/cpu/m68k/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/m68k/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/cpuimpl.h b/cpukit/score/cpu/m68k/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/moxie/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/m68k/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/include/rtems/score/m68k.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/score/m68k.h
rename to cpukit/score/cpu/m68k/include/rtems/score/m68k.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/cpukit/score/cpu/m68k/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/score/types.h
rename to cpukit/score/cpu/m68k/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/m68k/preinstall.am b/cpukit/score/cpu/m68k/preinstall.am
deleted file mode 100644
index a580b7a..0000000
--- a/cpukit/score/cpu/m68k/preinstall.am
+++ /dev/null
@@ -1,70 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/m68k
- @: > $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/m68k/m68302.h: rtems/m68k/m68302.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/m68302.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/m68302.h
-
-$(PROJECT_INCLUDE)/rtems/m68k/m68360.h: rtems/m68k/m68360.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/m68360.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/m68360.h
-
-$(PROJECT_INCLUDE)/rtems/m68k/qsm.h: rtems/m68k/qsm.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/qsm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/qsm.h
-
-$(PROJECT_INCLUDE)/rtems/m68k/sim.h: rtems/m68k/sim.h $(PROJECT_INCLUDE)/rtems/m68k/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/m68k/sim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/m68k/sim.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/m68k.h: rtems/score/m68k.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/m68k.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/m68k.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index 123e523..fe7fa55 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -1,23 +1,9 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_mipsdir = $(includedir)/rtems/mips
-include_rtems_mips_HEADERS = rtems/mips/idtcpu.h
-include_rtems_mips_HEADERS += rtems/mips/iregdef.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/mips.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c cpu_asm.S
libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/mips/headers.am b/cpukit/score/cpu/mips/headers.am
new file mode 100644
index 0000000..cbcf1dd
--- /dev/null
+++ b/cpukit/score/cpu/mips/headers.am
@@ -0,0 +1,22 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_mipsdir = $(includedir)/rtems/mips
+include_rtems_mips_HEADERS =
+include_rtems_mips_HEADERS += include/rtems/mips/idtcpu.h
+include_rtems_mips_HEADERS += include/rtems/mips/iregdef.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/mips.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/mips/machine/elf_machdep.h b/cpukit/score/cpu/mips/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/mips/machine/elf_machdep.h
rename to cpukit/score/cpu/mips/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/mips/rtems/asm.h b/cpukit/score/cpu/mips/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/mips/rtems/asm.h
rename to cpukit/score/cpu/mips/include/rtems/asm.h
diff --git a/cpukit/score/cpu/mips/rtems/mips/idtcpu.h b/cpukit/score/cpu/mips/include/rtems/mips/idtcpu.h
similarity index 100%
rename from cpukit/score/cpu/mips/rtems/mips/idtcpu.h
rename to cpukit/score/cpu/mips/include/rtems/mips/idtcpu.h
diff --git a/cpukit/score/cpu/mips/rtems/mips/iregdef.h b/cpukit/score/cpu/mips/include/rtems/mips/iregdef.h
similarity index 100%
rename from cpukit/score/cpu/mips/rtems/mips/iregdef.h
rename to cpukit/score/cpu/mips/include/rtems/mips/iregdef.h
diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/mips/rtems/score/cpu.h
rename to cpukit/score/cpu/mips/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/cpuatomic.h b/cpukit/score/cpu/mips/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/moxie/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/mips/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/mips/rtems/score/cpuimpl.h b/cpukit/score/cpu/mips/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/mips/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/mips/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/mips/rtems/score/mips.h b/cpukit/score/cpu/mips/include/rtems/score/mips.h
similarity index 100%
rename from cpukit/score/cpu/mips/rtems/score/mips.h
rename to cpukit/score/cpu/mips/include/rtems/score/mips.h
diff --git a/cpukit/score/cpu/mips/rtems/score/types.h b/cpukit/score/cpu/mips/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/mips/rtems/score/types.h
rename to cpukit/score/cpu/mips/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/mips/preinstall.am b/cpukit/score/cpu/mips/preinstall.am
deleted file mode 100644
index 8fa3cc6..0000000
--- a/cpukit/score/cpu/mips/preinstall.am
+++ /dev/null
@@ -1,62 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/mips/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/mips
- @: > $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/mips/idtcpu.h: rtems/mips/idtcpu.h $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mips/idtcpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mips/idtcpu.h
-
-$(PROJECT_INCLUDE)/rtems/mips/iregdef.h: rtems/mips/iregdef.h $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mips/iregdef.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mips/iregdef.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/mips.h: rtems/score/mips.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mips.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mips.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/moxie/Makefile.am b/cpukit/score/cpu/moxie/Makefile.am
index edd2bd4..29c9a65 100644
--- a/cpukit/score/cpu/moxie/Makefile.am
+++ b/cpukit/score/cpu/moxie/Makefile.am
@@ -4,19 +4,10 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/moxie.h \
- rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c moxie-exception-frame-print.c cpu_asm.S
libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/moxie/headers.am b/cpukit/score/cpu/moxie/headers.am
new file mode 100644
index 0000000..4f253a6
--- /dev/null
+++ b/cpukit/score/cpu/moxie/headers.am
@@ -0,0 +1,17 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/moxie.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/moxie/machine/elf_machdep.h b/cpukit/score/cpu/moxie/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/moxie/machine/elf_machdep.h
rename to cpukit/score/cpu/moxie/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/moxie/rtems/asm.h b/cpukit/score/cpu/moxie/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/moxie/rtems/asm.h
rename to cpukit/score/cpu/moxie/include/rtems/asm.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/cpu.h b/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/moxie/rtems/score/cpu.h
rename to cpukit/score/cpu/moxie/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/mips/rtems/score/cpuatomic.h b/cpukit/score/cpu/moxie/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/mips/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/moxie/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpuimpl.h b/cpukit/score/cpu/moxie/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/moxie/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/moxie.h b/cpukit/score/cpu/moxie/include/rtems/score/moxie.h
similarity index 100%
rename from cpukit/score/cpu/moxie/rtems/score/moxie.h
rename to cpukit/score/cpu/moxie/include/rtems/score/moxie.h
diff --git a/cpukit/score/cpu/moxie/rtems/score/types.h b/cpukit/score/cpu/moxie/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/moxie/rtems/score/types.h
rename to cpukit/score/cpu/moxie/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/moxie/preinstall.am b/cpukit/score/cpu/moxie/preinstall.am
deleted file mode 100644
index 9753489..0000000
--- a/cpukit/score/cpu/moxie/preinstall.am
+++ /dev/null
@@ -1,49 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/moxie.h: rtems/score/moxie.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/moxie.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/moxie.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/nios2/Makefile.am b/cpukit/score/cpu/nios2/Makefile.am
index b3e9d28..243f937 100644
--- a/cpukit/score/cpu/nios2/Makefile.am
+++ b/cpukit/score/cpu/nios2/Makefile.am
@@ -3,22 +3,6 @@ include $(top_srcdir)/automake/compile.am
CLEANFILES =
DISTCLEANFILES =
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_rtems_score_HEADERS =
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/nios2.h
-include_rtems_score_HEADERS += rtems/score/nios2-utility.h
-include_rtems_score_HEADERS += rtems/score/nios2-count-zeros.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES =
@@ -50,6 +34,6 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
all-local: $(PREINSTALL_FILES)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/nios2/headers.am b/cpukit/score/cpu/nios2/headers.am
new file mode 100644
index 0000000..8cf15f1
--- /dev/null
+++ b/cpukit/score/cpu/nios2/headers.am
@@ -0,0 +1,20 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/nios2-count-zeros.h
+include_rtems_score_HEADERS += include/rtems/score/nios2-utility.h
+include_rtems_score_HEADERS += include/rtems/score/nios2.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/nios2/machine/elf_machdep.h b/cpukit/score/cpu/nios2/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/nios2/machine/elf_machdep.h
rename to cpukit/score/cpu/nios2/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/nios2/rtems/asm.h b/cpukit/score/cpu/nios2/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/asm.h
rename to cpukit/score/cpu/nios2/include/rtems/asm.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/score/cpu.h
rename to cpukit/score/cpu/nios2/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu_asm.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/nios2/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpuatomic.h b/cpukit/score/cpu/nios2/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/m68k/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/nios2/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpuimpl.h b/cpukit/score/cpu/nios2/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/m32c/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/nios2/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2-count-zeros.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/score/nios2-count-zeros.h
rename to cpukit/score/cpu/nios2/include/rtems/score/nios2-count-zeros.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2-utility.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/score/nios2-utility.h
rename to cpukit/score/cpu/nios2/include/rtems/score/nios2-utility.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2.h b/cpukit/score/cpu/nios2/include/rtems/score/nios2.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/score/nios2.h
rename to cpukit/score/cpu/nios2/include/rtems/score/nios2.h
diff --git a/cpukit/score/cpu/nios2/rtems/score/types.h b/cpukit/score/cpu/nios2/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/nios2/rtems/score/types.h
rename to cpukit/score/cpu/nios2/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/nios2/preinstall.am b/cpukit/score/cpu/nios2/preinstall.am
deleted file mode 100644
index fa07df8..0000000
--- a/cpukit/score/cpu/nios2/preinstall.am
+++ /dev/null
@@ -1,61 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/nios2.h: rtems/score/nios2.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2.h
-
-$(PROJECT_INCLUDE)/rtems/score/nios2-utility.h: rtems/score/nios2-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2-utility.h
-
-$(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h: rtems/score/nios2-count-zeros.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/nios2-count-zeros.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am
index 3134c01..556d3de 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -1,19 +1,9 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/no_cpu.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c cpu_asm.c
libscorecpu_a_SOURCES += cpucounterread.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/no_cpu/headers.am b/cpukit/score/cpu/no_cpu/headers.am
new file mode 100644
index 0000000..faf934f
--- /dev/null
+++ b/cpukit/score/cpu/no_cpu/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/no_cpu.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/asm.h b/cpukit/score/cpu/no_cpu/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/no_cpu/rtems/asm.h
rename to cpukit/score/cpu/no_cpu/include/rtems/asm.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/no_cpu/rtems/score/cpu.h
rename to cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu_asm.h b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/no_cpu/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/no_cpu/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h b/cpukit/score/cpu/no_cpu/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/no_cpu/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/no_cpu/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/no_cpu.h b/cpukit/score/cpu/no_cpu/include/rtems/score/no_cpu.h
similarity index 100%
rename from cpukit/score/cpu/no_cpu/rtems/score/no_cpu.h
rename to cpukit/score/cpu/no_cpu/include/rtems/score/no_cpu.h
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/types.h b/cpukit/score/cpu/no_cpu/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/no_cpu/rtems/score/types.h
rename to cpukit/score/cpu/no_cpu/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/no_cpu/preinstall.am b/cpukit/score/cpu/no_cpu/preinstall.am
deleted file mode 100644
index fa63e6a..0000000
--- a/cpukit/score/cpu/no_cpu/preinstall.am
+++ /dev/null
@@ -1,49 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/no_cpu.h: rtems/score/no_cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/no_cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/no_cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
diff --git a/cpukit/score/cpu/or1k/Makefile.am b/cpukit/score/cpu/or1k/Makefile.am
index c9f2859..e4c5b7c 100644
--- a/cpukit/score/cpu/or1k/Makefile.am
+++ b/cpukit/score/cpu/or1k/Makefile.am
@@ -3,21 +3,6 @@ include $(top_srcdir)/automake/compile.am
CLEANFILES =
DISTCLEANFILES =
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_rtems_score_HEADERS =
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/or1k.h
-include_rtems_score_HEADERS += rtems/score/or1k-utility.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES =
@@ -34,5 +19,5 @@ libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
all-local: $(PREINSTALL_FILES)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/or1k/headers.am b/cpukit/score/cpu/or1k/headers.am
new file mode 100644
index 0000000..1ddc654
--- /dev/null
+++ b/cpukit/score/cpu/or1k/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/or1k-utility.h
+include_rtems_score_HEADERS += include/rtems/score/or1k.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/or1k/rtems/asm.h b/cpukit/score/cpu/or1k/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/or1k/rtems/asm.h
rename to cpukit/score/cpu/or1k/include/rtems/asm.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpu.h b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/or1k/rtems/score/cpu.h
rename to cpukit/score/cpu/or1k/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpu_asm.h b/cpukit/score/cpu/or1k/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/or1k/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/or1k/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpuatomic.h b/cpukit/score/cpu/or1k/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/m32c/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/or1k/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpuimpl.h b/cpukit/score/cpu/or1k/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/lm32/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/or1k/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/or1k-utility.h b/cpukit/score/cpu/or1k/include/rtems/score/or1k-utility.h
similarity index 100%
rename from cpukit/score/cpu/or1k/rtems/score/or1k-utility.h
rename to cpukit/score/cpu/or1k/include/rtems/score/or1k-utility.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/or1k.h b/cpukit/score/cpu/or1k/include/rtems/score/or1k.h
similarity index 100%
rename from cpukit/score/cpu/or1k/rtems/score/or1k.h
rename to cpukit/score/cpu/or1k/include/rtems/score/or1k.h
diff --git a/cpukit/score/cpu/or1k/rtems/score/types.h b/cpukit/score/cpu/or1k/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/or1k/rtems/score/types.h
rename to cpukit/score/cpu/or1k/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/or1k/preinstall.am b/cpukit/score/cpu/or1k/preinstall.am
deleted file mode 100644
index eae1e46..0000000
--- a/cpukit/score/cpu/or1k/preinstall.am
+++ /dev/null
@@ -1,57 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/or1k.h: rtems/score/or1k.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/or1k.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/or1k.h
-
-$(PROJECT_INCLUDE)/rtems/score/or1k-utility.h: rtems/score/or1k-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/or1k-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/or1k-utility.h
-
diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am
index 7ed1f79..05ab2f4 100644
--- a/cpukit/score/cpu/powerpc/Makefile.am
+++ b/cpukit/score/cpu/powerpc/Makefile.am
@@ -1,18 +1,5 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/powerpc.h
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
-include_rtems_powerpcdir = $(includedir)/rtems/powerpc
-include_rtems_powerpc_HEADERS = rtems/powerpc/registers.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c
libscorecpu_a_SOURCES += ppc-context-volatile-clobber.S
@@ -21,5 +8,5 @@ libscorecpu_a_SOURCES += ppc-isr-disable-mask.S
libscorecpu_a_SOURCES += ppc-isr-vector-install.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/powerpc/headers.am b/cpukit/score/cpu/powerpc/headers.am
new file mode 100644
index 0000000..d8253e8
--- /dev/null
+++ b/cpukit/score/cpu/powerpc/headers.am
@@ -0,0 +1,21 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_powerpcdir = $(includedir)/rtems/powerpc
+include_rtems_powerpc_HEADERS =
+include_rtems_powerpc_HEADERS += include/rtems/powerpc/registers.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/powerpc.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/powerpc/machine/elf_machdep.h b/cpukit/score/cpu/powerpc/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/powerpc/machine/elf_machdep.h
rename to cpukit/score/cpu/powerpc/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/powerpc/rtems/asm.h b/cpukit/score/cpu/powerpc/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/powerpc/rtems/asm.h
rename to cpukit/score/cpu/powerpc/include/rtems/asm.h
diff --git a/cpukit/score/cpu/powerpc/rtems/powerpc/registers.h b/cpukit/score/cpu/powerpc/include/rtems/powerpc/registers.h
similarity index 100%
rename from cpukit/score/cpu/powerpc/rtems/powerpc/registers.h
rename to cpukit/score/cpu/powerpc/include/rtems/powerpc/registers.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/powerpc/rtems/score/cpu.h
rename to cpukit/score/cpu/powerpc/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpuatomic.h b/cpukit/score/cpu/powerpc/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/lm32/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/powerpc/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpuimpl.h b/cpukit/score/cpu/powerpc/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/powerpc/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/powerpc/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h b/cpukit/score/cpu/powerpc/include/rtems/score/powerpc.h
similarity index 100%
rename from cpukit/score/cpu/powerpc/rtems/score/powerpc.h
rename to cpukit/score/cpu/powerpc/include/rtems/score/powerpc.h
diff --git a/cpukit/score/cpu/powerpc/rtems/score/types.h b/cpukit/score/cpu/powerpc/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/powerpc/rtems/score/types.h
rename to cpukit/score/cpu/powerpc/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/powerpc/preinstall.am b/cpukit/score/cpu/powerpc/preinstall.am
deleted file mode 100644
index b0f59c2..0000000
--- a/cpukit/score/cpu/powerpc/preinstall.am
+++ /dev/null
@@ -1,58 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/powerpc.h: rtems/score/powerpc.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/powerpc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/powerpc.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/powerpc
- @: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/powerpc/registers.h: rtems/powerpc/registers.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/registers.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/registers.h
-
diff --git a/cpukit/score/cpu/riscv/Makefile.am b/cpukit/score/cpu/riscv/Makefile.am
index 1de5b2d..3630c03 100644
--- a/cpukit/score/cpu/riscv/Makefile.am
+++ b/cpukit/score/cpu/riscv/Makefile.am
@@ -1,16 +1,4 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/riscv.h
-include_rtems_score_HEADERS += rtems/score/riscv-utility.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
libscorecpu_a_SOURCES = cpu.c
@@ -22,5 +10,5 @@ libscorecpu_a_SOURCES += riscv-context-initialize.c
libscorecpu_a_SOURCES += riscv-context-validate.S
libscorecpu_a_SOURCES += riscv-context-volatile-clobber.S
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/riscv/headers.am b/cpukit/score/cpu/riscv/headers.am
new file mode 100644
index 0000000..b5d3295
--- /dev/null
+++ b/cpukit/score/cpu/riscv/headers.am
@@ -0,0 +1,15 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/riscv-utility.h
+include_rtems_score_HEADERS += include/rtems/score/riscv.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/riscv/rtems/asm.h b/cpukit/score/cpu/riscv/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/riscv/rtems/asm.h
rename to cpukit/score/cpu/riscv/include/rtems/asm.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/cpu.h b/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/riscv/rtems/score/cpu.h
rename to cpukit/score/cpu/riscv/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/cpu_asm.h b/cpukit/score/cpu/riscv/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/riscv/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/riscv/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/cpuatomic.h b/cpukit/score/cpu/riscv/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/riscv/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/riscv/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/cpuimpl.h b/cpukit/score/cpu/riscv/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/riscv/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/riscv/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/riscv-utility.h b/cpukit/score/cpu/riscv/include/rtems/score/riscv-utility.h
similarity index 100%
rename from cpukit/score/cpu/riscv/rtems/score/riscv-utility.h
rename to cpukit/score/cpu/riscv/include/rtems/score/riscv-utility.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/riscv.h b/cpukit/score/cpu/riscv/include/rtems/score/riscv.h
similarity index 100%
rename from cpukit/score/cpu/riscv/rtems/score/riscv.h
rename to cpukit/score/cpu/riscv/include/rtems/score/riscv.h
diff --git a/cpukit/score/cpu/riscv/rtems/score/types.h b/cpukit/score/cpu/riscv/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/riscv/rtems/score/types.h
rename to cpukit/score/cpu/riscv/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/riscv/preinstall.am b/cpukit/score/cpu/riscv/preinstall.am
deleted file mode 100644
index 14256ba..0000000
--- a/cpukit/score/cpu/riscv/preinstall.am
+++ /dev/null
@@ -1,57 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/riscv.h: rtems/score/riscv.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/riscv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/riscv.h
-
-$(PROJECT_INCLUDE)/rtems/score/riscv-utility.h: rtems/score/riscv-utility.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/riscv-utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/riscv-utility.h
-
diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am
index b480b1a..6a19ce4 100644
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -1,21 +1,10 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/sh.h
-include_rtems_score_HEADERS += rtems/score/sh_io.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c context.c
libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_SOURCES += sh-exception-frame-print.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/sh/headers.am b/cpukit/score/cpu/sh/headers.am
new file mode 100644
index 0000000..40073e7
--- /dev/null
+++ b/cpukit/score/cpu/sh/headers.am
@@ -0,0 +1,14 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/sh.h
+include_rtems_score_HEADERS += include/rtems/score/sh_io.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sh/rtems/asm.h b/cpukit/score/cpu/sh/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/sh/rtems/asm.h
rename to cpukit/score/cpu/sh/include/rtems/asm.h
diff --git a/cpukit/score/cpu/sh/rtems/score/cpu.h b/cpukit/score/cpu/sh/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/sh/rtems/score/cpu.h
rename to cpukit/score/cpu/sh/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/i386/rtems/score/cpuatomic.h b/cpukit/score/cpu/sh/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/sh/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/i386/rtems/score/cpuimpl.h b/cpukit/score/cpu/sh/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/i386/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/sh/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/sh/rtems/score/sh.h b/cpukit/score/cpu/sh/include/rtems/score/sh.h
similarity index 100%
rename from cpukit/score/cpu/sh/rtems/score/sh.h
rename to cpukit/score/cpu/sh/include/rtems/score/sh.h
diff --git a/cpukit/score/cpu/sh/rtems/score/sh_io.h b/cpukit/score/cpu/sh/include/rtems/score/sh_io.h
similarity index 100%
rename from cpukit/score/cpu/sh/rtems/score/sh_io.h
rename to cpukit/score/cpu/sh/include/rtems/score/sh_io.h
diff --git a/cpukit/score/cpu/sh/rtems/score/types.h b/cpukit/score/cpu/sh/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/sh/rtems/score/types.h
rename to cpukit/score/cpu/sh/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sh/preinstall.am b/cpukit/score/cpu/sh/preinstall.am
deleted file mode 100644
index 08d2352..0000000
--- a/cpukit/score/cpu/sh/preinstall.am
+++ /dev/null
@@ -1,53 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh.h: rtems/score/sh.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh.h
-
-$(PROJECT_INCLUDE)/rtems/score/sh_io.h: rtems/score/sh_io.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh_io.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index e03aabc..1a76a2f 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -1,19 +1,5 @@
include $(top_srcdir)/automake/compile.am
-include_libcpudir = $(includedir)/libcpu
-include_libcpu_HEADERS = include/libcpu/byteorder.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/sparc.h
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/sparcimpl.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c
libscorecpu_a_SOURCES += sparc-context-volatile-clobber.S
@@ -22,5 +8,5 @@ libscorecpu_a_SOURCES += sparc-counter.c
libscorecpu_a_SOURCES += sparc-counter-asm.S
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/sparc/headers.am b/cpukit/score/cpu/sparc/headers.am
new file mode 100644
index 0000000..89f4f63
--- /dev/null
+++ b/cpukit/score/cpu/sparc/headers.am
@@ -0,0 +1,22 @@
+## This file was generated by "./boostrap -H".
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS =
+include_libcpu_HEADERS += include/libcpu/byteorder.h
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/sparc.h
+include_rtems_score_HEADERS += include/rtems/score/sparcimpl.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/libdl/include/arch/sparc/machine/elf_machdep.h b/cpukit/score/cpu/sparc/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/sparc/machine/elf_machdep.h
rename to cpukit/score/cpu/sparc/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/sparc/rtems/asm.h b/cpukit/score/cpu/sparc/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/sparc/rtems/asm.h
rename to cpukit/score/cpu/sparc/include/rtems/asm.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/sparc/rtems/score/cpu.h
rename to cpukit/score/cpu/sparc/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpuatomic.h b/cpukit/score/cpu/sparc/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/epiphany/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/sparc/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpuimpl.h b/cpukit/score/cpu/sparc/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/sparc/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/sparc/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/sparc.h b/cpukit/score/cpu/sparc/include/rtems/score/sparc.h
similarity index 100%
rename from cpukit/score/cpu/sparc/rtems/score/sparc.h
rename to cpukit/score/cpu/sparc/include/rtems/score/sparc.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/sparcimpl.h b/cpukit/score/cpu/sparc/include/rtems/score/sparcimpl.h
similarity index 100%
rename from cpukit/score/cpu/sparc/rtems/score/sparcimpl.h
rename to cpukit/score/cpu/sparc/include/rtems/score/sparcimpl.h
diff --git a/cpukit/score/cpu/sparc/rtems/score/types.h b/cpukit/score/cpu/sparc/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/sparc/rtems/score/types.h
rename to cpukit/score/cpu/sparc/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sparc/preinstall.am b/cpukit/score/cpu/sparc/preinstall.am
deleted file mode 100644
index 13caf27..0000000
--- a/cpukit/score/cpu/sparc/preinstall.am
+++ /dev/null
@@ -1,62 +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_INCLUDE)/libcpu/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
- @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/byteorder.h: include/libcpu/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/sparc.h: rtems/score/sparc.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sparc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sparc.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/sparcimpl.h: rtems/score/sparcimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sparcimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sparcimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/sparc64/Makefile.am b/cpukit/score/cpu/sparc64/Makefile.am
index 491c197..2afd3ed 100644
--- a/cpukit/score/cpu/sparc64/Makefile.am
+++ b/cpukit/score/cpu/sparc64/Makefile.am
@@ -1,23 +1,13 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
#include_rtems_sparc64dir = $(includedir)/rtems/sparc64
#include_rtems_sparc64_HEADERS =
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/sparc64.h
-include_rtems_score_HEADERS += rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = context.S cpu.c
libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_SOURCES += sparc64-exception-frame-print.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/sparc64/headers.am b/cpukit/score/cpu/sparc64/headers.am
new file mode 100644
index 0000000..9b54d09
--- /dev/null
+++ b/cpukit/score/cpu/sparc64/headers.am
@@ -0,0 +1,13 @@
+## This file was generated by "./boostrap -H".
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/sparc64.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sparc64/rtems/asm.h b/cpukit/score/cpu/sparc64/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/sparc64/rtems/asm.h
rename to cpukit/score/cpu/sparc64/include/rtems/asm.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpu.h b/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/sparc64/rtems/score/cpu.h
rename to cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpuatomic.h b/cpukit/score/cpu/sparc64/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/sparc64/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpuimpl.h b/cpukit/score/cpu/sparc64/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/epiphany/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/sparc64/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/sparc64.h b/cpukit/score/cpu/sparc64/include/rtems/score/sparc64.h
similarity index 100%
rename from cpukit/score/cpu/sparc64/rtems/score/sparc64.h
rename to cpukit/score/cpu/sparc64/include/rtems/score/sparc64.h
diff --git a/cpukit/score/cpu/sparc64/rtems/score/types.h b/cpukit/score/cpu/sparc64/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/sparc64/rtems/score/types.h
rename to cpukit/score/cpu/sparc64/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sparc64/preinstall.am b/cpukit/score/cpu/sparc64/preinstall.am
deleted file mode 100644
index 8565c8a..0000000
--- a/cpukit/score/cpu/sparc64/preinstall.am
+++ /dev/null
@@ -1,49 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/sparc64.h: rtems/score/sparc64.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sparc64.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sparc64.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/cpu/v850/Makefile.am b/cpukit/score/cpu/v850/Makefile.am
index 7200f2a..1586780 100644
--- a/cpukit/score/cpu/v850/Makefile.am
+++ b/cpukit/score/cpu/v850/Makefile.am
@@ -1,15 +1,5 @@
include $(top_srcdir)/automake/compile.am
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = rtems/asm.h
-
-include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h
-include_rtems_score_HEADERS += rtems/score/cpuimpl.h
-include_rtems_score_HEADERS += rtems/score/v850.h
-include_rtems_score_HEADERS += rtems/score/cpu_asm.h rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpuatomic.h
-
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c
libscorecpu_a_SOURCES += cpu_asm.S
@@ -17,5 +7,5 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c
libscorecpu_a_SOURCES += v850-exception-frame-print.c
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am
diff --git a/cpukit/score/cpu/v850/headers.am b/cpukit/score/cpu/v850/headers.am
new file mode 100644
index 0000000..ea94e64
--- /dev/null
+++ b/cpukit/score/cpu/v850/headers.am
@@ -0,0 +1,18 @@
+## This file was generated by "./boostrap -H".
+
+include_machinedir = $(includedir)/machine
+include_machine_HEADERS =
+include_machine_HEADERS += include/machine/elf_machdep.h
+
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS =
+include_rtems_HEADERS += include/rtems/asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += include/rtems/score/cpu.h
+include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
+include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
+include_rtems_score_HEADERS += include/rtems/score/types.h
+include_rtems_score_HEADERS += include/rtems/score/v850.h
diff --git a/cpukit/libdl/include/arch/v850/machine/elf_machdep.h b/cpukit/score/cpu/v850/include/machine/elf_machdep.h
similarity index 100%
rename from cpukit/libdl/include/arch/v850/machine/elf_machdep.h
rename to cpukit/score/cpu/v850/include/machine/elf_machdep.h
diff --git a/cpukit/score/cpu/v850/rtems/asm.h b/cpukit/score/cpu/v850/include/rtems/asm.h
similarity index 100%
rename from cpukit/score/cpu/v850/rtems/asm.h
rename to cpukit/score/cpu/v850/include/rtems/asm.h
diff --git a/cpukit/score/cpu/v850/rtems/score/cpu.h b/cpukit/score/cpu/v850/include/rtems/score/cpu.h
similarity index 100%
rename from cpukit/score/cpu/v850/rtems/score/cpu.h
rename to cpukit/score/cpu/v850/include/rtems/score/cpu.h
diff --git a/cpukit/score/cpu/v850/rtems/score/cpu_asm.h b/cpukit/score/cpu/v850/include/rtems/score/cpu_asm.h
similarity index 100%
rename from cpukit/score/cpu/v850/rtems/score/cpu_asm.h
rename to cpukit/score/cpu/v850/include/rtems/score/cpu_asm.h
diff --git a/cpukit/score/cpu/arm/rtems/score/cpuatomic.h b/cpukit/score/cpu/v850/include/rtems/score/cpuatomic.h
similarity index 100%
rename from cpukit/score/cpu/arm/rtems/score/cpuatomic.h
rename to cpukit/score/cpu/v850/include/rtems/score/cpuatomic.h
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpuimpl.h b/cpukit/score/cpu/v850/include/rtems/score/cpuimpl.h
similarity index 100%
rename from cpukit/score/cpu/bfin/rtems/score/cpuimpl.h
rename to cpukit/score/cpu/v850/include/rtems/score/cpuimpl.h
diff --git a/cpukit/score/cpu/v850/rtems/score/types.h b/cpukit/score/cpu/v850/include/rtems/score/types.h
similarity index 100%
rename from cpukit/score/cpu/v850/rtems/score/types.h
rename to cpukit/score/cpu/v850/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/v850/rtems/score/v850.h b/cpukit/score/cpu/v850/include/rtems/score/v850.h
similarity index 100%
rename from cpukit/score/cpu/v850/rtems/score/v850.h
rename to cpukit/score/cpu/v850/include/rtems/score/v850.h
diff --git a/cpukit/score/cpu/v850/preinstall.am b/cpukit/score/cpu/v850/preinstall.am
deleted file mode 100644
index 5acf6a3..0000000
--- a/cpukit/score/cpu/v850/preinstall.am
+++ /dev/null
@@ -1,53 +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_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/asm.h: rtems/asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuimpl.h: rtems/score/cpuimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/v850.h: rtems/score/v850.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/v850.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/v850.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
-
-$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuatomic.h: rtems/score/cpuatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuatomic.h
-
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
deleted file mode 100644
index 3d70ec3..0000000
--- a/cpukit/score/preinstall.am
+++ /dev/null
@@ -1,472 +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_INCLUDE)/sys/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/sys
- @: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp)
-
-$(PROJECT_INCLUDE)/sys/_ffcounter.h: include/sys/_ffcounter.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_ffcounter.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/_ffcounter.h
-
-$(PROJECT_INCLUDE)/sys/timeffc.h: include/sys/timeffc.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/timeffc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/timeffc.h
-
-$(PROJECT_INCLUDE)/sys/timepps.h: include/sys/timepps.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/timepps.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/timepps.h
-
-$(PROJECT_INCLUDE)/sys/timetc.h: include/sys/timetc.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/timetc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/timetc.h
-
-$(PROJECT_INCLUDE)/sys/timex.h: include/sys/timex.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/timex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/timex.h
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/linkersets.h: include/rtems/linkersets.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/linkersets.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/linkersets.h
-
-$(PROJECT_INCLUDE)/rtems/sysinit.h: include/rtems/sysinit.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sysinit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sysinit.h
-
-$(PROJECT_INCLUDE)/rtems/system.h: include/rtems/system.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/system.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/system.h
-
-$(PROJECT_INCLUDE)/rtems/seterr.h: include/rtems/seterr.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/seterr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/seterr.h
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/address.h: include/rtems/score/address.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/address.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/address.h
-
-$(PROJECT_INCLUDE)/rtems/score/apimutex.h: include/rtems/score/apimutex.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/apimutex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/apimutex.h
-
-$(PROJECT_INCLUDE)/rtems/score/assert.h: include/rtems/score/assert.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/assert.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/assert.h
-
-$(PROJECT_INCLUDE)/rtems/score/atomic.h: include/rtems/score/atomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/atomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/atomic.h
-
-$(PROJECT_INCLUDE)/rtems/score/chain.h: include/rtems/score/chain.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/chain.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/chain.h
-
-$(PROJECT_INCLUDE)/rtems/score/chainimpl.h: include/rtems/score/chainimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/chainimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/chainimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/context.h: include/rtems/score/context.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/context.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/context.h
-
-$(PROJECT_INCLUDE)/rtems/score/copyrt.h: include/rtems/score/copyrt.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/copyrt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/copyrt.h
-
-$(PROJECT_INCLUDE)/rtems/score/corebarrier.h: include/rtems/score/corebarrier.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corebarrier.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corebarrier.h
-
-$(PROJECT_INCLUDE)/rtems/score/corebarrierimpl.h: include/rtems/score/corebarrierimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corebarrierimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corebarrierimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/coremsg.h: include/rtems/score/coremsg.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coremsg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coremsg.h
-
-$(PROJECT_INCLUDE)/rtems/score/coremsgimpl.h: include/rtems/score/coremsgimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coremsgimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coremsgimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/coremutex.h: include/rtems/score/coremutex.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coremutex.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coremutex.h
-
-$(PROJECT_INCLUDE)/rtems/score/coremuteximpl.h: include/rtems/score/coremuteximpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coremuteximpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coremuteximpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/corerwlockimpl.h: include/rtems/score/corerwlockimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corerwlockimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corerwlockimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/coresem.h: include/rtems/score/coresem.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coresem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coresem.h
-
-$(PROJECT_INCLUDE)/rtems/score/coresemimpl.h: include/rtems/score/coresemimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coresemimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coresemimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h: include/rtems/score/cpustdatomic.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpustdatomic.h
-
-$(PROJECT_INCLUDE)/rtems/score/heap.h: include/rtems/score/heap.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/heap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/heap.h
-
-$(PROJECT_INCLUDE)/rtems/score/heapimpl.h: include/rtems/score/heapimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/heapimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/heapimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/protectedheap.h: include/rtems/score/protectedheap.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/protectedheap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/protectedheap.h
-
-$(PROJECT_INCLUDE)/rtems/score/interr.h: include/rtems/score/interr.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/interr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/interr.h
-
-$(PROJECT_INCLUDE)/rtems/score/io.h: include/rtems/score/io.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/io.h
-
-$(PROJECT_INCLUDE)/rtems/score/isr.h: include/rtems/score/isr.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isr.h
-
-$(PROJECT_INCLUDE)/rtems/score/isrlevel.h: include/rtems/score/isrlevel.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isrlevel.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isrlevel.h
-
-$(PROJECT_INCLUDE)/rtems/score/isrlock.h: include/rtems/score/isrlock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isrlock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isrlock.h
-
-$(PROJECT_INCLUDE)/rtems/score/freechain.h: include/rtems/score/freechain.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/freechain.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/freechain.h
-
-$(PROJECT_INCLUDE)/rtems/score/mrsp.h: include/rtems/score/mrsp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mrsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mrsp.h
-
-$(PROJECT_INCLUDE)/rtems/score/mrspimpl.h: include/rtems/score/mrspimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mrspimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mrspimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/muteximpl.h: include/rtems/score/muteximpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/muteximpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/muteximpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/object.h: include/rtems/score/object.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.h
-
-$(PROJECT_INCLUDE)/rtems/score/objectimpl.h: include/rtems/score/objectimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/objectimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/objectimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/onceimpl.h: include/rtems/score/onceimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/onceimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/onceimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/percpu.h: include/rtems/score/percpu.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/percpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/percpu.h
-
-$(PROJECT_INCLUDE)/rtems/score/priority.h: include/rtems/score/priority.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/priority.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/priority.h
-
-$(PROJECT_INCLUDE)/rtems/score/priorityimpl.h: include/rtems/score/priorityimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/priorityimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/priorityimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h: include/rtems/score/prioritybitmap.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmap.h
-
-$(PROJECT_INCLUDE)/rtems/score/prioritybitmapimpl.h: include/rtems/score/prioritybitmapimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/prioritybitmapimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/prioritybitmapimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/profiling.h: include/rtems/score/profiling.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/profiling.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/profiling.h
-
-$(PROJECT_INCLUDE)/rtems/score/processormask.h: include/rtems/score/processormask.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/processormask.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/processormask.h
-
-$(PROJECT_INCLUDE)/rtems/score/rbtree.h: include/rtems/score/rbtree.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/rbtree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/rbtree.h
-
-$(PROJECT_INCLUDE)/rtems/score/rbtreeimpl.h: include/rtems/score/rbtreeimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/rbtreeimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/rbtreeimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/scheduler.h: include/rtems/score/scheduler.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/scheduler.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/scheduler.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulerimpl.h: include/rtems/score/schedulerimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulercbs.h: include/rtems/score/schedulercbs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulercbs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulercbs.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulercbsimpl.h: include/rtems/score/schedulercbsimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulercbsimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulercbsimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/scheduleredf.h: include/rtems/score/scheduleredf.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/scheduleredf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/scheduleredf.h
-
-$(PROJECT_INCLUDE)/rtems/score/scheduleredfimpl.h: include/rtems/score/scheduleredfimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/scheduleredfimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/scheduleredfimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulernode.h: include/rtems/score/schedulernode.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulernode.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulernode.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulernodeimpl.h: include/rtems/score/schedulernodeimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulernodeimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulernodeimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulerpriority.h: include/rtems/score/schedulerpriority.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerpriority.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulerpriorityimpl.h: include/rtems/score/schedulerpriorityimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerpriorityimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerpriorityimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulerprioritysmp.h: include/rtems/score/schedulerprioritysmp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerprioritysmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerprioritysmp.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulersimple.h: include/rtems/score/schedulersimple.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimple.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulersimpleimpl.h: include/rtems/score/schedulersimpleimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimpleimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimpleimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulersmp.h: include/rtems/score/schedulersmp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersmp.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulersmpimpl.h: include/rtems/score/schedulersmpimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersmpimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersmpimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/semaphoreimpl.h: include/rtems/score/semaphoreimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/semaphoreimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/semaphoreimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/smp.h: include/rtems/score/smp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smp.h
-
-$(PROJECT_INCLUDE)/rtems/score/smpbarrier.h: include/rtems/score/smpbarrier.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smpbarrier.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smpbarrier.h
-
-$(PROJECT_INCLUDE)/rtems/score/smplock.h: include/rtems/score/smplock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplock.h
-
-$(PROJECT_INCLUDE)/rtems/score/smplockseq.h: include/rtems/score/smplockseq.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplockseq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplockseq.h
-
-$(PROJECT_INCLUDE)/rtems/score/smpimpl.h: include/rtems/score/smpimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smpimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smpimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/stack.h: include/rtems/score/stack.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/stack.h
-
-$(PROJECT_INCLUDE)/rtems/score/stackimpl.h: include/rtems/score/stackimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/stackimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/stackimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/states.h: include/rtems/score/states.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.h
-
-$(PROJECT_INCLUDE)/rtems/score/statesimpl.h: include/rtems/score/statesimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/statesimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/statesimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/status.h: include/rtems/score/status.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/status.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/status.h
-
-$(PROJECT_INCLUDE)/rtems/score/sysstate.h: include/rtems/score/sysstate.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sysstate.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sysstate.h
-
-$(PROJECT_INCLUDE)/rtems/score/thread.h: include/rtems/score/thread.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/thread.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/thread.h
-
-$(PROJECT_INCLUDE)/rtems/score/threadimpl.h: include/rtems/score/threadimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/threaddispatch.h: include/rtems/score/threaddispatch.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threaddispatch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threaddispatch.h
-
-$(PROJECT_INCLUDE)/rtems/score/threadq.h: include/rtems/score/threadq.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadq.h
-
-$(PROJECT_INCLUDE)/rtems/score/threadqimpl.h: include/rtems/score/threadqimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadqimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadqimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/timespec.h: include/rtems/score/timespec.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/timespec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/timespec.h
-
-$(PROJECT_INCLUDE)/rtems/score/timestamp.h: include/rtems/score/timestamp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/timestamp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/timestamp.h
-
-$(PROJECT_INCLUDE)/rtems/score/timecounter.h: include/rtems/score/timecounter.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/timecounter.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/timecounter.h
-
-$(PROJECT_INCLUDE)/rtems/score/timecounterimpl.h: include/rtems/score/timecounterimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/timecounterimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/timecounterimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/tls.h: include/rtems/score/tls.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/tls.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/tls.h
-
-$(PROJECT_INCLUDE)/rtems/score/tod.h: include/rtems/score/tod.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/tod.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/tod.h
-
-$(PROJECT_INCLUDE)/rtems/score/todimpl.h: include/rtems/score/todimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/todimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/todimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/userext.h: include/rtems/score/userext.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/userext.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/userext.h
-
-$(PROJECT_INCLUDE)/rtems/score/userextimpl.h: include/rtems/score/userextimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/userextimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/userextimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/watchdog.h: include/rtems/score/watchdog.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/watchdog.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/watchdog.h
-
-$(PROJECT_INCLUDE)/rtems/score/watchdogimpl.h: include/rtems/score/watchdogimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/watchdogimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/watchdogimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/wkspace.h: include/rtems/score/wkspace.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/wkspace.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/wkspace.h
-
-$(PROJECT_INCLUDE)/rtems/score/cpuopts.h: include/rtems/score/cpuopts.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuopts.h
-
-$(PROJECT_INCLUDE)/rtems/score/basedefs.h: include/rtems/score/basedefs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/basedefs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/basedefs.h
-
-if HAS_MP
-$(PROJECT_INCLUDE)/rtems/score/mpci.h: include/rtems/score/mpci.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mpci.h
-
-$(PROJECT_INCLUDE)/rtems/score/mpciimpl.h: include/rtems/score/mpciimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mpciimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mpciimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/mppkt.h: include/rtems/score/mppkt.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mppkt.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mppkt.h
-
-$(PROJECT_INCLUDE)/rtems/score/objectmp.h: include/rtems/score/objectmp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/objectmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/objectmp.h
-
-$(PROJECT_INCLUDE)/rtems/score/threadmp.h: include/rtems/score/threadmp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadmp.h
-endif
-if HAS_SMP
-$(PROJECT_INCLUDE)/rtems/score/scheduleredfsmp.h: include/rtems/score/scheduleredfsmp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/scheduleredfsmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/scheduleredfsmp.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulerprioritysmpimpl.h: include/rtems/score/schedulerprioritysmpimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerprioritysmpimpl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerprioritysmpimpl.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulerpriorityaffinitysmp.h: include/rtems/score/schedulerpriorityaffinitysmp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerpriorityaffinitysmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerpriorityaffinitysmp.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulersimplesmp.h: include/rtems/score/schedulersimplesmp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulersimplesmp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulersimplesmp.h
-
-$(PROJECT_INCLUDE)/rtems/score/schedulerstrongapa.h: include/rtems/score/schedulerstrongapa.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/schedulerstrongapa.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/schedulerstrongapa.h
-
-$(PROJECT_INCLUDE)/rtems/score/smplockmcs.h: include/rtems/score/smplockmcs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplockmcs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplockmcs.h
-
-$(PROJECT_INCLUDE)/rtems/score/smplockstats.h: include/rtems/score/smplockstats.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplockstats.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplockstats.h
-
-$(PROJECT_INCLUDE)/rtems/score/smplockticket.h: include/rtems/score/smplockticket.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplockticket.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplockticket.h
-endif
diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am
index d114ba4..e2ae6a9 100644
--- a/cpukit/telnetd/Makefile.am
+++ b/cpukit/telnetd/Makefile.am
@@ -2,10 +2,12 @@ include $(top_srcdir)/automake/compile.am
if LIBNETWORKING
if LIBSHELL
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = pty.h telnetd.h passwd.h
-
project_lib_LIBRARIES = libtelnetd.a
+
+$(PROJECT_LIB)/libtelnetd.a: libtelnetd.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libtelnetd.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libtelnetd.a
+
libtelnetd_a_SOURCES = check_passwd.c des.c pty.c telnetd.c
libtelnetd_a_CPPFLAGS = $(AM_CPPFLAGS)
endif
@@ -13,5 +15,4 @@ endif
EXTRA_DIST = README
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/telnetd/preinstall.am b/cpukit/telnetd/preinstall.am
deleted file mode 100644
index 9acb287..0000000
--- a/cpukit/telnetd/preinstall.am
+++ /dev/null
@@ -1,49 +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)
-
-if LIBNETWORKING
-if LIBSHELL
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
- @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/pty.h: pty.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/pty.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/pty.h
-
-$(PROJECT_INCLUDE)/rtems/telnetd.h: telnetd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/telnetd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/telnetd.h
-
-$(PROJECT_INCLUDE)/rtems/passwd.h: passwd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/passwd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/passwd.h
-
-$(PROJECT_LIB)/libtelnetd.a: libtelnetd.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/libtelnetd.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libtelnetd.a
-endif
-endif
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 14f0c33..2fdb754 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -5,6 +5,11 @@ include $(top_srcdir)/automake/compile.am
ARCH = o-optimize
project_lib_LIBRARIES = librtemscpu.a
+
+$(PROJECT_LIB)/librtemscpu.a: librtemscpu.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/librtemscpu.a
+
librtemscpu_a_SOURCES =
TMP_LIBS =
@@ -134,5 +139,4 @@ librtemscpu.a: $(TMP_LIBS)
all-local: $(TMPINSTALL_FILES)
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/wrapup/preinstall.am b/cpukit/wrapup/preinstall.am
deleted file mode 100644
index 0c39a9c..0000000
--- a/cpukit/wrapup/preinstall.am
+++ /dev/null
@@ -1,24 +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-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES = $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/librtemscpu.a: librtemscpu.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu.a
-
diff --git a/cpukit/zlib/Makefile.am b/cpukit/zlib/Makefile.am
index 0b38ecd..f5a42cc 100644
--- a/cpukit/zlib/Makefile.am
+++ b/cpukit/zlib/Makefile.am
@@ -2,6 +2,11 @@ include $(top_srcdir)/automake/compile.am
project_lib_LIBRARIES = libz.a
+$(PROJECT_LIB)/libz.a: libz.a
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libz.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libz.a
+
+
libz_a_SOURCES = adler32.c
libz_a_SOURCES += compress.c
libz_a_SOURCES += crc32.c crc32.h
@@ -18,7 +23,4 @@ libz_a_SOURCES += zconf.h
libz_a_SOURCES += zlib.h
libz_a_SOURCES += zutil.c zutil.h
-include_HEADERS = zlib.h
-
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/local.am
diff --git a/cpukit/zlib/preinstall.am b/cpukit/zlib/preinstall.am
deleted file mode 100644
index 799bb7b..0000000
--- a/cpukit/zlib/preinstall.am
+++ /dev/null
@@ -1,38 +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)/libz.a: libz.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/libz.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libz.a
-
-$(PROJECT_INCLUDE)/zlib.h: zlib.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zlib.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/zlib.h
-
diff --git a/testsuites/aclocal/check-cpuopts.m4 b/testsuites/aclocal/check-cpuopts.m4
index 5f5d94c..e399f13 100644
--- a/testsuites/aclocal/check-cpuopts.m4
+++ b/testsuites/aclocal/check-cpuopts.m4
@@ -2,18 +2,14 @@
# RTEMS_CHECK_CPUOPTS(define)
AC_DEFUN([RTEMS_CHECK_CPUOPTS],
[
+AC_REQUIRE([RTEMS_BUILD_TOP])
sav_CPPFLAGS="$CPPFLAGS"
-AS_IF([test "${enable_cpukit_root+set}" = set],[
- CPPFLAGS="$CPPFLAGS -I$cpukit_rootdir/lib/include"
-])
-AS_IF([test "${enable_project_root+set}" = set],[
- CPPFLAGS="$CPPFLAGS -I$project_rootdir/lib/include"
-])
+CPPFLAGS="$CPPFLAGS -I${RTEMS_BUILD_ROOT}/include"
AC_CACHE_CHECK(
[for $1],
[rtems_cv_$1],
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <rtems/system.h>
+#include <rtems/score/cpuopts.h>
#ifndef $1
choke me
#endif
diff --git a/testsuites/aclocal/prog-cc.m4 b/testsuites/aclocal/prog-cc.m4
index c57008b..748c76b 100644
--- a/testsuites/aclocal/prog-cc.m4
+++ b/testsuites/aclocal/prog-cc.m4
@@ -25,10 +25,11 @@ dnl check target cc
RTEMS_PROG_CC
AS_IF([test x"$GCC" = xyes],[
-AS_IF([test "${enable_cpukit_root+set}"],[
- GCCSPECS="-B\$(CPUKIT_ROOT)/lib/"])
-AS_IF([test "${enable_project_root+set}"],[
- GCCSPECS="$GCCSPECS -B\$(PROJECT_ROOT)/lib/"])
+GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/startup/"
GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
AC_SUBST(GCCSPECS)
+
+RTEMS_INCLUDES
+RTEMS_BSP_INCLUDES
+RTEMS_BSP_LINKCMDS
])
diff --git a/testsuites/aclocal/rtems-bsp-includes.m4 b/testsuites/aclocal/rtems-bsp-includes.m4
new file mode 100644
index 0000000..2248211
--- /dev/null
+++ b/testsuites/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/testsuites/aclocal/rtems-bsp-linkcmds.m4 b/testsuites/aclocal/rtems-bsp-linkcmds.m4
new file mode 100644
index 0000000..a4137e1
--- /dev/null
+++ b/testsuites/aclocal/rtems-bsp-linkcmds.m4
@@ -0,0 +1,25 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+dnl This is messy because the linkcmds have no clear and defined structure.
+dnl There are BSP named linkcmds files, plain linkcmds file, configure template
+dnl .in files configure changes and shared versions of these. The approach to have
+dnl a single file for a number of BSPs in a family is sound, the lack of rules
+dnl means we have a range of variants and this results in following code.
+dnl
+dnl The preinstall hid a number of questionable things and preinstall has gone.
+dnl
+AC_DEFUN([RTEMS_BSP_LINKCMDS],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+
+AC_MSG_CHECKING([BSP linkcmds])
+
+RTEMS_BSP_ARCH_PATH="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}"
+RTEMS_BSP_ARCH_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/shared/startup"
+RTEMS_BSP_LIBBSP_PATH="${RTEMS_BUILD_ROOT}/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}"
+
+AC_SUBST(RTEMS_BSP_ARCH_LINKCMDS_PATH)
+AC_SUBST(RTEMS_BSP_LIBBSP_PATH)
+])
diff --git a/testsuites/aclocal/rtems-build-top.m4 b/testsuites/aclocal/rtems-build-top.m4
new file mode 100644
index 0000000..5708119
--- /dev/null
+++ b/testsuites/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/testsuites/aclocal/rtems-includes.m4 b/testsuites/aclocal/rtems-includes.m4
new file mode 100644
index 0000000..ca4ebed
--- /dev/null
+++ b/testsuites/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/testsuites/aclocal/rtems-source-top.m4 b/testsuites/aclocal/rtems-source-top.m4
new file mode 100644
index 0000000..d1460ae
--- /dev/null
+++ b/testsuites/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/testsuites/ada/ada.am b/testsuites/ada/ada.am
index 17084fb..33d0c3a 100644
--- a/testsuites/ada/ada.am
+++ b/testsuites/ada/ada.am
@@ -2,18 +2,14 @@ SUFFIXES = .adb .ali .ads .adp
GNATMAKE = @GNATMAKE@
-AM_ADAFLAGS = -I$(PROJECT_ROOT)/lib/include/adainclude \
--I$(PROJECT_ROOT)/@RTEMS_BSP@/lib/include/adainclude \
+AM_ADAFLAGS = -I$(RTEMS_SOURCE_ROOT)/cpukit/include/adainclude \
-I$(top_srcdir)/support
GNATCOMPILE = $(GNATMAKE) \
-bargs -Mgnat_main \
-margs $(AM_ADAFLAGS) $(ADAFLAGS) \
-cargs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
- $(GCCSPECS) \
--largs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
- $(GCCSPECS) \
-$(AM_LDFLAGS) $(LDFLAGS) init.o
+-largs $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) init.o
CLEANFILES += *.ali *.o b~*.adb b~*.ads
diff --git a/testsuites/ada/configure.ac b/testsuites/ada/configure.ac
index a929384..4ec8532 100644
--- a/testsuites/ada/configure.ac
+++ b/testsuites/ada/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-ada-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([support])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/ada/samples/base_mp/node1/Makefile.am b/testsuites/ada/samples/base_mp/node1/Makefile.am
index c6ec8cd..f9e45cf 100644
--- a/testsuites/ada/samples/base_mp/node1/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node1/Makefile.am
@@ -14,7 +14,7 @@ ada_base_mp_node1$(EXEEXT): ../mptest.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
init.o: ../../../support/init.c
- $(COMPILE.c) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $<
+ $(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $<
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = ada_base_mp-node1.scn
diff --git a/testsuites/ada/samples/base_mp/node2/Makefile.am b/testsuites/ada/samples/base_mp/node2/Makefile.am
index 9095902..6567b95 100644
--- a/testsuites/ada/samples/base_mp/node2/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node2/Makefile.am
@@ -14,7 +14,7 @@ ada_base_mp_node2$(EXEEXT): ../mptest.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
init.o: ../../../support/init.c
- $(COMPILE.c) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $<
+ $(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $<
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = ada_base_mp-node2.scn
diff --git a/testsuites/ada/samples/base_sp/Makefile.am b/testsuites/ada/samples/base_sp/Makefile.am
index c6b2628..97ed434 100644
--- a/testsuites/ada/samples/base_sp/Makefile.am
+++ b/testsuites/ada/samples/base_sp/Makefile.am
@@ -7,7 +7,7 @@ ada_base_sp$(EXEEXT): base_sp.adb init.$(OBJEXT)
$(GNATCOMPILE) -margs -a $< -o $@
init.$(OBJEXT): ../../support/init.c
- $(COMPILE.c) -I$(srcdir) -c $<
+ $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
noinst_PROGRAMS = ada_base_sp
diff --git a/testsuites/ada/samples/hello/Makefile.am b/testsuites/ada/samples/hello/Makefile.am
index 9a6aa5e..ccf8ccf 100644
--- a/testsuites/ada/samples/hello/Makefile.am
+++ b/testsuites/ada/samples/hello/Makefile.am
@@ -7,7 +7,7 @@ ada_hello$(EXEEXT): hello.adb init.$(OBJEXT)
$(GNATCOMPILE) -margs -a $< -o $@
init.$(OBJEXT): ../../support/init.c
- $(COMPILE.c) -I$(srcdir) -c $<
+ $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
noinst_PROGRAMS = ada_hello
diff --git a/testsuites/ada/samples/nsecs/Makefile.am b/testsuites/ada/samples/nsecs/Makefile.am
index 64a8145..e0b0849 100644
--- a/testsuites/ada/samples/nsecs/Makefile.am
+++ b/testsuites/ada/samples/nsecs/Makefile.am
@@ -7,7 +7,7 @@ ada_nsecs$(EXEEXT): nsecs.adb init.$(OBJEXT)
$(GNATCOMPILE) -margs -a $< -o $@
init.$(OBJEXT): ../../support/init.c
- $(COMPILE.c) -I$(srcdir) -c $<
+ $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
noinst_PROGRAMS = ada_nsecs
diff --git a/testsuites/ada/samples/ticker/Makefile.am b/testsuites/ada/samples/ticker/Makefile.am
index 1259458..de5050e 100644
--- a/testsuites/ada/samples/ticker/Makefile.am
+++ b/testsuites/ada/samples/ticker/Makefile.am
@@ -7,7 +7,7 @@ ada_ticker$(EXEEXT): ticker.adb init.$(OBJEXT)
$(GNATCOMPILE) -margs -a $< -o $@
init.$(OBJEXT): ../../support/init.c
- $(COMPILE.c) -I$(srcdir) -c $<
+ $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
noinst_PROGRAMS = ada_ticker
diff --git a/testsuites/ada/sptests/spname01/Makefile.am b/testsuites/ada/sptests/spname01/Makefile.am
index fccab37..e011a95 100644
--- a/testsuites/ada/sptests/spname01/Makefile.am
+++ b/testsuites/ada/sptests/spname01/Makefile.am
@@ -10,7 +10,7 @@ ada_spname01$(EXEEXT): spname01.adb init.$(OBJEXT)
$(GNATCOMPILE) -margs -a $< -o $@
init.$(OBJEXT): ../../support/init.c
- $(COMPILE.c) -I$(srcdir) -c $<
+ $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
scndir = $(rtems_ada_testsdir)
dist_scn_DATA = ada_spname01.scn
diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am
index ee1f773..3cd08c4 100644
--- a/testsuites/automake/compile.am
+++ b/testsuites/automake/compile.am
@@ -1,6 +1,6 @@
-CC = @CC@ $(GCCSPECS)
-CXX = @CXX@ $(GCCSPECS)
-CPP = @CPP@ $(GCCSPECS)
+CC = @CC@
+CXX = @CXX@
+CPP = @CPP@
LD = @LD@
OBJCOPY = @OBJCOPY@
@@ -9,9 +9,12 @@ SIZE = @SIZE@
STRIP = @STRIP@
##
-AM_CPPFLAGS = $(TEST_FLAGS)
+AM_CPPFLAGS = $(TEST_FLAGS) @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@
AM_CFLAGS = $(TEST_C_FLAGS)
AM_CXXFLAGS = $(TEST_CXX_FLAGS)
-AM_LDFLAGS = $(TEST_LD_FLAGS)
+AM_LDFLAGS = -B$(RTEMS_BSP_LIBBSP_PATH) $(GCCSPECS) \
+ -L$(PROJECT_LIB) \
+ -L$(RTEMS_BSP_ARCH_LINKCMDS_PATH) \
+ $(TEST_LD_FLAGS)
CLEANFILES = *.num *.nxe *.elf *.srec* *.bin *.bt *.ralf
diff --git a/testsuites/automake/host.am b/testsuites/automake/host.am
index c25c052..2f0bead 100644
--- a/testsuites/automake/host.am
+++ b/testsuites/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/testsuites/automake/local.am b/testsuites/automake/local.am
index 3129902..b87fd89 100644
--- a/testsuites/automake/local.am
+++ b/testsuites/automake/local.am
@@ -1,6 +1,5 @@
-preinstall:
-.PHONY: preinstall
-
PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
TEST_LD_FLAGS = -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar
+
+all-local: $(TMPINSTALL_FILES)
diff --git a/testsuites/benchmarks/configure.ac b/testsuites/benchmarks/configure.ac
index f28fc79..a9dbefc 100644
--- a/testsuites/benchmarks/configure.ac
+++ b/testsuites/benchmarks/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-tests-benchmarks],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/configure.ac b/testsuites/configure.ac
index ae01a97..a01bc43 100644
--- a/testsuites/configure.ac
+++ b/testsuites/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([PROBLEMS])
RTEMS_TOP([..],[])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/fstests/configure.ac b/testsuites/fstests/configure.ac
index 37a92bb..9b4a299 100644
--- a/testsuites/fstests/configure.ac
+++ b/testsuites/fstests/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-fstests],
[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([imfs_support])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/libtests/POSIX/Makefile.am b/testsuites/libtests/POSIX/Makefile.am
index 1f80651..689fd39 100644
--- a/testsuites/libtests/POSIX/Makefile.am
+++ b/testsuites/libtests/POSIX/Makefile.am
@@ -1,4 +1,4 @@
-CC = @CC@ $(GCCSPECS)
+CC = @CC@
check_PROGRAMS =
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index 16cc095..dc4602c 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-libtests],[_RTEMS_VERSION],[https://devel.rtems.org/n
AC_CONFIG_SRCDIR([cpuuse])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/libtests/ftp01/Makefile.am b/testsuites/libtests/ftp01/Makefile.am
index a3b8f3e..4a0fd4e 100644
--- a/testsuites/libtests/ftp01/Makefile.am
+++ b/testsuites/libtests/ftp01/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/termios04
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(ftp01_OBJECTS) $(ftp01_LDADD)
LINK_LIBS = $(ftp01_LDLIBS)
diff --git a/testsuites/libtests/mghttpd01/Makefile.am b/testsuites/libtests/mghttpd01/Makefile.am
index 909a646..d3c89d8 100644
--- a/testsuites/libtests/mghttpd01/Makefile.am
+++ b/testsuites/libtests/mghttpd01/Makefile.am
@@ -12,6 +12,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(mghttpd01_OBJECTS) $(mghttpd01_LDADD)
LINK_LIBS = $(mghttpd01_LDLIBS)
diff --git a/testsuites/libtests/networking01/Makefile.am b/testsuites/libtests/networking01/Makefile.am
index 0f1fb70..3bc93ce 100644
--- a/testsuites/libtests/networking01/Makefile.am
+++ b/testsuites/libtests/networking01/Makefile.am
@@ -10,7 +10,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/termios04
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(networking01_OBJECTS)
LINK_LIBS = $(networking01_LDLIBS)
diff --git a/testsuites/libtests/syscall01/Makefile.am b/testsuites/libtests/syscall01/Makefile.am
index 126cd30..6d8038e 100644
--- a/testsuites/libtests/syscall01/Makefile.am
+++ b/testsuites/libtests/syscall01/Makefile.am
@@ -8,6 +8,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(syscall01_OBJECTS)
LINK_LIBS = $(syscall01_LDLIBS)
diff --git a/testsuites/mptests/configure.ac b/testsuites/mptests/configure.ac
index f01cfc1..fca8911 100644
--- a/testsuites/mptests/configure.ac
+++ b/testsuites/mptests/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-mptests],[_RTEMS_VERSION],[https://devel.rtems.org/ne
AC_CONFIG_SRCDIR([mp01])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index 7243bfd..e84d92c 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-psxtests],[_RTEMS_VERSION],[https://devel.rtems.org/n
AC_CONFIG_SRCDIR([psx01])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index b3ab540..becaa2e 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-tests-psxtmtests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([psxtmmutex02])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/rhealstone/configure.ac b/testsuites/rhealstone/configure.ac
index af35f68..9319c28 100644
--- a/testsuites/rhealstone/configure.ac
+++ b/testsuites/rhealstone/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-rhealstone],[_RTEMS_VERSION],[https://devel.rtems.org
AC_CONFIG_SRCDIR([rhtaskswitch])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/samples/configure.ac b/testsuites/samples/configure.ac
index ffe1bad..88e868f 100644
--- a/testsuites/samples/configure.ac
+++ b/testsuites/samples/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-samples],[_RTEMS_VERSION],[https://devel.rtems.org/ne
AC_CONFIG_SRCDIR([hello])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index d0cebb9..51d30c2 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -9,6 +9,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(loopback_OBJECTS)
LINK_LIBS = $(loopback_LDLIBS)
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index 6a989f8..6ef0562 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -10,6 +10,7 @@ include $(top_srcdir)/../automake/leaf.am
pppd_LDLIBS = -lpppd
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(pppd_OBJECTS)
LINK_LIBS = $(pppd_LDLIBS)
diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac
index d72f6e0..78996b2 100644
--- a/testsuites/smptests/configure.ac
+++ b/testsuites/smptests/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-smptests],[_RTEMS_VERSION],[https://devel.rtems.org/n
AC_CONFIG_SRCDIR([smp01])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 6a303b2..2dcdb0c 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-sptests],[_RTEMS_VERSION],[https://devel.rtems.org/ne
AC_CONFIG_SRCDIR([sp01])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/tmtests/configure.ac b/testsuites/tmtests/configure.ac
index b899000..a5d8c3e 100644
--- a/testsuites/tmtests/configure.ac
+++ b/testsuites/tmtests/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-tmtests],[_RTEMS_VERSION],[https://devel.rtems.org/ne
AC_CONFIG_SRCDIR([tm01])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/tools/configure.ac b/testsuites/tools/configure.ac
index 4249701..5f559b8 100644
--- a/testsuites/tools/configure.ac
+++ b/testsuites/tools/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-tests-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([generic])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/tools/generic/configure.ac b/testsuites/tools/generic/configure.ac
index 73f1144..ffde158 100644
--- a/testsuites/tools/generic/configure.ac
+++ b/testsuites/tools/generic/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-tests-tools-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([sorttimes.in])
RTEMS_TOP(../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/tools/build/configure.ac b/tools/build/configure.ac
index d1e22da..10a61ed 100644
--- a/tools/build/configure.ac
+++ b/tools/build/configure.ac
@@ -2,6 +2,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-tools-build],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([install-if-change.in])
RTEMS_TOP(../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
AC_CANONICAL_HOST
diff --git a/tools/cpu/configure.ac b/tools/cpu/configure.ac
index 70d74b6..5808112 100644
--- a/tools/cpu/configure.ac
+++ b/tools/cpu/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-tools-cpu],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([generic])
RTEMS_TOP(../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/tools/cpu/generic/configure.ac b/tools/cpu/generic/configure.ac
index e169be9..c393d30 100644
--- a/tools/cpu/generic/configure.ac
+++ b/tools/cpu/generic/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-tools-cpu-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([size_rtems.in])
RTEMS_TOP(../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/tools/cpu/nios2/configure.ac b/tools/cpu/nios2/configure.ac
index fe39a2c..2088191 100644
--- a/tools/cpu/nios2/configure.ac
+++ b/tools/cpu/nios2/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-tools-cpu-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([nios2gen.c])
RTEMS_TOP(../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/tools/cpu/sh/configure.ac b/tools/cpu/sh/configure.ac
index ddbb466..7b6b118 100644
--- a/tools/cpu/sh/configure.ac
+++ b/tools/cpu/sh/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-tools-cpu-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([shgen.c])
RTEMS_TOP(../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
More information about the vc
mailing list