diff options
author | Chris Johns <chrisj@rtems.org> | 2017-12-23 18:18:56 +1100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-25 08:45:26 +0100 |
commit | 2afb22b7e1ebcbe40373ff7e0efae7d207c655a9 (patch) | |
tree | 44759efe9374f13200a97e96d91bd9a2b7e5ce2a /c/src/lib/libbsp/powerpc | |
parent | MAINTAINERS: Add myself to Write After Approval. (diff) | |
download | rtems-2afb22b7e1ebcbe40373ff7e0efae7d207c655a9.tar.bz2 |
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.
Diffstat (limited to '')
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/beatnik/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/VMEConfig.h (renamed from c/src/lib/libbsp/powerpc/beatnik/vme/VMEConfig.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/bsp_bsdnet_attach.h (renamed from c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_bsdnet_attach.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/early_enet_link_status.h (renamed from c/src/lib/libbsp/powerpc/beatnik/network/support/early_enet_link_status.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/gt_timer.h (renamed from c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/gti2c_busdrv.h (renamed from c/src/lib/libbsp/powerpc/beatnik/marvell/gti2c_busdrv.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/gti2creg.h (renamed from c/src/lib/libbsp/powerpc/beatnik/marvell/gti2creg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/gtintrreg.h (renamed from c/src/lib/libbsp/powerpc/beatnik/marvell/gtintrreg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/gtpcireg.h (renamed from c/src/lib/libbsp/powerpc/beatnik/marvell/gtpcireg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/gtreg.h (renamed from c/src/lib/libbsp/powerpc/beatnik/marvell/gtreg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/if_em_pub.h (renamed from c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_pub.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/if_gfe_pub.h (renamed from c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_pub.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/if_mve_pub.h (renamed from c/src/lib/libbsp/powerpc/beatnik/network/if_mve/if_mve_pub.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/beatnik/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/beatnik/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/beatnik/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/ata.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/ata.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h (renamed from c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/i2c.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/i2c.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/i2cdrv.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/mpc5200.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/mscan-base.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/mscan.h (renamed from c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/nvram.h (renamed from c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/slicetimer.h (renamed from c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/bsp/u-boot-config.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen5200/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/gen5200/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen83xx/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h (renamed from c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen83xx/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/gen83xx/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen83xx/include/bsp/tsec-config.h (renamed from c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen83xx/include/bsp/u-boot-config.h (renamed from c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/gen83xx/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/haleakala/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/haleakala/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/haleakala/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/haleakala/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/haleakala/include/mmu_405.h (renamed from c/src/lib/libbsp/powerpc/haleakala/include/mmu_405.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/haleakala/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/haleakala/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/consoleIo.h (renamed from c/src/lib/libbsp/powerpc/shared/console/consoleIo.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/flashPgm.h (renamed from c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/flashPgmPvt.h (renamed from c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/linker-symbols.h (renamed from c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/motorola.h (renamed from c/src/lib/libbsp/powerpc/shared/motorola/motorola.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/openpic.h (renamed from c/src/lib/libbsp/powerpc/shared/openpic/openpic.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/pci.h (renamed from c/src/lib/libbsp/powerpc/shared/pci/pci.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/pnp.h (renamed from c/src/lib/libbsp/powerpc/shared/residual/pnp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/residual.h (renamed from c/src/lib/libbsp/powerpc/shared/residual/residual.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/start.h (renamed from c/src/lib/libbsp/powerpc/shared/include/start.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/tictac.h (renamed from c/src/lib/libbsp/powerpc/shared/include/tictac.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/u-boot-board-info.h (renamed from c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/uart.h (renamed from c/src/lib/libbsp/powerpc/shared/console/uart.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/bsp/vpd.h (renamed from c/src/lib/libbsp/powerpc/shared/motorola/vpd.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/include/nvram.h (renamed from c/src/lib/libbsp/powerpc/shared/include/nvram.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h (renamed from c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/VMEConfig.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/motorola_powerpc/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/motorola_powerpc/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-esci.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-generic.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-linflex.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/include/smsc9218i.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc8260ads/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc8260ads/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mpc8260ads/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/mpc8260ads/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme3100/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme3100/include/bsp/VMEConfig.h (renamed from c/src/lib/libbsp/powerpc/mvme3100/vme/VMEConfig.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme3100/include/bsp/if_tsec_pub.h (renamed from c/src/lib/libbsp/powerpc/mvme3100/network/if_tsec_pub.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme3100/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/mvme3100/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme3100/include/bsp/mpc8540_i2c_busdrv.h (renamed from c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c_busdrv.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme3100/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/mvme3100/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/GT64260TWSI.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/GT64260/GT64260TWSI.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/GT64260eth.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/GT64260ethreg.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260ethreg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/VMEConfig.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/VPD.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/GT64260/VPD.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/bspException.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/vectors/bspException.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/bspMvme5500.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/GT64260/bspMvme5500.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/gtpcireg.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/pci/gtpcireg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/gtreg.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/GT64260/gtreg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/if_wmreg.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wmreg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/bsp/pcireg.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pcireg.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/mvme5500/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/mvme5500/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/psim/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/psim/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/psim/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/psim/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/psim/include/psim.h (renamed from c/src/lib/libbsp/powerpc/psim/include/psim.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/psim/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/psim/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qemuppc/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qemuppc/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qemuppc/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/qemuppc/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/asm/epapr_hcalls.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/asm/fsl_hcalls.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/asm/fsl_hcalls.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/bsp/intercom.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/intercom.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/bsp/mmu.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/bsp/qoriq.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/bsp/tsec-config.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/bsp/uart-bridge.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h (renamed from c/src/lib/libbsp/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/ss555/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/ss555/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/ss555/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/ss555/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/ss555/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/ss555/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/t32mppc/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/t32mppc/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/t32mppc/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/t32mppc/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/t32mppc/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/tqm8xx/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h (renamed from c/src/lib/libbsp/powerpc/tqm8xx/include/8xx_immap.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/tqm8xx/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/tqm8xx/include/bsp/spi.h (renamed from c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/tqm8xx/include/bsp/tqm.h (renamed from c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/tqm8xx/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/tqm8xx/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/virtex/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/virtex/irq/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/bsp/opbintctrl.h (renamed from c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/virtex/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/xiltemac.h (renamed from c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/xparameters_dflt.h (renamed from c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/virtex4/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/virtex4/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/include/bsp/mmu.h (renamed from c/src/lib/libbsp/powerpc/virtex4/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/virtex4/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/bsp.h (renamed from c/src/lib/libbsp/powerpc/virtex5/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/bsp/irq.h (renamed from c/src/lib/libbsp/powerpc/virtex5/include/irq.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/bsp/mmu.h (renamed from c/src/lib/libbsp/powerpc/virtex5/include/mmu.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/tm27.h (renamed from c/src/lib/libbsp/powerpc/virtex5/include/tm27.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 49 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/preinstall.am | 180 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/beatnik/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 61 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/preinstall.am | 207 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/gen5200/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/Makefile.am | 41 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/preinstall.am | 143 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/gen83xx/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/haleakala/Makefile.am | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/haleakala/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/haleakala/preinstall.am | 79 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/haleakala/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 31 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am | 143 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 42 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am | 183 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/mpc55xxevb/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 20 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am | 79 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/mpc8260ads/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/Makefile.am | 30 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/preinstall.am | 136 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/mvme3100/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 36 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/preinstall.am | 156 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/mvme5500/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/Makefile.am | 19 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/preinstall.am | 95 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/psim/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qemuppc/Makefile.am | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qemuppc/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qemuppc/preinstall.am | 83 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qemuppc/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/qemuppc/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/Makefile.am | 47 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/preinstall.am | 165 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/qoriq/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/Makefile.am | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/preinstall.am | 67 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/ss555/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/t32mppc/Makefile.am | 25 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/t32mppc/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/t32mppc/preinstall.am | 103 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/t32mppc/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/t32mppc/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am | 20 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am | 95 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/tqm8xx/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/tqm8xx/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/Makefile.am | 23 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/configure.ac | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/preinstall.am | 100 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/virtex/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex4/Makefile.am | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex4/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex4/preinstall.am | 71 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/virtex4/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/Makefile.am | 17 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/preinstall.am | 71 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/virtex5/bsp_specs) | 0 |
220 files changed, 147 insertions, 2609 deletions
diff --git a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h b/bsps/powerpc/beatnik/include/bsp.h index e980f1a056..e980f1a056 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h +++ b/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 index 986a01674e..986a01674e 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/vme/VMEConfig.h +++ b/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 index a12e9e2c86..a12e9e2c86 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_bsdnet_attach.h +++ b/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 index 74160a3b84..74160a3b84 100644 --- 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 diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h b/bsps/powerpc/beatnik/include/bsp/gt_timer.h index 4a68971d13..4a68971d13 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gt_timer.h +++ b/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 index b75e16cdf8..b75e16cdf8 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2c_busdrv.h +++ b/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 index 33e566f5bc..33e566f5bc 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gti2creg.h +++ b/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 index bd3f69514e..bd3f69514e 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtintrreg.h +++ b/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 index d01fc702ac..d01fc702ac 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtpcireg.h +++ b/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 index a6c87e2047..a6c87e2047 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/marvell/gtreg.h +++ b/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 index eb970e465b..eb970e465b 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_pub.h +++ b/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 index 8ea849efb1..8ea849efb1 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_pub.h +++ b/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 index 0a84310d72..0a84310d72 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/if_mve_pub.h +++ b/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 index e5f9558ecf..e5f9558ecf 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/irq/irq.h +++ b/bsps/powerpc/beatnik/include/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/beatnik/include/tm27.h b/bsps/powerpc/beatnik/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/include/tm27.h +++ b/bsps/powerpc/beatnik/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/bsps/powerpc/gen5200/include/bsp.h index 40ac1116c5..40ac1116c5 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h +++ b/bsps/powerpc/gen5200/include/bsp.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/ata.h b/bsps/powerpc/gen5200/include/bsp/ata.h index 3d8ccfc49a..3d8ccfc49a 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/ata.h +++ b/bsps/powerpc/gen5200/include/bsp/ata.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h b/bsps/powerpc/gen5200/include/bsp/bestcomm.h index 366465565a..366465565a 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h index f1fa22d1d5..f1fa22d1d5 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_api.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h index 18827b77c7..18827b77c7 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h index 102fc082cb..102fc082cb 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_priv.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_priv.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h index 6b07cbcb2a..6b07cbcb2a 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.capi.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.capi.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h index 1f8b86cded..1f8b86cded 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/dma_image.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h index 9e4b94cd10..9e4b94cd10 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/mgt5200.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/mgt5200.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h index 52d84777ad..52d84777ad 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/mgt5200/sdma.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/mgt5200/sdma.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h index ff2aed1997..ff2aed1997 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/include/ppctypes.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/include/ppctypes.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h index dc529d6a22..dc529d6a22 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_api_mem.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_api_mem.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h index 3712bae3d0..3712bae3d0 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/bestcomm_cntrl.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/bestcomm_cntrl.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h index 7f261d21ee..7f261d21ee 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_bdtable.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_bdtable.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h index be7bb9d7b0..be7bb9d7b0 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/task_api/tasksetup_general.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h b/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h index 2b74adf366..2b74adf366 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/bestcomm_ops.h +++ b/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h b/bsps/powerpc/gen5200/include/bsp/i2c.h index e5d7d472dd..e5d7d472dd 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/i2c.h +++ b/bsps/powerpc/gen5200/include/bsp/i2c.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h b/bsps/powerpc/gen5200/include/bsp/i2cdrv.h index 4b4a1ec141..4b4a1ec141 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/i2cdrv.h +++ b/bsps/powerpc/gen5200/include/bsp/i2cdrv.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/irq.h b/bsps/powerpc/gen5200/include/bsp/irq.h index 5a0b3bd29e..5a0b3bd29e 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/irq.h +++ b/bsps/powerpc/gen5200/include/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h b/bsps/powerpc/gen5200/include/bsp/mpc5200.h index 263e66fb9e..263e66fb9e 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/mpc5200.h +++ b/bsps/powerpc/gen5200/include/bsp/mpc5200.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h b/bsps/powerpc/gen5200/include/bsp/mscan-base.h index a2b8737d8e..a2b8737d8e 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h +++ b/bsps/powerpc/gen5200/include/bsp/mscan-base.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h b/bsps/powerpc/gen5200/include/bsp/mscan.h index 9cb7fd44e7..9cb7fd44e7 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.h +++ b/bsps/powerpc/gen5200/include/bsp/mscan.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h b/bsps/powerpc/gen5200/include/bsp/nvram.h index b05c35986f..b05c35986f 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.h +++ b/bsps/powerpc/gen5200/include/bsp/nvram.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h b/bsps/powerpc/gen5200/include/bsp/slicetimer.h index e089dbc8ad..e089dbc8ad 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.h +++ b/bsps/powerpc/gen5200/include/bsp/slicetimer.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h b/bsps/powerpc/gen5200/include/bsp/u-boot-config.h index 2fee83bce9..2fee83bce9 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/u-boot-config.h +++ b/bsps/powerpc/gen5200/include/bsp/u-boot-config.h diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h b/bsps/powerpc/gen5200/include/tm27.h index ff43cc9ab6..ff43cc9ab6 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h +++ b/bsps/powerpc/gen5200/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h b/bsps/powerpc/gen83xx/include/bsp.h index 59fd20de54..59fd20de54 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h +++ b/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 index c7a5bac9c2..c7a5bac9c2 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h +++ b/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 index dc084ed2a2..dc084ed2a2 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/include/irq.h +++ b/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 index 5ec0ccbad1..5ec0ccbad1 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/include/tsec-config.h +++ b/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 index c2271c965b..c2271c965b 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/include/u-boot-config.h +++ b/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 index 22787473a5..22787473a5 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h +++ b/bsps/powerpc/gen83xx/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h b/bsps/powerpc/haleakala/include/bsp.h index b26e739e60..b26e739e60 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h +++ b/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 index c413ec3172..c413ec3172 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/irq/irq.h +++ b/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 index e11cfa7738..e11cfa7738 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/include/mmu_405.h +++ b/bsps/powerpc/haleakala/include/mmu_405.h diff --git a/c/src/lib/libbsp/powerpc/haleakala/include/tm27.h b/bsps/powerpc/haleakala/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/include/tm27.h +++ b/bsps/powerpc/haleakala/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h b/bsps/powerpc/include/bsp/consoleIo.h index e62c9d143c..e62c9d143c 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/consoleIo.h +++ b/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 index 19f2c4708e..19f2c4708e 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h +++ b/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 index c26b8ed01d..c26b8ed01d 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h +++ b/bsps/powerpc/include/bsp/flashPgmPvt.h diff --git a/c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h b/bsps/powerpc/include/bsp/linker-symbols.h index de7a6c483d..de7a6c483d 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h +++ b/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 index 14360d56d1..14360d56d1 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.h +++ b/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 index df782596b5..df782596b5 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h +++ b/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 index 42dc43875b..42dc43875b 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pci.h +++ b/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 index 203a1a46d3..203a1a46d3 100644 --- a/c/src/lib/libbsp/powerpc/shared/residual/pnp.h +++ b/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 index 1bf1a34e20..1bf1a34e20 100644 --- a/c/src/lib/libbsp/powerpc/shared/residual/residual.h +++ b/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 index ab718a87ee..ab718a87ee 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/start.h +++ b/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 index 31c7386943..31c7386943 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/tictac.h +++ b/bsps/powerpc/include/bsp/tictac.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 index b377705687..b377705687 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/u-boot-board-info.h +++ b/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 index b7539b5b7b..b7539b5b7b 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/uart.h +++ b/bsps/powerpc/include/bsp/uart.h diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h b/bsps/powerpc/include/bsp/vpd.h index 23e49ac9f0..23e49ac9f0 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h +++ b/bsps/powerpc/include/bsp/vpd.h diff --git a/c/src/lib/libbsp/powerpc/shared/include/nvram.h b/bsps/powerpc/include/nvram.h index f579544336..f579544336 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/nvram.h +++ b/bsps/powerpc/include/nvram.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/bsps/powerpc/motorola_powerpc/include/bsp.h index 675796becf..675796becf 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h +++ b/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 index 9b355819f1..9b355819f1 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/VMEConfig.h +++ b/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 index 2d575d8122..2d575d8122 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp/irq.h +++ b/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 index 81eb55a54a..81eb55a54a 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/tm27.h +++ b/bsps/powerpc/motorola_powerpc/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h b/bsps/powerpc/mpc55xxevb/include/bsp.h index eee5d208c1..eee5d208c1 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h +++ b/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 index 4be6788141..4be6788141 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-esci.h +++ b/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 index c3f7a4628f..c3f7a4628f 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-generic.h +++ b/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 index c70f36d13b..c70f36d13b 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/console-linflex.h +++ b/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 index 4efa92219e..4efa92219e 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp/irq.h +++ b/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 index b432b9cecd..b432b9cecd 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/mpc55xx-config.h +++ b/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 index e4366b039c..e4366b039c 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/smsc9218i.h +++ b/bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h b/bsps/powerpc/mpc55xxevb/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h +++ b/bsps/powerpc/mpc55xxevb/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/bsps/powerpc/mpc8260ads/include/bsp.h index c207a2ec99..c207a2ec99 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h +++ b/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 index 1dd18611fc..1dd18611fc 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h +++ b/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 index b1eafc47aa..b1eafc47aa 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/tm27.h +++ b/bsps/powerpc/mpc8260ads/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/bsps/powerpc/mvme3100/include/bsp.h index 3fbfcb3120..3fbfcb3120 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h +++ b/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 index 10b424c2a8..10b424c2a8 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/vme/VMEConfig.h +++ b/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 index 7eb0358eae..7eb0358eae 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/network/if_tsec_pub.h +++ b/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 index 0158e05149..0158e05149 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq.h +++ b/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 index 181b45f468..181b45f468 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c_busdrv.h +++ b/bsps/powerpc/mvme3100/include/bsp/mpc8540_i2c_busdrv.h diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/tm27.h b/bsps/powerpc/mvme3100/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/include/tm27.h +++ b/bsps/powerpc/mvme3100/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/bsps/powerpc/mvme5500/include/bsp.h index c1b17cee10..c1b17cee10 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h +++ b/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 index 1377e6f607..1377e6f607 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/GT64260TWSI.h +++ b/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 index 2703bb423e..2703bb423e 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.h +++ b/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 index d9081ccb53..d9081ccb53 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260ethreg.h +++ b/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 index ecc5789899..ecc5789899 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/vme/VMEConfig.h +++ b/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 index 33aec8b74c..33aec8b74c 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/VPD.h +++ b/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 index 7cd816e818..7cd816e818 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/vectors/bspException.h +++ b/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 index 9fb53869ff..9fb53869ff 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/bspMvme5500.h +++ b/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 index 74751f6088..74751f6088 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/pci/gtpcireg.h +++ b/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 index e9aaeff844..e9aaeff844 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/GT64260/gtreg.h +++ b/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 index 3e21c62581..3e21c62581 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wmreg.h +++ b/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 index 6704c2f626..6704c2f626 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq.h +++ b/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 index 2b8b10d853..2b8b10d853 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pcireg.h +++ b/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 index 2a80618cfb..2a80618cfb 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/include/tm27.h +++ b/bsps/powerpc/mvme5500/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/bsps/powerpc/psim/include/bsp.h index cffc9632e7..cffc9632e7 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h +++ b/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 index 376c95a627..376c95a627 100644 --- a/c/src/lib/libbsp/powerpc/psim/irq/irq.h +++ b/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 index e7b6fa7578..e7b6fa7578 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/psim.h +++ b/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 index 3a41283a13..3a41283a13 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/tm27.h +++ b/bsps/powerpc/psim/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h b/bsps/powerpc/qemuppc/include/bsp.h index 240cfd3bea..240cfd3bea 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/include/bsp.h +++ b/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 index 7124dbcaf8..7124dbcaf8 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq.h +++ b/bsps/powerpc/qemuppc/include/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/qemuppc/include/tm27.h b/bsps/powerpc/qemuppc/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/include/tm27.h +++ b/bsps/powerpc/qemuppc/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h b/bsps/powerpc/qoriq/include/asm/epapr_hcalls.h index 3d87cca611..3d87cca611 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/asm/epapr_hcalls.h +++ b/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 index ba76c132aa..ba76c132aa 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/asm/fsl_hcalls.h +++ b/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 index d7e9e95b3f..d7e9e95b3f 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h +++ b/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 index 39b2ba938e..39b2ba938e 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/intercom.h +++ b/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 index e178057950..e178057950 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/irq.h +++ b/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 index 4cacb1b375..4cacb1b375 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/mmu.h +++ b/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 index 2d28d0aec7..2d28d0aec7 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/qoriq.h +++ b/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 index b1a70e7486..b1a70e7486 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/tsec-config.h +++ b/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 index 97e6553b7c..97e6553b7c 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/uart-bridge.h +++ b/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 index 46264b7e67..46264b7e67 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/tm27.h +++ b/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 index b4504f3944..b4504f3944 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h +++ b/bsps/powerpc/qoriq/include/uapi/asm/epapr_hcalls.h diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/bsps/powerpc/ss555/include/bsp.h index a82d10a667..a82d10a667 100644 --- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h +++ b/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 index 44e39608b1..44e39608b1 100644 --- a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h +++ b/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 index 5106801744..5106801744 100644 --- a/c/src/lib/libbsp/powerpc/ss555/include/tm27.h +++ b/bsps/powerpc/ss555/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h b/bsps/powerpc/t32mppc/include/bsp.h index c27f235ef6..c27f235ef6 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/include/bsp.h +++ b/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 index 0053aa5ac1..0053aa5ac1 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/include/irq.h +++ b/bsps/powerpc/t32mppc/include/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/t32mppc/include/tm27.h b/bsps/powerpc/t32mppc/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/include/tm27.h +++ b/bsps/powerpc/t32mppc/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h b/bsps/powerpc/tqm8xx/include/bsp.h index 5c8eae81b4..5c8eae81b4 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h +++ b/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 index c1c414e25f..c1c414e25f 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/include/8xx_immap.h +++ b/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 index 2d66829037..2d66829037 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/include/irq.h +++ b/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 index e2af971c8d..e2af971c8d 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/spi/spi.h +++ b/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 index 11f6001304..11f6001304 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/include/tqm.h +++ b/bsps/powerpc/tqm8xx/include/bsp/tqm.h diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/tm27.h b/bsps/powerpc/tqm8xx/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/include/tm27.h +++ b/bsps/powerpc/tqm8xx/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h b/bsps/powerpc/virtex/include/bsp.h index 2f61ee2517..2f61ee2517 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h +++ b/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 index 1ce5b68b98..1ce5b68b98 100644 --- a/c/src/lib/libbsp/powerpc/virtex/irq/irq.h +++ b/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 index 4ade0e48f8..4ade0e48f8 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/opbintctrl.h +++ b/bsps/powerpc/virtex/include/bsp/opbintctrl.h diff --git a/c/src/lib/libbsp/powerpc/virtex/include/tm27.h b/bsps/powerpc/virtex/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/tm27.h +++ b/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 index 185b89bdc1..185b89bdc1 100644 --- a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.h +++ b/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 index b31cb26fe8..b31cb26fe8 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/xparameters_dflt.h +++ b/bsps/powerpc/virtex/include/xparameters_dflt.h diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h b/bsps/powerpc/virtex4/include/bsp.h index 91e7ddf4ab..91e7ddf4ab 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h +++ b/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 index 45ef69adbf..45ef69adbf 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/include/irq.h +++ b/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 index 3e2710b95c..3e2710b95c 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/include/mmu.h +++ b/bsps/powerpc/virtex4/include/bsp/mmu.h diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/tm27.h b/bsps/powerpc/virtex4/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/include/tm27.h +++ b/bsps/powerpc/virtex4/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h b/bsps/powerpc/virtex5/include/bsp.h index ee9f20058d..ee9f20058d 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h +++ b/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 index 066090de7f..066090de7f 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/include/irq.h +++ b/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 index a3fb32b662..a3fb32b662 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/include/mmu.h +++ b/bsps/powerpc/virtex5/include/bsp/mmu.h diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/tm27.h b/bsps/powerpc/virtex5/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/include/tm27.h +++ b/bsps/powerpc/virtex5/include/tm27.h diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am index b28f6d5851..eb482794a4 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 d0eafbf86c..c51965b9a8 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 82c73b03ec..2c6a813fa5 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 aaf5448354..0000000000 --- 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 index 99ca0adb61..99ca0adb61 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/bsp_specs +++ b/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 bf3947cd11..2725b86d1c 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 88e8d5191b..a727020c0a 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am @@ -4,18 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_bestcommdir = $(include_bspdir)/bestcomm -include_bestcomm_includedir = $(include_bestcommdir)/include -include_bestcomm_include_mgt5200dir = $(include_bestcomm_includedir)/mgt5200 -include_bestcomm_task_apidir = $(include_bestcommdir)/task_api +dist_project_lib_DATA = startup/bsp_specs -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -31,14 +21,14 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA += rtems_crti.$(OBJEXT) +project_lib_DATA += linkcmds +dist_project_lib_DATA += startup/linkcmds.brs5l +dist_project_lib_DATA += startup/linkcmds.brs6l +dist_project_lib_DATA += startup/linkcmds.dp2 dist_project_lib_DATA += startup/linkcmds.gen5200_base -project_lib_DATA += startup/linkcmds -EXTRA_DIST += startup/linkcmds.brs5l -EXTRA_DIST += startup/linkcmds.brs6l -EXTRA_DIST += startup/linkcmds.icecube -EXTRA_DIST += startup/linkcmds.pm520_cr825 -EXTRA_DIST += startup/linkcmds.pm520_ze30 -EXTRA_DIST += startup/linkcmds.dp2 +dist_project_lib_DATA += startup/linkcmds.icecube +dist_project_lib_DATA += startup/linkcmds.pm520_cr825 +dist_project_lib_DATA += startup/linkcmds.pm520_ze30 noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -61,19 +51,6 @@ libbsp_a_SOURCES += bestcomm/include/ppctypes.h \ bestcomm/task_api/bestcomm_api_mem.h bestcomm/task_api/bestcomm_cntrl.h \ bestcomm/task_api/tasksetup_bdtable.h \ bestcomm/task_api/tasksetup_general.h -include_bestcomm_HEADERS = bestcomm/bestcomm_priv.h \ - bestcomm/dma_image.h \ - bestcomm/dma_image.capi.h \ - bestcomm/bestcomm_api.h \ - bestcomm/bestcomm_glue.h -include_bestcomm_include_HEADERS = bestcomm/include/ppctypes.h -include_bestcomm_include_mgt5200_HEADERS = bestcomm/include/mgt5200/mgt5200.h \ - bestcomm/include/mgt5200/sdma.h -include_bestcomm_task_api_HEADERS = bestcomm/task_api/tasksetup_general.h \ - bestcomm/task_api/tasksetup_bdtable.h \ - bestcomm/task_api/bestcomm_cntrl.h \ - bestcomm/task_api/bestcomm_api_mem.h - # clock # clock libbsp_a_SOURCES += ../shared/clock/clock.c @@ -87,24 +64,6 @@ libbsp_a_SOURCES += ide/ata.c libbsp_a_SOURCES += ide/ata-instance.c libbsp_a_SOURCES += ide/ata-dma-pio-single.c -include_bsp_HEADERS = -include_bsp_HEADERS += ../../shared/include/bootcard.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/u-boot.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../shared/include/u-boot-board-info.h -include_bsp_HEADERS += include/ata.h -include_bsp_HEADERS += include/bestcomm.h -include_bsp_HEADERS += include/bestcomm_ops.h -include_bsp_HEADERS += include/i2cdrv.h -include_bsp_HEADERS += include/i2c.h -include_bsp_HEADERS += include/irq.h -include_bsp_HEADERS += include/mpc5200.h -include_bsp_HEADERS += include/mscan-base.h -include_bsp_HEADERS += include/u-boot-config.h -include_bsp_HEADERS += mscan/mscan.h - # irq libbsp_a_SOURCES += include/irq.h \ irq/irq.c \ @@ -117,11 +76,9 @@ libbsp_a_SOURCES += include/irq.h \ # mscan libbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h -include_bsp_HEADERS += nvram/nvram.h # nvram libbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h -include_bsp_HEADERS += slicetimer/slicetimer.h # slicetimer libbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h @@ -161,5 +118,5 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/powerpc/gen5200/headers.am diff --git a/c/src/lib/libbsp/powerpc/gen5200/configure.ac b/c/src/lib/libbsp/powerpc/gen5200/configure.ac index 74b7440f44..b5cf38f8de 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen5200/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-powerpc-gen5200],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/brs5l.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -129,7 +132,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_FILES([Makefile]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS RTEMS_PPC_EXCEPTIONS diff --git a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am b/c/src/lib/libbsp/powerpc/gen5200/preinstall.am deleted file mode 100644 index 73c986eacc..0000000000 --- a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am +++ /dev/null @@ -1,207 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm - @: > $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/include - @: > $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200 - @: > $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/bestcomm/task_api - @: > $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds.gen5200_base: startup/linkcmds.gen5200_base $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gen5200_base -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gen5200_base - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h: bestcomm/bestcomm_priv.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_priv.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h: bestcomm/dma_image.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h: bestcomm/dma_image.capi.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/dma_image.capi.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h: bestcomm/bestcomm_api.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_api.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h: bestcomm/bestcomm_glue.h $(PROJECT_INCLUDE)/bsp/bestcomm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/bestcomm_glue.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h: bestcomm/include/ppctypes.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/ppctypes.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h: bestcomm/include/mgt5200/mgt5200.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/mgt5200.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h: bestcomm/include/mgt5200/sdma.h $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/include/mgt5200/sdma.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h: bestcomm/task_api/tasksetup_general.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_general.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h: bestcomm/task_api/tasksetup_bdtable.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/tasksetup_bdtable.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h: bestcomm/task_api/bestcomm_cntrl.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_cntrl.h - -$(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h: bestcomm/task_api/bestcomm_api_mem.h $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm/task_api/bestcomm_api_mem.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h - -$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h - -$(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h - -$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h - -$(PROJECT_INCLUDE)/bsp/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h - -$(PROJECT_INCLUDE)/bsp/ata.h: include/ata.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ata.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ata.h - -$(PROJECT_INCLUDE)/bsp/bestcomm.h: include/bestcomm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm.h - -$(PROJECT_INCLUDE)/bsp/bestcomm_ops.h: include/bestcomm_ops.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bestcomm_ops.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bestcomm_ops.h - -$(PROJECT_INCLUDE)/bsp/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cdrv.h - -$(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h - -$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - -$(PROJECT_INCLUDE)/bsp/mpc5200.h: include/mpc5200.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mpc5200.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mpc5200.h - -$(PROJECT_INCLUDE)/bsp/mscan-base.h: include/mscan-base.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mscan-base.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mscan-base.h - -$(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h - -$(PROJECT_INCLUDE)/bsp/mscan.h: mscan/mscan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mscan.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mscan.h - -$(PROJECT_INCLUDE)/bsp/nvram.h: nvram/nvram.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/nvram.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/nvram.h - -$(PROJECT_INCLUDE)/bsp/slicetimer.h: slicetimer/slicetimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/slicetimer.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/slicetimer.h - diff --git a/c/src/lib/libbsp/powerpc/gen5200/bsp_specs b/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bsp_specs +++ b/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am index d6aaf3c6c4..5f9bad706e 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 7764d2ef9e..fd96450522 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 69ee597190..0000000000 --- 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 index a37ec281c8..a37ec281c8 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/bsp_specs +++ b/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 1a835adaed..24b30661a1 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 63111bc435..c6b116f234 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 81d3386443..0000000000 --- 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 index 5752caaca0..5752caaca0 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/bsp_specs +++ b/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 8196c9d2af..96ec40e15f 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 dd832f07f4..97f4925f0e 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 2670d0df57..8dd21e4d68 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 362a026dd6..0000000000 --- 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/motorola_powerpc/bsp_specs b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bsp_specs index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs +++ b/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 fa8eb58fe8..6cf6acc7e7 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 caa630e609..f32c89e8fb 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 b6238a58c3..0000000000 --- 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/mpc55xxevb/bsp_specs b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bsp_specs index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/bsp_specs +++ b/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 5436770e52..bd84c6c0cc 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 b1f1c27631..96a4af7697 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 7c3f1a39fd..0000000000 --- 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/mpc8260ads/bsp_specs b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bsp_specs index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/bsp_specs +++ b/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 83b63c2374..a9c1cea0f1 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 f19e6c6164..ec58a87c88 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 b9c491762d..0000000000 --- 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 index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/bsp_specs +++ b/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 4b1c464502..4d7e0d4733 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 2e93857cff..5da9add985 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 282acf416a..0000000000 --- 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/mvme5500/bsp_specs b/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/bsp_specs +++ b/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 66150472d6..61f78140c3 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 d97ac6c8c3..11f58874e3 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 dd18989cb3..0000000000 --- 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/psim/bsp_specs b/c/src/lib/libbsp/powerpc/psim/startup/bsp_specs index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/psim/bsp_specs +++ b/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 7be4f11de3..6d887f2d47 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 3209a0073c..0dab820017 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 3867c4eed9..0000000000 --- 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/qemuppc/bsp_specs b/c/src/lib/libbsp/powerpc/qemuppc/startup/bsp_specs index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/qemuppc/bsp_specs +++ b/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 646dbfbc28..6760cece35 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 f0e8af62d7..02fffa7e7a 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 5fe3411548..0000000000 --- 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 index 001c45b3c4..001c45b3c4 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/bsp_specs +++ b/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 a2cd12f4f2..afa059e5a3 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 f586a58bc2..159755d8eb 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 c051571ead..0000000000 --- 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/ss555/bsp_specs b/c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs index 2625609327..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/ss555/bsp_specs +++ b/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 811e244dfb..bb7b7875ad 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 efaf446f73..bb86f6149d 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 0dfb26fa4c..0000000000 --- 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 index f8bbffbdf6..f8bbffbdf6 100644 --- a/c/src/lib/libbsp/powerpc/t32mppc/bsp_specs +++ b/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 5b21dc1b7a..5531021385 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 e94c509ae6..57216624f1 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 5b27200561..0000000000 --- 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 index b5cd6764ce..b5cd6764ce 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/bsp_specs +++ b/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 9b6de34f50..232ec7b190 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 323d9759ed..8c910b5b3a 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 9263f7a4d1..0000000000 --- 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 index 6cb546f392..6cb546f392 100644 --- a/c/src/lib/libbsp/powerpc/virtex/bsp_specs +++ b/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 28411c1fd0..c5a2a32632 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 8546bfc3a9..75e3c3bd15 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 62df611471..0000000000 --- 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/virtex4/bsp_specs b/c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs index ccbea2690c..ccbea2690c 100644 --- a/c/src/lib/libbsp/powerpc/virtex4/bsp_specs +++ b/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 5466edf088..ffc9c7eaea 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 f3a156cb44..0c5481d772 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 62df611471..0000000000 --- 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/virtex5/bsp_specs b/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs index ccbea2690c..ccbea2690c 100644 --- a/c/src/lib/libbsp/powerpc/virtex5/bsp_specs +++ b/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs |