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/sparc | |
| 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/sparc/erc32/include/bsp.h (renamed from c/src/lib/libbsp/sparc/erc32/include/bsp.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/erc32/include/bsp/irq.h (renamed from c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/erc32/include/erc32.h (renamed from c/src/lib/libbsp/sparc/erc32/include/erc32.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/erc32/include/tm27.h (renamed from c/src/lib/libbsp/sparc/erc32/include/tm27.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/ambapp.h (renamed from c/src/lib/libbsp/sparc/shared/include/ambapp.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/ambapp_ids.h (renamed from c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/ahbstat.h (renamed from c/src/lib/libbsp/sparc/shared/include/ahbstat.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/apbuart.h (renamed from c/src/lib/libbsp/sparc/shared/include/apbuart.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/apbuart_cons.h (renamed from c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/apbuart_termios.h (renamed from c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/b1553brm.h (renamed from c/src/lib/libbsp/sparc/shared/include/b1553brm.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/b1553rt.h (renamed from c/src/lib/libbsp/sparc/shared/include/b1553rt.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/canmux.h (renamed from c/src/lib/libbsp/sparc/shared/include/canmux.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/cons.h (renamed from c/src/lib/libbsp/sparc/shared/include/cons.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/debug_defs.h (renamed from c/src/lib/libbsp/sparc/shared/include/debug_defs.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/genirq.h (renamed from c/src/lib/libbsp/sparc/shared/include/genirq.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gnatcommon.h (renamed from c/src/lib/libbsp/sparc/shared/include/gnatcommon.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gpiolib.h (renamed from c/src/lib/libbsp/sparc/shared/include/gpiolib.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gptimer.h (renamed from c/src/lib/libbsp/sparc/shared/include/gptimer.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr1553b.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr1553b.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr1553bc.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr1553bc.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr1553bc_list.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr1553bm.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr1553bm.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr1553rt.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr1553rt.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr_701.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr_701.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr_cpci_gr740.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr_leon4_n2x.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr_rasta_adcdac.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr_rasta_io.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr_rasta_spw_router.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr_rasta_tmtc.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gr_tmtc_1553.h (renamed from c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/gradcdac.h (renamed from c/src/lib/libbsp/sparc/shared/include/gradcdac.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grascs.h (renamed from c/src/lib/libbsp/sparc/shared/include/grascs.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grcan.h (renamed from c/src/lib/libbsp/sparc/shared/include/grcan.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grctm.h (renamed from c/src/lib/libbsp/sparc/shared/include/grctm.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/greth.h (renamed from c/src/lib/libbsp/sparc/shared/include/greth.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grgpio.h (renamed from c/src/lib/libbsp/sparc/shared/include/grgpio.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/griommu.h (renamed from c/src/lib/libbsp/sparc/shared/include/griommu.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grpci.h (renamed from c/src/lib/libbsp/sparc/shared/include/grpci.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grpci2.h (renamed from c/src/lib/libbsp/sparc/shared/include/grpci2.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grpci2dma.h (renamed from c/src/lib/libbsp/sparc/shared/include/grpci2dma.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grpwm.h (renamed from c/src/lib/libbsp/sparc/shared/include/grpwm.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grslink.h (renamed from c/src/lib/libbsp/sparc/shared/include/grslink.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grspw.h (renamed from c/src/lib/libbsp/sparc/shared/include/grspw.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grspw_pkt.h (renamed from c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grspw_router.h (renamed from c/src/lib/libbsp/sparc/shared/include/grspw_router.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grtc.h (renamed from c/src/lib/libbsp/sparc/shared/include/grtc.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/grtm.h (renamed from c/src/lib/libbsp/sparc/shared/include/grtm.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/i2cmst.h (renamed from c/src/lib/libbsp/sparc/shared/include/i2cmst.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/l2c.h (renamed from c/src/lib/libbsp/sparc/shared/include/l2c.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/l4stat.h (renamed from c/src/lib/libbsp/sparc/shared/include/l4stat.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/mctrl.h (renamed from c/src/lib/libbsp/sparc/shared/include/mctrl.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/memscrub.h (renamed from c/src/lib/libbsp/sparc/shared/include/memscrub.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/network_interface_add.h (renamed from c/src/lib/libbsp/sparc/shared/include/network_interface_add.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/occan.h (renamed from c/src/lib/libbsp/sparc/shared/include/occan.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/pcif.h (renamed from c/src/lib/libbsp/sparc/shared/include/pcif.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/satcan.h (renamed from c/src/lib/libbsp/sparc/shared/include/satcan.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/spictrl.h (renamed from c/src/lib/libbsp/sparc/shared/include/spictrl.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/spwcuc.h (renamed from c/src/lib/libbsp/sparc/shared/include/spwcuc.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/bsp/tlib.h (renamed from c/src/lib/libbsp/sparc/shared/include/tlib.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/drvmgr/ambapp_bus.h (renamed from c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/drvmgr/ambapp_bus_grlib.h (renamed from c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/drvmgr/bspcommon.h (renamed from c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/drvmgr/leon2_amba_bus.h (renamed from c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/include/grlib.h (renamed from c/src/lib/libbsp/sparc/shared/include/grlib.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon2/include/bsp.h (renamed from c/src/lib/libbsp/sparc/leon2/include/bsp.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon2/include/bsp/at697_pci.h (renamed from c/src/lib/libbsp/sparc/leon2/include/at697_pci.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon2/include/bsp/irq.h (renamed from c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon2/include/leon.h (renamed from c/src/lib/libbsp/sparc/leon2/include/leon.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon2/include/tm27.h (renamed from c/src/lib/libbsp/sparc/leon2/include/tm27.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon3/include/amba.h (renamed from c/src/lib/libbsp/sparc/leon3/include/amba.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon3/include/bsp.h (renamed from c/src/lib/libbsp/sparc/leon3/include/bsp.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon3/include/bsp/irq.h (renamed from c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon3/include/bsp/watchdog.h (renamed from c/src/lib/libbsp/sparc/leon3/include/watchdog.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon3/include/leon.h (renamed from c/src/lib/libbsp/sparc/leon3/include/leon.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc/leon3/include/tm27.h (renamed from c/src/lib/libbsp/sparc/leon3/include/tm27.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/arch.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/boot.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/cache_spec.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/frame.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/mmu.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/page.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/sun4u/frame.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/sun4u/mmu.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/sun4u/page.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/sun4u/tlb.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/sun4u/tte.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/tlb.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/tte.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/regdef.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/stack.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/sun4u/arch.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/asm.h (renamed from c/src/lib/libbsp/sparc64/shared/include/asm.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/align.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/balloc.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/gentypes.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/main.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/ofw.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/ofw_tree.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/ofwarch.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/register.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/stack.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/boot/types.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/genarch/ofw/ofw_tree.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/kernel/align.h (renamed from c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/include/traptable.h (renamed from c/src/lib/libbsp/sparc64/shared/include/traptable.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/niagara/include/bsp.h (renamed from c/src/lib/libbsp/sparc64/niagara/include/bsp.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/niagara/include/tm27.h (renamed from c/src/lib/libbsp/sparc64/niagara/include/tm27.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/usiii/include/bsp.h (renamed from c/src/lib/libbsp/sparc64/usiii/include/bsp.h) | 0 | ||||
| -rw-r--r-- | bsps/sparc64/usiii/include/tm27.h (renamed from c/src/lib/libbsp/sparc64/usiii/include/tm27.h) | 0 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/configure.ac | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/Makefile.am | 20 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/configure.ac | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/preinstall.am | 87 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startup/bsp_specs (renamed from c/src/lib/libbsp/sparc/erc32/bsp_specs) | 0 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/Makefile.am | 81 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/configure.ac | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/preinstall.am | 314 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/startup/bsp_specs (renamed from c/src/lib/libbsp/sparc/leon2/bsp_specs) | 0 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/Makefile.am | 92 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/configure.ac | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/preinstall.am | 363 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/startup/bsp_specs (renamed from c/src/lib/libbsp/sparc/leon3/bsp_specs) | 0 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/configure.ac | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/niagara/Makefile.am | 24 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/niagara/configure.ac | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/niagara/preinstall.am | 112 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs (renamed from c/src/lib/libbsp/sparc64/niagara/bsp_specs) | 0 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/usiii/Makefile.am | 66 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/usiii/configure.ac | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/usiii/preinstall.am | 218 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs (renamed from c/src/lib/libbsp/sparc64/usiii/bsp_specs) | 0 |
135 files changed, 40 insertions, 1360 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/bsps/sparc/erc32/include/bsp.h index 71719f9cf3..71719f9cf3 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h +++ b/bsps/sparc/erc32/include/bsp.h diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h b/bsps/sparc/erc32/include/bsp/irq.h index 7789c9f57d..7789c9f57d 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/bsp/irq.h +++ b/bsps/sparc/erc32/include/bsp/irq.h diff --git a/c/src/lib/libbsp/sparc/erc32/include/erc32.h b/bsps/sparc/erc32/include/erc32.h index 7db4a6c91b..7db4a6c91b 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/erc32.h +++ b/bsps/sparc/erc32/include/erc32.h diff --git a/c/src/lib/libbsp/sparc/erc32/include/tm27.h b/bsps/sparc/erc32/include/tm27.h index 958036fbf0..958036fbf0 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/tm27.h +++ b/bsps/sparc/erc32/include/tm27.h diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/bsps/sparc/include/ambapp.h index 338602e83d..338602e83d 100644 --- a/c/src/lib/libbsp/sparc/shared/include/ambapp.h +++ b/bsps/sparc/include/ambapp.h diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h b/bsps/sparc/include/ambapp_ids.h index c0c3547e94..c0c3547e94 100644 --- a/c/src/lib/libbsp/sparc/shared/include/ambapp_ids.h +++ b/bsps/sparc/include/ambapp_ids.h diff --git a/c/src/lib/libbsp/sparc/shared/include/ahbstat.h b/bsps/sparc/include/bsp/ahbstat.h index 71e2330f69..71e2330f69 100644 --- a/c/src/lib/libbsp/sparc/shared/include/ahbstat.h +++ b/bsps/sparc/include/bsp/ahbstat.h diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart.h b/bsps/sparc/include/bsp/apbuart.h index a324805d7d..a324805d7d 100644 --- a/c/src/lib/libbsp/sparc/shared/include/apbuart.h +++ b/bsps/sparc/include/bsp/apbuart.h diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h b/bsps/sparc/include/bsp/apbuart_cons.h index d0ac9244af..d0ac9244af 100644 --- a/c/src/lib/libbsp/sparc/shared/include/apbuart_cons.h +++ b/bsps/sparc/include/bsp/apbuart_cons.h diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h b/bsps/sparc/include/bsp/apbuart_termios.h index 40377c1023..40377c1023 100644 --- a/c/src/lib/libbsp/sparc/shared/include/apbuart_termios.h +++ b/bsps/sparc/include/bsp/apbuart_termios.h diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h b/bsps/sparc/include/bsp/b1553brm.h index eba0716f75..eba0716f75 100644 --- a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h +++ b/bsps/sparc/include/bsp/b1553brm.h diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553rt.h b/bsps/sparc/include/bsp/b1553rt.h index fbe4b706de..fbe4b706de 100644 --- a/c/src/lib/libbsp/sparc/shared/include/b1553rt.h +++ b/bsps/sparc/include/bsp/b1553rt.h diff --git a/c/src/lib/libbsp/sparc/shared/include/canmux.h b/bsps/sparc/include/bsp/canmux.h index 02727f44c7..02727f44c7 100644 --- a/c/src/lib/libbsp/sparc/shared/include/canmux.h +++ b/bsps/sparc/include/bsp/canmux.h diff --git a/c/src/lib/libbsp/sparc/shared/include/cons.h b/bsps/sparc/include/bsp/cons.h index c30e41cf14..c30e41cf14 100644 --- a/c/src/lib/libbsp/sparc/shared/include/cons.h +++ b/bsps/sparc/include/bsp/cons.h diff --git a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h b/bsps/sparc/include/bsp/debug_defs.h index 58f7460f52..58f7460f52 100644 --- a/c/src/lib/libbsp/sparc/shared/include/debug_defs.h +++ b/bsps/sparc/include/bsp/debug_defs.h diff --git a/c/src/lib/libbsp/sparc/shared/include/genirq.h b/bsps/sparc/include/bsp/genirq.h index 673be173b1..673be173b1 100644 --- a/c/src/lib/libbsp/sparc/shared/include/genirq.h +++ b/bsps/sparc/include/bsp/genirq.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h b/bsps/sparc/include/bsp/gnatcommon.h index 1a04449293..1a04449293 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gnatcommon.h +++ b/bsps/sparc/include/bsp/gnatcommon.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gpiolib.h b/bsps/sparc/include/bsp/gpiolib.h index f82d4fa2c2..f82d4fa2c2 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gpiolib.h +++ b/bsps/sparc/include/bsp/gpiolib.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gptimer.h b/bsps/sparc/include/bsp/gptimer.h index ee0120d2bd..ee0120d2bd 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gptimer.h +++ b/bsps/sparc/include/bsp/gptimer.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553b.h b/bsps/sparc/include/bsp/gr1553b.h index 006417b530..006417b530 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr1553b.h +++ b/bsps/sparc/include/bsp/gr1553b.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h b/bsps/sparc/include/bsp/gr1553bc.h index ec766d2147..ec766d2147 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h +++ b/bsps/sparc/include/bsp/gr1553bc.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h b/bsps/sparc/include/bsp/gr1553bc_list.h index a89ddf58cf..a89ddf58cf 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h +++ b/bsps/sparc/include/bsp/gr1553bc_list.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bm.h b/bsps/sparc/include/bsp/gr1553bm.h index 058bc59a45..058bc59a45 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr1553bm.h +++ b/bsps/sparc/include/bsp/gr1553bm.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553rt.h b/bsps/sparc/include/bsp/gr1553rt.h index 55237b5dfd..55237b5dfd 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr1553rt.h +++ b/bsps/sparc/include/bsp/gr1553rt.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_701.h b/bsps/sparc/include/bsp/gr_701.h index acfd9237a2..acfd9237a2 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr_701.h +++ b/bsps/sparc/include/bsp/gr_701.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h b/bsps/sparc/include/bsp/gr_cpci_gr740.h index 55c28acb4c..55c28acb4c 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr_cpci_gr740.h +++ b/bsps/sparc/include/bsp/gr_cpci_gr740.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h b/bsps/sparc/include/bsp/gr_leon4_n2x.h index 9a8041202a..9a8041202a 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr_leon4_n2x.h +++ b/bsps/sparc/include/bsp/gr_leon4_n2x.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h b/bsps/sparc/include/bsp/gr_rasta_adcdac.h index 9e16cab96b..9e16cab96b 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_adcdac.h +++ b/bsps/sparc/include/bsp/gr_rasta_adcdac.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h b/bsps/sparc/include/bsp/gr_rasta_io.h index 72a44f5151..72a44f5151 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_io.h +++ b/bsps/sparc/include/bsp/gr_rasta_io.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h b/bsps/sparc/include/bsp/gr_rasta_spw_router.h index 1cc9e41979..1cc9e41979 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h +++ b/bsps/sparc/include/bsp/gr_rasta_spw_router.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h b/bsps/sparc/include/bsp/gr_rasta_tmtc.h index 2b10ce2df3..2b10ce2df3 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_tmtc.h +++ b/bsps/sparc/include/bsp/gr_rasta_tmtc.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h b/bsps/sparc/include/bsp/gr_tmtc_1553.h index b6ac43da00..b6ac43da00 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr_tmtc_1553.h +++ b/bsps/sparc/include/bsp/gr_tmtc_1553.h diff --git a/c/src/lib/libbsp/sparc/shared/include/gradcdac.h b/bsps/sparc/include/bsp/gradcdac.h index b52077845f..b52077845f 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gradcdac.h +++ b/bsps/sparc/include/bsp/gradcdac.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grascs.h b/bsps/sparc/include/bsp/grascs.h index b393e77888..b393e77888 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grascs.h +++ b/bsps/sparc/include/bsp/grascs.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan.h b/bsps/sparc/include/bsp/grcan.h index 5cdbad4b01..5cdbad4b01 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grcan.h +++ b/bsps/sparc/include/bsp/grcan.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grctm.h b/bsps/sparc/include/bsp/grctm.h index 5ff81559aa..5ff81559aa 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grctm.h +++ b/bsps/sparc/include/bsp/grctm.h diff --git a/c/src/lib/libbsp/sparc/shared/include/greth.h b/bsps/sparc/include/bsp/greth.h index 9209d823e3..9209d823e3 100644 --- a/c/src/lib/libbsp/sparc/shared/include/greth.h +++ b/bsps/sparc/include/bsp/greth.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grgpio.h b/bsps/sparc/include/bsp/grgpio.h index c49054548c..c49054548c 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grgpio.h +++ b/bsps/sparc/include/bsp/grgpio.h diff --git a/c/src/lib/libbsp/sparc/shared/include/griommu.h b/bsps/sparc/include/bsp/griommu.h index 2bafe4c513..2bafe4c513 100644 --- a/c/src/lib/libbsp/sparc/shared/include/griommu.h +++ b/bsps/sparc/include/bsp/griommu.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci.h b/bsps/sparc/include/bsp/grpci.h index 2321706200..2321706200 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grpci.h +++ b/bsps/sparc/include/bsp/grpci.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci2.h b/bsps/sparc/include/bsp/grpci2.h index c356b5641f..c356b5641f 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grpci2.h +++ b/bsps/sparc/include/bsp/grpci2.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grpci2dma.h b/bsps/sparc/include/bsp/grpci2dma.h index c1a2663a86..c1a2663a86 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grpci2dma.h +++ b/bsps/sparc/include/bsp/grpci2dma.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grpwm.h b/bsps/sparc/include/bsp/grpwm.h index 6898f8ac2e..6898f8ac2e 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grpwm.h +++ b/bsps/sparc/include/bsp/grpwm.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grslink.h b/bsps/sparc/include/bsp/grslink.h index 575a24aee4..575a24aee4 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grslink.h +++ b/bsps/sparc/include/bsp/grslink.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw.h b/bsps/sparc/include/bsp/grspw.h index 3270e8a5a2..3270e8a5a2 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grspw.h +++ b/bsps/sparc/include/bsp/grspw.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h b/bsps/sparc/include/bsp/grspw_pkt.h index a74a7c9f6a..a74a7c9f6a 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grspw_pkt.h +++ b/bsps/sparc/include/bsp/grspw_pkt.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_router.h b/bsps/sparc/include/bsp/grspw_router.h index 2fab8d5f6c..2fab8d5f6c 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grspw_router.h +++ b/bsps/sparc/include/bsp/grspw_router.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grtc.h b/bsps/sparc/include/bsp/grtc.h index 3ee1fa547c..3ee1fa547c 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grtc.h +++ b/bsps/sparc/include/bsp/grtc.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grtm.h b/bsps/sparc/include/bsp/grtm.h index 625f8389b7..625f8389b7 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grtm.h +++ b/bsps/sparc/include/bsp/grtm.h diff --git a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h b/bsps/sparc/include/bsp/i2cmst.h index 3eee717524..3eee717524 100644 --- a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h +++ b/bsps/sparc/include/bsp/i2cmst.h diff --git a/c/src/lib/libbsp/sparc/shared/include/l2c.h b/bsps/sparc/include/bsp/l2c.h index 52473ddf2a..52473ddf2a 100644 --- a/c/src/lib/libbsp/sparc/shared/include/l2c.h +++ b/bsps/sparc/include/bsp/l2c.h diff --git a/c/src/lib/libbsp/sparc/shared/include/l4stat.h b/bsps/sparc/include/bsp/l4stat.h index 94fbe4b095..94fbe4b095 100644 --- a/c/src/lib/libbsp/sparc/shared/include/l4stat.h +++ b/bsps/sparc/include/bsp/l4stat.h diff --git a/c/src/lib/libbsp/sparc/shared/include/mctrl.h b/bsps/sparc/include/bsp/mctrl.h index db449cb11a..db449cb11a 100644 --- a/c/src/lib/libbsp/sparc/shared/include/mctrl.h +++ b/bsps/sparc/include/bsp/mctrl.h diff --git a/c/src/lib/libbsp/sparc/shared/include/memscrub.h b/bsps/sparc/include/bsp/memscrub.h index 1e55d8e127..1e55d8e127 100644 --- a/c/src/lib/libbsp/sparc/shared/include/memscrub.h +++ b/bsps/sparc/include/bsp/memscrub.h diff --git a/c/src/lib/libbsp/sparc/shared/include/network_interface_add.h b/bsps/sparc/include/bsp/network_interface_add.h index b04a96f003..b04a96f003 100644 --- a/c/src/lib/libbsp/sparc/shared/include/network_interface_add.h +++ b/bsps/sparc/include/bsp/network_interface_add.h diff --git a/c/src/lib/libbsp/sparc/shared/include/occan.h b/bsps/sparc/include/bsp/occan.h index 0bf34dee48..0bf34dee48 100644 --- a/c/src/lib/libbsp/sparc/shared/include/occan.h +++ b/bsps/sparc/include/bsp/occan.h diff --git a/c/src/lib/libbsp/sparc/shared/include/pcif.h b/bsps/sparc/include/bsp/pcif.h index 0221fcdd50..0221fcdd50 100644 --- a/c/src/lib/libbsp/sparc/shared/include/pcif.h +++ b/bsps/sparc/include/bsp/pcif.h diff --git a/c/src/lib/libbsp/sparc/shared/include/satcan.h b/bsps/sparc/include/bsp/satcan.h index ab9f5e0cd4..ab9f5e0cd4 100644 --- a/c/src/lib/libbsp/sparc/shared/include/satcan.h +++ b/bsps/sparc/include/bsp/satcan.h diff --git a/c/src/lib/libbsp/sparc/shared/include/spictrl.h b/bsps/sparc/include/bsp/spictrl.h index 98922fbd30..98922fbd30 100644 --- a/c/src/lib/libbsp/sparc/shared/include/spictrl.h +++ b/bsps/sparc/include/bsp/spictrl.h diff --git a/c/src/lib/libbsp/sparc/shared/include/spwcuc.h b/bsps/sparc/include/bsp/spwcuc.h index e420367640..e420367640 100644 --- a/c/src/lib/libbsp/sparc/shared/include/spwcuc.h +++ b/bsps/sparc/include/bsp/spwcuc.h diff --git a/c/src/lib/libbsp/sparc/shared/include/tlib.h b/bsps/sparc/include/bsp/tlib.h index debb8c8215..debb8c8215 100644 --- a/c/src/lib/libbsp/sparc/shared/include/tlib.h +++ b/bsps/sparc/include/bsp/tlib.h diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h b/bsps/sparc/include/drvmgr/ambapp_bus.h index d034aae3a3..d034aae3a3 100644 --- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus.h +++ b/bsps/sparc/include/drvmgr/ambapp_bus.h diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h b/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h index 2def4bc2b4..2def4bc2b4 100644 --- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/ambapp_bus_grlib.h +++ b/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h b/bsps/sparc/include/drvmgr/bspcommon.h index d3470009f8..d3470009f8 100644 --- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/bspcommon.h +++ b/bsps/sparc/include/drvmgr/bspcommon.h diff --git a/c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h b/bsps/sparc/include/drvmgr/leon2_amba_bus.h index ebb3a08486..ebb3a08486 100644 --- a/c/src/lib/libbsp/sparc/shared/include/drvmgr/leon2_amba_bus.h +++ b/bsps/sparc/include/drvmgr/leon2_amba_bus.h diff --git a/c/src/lib/libbsp/sparc/shared/include/grlib.h b/bsps/sparc/include/grlib.h index a2d0877fb8..a2d0877fb8 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grlib.h +++ b/bsps/sparc/include/grlib.h diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/bsps/sparc/leon2/include/bsp.h index 2028ba0db3..2028ba0db3 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h +++ b/bsps/sparc/leon2/include/bsp.h diff --git a/c/src/lib/libbsp/sparc/leon2/include/at697_pci.h b/bsps/sparc/leon2/include/bsp/at697_pci.h index 9a511ec6f9..9a511ec6f9 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/at697_pci.h +++ b/bsps/sparc/leon2/include/bsp/at697_pci.h diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h b/bsps/sparc/leon2/include/bsp/irq.h index 086bf253c4..086bf253c4 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/bsp/irq.h +++ b/bsps/sparc/leon2/include/bsp/irq.h diff --git a/c/src/lib/libbsp/sparc/leon2/include/leon.h b/bsps/sparc/leon2/include/leon.h index 7ec6b1dcf9..7ec6b1dcf9 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/leon.h +++ b/bsps/sparc/leon2/include/leon.h diff --git a/c/src/lib/libbsp/sparc/leon2/include/tm27.h b/bsps/sparc/leon2/include/tm27.h index 0d28641b9b..0d28641b9b 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/tm27.h +++ b/bsps/sparc/leon2/include/tm27.h diff --git a/c/src/lib/libbsp/sparc/leon3/include/amba.h b/bsps/sparc/leon3/include/amba.h index 059b28ca07..059b28ca07 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/amba.h +++ b/bsps/sparc/leon3/include/amba.h diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/bsps/sparc/leon3/include/bsp.h index 3fda4edc66..3fda4edc66 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h +++ b/bsps/sparc/leon3/include/bsp.h diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h b/bsps/sparc/leon3/include/bsp/irq.h index c3e7959139..c3e7959139 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/bsp/irq.h +++ b/bsps/sparc/leon3/include/bsp/irq.h diff --git a/c/src/lib/libbsp/sparc/leon3/include/watchdog.h b/bsps/sparc/leon3/include/bsp/watchdog.h index 3c63be2a8f..3c63be2a8f 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/watchdog.h +++ b/bsps/sparc/leon3/include/bsp/watchdog.h diff --git a/c/src/lib/libbsp/sparc/leon3/include/leon.h b/bsps/sparc/leon3/include/leon.h index 758b760b0b..758b760b0b 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/leon.h +++ b/bsps/sparc/leon3/include/leon.h diff --git a/c/src/lib/libbsp/sparc/leon3/include/tm27.h b/bsps/sparc/leon3/include/tm27.h index 00921d4880..00921d4880 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/tm27.h +++ b/bsps/sparc/leon3/include/tm27.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h b/bsps/sparc64/include/arch/arch.h index 5fdd4a2cb2..5fdd4a2cb2 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h +++ b/bsps/sparc64/include/arch/arch.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h b/bsps/sparc64/include/arch/boot.h index b0a997a957..b0a997a957 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h +++ b/bsps/sparc64/include/arch/boot.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h b/bsps/sparc64/include/arch/mm/cache_spec.h index 1d9199db33..1d9199db33 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h +++ b/bsps/sparc64/include/arch/mm/cache_spec.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h b/bsps/sparc64/include/arch/mm/frame.h index fb66e54bf1..fb66e54bf1 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h +++ b/bsps/sparc64/include/arch/mm/frame.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h b/bsps/sparc64/include/arch/mm/mmu.h index 1d445f2e24..1d445f2e24 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h +++ b/bsps/sparc64/include/arch/mm/mmu.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h b/bsps/sparc64/include/arch/mm/page.h index f1451a2866..f1451a2866 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h +++ b/bsps/sparc64/include/arch/mm/page.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h b/bsps/sparc64/include/arch/mm/sun4u/frame.h index e30f504d08..e30f504d08 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h +++ b/bsps/sparc64/include/arch/mm/sun4u/frame.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h b/bsps/sparc64/include/arch/mm/sun4u/mmu.h index f887ebe7f4..f887ebe7f4 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h +++ b/bsps/sparc64/include/arch/mm/sun4u/mmu.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h b/bsps/sparc64/include/arch/mm/sun4u/page.h index f1451a2866..f1451a2866 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h +++ b/bsps/sparc64/include/arch/mm/sun4u/page.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h b/bsps/sparc64/include/arch/mm/sun4u/tlb.h index 6f6e6542e6..6f6e6542e6 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h +++ b/bsps/sparc64/include/arch/mm/sun4u/tlb.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h b/bsps/sparc64/include/arch/mm/sun4u/tte.h index 46acaed47c..46acaed47c 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h +++ b/bsps/sparc64/include/arch/mm/sun4u/tte.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h b/bsps/sparc64/include/arch/mm/tlb.h index 4adf26ca64..4adf26ca64 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h +++ b/bsps/sparc64/include/arch/mm/tlb.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h b/bsps/sparc64/include/arch/mm/tte.h index f0b746e8c6..f0b746e8c6 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h +++ b/bsps/sparc64/include/arch/mm/tte.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h b/bsps/sparc64/include/arch/regdef.h index aae46fa99f..aae46fa99f 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h +++ b/bsps/sparc64/include/arch/regdef.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h b/bsps/sparc64/include/arch/stack.h index 6364916912..6364916912 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h +++ b/bsps/sparc64/include/arch/stack.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h b/bsps/sparc64/include/arch/sun4u/arch.h index 9e883a37ff..9e883a37ff 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h +++ b/bsps/sparc64/include/arch/sun4u/arch.h diff --git a/c/src/lib/libbsp/sparc64/shared/include/asm.h b/bsps/sparc64/include/asm.h index bd3cc1298a..bd3cc1298a 100644 --- a/c/src/lib/libbsp/sparc64/shared/include/asm.h +++ b/bsps/sparc64/include/asm.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h b/bsps/sparc64/include/boot/align.h index 96229101ed..96229101ed 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h +++ b/bsps/sparc64/include/boot/align.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h b/bsps/sparc64/include/boot/balloc.h index 8e502c0c58..8e502c0c58 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h +++ b/bsps/sparc64/include/boot/balloc.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h b/bsps/sparc64/include/boot/gentypes.h index a3e82d6eef..a3e82d6eef 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h +++ b/bsps/sparc64/include/boot/gentypes.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h b/bsps/sparc64/include/boot/main.h index 5ddc814ac8..5ddc814ac8 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h +++ b/bsps/sparc64/include/boot/main.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h b/bsps/sparc64/include/boot/ofw.h index c562b675a2..c562b675a2 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h +++ b/bsps/sparc64/include/boot/ofw.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h b/bsps/sparc64/include/boot/ofw_tree.h index 5872ade261..5872ade261 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h +++ b/bsps/sparc64/include/boot/ofw_tree.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h b/bsps/sparc64/include/boot/ofwarch.h index 2d4f7643c0..2d4f7643c0 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h +++ b/bsps/sparc64/include/boot/ofwarch.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h b/bsps/sparc64/include/boot/register.h index 61bf34ac66..61bf34ac66 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h +++ b/bsps/sparc64/include/boot/register.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h b/bsps/sparc64/include/boot/stack.h index 1486dd21b4..1486dd21b4 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h +++ b/bsps/sparc64/include/boot/stack.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h b/bsps/sparc64/include/boot/types.h index 095e25233d..095e25233d 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h +++ b/bsps/sparc64/include/boot/types.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h b/bsps/sparc64/include/genarch/ofw/ofw_tree.h index f62d545527..f62d545527 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h +++ b/bsps/sparc64/include/genarch/ofw/ofw_tree.h diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h b/bsps/sparc64/include/kernel/align.h index 6003ea9c4e..6003ea9c4e 100644 --- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h +++ b/bsps/sparc64/include/kernel/align.h diff --git a/c/src/lib/libbsp/sparc64/shared/include/traptable.h b/bsps/sparc64/include/traptable.h index 353c60d79c..353c60d79c 100644 --- a/c/src/lib/libbsp/sparc64/shared/include/traptable.h +++ b/bsps/sparc64/include/traptable.h diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/bsps/sparc64/niagara/include/bsp.h index 81058270a9..81058270a9 100644 --- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h +++ b/bsps/sparc64/niagara/include/bsp.h diff --git a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h b/bsps/sparc64/niagara/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h +++ b/bsps/sparc64/niagara/include/tm27.h diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/bsps/sparc64/usiii/include/bsp.h index 8051db3987..8051db3987 100644 --- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h +++ b/bsps/sparc64/usiii/include/bsp.h diff --git a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h b/bsps/sparc64/usiii/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h +++ b/bsps/sparc64/usiii/include/tm27.h diff --git a/c/src/lib/libbsp/sparc/Makefile.am b/c/src/lib/libbsp/sparc/Makefile.am index 30ea8497b5..7a23cbb3a8 100644 --- a/c/src/lib/libbsp/sparc/Makefile.am +++ b/c/src/lib/libbsp/sparc/Makefile.am @@ -191,3 +191,4 @@ EXTRA_DIST += shared/include/l4stat.h include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am +include $(srcdir)/../../../../../bsps/sparc/headers.am diff --git a/c/src/lib/libbsp/sparc/configure.ac b/c/src/lib/libbsp/sparc/configure.ac index a3adc185e0..29b7f8408d 100644 --- a/c/src/lib/libbsp/sparc/configure.ac +++ b/c/src/lib/libbsp/sparc/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([shared]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) @@ -12,6 +14,8 @@ AM_MAINTAINER_MODE RTEMS_ENV_RTEMSBSP RTEMS_PROJECT_ROOT +AC_SUBST(RTEMS_CPU) +AC_SUBST(RTEMS_BSP_FAMILIY) RTEMS_CHECK_BSPDIR([$RTEMS_BSP_FAMILY]) diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index cf019faa95..cf499de0d5 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -4,27 +4,20 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp +dist_project_lib_DATA = startup/bsp_specs -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/erc32.h EXTRA_DIST += ../../sparc/shared/start/start.S start.$(OBJEXT): ../../sparc/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds ../shared/startup/linkcmds.base +project_lib_DATA += linkcmds +dist_project_lib_DATA += ../shared/startup/linkcmds.base noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -51,7 +44,6 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S # gnatsupp libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c -include_bsp_HEADERS = ../shared/include/gnatcommon.h # console libbsp_a_SOURCES += console/erc32_console.c ../../shared/console.c \ ../../shared/console_select.c ../../shared/console_control.c \ @@ -65,10 +57,6 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h libbsp_a_SOURCES += timer/timer.c # IRQ -include_bsp_HEADERS += \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - include/bsp/irq.h libbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../sparc/shared/irq/bsp_isr_handler.c \ @@ -103,5 +91,5 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sparc/erc32/headers.am diff --git a/c/src/lib/libbsp/sparc/erc32/configure.ac b/c/src/lib/libbsp/sparc/erc32/configure.ac index 566a959b10..6e58139f95 100644 --- a/c/src/lib/libbsp/sparc/erc32/configure.ac +++ b/c/src/lib/libbsp/sparc/erc32/configure.ac @@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-erc32], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/erc32.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc/erc32/preinstall.am b/c/src/lib/libbsp/sparc/erc32/preinstall.am deleted file mode 100644 index 831c8e4169..0000000000 --- a/c/src/lib/libbsp/sparc/erc32/preinstall.am +++ /dev/null @@ -1,87 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_INCLUDE)/erc32.h: include/erc32.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/erc32.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/erc32.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base - -$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h - -$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h - -$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h - -$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - diff --git a/c/src/lib/libbsp/sparc/erc32/bsp_specs b/c/src/lib/libbsp/sparc/erc32/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/sparc/erc32/bsp_specs +++ b/c/src/lib/libbsp/sparc/erc32/startup/bsp_specs diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 3a5845c8c9..1914c6956f 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -4,31 +4,22 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp +dist_project_lib_DATA = startup/bsp_specs -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/leon.h EXTRA_DIST += ../../sparc/shared/start/start.S start.$(OBJEXT): ../../sparc/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) +project_lib_DATA += linkcmds dist_project_lib_DATA += ../shared/startup/linkcmds.base -dist_project_lib_DATA += startup/linkcmds -dist_project_lib_DATA += startup/linkcmds.leon2 dist_project_lib_DATA += startup/linkcmds.at697f +dist_project_lib_DATA += startup/linkcmds.leon2 noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -54,19 +45,13 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S # gnatsupp libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c -include_bsp_HEADERS += ../shared/include/gnatcommon.h # console libbsp_a_SOURCES += console/console.c console/debugputs.c # clock libbsp_a_SOURCES += clock/ckinit.c libbsp_a_SOURCES += ../../shared/clockdrv_shell.h # IRQ -include_bsp_HEADERS += ../../sparc/shared/include/genirq.h libbsp_a_SOURCES += ../../sparc/shared/irq/genirq.c -include_bsp_HEADERS += \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - include/bsp/irq.h libbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../sparc/shared/irq/bsp_isr_handler.c \ @@ -78,10 +63,6 @@ libbsp_a_SOURCES += \ ../../shared/src/irq-shell.c # AMBA bus -include_HEADERS += ../../sparc/shared/include/ambapp.h -include_HEADERS += ../../sparc/shared/include/ambapp_ids.h -include_HEADERS += ../../sparc/shared/include/grlib.h -include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_count.c @@ -95,17 +76,10 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c # Clock Driver and Timer Library -include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h -include_bsp_HEADERS += ../../sparc/shared/include/tlib.h libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c # PCI -include_bsp_HEADERS += ../../sparc/shared/include/grpci.h -include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h -include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h -include_bsp_HEADERS += ../../sparc/shared/include/pcif.h -include_bsp_HEADERS += include/at697_pci.h libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c @@ -115,13 +89,6 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_be.c libbsp_a_SOURCES += pci/at697_pci.c # PCI target devices -include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h libbsp_a_SOURCES += ../../sparc/shared/pci/gr_701.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_adcdac.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_io.c @@ -131,104 +98,66 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/gr_leon4_n2x.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_cpci_gr740.c # B1553BRM -include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h -include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c # GR1553B -include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c # CAN -include_bsp_HEADERS += ../../sparc/shared/include/occan.h -include_bsp_HEADERS += ../../sparc/shared/include/grcan.h libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \ ../../sparc/shared/can/grcan.c # SpaceWire if !HAS_SMP -include_bsp_HEADERS += ../../sparc/shared/include/grspw.h libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c endif -include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h -include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c # UART (RAW) -include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h - # I2CMST -include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c # SPI -include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c # TIME -include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h -include_bsp_HEADERS += ../../sparc/shared/include/grctm.h libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c # GPIO -include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h -include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c # PWM -include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c # ADC and DAC -include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c # Memory controllers libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c -include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h - # l2cache libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c -include_bsp_HEADERS += ../../sparc/shared/include/l2c.h - # griommu libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c -include_bsp_HEADERS += ../../sparc/shared/include/griommu.h - # timer libbsp_a_SOURCES += timer/timer.c # TM/TC -include_bsp_HEADERS += ../../sparc/shared/include/grtc.h -include_bsp_HEADERS += ../../sparc/shared/include/grtm.h libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c # MEMSCRUB libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c -include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h - # L4STAT libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c -include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h - # Driver Manager -include_drvmgrdir = $(includedir)/drvmgr -include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus.h -include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/leon2_amba_bus.h -include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_leon2.c libbsp_a_SOURCES += ../../sparc/shared/drvmgr/leon2_amba_bus.c @@ -258,13 +187,11 @@ endif if HAS_NETWORKING noinst_PROGRAMS += leon_greth.rel leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c -include_bsp_HEADERS += ../../sparc/shared/include/greth.h leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS) leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # BSP Network configuration -include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c endif @@ -282,5 +209,5 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sparc/leon2/headers.am diff --git a/c/src/lib/libbsp/sparc/leon2/configure.ac b/c/src/lib/libbsp/sparc/leon2/configure.ac index 5ca4a1353a..cb12706219 100644 --- a/c/src/lib/libbsp/sparc/leon2/configure.ac +++ b/c/src/lib/libbsp/sparc/leon2/configure.ac @@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-leon2], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/leon2.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -36,7 +39,6 @@ RTEMS_BSPOPTS_HELP([BSP_POWER_DOWN_AT_FATAL_HALT], error which will hand over to debugger, simulator, etc.]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/sparc/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am deleted file mode 100644 index 7f44269d58..0000000000 --- a/c/src/lib/libbsp/sparc/leon2/preinstall.am +++ /dev/null @@ -1,314 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/bsp/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmds.leon2: startup/linkcmds.leon2 $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.leon2 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.leon2 - -$(PROJECT_LIB)/linkcmds.at697f: startup/linkcmds.at697f $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.at697f -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.at697f - -$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h - -$(PROJECT_INCLUDE)/bsp/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/genirq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/genirq.h - -$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h - -$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h - -$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - -$(PROJECT_INCLUDE)/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h - -$(PROJECT_INCLUDE)/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp_ids.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp_ids.h - -$(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h - -$(PROJECT_INCLUDE)/bsp/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ahbstat.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ahbstat.h - -$(PROJECT_INCLUDE)/bsp/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gptimer.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gptimer.h - -$(PROJECT_INCLUDE)/bsp/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tlib.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tlib.h - -$(PROJECT_INCLUDE)/bsp/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci.h - -$(PROJECT_INCLUDE)/bsp/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2.h - -$(PROJECT_INCLUDE)/bsp/grpci2dma.h: ../../sparc/shared/include/grpci2dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2dma.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2dma.h - -$(PROJECT_INCLUDE)/bsp/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcif.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcif.h - -$(PROJECT_INCLUDE)/bsp/at697_pci.h: include/at697_pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/at697_pci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/at697_pci.h - -$(PROJECT_INCLUDE)/bsp/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_701.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_701.h - -$(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h - -$(PROJECT_INCLUDE)/bsp/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h - -$(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h - -$(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h - -$(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h - -$(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h: ../../sparc/shared/include/gr_cpci_gr740.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h - -$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h - -$(PROJECT_INCLUDE)/bsp/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553rt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553rt.h - -$(PROJECT_INCLUDE)/bsp/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553b.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553b.h - -$(PROJECT_INCLUDE)/bsp/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc.h - -$(PROJECT_INCLUDE)/bsp/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h - -$(PROJECT_INCLUDE)/bsp/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bm.h - -$(PROJECT_INCLUDE)/bsp/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553rt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553rt.h - -$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h - -$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h - -if !HAS_SMP -$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h -endif -$(PROJECT_INCLUDE)/bsp/grspw_pkt.h: ../../sparc/shared/include/grspw_pkt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pkt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pkt.h - -$(PROJECT_INCLUDE)/bsp/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_router.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_router.h - -$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h - -$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h - -$(PROJECT_INCLUDE)/bsp/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spictrl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spictrl.h - -$(PROJECT_INCLUDE)/bsp/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spwcuc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spwcuc.h - -$(PROJECT_INCLUDE)/bsp/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grctm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grctm.h - -$(PROJECT_INCLUDE)/bsp/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grgpio.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grgpio.h - -$(PROJECT_INCLUDE)/bsp/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpiolib.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpiolib.h - -$(PROJECT_INCLUDE)/bsp/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpwm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpwm.h - -$(PROJECT_INCLUDE)/bsp/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gradcdac.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gradcdac.h - -$(PROJECT_INCLUDE)/bsp/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mctrl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mctrl.h - -$(PROJECT_INCLUDE)/bsp/l2c.h: ../../sparc/shared/include/l2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l2c.h - -$(PROJECT_INCLUDE)/bsp/griommu.h: ../../sparc/shared/include/griommu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/griommu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/griommu.h - -$(PROJECT_INCLUDE)/bsp/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtc.h - -$(PROJECT_INCLUDE)/bsp/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtm.h - -$(PROJECT_INCLUDE)/bsp/memscrub.h: ../../sparc/shared/include/memscrub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/memscrub.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/memscrub.h - -$(PROJECT_INCLUDE)/bsp/l4stat.h: ../../sparc/shared/include/l4stat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l4stat.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l4stat.h - -$(PROJECT_INCLUDE)/drvmgr/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr - @: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) - -$(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h: ../../sparc/shared/include/drvmgr/ambapp_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h - -$(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h: ../../sparc/shared/include/drvmgr/leon2_amba_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/leon2_amba_bus.h - -$(PROJECT_INCLUDE)/drvmgr/bspcommon.h: ../../sparc/shared/include/drvmgr/bspcommon.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/bspcommon.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/bspcommon.h - -if HAS_NETWORKING -$(PROJECT_INCLUDE)/bsp/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/greth.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/greth.h - -$(PROJECT_INCLUDE)/bsp/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/network_interface_add.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/network_interface_add.h -endif diff --git a/c/src/lib/libbsp/sparc/leon2/bsp_specs b/c/src/lib/libbsp/sparc/leon2/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/sparc/leon2/bsp_specs +++ b/c/src/lib/libbsp/sparc/leon2/startup/bsp_specs diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index b73569d222..60e2a9044a 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -4,34 +4,25 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp +dist_project_lib_DATA = startup/bsp_specs -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_bsp_HEADERS = ../../sparc/shared/include/debug_defs.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/leon.h EXTRA_DIST += ../../sparc/shared/start/start.S start.$(OBJEXT): ../../sparc/shared/start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) +project_lib_DATA += linkcmds dist_project_lib_DATA += ../shared/startup/linkcmds.base -dist_project_lib_DATA += startup/linkcmds +dist_project_lib_DATA += startup/linkcmds.gr712rc +dist_project_lib_DATA += startup/linkcmds.gr740 dist_project_lib_DATA += startup/linkcmds.leon3 dist_project_lib_DATA += startup/linkcmds.ut699 -dist_project_lib_DATA += startup/linkcmds.gr712rc dist_project_lib_DATA += startup/linkcmds.ut700 -dist_project_lib_DATA += startup/linkcmds.gr740 noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -55,13 +46,7 @@ libbsp_a_SOURCES += ../../sparc/shared/cpu.c libbsp_a_SOURCES += ../../sparc/shared/irq_asm.S # gnatsupp libbsp_a_SOURCES += gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c -include_bsp_HEADERS += ../shared/include/gnatcommon.h # AMBA bus -include_HEADERS += include/amba.h -include_HEADERS += ../../sparc/shared/include/ambapp.h -include_HEADERS += ../../sparc/shared/include/ambapp_ids.h -include_HEADERS += ../../sparc/shared/include/grlib.h -include_bsp_HEADERS += ../../sparc/shared/include/ahbstat.h libbsp_a_SOURCES += amba/amba.c libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp.c libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_alloc.c @@ -76,8 +61,6 @@ libbsp_a_SOURCES += ../../sparc/shared/amba/ambapp_show.c libbsp_a_SOURCES += ../../sparc/shared/amba/ahbstat.c # Clock Driver and Timer Library -include_bsp_HEADERS += ../../sparc/shared/include/gptimer.h -include_bsp_HEADERS += ../../sparc/shared/include/tlib.h libbsp_a_SOURCES += ../../sparc/shared/timer/gptimer.c libbsp_a_SOURCES += ../../sparc/shared/timer/tlib.c libbsp_a_SOURCES += ../../sparc/shared/timer/tlib_ckinit.c @@ -90,17 +73,10 @@ libbsp_a_SOURCES += ../../shared/console-termios.c libbsp_a_SOURCES += console/console.c libbsp_a_SOURCES += ../../sparc/shared/uart/cons.c libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_cons.c -include_bsp_HEADERS += ../../sparc/shared/include/cons.h -include_bsp_HEADERS += ../../sparc/shared/include/apbuart_cons.h # debugio libbsp_a_SOURCES += console/printk_support.c # IRQ -include_bsp_HEADERS += ../../sparc/shared/include/genirq.h -include_bsp_HEADERS += \ - ../../shared/include/irq-generic.h \ - ../../shared/include/irq-info.h \ - include/bsp/irq.h libbsp_a_SOURCES += \ startup/eirq.c \ ../../sparc/shared/irq/genirq.c \ @@ -114,10 +90,6 @@ libbsp_a_SOURCES += \ ../../shared/src/irq-shell.c # PCI -include_bsp_HEADERS += ../../sparc/shared/include/grpci.h -include_bsp_HEADERS += ../../sparc/shared/include/grpci2.h -include_bsp_HEADERS += ../../sparc/shared/include/grpci2dma.h -include_bsp_HEADERS += ../../sparc/shared/include/pcif.h libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2dma.c @@ -126,14 +98,6 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_le.c libbsp_a_SOURCES += ../../sparc/shared/pci/pci_memreg_sparc_be.c # PCI target devices -include_bsp_HEADERS += ../../sparc/shared/include/gr_701.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_adcdac.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_io.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_spw_router.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_rasta_tmtc.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_tmtc_1553.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_leon4_n2x.h -include_bsp_HEADERS += ../../sparc/shared/include/gr_cpci_gr740.h libbsp_a_SOURCES += ../../sparc/shared/pci/gr_701.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_adcdac.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_rasta_io.c @@ -144,122 +108,78 @@ libbsp_a_SOURCES += ../../sparc/shared/pci/gr_leon4_n2x.c libbsp_a_SOURCES += ../../sparc/shared/pci/gr_cpci_gr740.c # B1553BRM -include_bsp_HEADERS += ../../sparc/shared/include/b1553brm.h -include_bsp_HEADERS += ../../sparc/shared/include/b1553rt.h libbsp_a_SOURCES += ../../sparc/shared/1553/b1553brm.c libbsp_a_SOURCES += ../../sparc/shared/1553/b1553rt.c # GR1553B -include_bsp_HEADERS += ../../sparc/shared/include/gr1553b.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bc_list.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553bm.h -include_bsp_HEADERS += ../../sparc/shared/include/gr1553rt.h libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553b.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bc.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553bm.c libbsp_a_SOURCES += ../../sparc/shared/1553/gr1553rt.c # CAN -include_bsp_HEADERS += ../../sparc/shared/include/occan.h \ - ../../sparc/shared/include/grcan.h libbsp_a_SOURCES += ../../sparc/shared/can/occan.c \ ../../sparc/shared/can/grcan.c # SpaceWire if !HAS_SMP -include_bsp_HEADERS += ../../sparc/shared/include/grspw.h libbsp_a_SOURCES += ../../sparc/shared/spw/grspw.c endif -include_bsp_HEADERS += ../../sparc/shared/include/grspw_pkt.h -include_bsp_HEADERS += ../../sparc/shared/include/grspw_router.h libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_pkt.c libbsp_a_SOURCES += ../../sparc/shared/spw/grspw_router.c # UART -include_bsp_HEADERS += ../../sparc/shared/include/apbuart.h \ - ../../sparc/shared/include/apbuart_termios.h libbsp_a_SOURCES += ../../sparc/shared/uart/apbuart_termios.c # I2CMST -include_bsp_HEADERS += ../../sparc/shared/include/i2cmst.h libbsp_a_SOURCES += ../../sparc/shared/i2c/i2cmst.c # SPI -include_bsp_HEADERS += ../../sparc/shared/include/spictrl.h libbsp_a_SOURCES += ../../sparc/shared/spi/spictrl.c # TIME -include_bsp_HEADERS += ../../sparc/shared/include/spwcuc.h -include_bsp_HEADERS += ../../sparc/shared/include/grctm.h libbsp_a_SOURCES += ../../sparc/shared/time/spwcuc.c libbsp_a_SOURCES += ../../sparc/shared/time/grctm.c # GPIO -include_bsp_HEADERS += ../../sparc/shared/include/grgpio.h -include_bsp_HEADERS += ../../sparc/shared/include/gpiolib.h libbsp_a_SOURCES += ../../sparc/shared/gpio/grgpio.c libbsp_a_SOURCES += ../../sparc/shared/gpio/gpiolib.c # PWM -include_bsp_HEADERS += ../../sparc/shared/include/grpwm.h libbsp_a_SOURCES += ../../sparc/shared/pwm/grpwm.c # ADC and DAC -include_bsp_HEADERS += ../../sparc/shared/include/gradcdac.h libbsp_a_SOURCES += ../../sparc/shared/analog/gradcdac.c # Memory controllers libbsp_a_SOURCES += ../../sparc/shared/mem/mctrl.c -include_bsp_HEADERS += ../../sparc/shared/include/mctrl.h - # l2cache libbsp_a_SOURCES += ../../sparc/shared/l2c/l2c.c -include_bsp_HEADERS += ../../sparc/shared/include/l2c.h - # griommu libbsp_a_SOURCES += ../../sparc/shared/iommu/griommu.c -include_bsp_HEADERS += ../../sparc/shared/include/griommu.h - # timer libbsp_a_SOURCES += timer/timer.c libbsp_a_SOURCES += timer/watchdog.c -include_bsp_HEADERS += include/watchdog.h - # Cache libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c libbsp_a_SOURCES += include/cache_.h libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include # GR712 -include_bsp_HEADERS += ../../sparc/shared/include/grascs.h -include_bsp_HEADERS += ../../sparc/shared/include/satcan.h -include_bsp_HEADERS += ../../sparc/shared/include/canmux.h -include_bsp_HEADERS += ../../sparc/shared/include/grslink.h libbsp_a_SOURCES += ../../sparc/shared/ascs/grascs.c libbsp_a_SOURCES += ../../sparc/shared/can/satcan.c libbsp_a_SOURCES += ../../sparc/shared/can/canmux.c libbsp_a_SOURCES += ../../sparc/shared/slink/grslink.c # TM/TC -include_bsp_HEADERS += ../../sparc/shared/include/grtc.h -include_bsp_HEADERS += ../../sparc/shared/include/grtm.h libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtc.c libbsp_a_SOURCES += ../../sparc/shared/tmtc/grtm.c # MEMSCRUB libbsp_a_SOURCES += ../../sparc/shared/scrub/memscrub.c -include_bsp_HEADERS += ../../sparc/shared/include/memscrub.h - # L4STAT libbsp_a_SOURCES += ../../sparc/shared/stat/l4stat.c -include_bsp_HEADERS += ../../sparc/shared/include/l4stat.h - # Driver Manager -include_drvmgrdir = $(includedir)/drvmgr -include_drvmgr_HEADERS = ../../sparc/shared/include/drvmgr/ambapp_bus_grlib.h -include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/ambapp_bus.h -include_drvmgr_HEADERS += ../../sparc/shared/include/drvmgr/bspcommon.h libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus.c libbsp_a_SOURCES += ../../sparc/shared/drvmgr/ambapp_bus_grlib.c libbsp_a_SOURCES += ../../sparc/shared/drvmgr/get_resarray_count.c @@ -290,7 +210,6 @@ if !HAS_SMP libbsp_a_SOURCES += leon_greth/leon_greth.c endif leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c -include_bsp_HEADERS += ../../sparc/shared/include/greth.h leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS) leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) @@ -298,7 +217,6 @@ endif # BSP Network configuration if HAS_NETWORKING -include_bsp_HEADERS += ../../sparc/shared/include/network_interface_add.h libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c endif @@ -322,5 +240,5 @@ endif EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sparc/leon3/headers.am diff --git a/c/src/lib/libbsp/sparc/leon3/configure.ac b/c/src/lib/libbsp/sparc/leon3/configure.ac index 83e754688c..c972868a8d 100644 --- a/c/src/lib/libbsp/sparc/leon3/configure.ac +++ b/c/src/lib/libbsp/sparc/leon3/configure.ac @@ -5,6 +5,9 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc-leon3], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/leon3.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) @@ -38,7 +41,6 @@ RTEMS_BSPOPTS_HELP([BSP_POWER_DOWN_AT_FATAL_HALT], error which will hand over to debugger, simulator, etc.]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am deleted file mode 100644 index 4d00a43c18..0000000000 --- a/c/src/lib/libbsp/sparc/leon3/preinstall.am +++ /dev/null @@ -1,363 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/bsp/debug_defs.h: ../../sparc/shared/include/debug_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/debug_defs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/debug_defs.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmds.leon3: startup/linkcmds.leon3 $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.leon3 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.leon3 - -$(PROJECT_LIB)/linkcmds.ut699: startup/linkcmds.ut699 $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ut699 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ut699 - -$(PROJECT_LIB)/linkcmds.gr712rc: startup/linkcmds.gr712rc $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gr712rc -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gr712rc - -$(PROJECT_LIB)/linkcmds.ut700: startup/linkcmds.ut700 $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ut700 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ut700 - -$(PROJECT_LIB)/linkcmds.gr740: startup/linkcmds.gr740 $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gr740 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gr740 - -$(PROJECT_INCLUDE)/bsp/gnatcommon.h: ../shared/include/gnatcommon.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gnatcommon.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gnatcommon.h - -$(PROJECT_INCLUDE)/amba.h: include/amba.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/amba.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/amba.h - -$(PROJECT_INCLUDE)/ambapp.h: ../../sparc/shared/include/ambapp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp.h - -$(PROJECT_INCLUDE)/ambapp_ids.h: ../../sparc/shared/include/ambapp_ids.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ambapp_ids.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/ambapp_ids.h - -$(PROJECT_INCLUDE)/grlib.h: ../../sparc/shared/include/grlib.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grlib.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/grlib.h - -$(PROJECT_INCLUDE)/bsp/ahbstat.h: ../../sparc/shared/include/ahbstat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ahbstat.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ahbstat.h - -$(PROJECT_INCLUDE)/bsp/gptimer.h: ../../sparc/shared/include/gptimer.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gptimer.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gptimer.h - -$(PROJECT_INCLUDE)/bsp/tlib.h: ../../sparc/shared/include/tlib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tlib.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tlib.h - -$(PROJECT_INCLUDE)/bsp/cons.h: ../../sparc/shared/include/cons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cons.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cons.h - -$(PROJECT_INCLUDE)/bsp/apbuart_cons.h: ../../sparc/shared/include/apbuart_cons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_cons.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_cons.h - -$(PROJECT_INCLUDE)/bsp/genirq.h: ../../sparc/shared/include/genirq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/genirq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/genirq.h - -$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h - -$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h - -$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - -$(PROJECT_INCLUDE)/bsp/grpci.h: ../../sparc/shared/include/grpci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci.h - -$(PROJECT_INCLUDE)/bsp/grpci2.h: ../../sparc/shared/include/grpci2.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2.h - -$(PROJECT_INCLUDE)/bsp/grpci2dma.h: ../../sparc/shared/include/grpci2dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpci2dma.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpci2dma.h - -$(PROJECT_INCLUDE)/bsp/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pcif.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pcif.h - -$(PROJECT_INCLUDE)/bsp/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_701.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_701.h - -$(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h: ../../sparc/shared/include/gr_rasta_adcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_adcdac.h - -$(PROJECT_INCLUDE)/bsp/gr_rasta_io.h: ../../sparc/shared/include/gr_rasta_io.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_io.h - -$(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h: ../../sparc/shared/include/gr_rasta_spw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_spw_router.h - -$(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h: ../../sparc/shared/include/gr_rasta_tmtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_rasta_tmtc.h - -$(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h: ../../sparc/shared/include/gr_tmtc_1553.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_tmtc_1553.h - -$(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h: ../../sparc/shared/include/gr_leon4_n2x.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_leon4_n2x.h - -$(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h: ../../sparc/shared/include/gr_cpci_gr740.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr_cpci_gr740.h - -$(PROJECT_INCLUDE)/bsp/b1553brm.h: ../../sparc/shared/include/b1553brm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553brm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553brm.h - -$(PROJECT_INCLUDE)/bsp/b1553rt.h: ../../sparc/shared/include/b1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/b1553rt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/b1553rt.h - -$(PROJECT_INCLUDE)/bsp/gr1553b.h: ../../sparc/shared/include/gr1553b.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553b.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553b.h - -$(PROJECT_INCLUDE)/bsp/gr1553bc.h: ../../sparc/shared/include/gr1553bc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc.h - -$(PROJECT_INCLUDE)/bsp/gr1553bc_list.h: ../../sparc/shared/include/gr1553bc_list.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bc_list.h - -$(PROJECT_INCLUDE)/bsp/gr1553bm.h: ../../sparc/shared/include/gr1553bm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553bm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553bm.h - -$(PROJECT_INCLUDE)/bsp/gr1553rt.h: ../../sparc/shared/include/gr1553rt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gr1553rt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gr1553rt.h - -$(PROJECT_INCLUDE)/bsp/occan.h: ../../sparc/shared/include/occan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/occan.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/occan.h - -$(PROJECT_INCLUDE)/bsp/grcan.h: ../../sparc/shared/include/grcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grcan.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grcan.h - -if !HAS_SMP -$(PROJECT_INCLUDE)/bsp/grspw.h: ../../sparc/shared/include/grspw.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw.h -endif -$(PROJECT_INCLUDE)/bsp/grspw_pkt.h: ../../sparc/shared/include/grspw_pkt.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_pkt.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_pkt.h - -$(PROJECT_INCLUDE)/bsp/grspw_router.h: ../../sparc/shared/include/grspw_router.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grspw_router.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grspw_router.h - -$(PROJECT_INCLUDE)/bsp/apbuart.h: ../../sparc/shared/include/apbuart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart.h - -$(PROJECT_INCLUDE)/bsp/apbuart_termios.h: ../../sparc/shared/include/apbuart_termios.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/apbuart_termios.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/apbuart_termios.h - -$(PROJECT_INCLUDE)/bsp/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2cmst.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2cmst.h - -$(PROJECT_INCLUDE)/bsp/spictrl.h: ../../sparc/shared/include/spictrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spictrl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spictrl.h - -$(PROJECT_INCLUDE)/bsp/spwcuc.h: ../../sparc/shared/include/spwcuc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spwcuc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/spwcuc.h - -$(PROJECT_INCLUDE)/bsp/grctm.h: ../../sparc/shared/include/grctm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grctm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grctm.h - -$(PROJECT_INCLUDE)/bsp/grgpio.h: ../../sparc/shared/include/grgpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grgpio.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grgpio.h - -$(PROJECT_INCLUDE)/bsp/gpiolib.h: ../../sparc/shared/include/gpiolib.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gpiolib.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gpiolib.h - -$(PROJECT_INCLUDE)/bsp/grpwm.h: ../../sparc/shared/include/grpwm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grpwm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grpwm.h - -$(PROJECT_INCLUDE)/bsp/gradcdac.h: ../../sparc/shared/include/gradcdac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/gradcdac.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/gradcdac.h - -$(PROJECT_INCLUDE)/bsp/mctrl.h: ../../sparc/shared/include/mctrl.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mctrl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mctrl.h - -$(PROJECT_INCLUDE)/bsp/l2c.h: ../../sparc/shared/include/l2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l2c.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l2c.h - -$(PROJECT_INCLUDE)/bsp/griommu.h: ../../sparc/shared/include/griommu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/griommu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/griommu.h - -$(PROJECT_INCLUDE)/bsp/watchdog.h: include/watchdog.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/watchdog.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/watchdog.h - -$(PROJECT_INCLUDE)/bsp/grascs.h: ../../sparc/shared/include/grascs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grascs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grascs.h - -$(PROJECT_INCLUDE)/bsp/satcan.h: ../../sparc/shared/include/satcan.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/satcan.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/satcan.h - -$(PROJECT_INCLUDE)/bsp/canmux.h: ../../sparc/shared/include/canmux.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/canmux.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/canmux.h - -$(PROJECT_INCLUDE)/bsp/grslink.h: ../../sparc/shared/include/grslink.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grslink.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grslink.h - -$(PROJECT_INCLUDE)/bsp/grtc.h: ../../sparc/shared/include/grtc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtc.h - -$(PROJECT_INCLUDE)/bsp/grtm.h: ../../sparc/shared/include/grtm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/grtm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/grtm.h - -$(PROJECT_INCLUDE)/bsp/memscrub.h: ../../sparc/shared/include/memscrub.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/memscrub.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/memscrub.h - -$(PROJECT_INCLUDE)/bsp/l4stat.h: ../../sparc/shared/include/l4stat.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/l4stat.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/l4stat.h - -$(PROJECT_INCLUDE)/drvmgr/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr - @: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) - -$(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h: ../../sparc/shared/include/drvmgr/ambapp_bus_grlib.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus_grlib.h - -$(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h: ../../sparc/shared/include/drvmgr/ambapp_bus.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/ambapp_bus.h - -$(PROJECT_INCLUDE)/drvmgr/bspcommon.h: ../../sparc/shared/include/drvmgr/bspcommon.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/bspcommon.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/bspcommon.h - -if HAS_NETWORKING -$(PROJECT_INCLUDE)/bsp/greth.h: ../../sparc/shared/include/greth.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/greth.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/greth.h -endif -if HAS_NETWORKING -$(PROJECT_INCLUDE)/bsp/network_interface_add.h: ../../sparc/shared/include/network_interface_add.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/network_interface_add.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/network_interface_add.h -endif diff --git a/c/src/lib/libbsp/sparc/leon3/bsp_specs b/c/src/lib/libbsp/sparc/leon3/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/sparc/leon3/bsp_specs +++ b/c/src/lib/libbsp/sparc/leon3/startup/bsp_specs diff --git a/c/src/lib/libbsp/sparc64/Makefile.am b/c/src/lib/libbsp/sparc64/Makefile.am index 526453030c..b0e0689014 100644 --- a/c/src/lib/libbsp/sparc64/Makefile.am +++ b/c/src/lib/libbsp/sparc64/Makefile.am @@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@ include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am +include $(srcdir)/../../../../../bsps/sparc64/headers.am diff --git a/c/src/lib/libbsp/sparc64/configure.ac b/c/src/lib/libbsp/sparc64/configure.ac index dc62789228..4c696899f3 100644 --- a/c/src/lib/libbsp/sparc64/configure.ac +++ b/c/src/lib/libbsp/sparc64/configure.ac @@ -7,6 +7,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc64],[_RTEMS_VERSION],[https://devel.rtems.o # AC_CONFIG_SRCDIR([shared]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am index 0267cc9a6c..717dfdc638 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -4,28 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp +dist_project_lib_DATA = startup/bsp_specs -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += ../shared/include/asm.h - -include_bootdir = $(includedir)/boot -include_boot_HEADERS = ../shared/helenos/boot/include/align.h \ - ../shared/helenos/boot/include/balloc.h \ - ../shared/helenos/boot/include/gentypes.h \ - ../shared/helenos/boot/include/main.h \ - ../shared/helenos/boot/include/ofwarch.h \ - ../shared/helenos/boot/include/ofw.h \ - ../shared/helenos/boot/include/ofw_tree.h \ - ../shared/helenos/boot/include/register.h \ - ../shared/helenos/boot/include/stack.h \ - ../shared/helenos/boot/include/types.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -75,5 +55,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sparc64/niagara/headers.am diff --git a/c/src/lib/libbsp/sparc64/niagara/configure.ac b/c/src/lib/libbsp/sparc64/niagara/configure.ac index 761700175e..cd5d26121e 100644 --- a/c/src/lib/libbsp/sparc64/niagara/configure.ac +++ b/c/src/lib/libbsp/sparc64/niagara/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4v],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/niagara.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc64/niagara/preinstall.am b/c/src/lib/libbsp/sparc64/niagara/preinstall.am deleted file mode 100644 index d2c8f3b3b8..0000000000 --- a/c/src/lib/libbsp/sparc64/niagara/preinstall.am +++ /dev/null @@ -1,112 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h - -$(PROJECT_INCLUDE)/boot/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/boot - @: > $(PROJECT_INCLUDE)/boot/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/boot/$(dirstamp) - -$(PROJECT_INCLUDE)/boot/align.h: ../shared/helenos/boot/include/align.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/align.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/align.h - -$(PROJECT_INCLUDE)/boot/balloc.h: ../shared/helenos/boot/include/balloc.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/balloc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/balloc.h - -$(PROJECT_INCLUDE)/boot/gentypes.h: ../shared/helenos/boot/include/gentypes.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/gentypes.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/gentypes.h - -$(PROJECT_INCLUDE)/boot/main.h: ../shared/helenos/boot/include/main.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/main.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/main.h - -$(PROJECT_INCLUDE)/boot/ofwarch.h: ../shared/helenos/boot/include/ofwarch.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofwarch.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofwarch.h - -$(PROJECT_INCLUDE)/boot/ofw.h: ../shared/helenos/boot/include/ofw.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw.h - -$(PROJECT_INCLUDE)/boot/ofw_tree.h: ../shared/helenos/boot/include/ofw_tree.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw_tree.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw_tree.h - -$(PROJECT_INCLUDE)/boot/register.h: ../shared/helenos/boot/include/register.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/register.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/register.h - -$(PROJECT_INCLUDE)/boot/stack.h: ../shared/helenos/boot/include/stack.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/stack.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/stack.h - -$(PROJECT_INCLUDE)/boot/types.h: ../shared/helenos/boot/include/types.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/types.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/types.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/sparc64/niagara/bsp_specs b/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs index 0b4b0db932..0b4b0db932 100644 --- a/c/src/lib/libbsp/sparc64/niagara/bsp_specs +++ b/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am index 90be322b0d..cf2828a015 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -4,74 +4,16 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp - -dist_project_lib_DATA = bsp_specs - -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h -include_HEADERS += ../shared/include/asm.h -include_HEADERS += ../shared/include/traptable.h +dist_project_lib_DATA = startup/bsp_specs ## these are the include files used by the boot process from HelenOS Sparc64 -include_bootdir = $(includedir)/boot -include_boot_HEADERS = \ - ../shared/helenos/boot/include/align.h \ - ../shared/helenos/boot/include/balloc.h \ - ../shared/helenos/boot/include/gentypes.h \ - ../shared/helenos/boot/include/main.h \ - ../shared/helenos/boot/include/ofwarch.h \ - ../shared/helenos/boot/include/ofw.h \ - ../shared/helenos/boot/include/ofw_tree.h \ - ../shared/helenos/boot/include/register.h \ - ../shared/helenos/boot/include/stack.h \ - ../shared/helenos/boot/include/types.h - ## These include files mimic the HelenOS kernel include layout, which ## in HelenOS-0.4.2 is more complicated than the boot include dirs. # assumed by the HelenOS sources to be in the root includedir. We place them # in a kernel include directory. -include_kerneldir = $(includedir)/kernel -include_kernel_HEADERS = \ - ../shared/helenos/kernel/generic/include/align.h - -include_archdir = $(includedir)/arch -include_arch_HEADERS = \ - ../shared/helenos/kernel/sparc64/include/arch.h \ - ../shared/helenos/kernel/sparc64/include/boot.h \ - ../shared/helenos/kernel/sparc64/include/regdef.h \ - ../shared/helenos/kernel/sparc64/include/stack.h - -include_arch_sun4udir = $(includedir)/arch/sun4u -include_arch_sun4u_HEADERS = \ - ../shared/helenos/kernel/sparc64/include/sun4u/arch.h - -include_arch_mmdir = $(includedir)/arch/mm -include_arch_mm_HEADERS = \ - ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h \ - ../shared/helenos/kernel/sparc64/include/mm/frame.h \ - ../shared/helenos/kernel/sparc64/include/mm/mmu.h \ - ../shared/helenos/kernel/sparc64/include/mm/page.h \ - ../shared/helenos/kernel/sparc64/include/mm/tlb.h \ - ../shared/helenos/kernel/sparc64/include/mm/tte.h - - -include_arch_mm_sun4udir = $(includedir)/arch/mm/sun4u -include_arch_mm_sun4u_HEADERS = \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h \ - ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h - -include_genarch_ofwdir = $(includedir)/genarch/ofw -include_genarch_ofw_HEADERS = \ - ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h - - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h + + DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = @@ -127,5 +69,5 @@ libbsp_a_LIBADD = \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sparc64/usiii/headers.am diff --git a/c/src/lib/libbsp/sparc64/usiii/configure.ac b/c/src/lib/libbsp/sparc64/usiii/configure.ac index 1d183d2a63..a95c48fd8b 100644 --- a/c/src/lib/libbsp/sparc64/usiii/configure.ac +++ b/c/src/lib/libbsp/sparc64/usiii/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4u],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/usiii.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sparc64/usiii/preinstall.am b/c/src/lib/libbsp/sparc64/usiii/preinstall.am deleted file mode 100644 index fa403a3842..0000000000 --- a/c/src/lib/libbsp/sparc64/usiii/preinstall.am +++ /dev/null @@ -1,218 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h - -$(PROJECT_INCLUDE)/traptable.h: ../shared/include/traptable.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/traptable.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/traptable.h - -$(PROJECT_INCLUDE)/boot/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/boot - @: > $(PROJECT_INCLUDE)/boot/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/boot/$(dirstamp) - -$(PROJECT_INCLUDE)/boot/align.h: ../shared/helenos/boot/include/align.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/align.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/align.h - -$(PROJECT_INCLUDE)/boot/balloc.h: ../shared/helenos/boot/include/balloc.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/balloc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/balloc.h - -$(PROJECT_INCLUDE)/boot/gentypes.h: ../shared/helenos/boot/include/gentypes.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/gentypes.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/gentypes.h - -$(PROJECT_INCLUDE)/boot/main.h: ../shared/helenos/boot/include/main.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/main.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/main.h - -$(PROJECT_INCLUDE)/boot/ofwarch.h: ../shared/helenos/boot/include/ofwarch.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofwarch.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofwarch.h - -$(PROJECT_INCLUDE)/boot/ofw.h: ../shared/helenos/boot/include/ofw.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw.h - -$(PROJECT_INCLUDE)/boot/ofw_tree.h: ../shared/helenos/boot/include/ofw_tree.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw_tree.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw_tree.h - -$(PROJECT_INCLUDE)/boot/register.h: ../shared/helenos/boot/include/register.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/register.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/register.h - -$(PROJECT_INCLUDE)/boot/stack.h: ../shared/helenos/boot/include/stack.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/stack.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/stack.h - -$(PROJECT_INCLUDE)/boot/types.h: ../shared/helenos/boot/include/types.h $(PROJECT_INCLUDE)/boot/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/types.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/types.h - -$(PROJECT_INCLUDE)/kernel/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/kernel - @: > $(PROJECT_INCLUDE)/kernel/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/kernel/$(dirstamp) - -$(PROJECT_INCLUDE)/kernel/align.h: ../shared/helenos/kernel/generic/include/align.h $(PROJECT_INCLUDE)/kernel/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/kernel/align.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/kernel/align.h - -$(PROJECT_INCLUDE)/arch/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/arch - @: > $(PROJECT_INCLUDE)/arch/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/$(dirstamp) - -$(PROJECT_INCLUDE)/arch/arch.h: ../shared/helenos/kernel/sparc64/include/arch.h $(PROJECT_INCLUDE)/arch/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/arch.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/arch.h - -$(PROJECT_INCLUDE)/arch/boot.h: ../shared/helenos/kernel/sparc64/include/boot.h $(PROJECT_INCLUDE)/arch/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/boot.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/boot.h - -$(PROJECT_INCLUDE)/arch/regdef.h: ../shared/helenos/kernel/sparc64/include/regdef.h $(PROJECT_INCLUDE)/arch/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/regdef.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/regdef.h - -$(PROJECT_INCLUDE)/arch/stack.h: ../shared/helenos/kernel/sparc64/include/stack.h $(PROJECT_INCLUDE)/arch/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/stack.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/stack.h - -$(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/arch/sun4u - @: > $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp) - -$(PROJECT_INCLUDE)/arch/sun4u/arch.h: ../shared/helenos/kernel/sparc64/include/sun4u/arch.h $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/sun4u/arch.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/sun4u/arch.h - -$(PROJECT_INCLUDE)/arch/mm/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/arch/mm - @: > $(PROJECT_INCLUDE)/arch/mm/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/mm/$(dirstamp) - -$(PROJECT_INCLUDE)/arch/mm/cache_spec.h: ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/cache_spec.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/cache_spec.h - -$(PROJECT_INCLUDE)/arch/mm/frame.h: ../shared/helenos/kernel/sparc64/include/mm/frame.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/frame.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/frame.h - -$(PROJECT_INCLUDE)/arch/mm/mmu.h: ../shared/helenos/kernel/sparc64/include/mm/mmu.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/mmu.h - -$(PROJECT_INCLUDE)/arch/mm/page.h: ../shared/helenos/kernel/sparc64/include/mm/page.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/page.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/page.h - -$(PROJECT_INCLUDE)/arch/mm/tlb.h: ../shared/helenos/kernel/sparc64/include/mm/tlb.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/tlb.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/tlb.h - -$(PROJECT_INCLUDE)/arch/mm/tte.h: ../shared/helenos/kernel/sparc64/include/mm/tte.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/tte.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/tte.h - -$(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/arch/mm/sun4u - @: > $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp) - -$(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h - -$(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h - -$(PROJECT_INCLUDE)/arch/mm/sun4u/page.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/page.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/page.h - -$(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h - -$(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h - -$(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/genarch/ofw - @: > $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp) - -$(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h: ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/sparc64/usiii/bsp_specs b/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs index 0b4b0db932..0b4b0db932 100644 --- a/c/src/lib/libbsp/sparc64/usiii/bsp_specs +++ b/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs |