grlib: Move source files

Update #3678.

2 files changed, 3 insertions, 203 deletions

diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 72946c03db..8ab87e5191 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -44,116 +44,20 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/console/debugputs.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/leon2/clock/ckinit.c
 # IRQ
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/irq/genirq.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/irq/irq-shared.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/irq/bsp_isr_handler.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
-# AMBA bus
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_alloc.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_count.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_depth.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_find_by_idx.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_freq.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_parent.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_old.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_names.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_show.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ahbstat.c
-
-# Clock Driver and Timer Library
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/gptimer.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/tlib.c
-
 # PCI
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pci/grpci2.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pci/grpci2dma.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pci/grpci.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pci/pcif.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/pci_memreg_sparc_le.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/pci_memreg_sparc_be.c
 librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/leon2/pci/at697_pci.c
-
-# PCI target devices
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_701.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_rasta_adcdac.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_rasta_io.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_rasta_spw_router.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_rasta_tmtc.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_leon4_n2x.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_cpci_gr740.c
-
-# B1553BRM
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/b1553brm.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/b1553rt.c
-
-# GR1553B
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/gr1553b.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/gr1553bc.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/gr1553bm.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/gr1553rt.c
-
-# CAN
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/can/occan.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/can/grcan.c
-
-# SpaceWire
-if !HAS_SMP
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/grspw.c
-endif
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/grspw_pkt.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/grspw_router.c
-
-# UART (RAW)
-# I2CMST
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/i2c/i2cmst.c
-
-# SPI
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spi/spictrl.c
-
-# TIME
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/time/spwcuc.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/time/grctm.c
-
-# GPIO
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/gpio/grgpio.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/gpio/gpiolib.c
-
-# PWM
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pwm/grpwm.c
-
-# ADC and DAC
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/analog/gradcdac.c
-
-# Memory controllers
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/mem/mctrl.c
 # l2cache
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/l2c/l2c.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/cache.c
-# griommu
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/iommu/griommu.c
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/btimer/btimer.c
 
-# TM/TC
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/tmtc/grtc.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/tmtc/grtm.c
-
-# MEMSCRUB
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/scrub/memscrub.c
-
-# L4STAT
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/stat/l4stat.c
-
-# SPWTDP
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/spwtdp.c
-
 # Driver Manager
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/drvmgr/ambapp_bus.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/drvmgr/ambapp_bus_leon2.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/drvmgr/leon2_amba_bus.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/drvmgr/get_resarray_count.c
 
 if HAS_SMP
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspsmp-dummy.c
@@ -163,11 +67,10 @@ endif
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/net/leon_smc91111.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/net/leon_open_eth.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/net/greth.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/net/network_interface_add.c
 endif
 
 
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
+include $(srcdir)/../../../../../../bsps/shared/grlib-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sparc/leon2/headers.am
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 9fff259955..7933a48024 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -44,136 +44,34 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/gnatsupp/gnatsupp.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/gnatcommon.c
 # AMBA bus
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/amba.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_alloc.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_count.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_depth.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_find_by_idx.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_freq.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_parent.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_old.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_names.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ambapp_show.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/amba/ahbstat.c
-
-# Clock Driver and Timer Library
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/gptimer.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/tlib.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/btimer/tlib_ckinit.c
+
 # non-Driver Manager Clock Implementation
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sparc/leon3/clock/ckinit.c
 
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/console/console.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/cons.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/apbuart_cons.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/apbuart_polled.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/apbuart_termios.c
 # debugio
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/console/printk_support.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/eirq.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/irq/genirq.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/irq/irq-shared.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/irq/bsp_isr_handler.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 # PCI
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pci/grpci.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pci/grpci2.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pci/grpci2dma.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/pcif.c
 librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/pci_memreg_sparc_le.c
 librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/pci_memreg_sparc_be.c
 
 # PCI target devices
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_701.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_rasta_adcdac.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_rasta_io.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_rasta_spw_router.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_rasta_tmtc.c
-librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_tmtc_1553.c
 librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_leon4_n2x.c
 librtemsbsp_a_SOURCES +=  ../../../../../../bsps/sparc/shared/pci/gr_cpci_gr740.c
 
-# B1553BRM
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/b1553brm.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/b1553rt.c
-
-# GR1553B
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/gr1553b.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/gr1553bc.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/gr1553bm.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/1553/gr1553rt.c
-
-# CAN
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/can/occan.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/can/grcan.c
-
-# SpaceWire
-if !HAS_SMP
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/grspw.c
-endif
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/grspw_pkt.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/grspw_router.c
-
-# I2CMST
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/i2c/i2cmst.c
-
-# SPI
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spi/spictrl.c
-
-# TIME
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/time/spwcuc.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/time/grctm.c
-
-# GPIO
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/gpio/grgpio.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/gpio/gpiolib.c
-
-# PWM
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/pwm/grpwm.c
-
-# ADC and DAC
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/analog/gradcdac.c
-
-# Memory controllers
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/mem/mctrl.c
-# l2cache
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/l2c/l2c.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/cache.c
-# griommu
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/iommu/griommu.c
-# timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/btimer/btimer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/btimer/watchdog.c
 
-# GR712
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/ascs/grascs.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/can/satcan.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/can/canmux.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/slink/grslink.c
-
-# TM/TC
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/tmtc/grtc.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/tmtc/grtm.c
-
-# MEMSCRUB
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/scrub/memscrub.c
-
-# L4STAT
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/stat/l4stat.c
-
-# SPWTDP
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/spwtdp.c
-
-# Driver Manager 
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/drvmgr/ambapp_bus.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/drvmgr/ambapp_bus_grlib.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/drvmgr/get_resarray_count.c
-
 if HAS_SMP
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/bspsmp.c
 endif
@@ -181,8 +79,6 @@ endif
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/net/leon_smc91111.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/net/leon_open_eth.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/net/greth.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/net/network_interface_add.c
 if !HAS_SMP
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/net/leon_greth.c
 endif
@@ -198,5 +94,6 @@ endif
 
 
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
+include $(srcdir)/../../../../../../bsps/shared/grlib-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
 include $(srcdir)/../../../../../../bsps/sparc/leon3/headers.am