grlib: Move source files

Update #3678.

69 files changed, 72 insertions, 203 deletions

diff --git a/bsps/shared/grlib-sources.am b/bsps/shared/grlib-sources.am
new file mode 100644
index 0000000000..512a48c7f7
--- /dev/null
+++ b/bsps/shared/grlib-sources.am
@@ -0,0 +1,69 @@
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/1553/b1553brm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/1553/b1553rt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/1553/gr1553b.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/1553/gr1553bc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/1553/gr1553bm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/1553/gr1553rt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ahbstat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_alloc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_count.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_depth.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_find_by_idx.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_freq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_names.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_old.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_parent.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/amba/ambapp_show.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/analog/gradcdac.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/ascs/grascs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/btimer/gptimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/btimer/tlib.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/btimer/tlib_ckinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/can/canmux.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/can/grcan.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/can/occan.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/can/satcan.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/drvmgr/ambapp_bus.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/drvmgr/ambapp_bus_grlib.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/drvmgr/get_resarray_count.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/gpio/gpiolib.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/gpio/grgpio.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/i2c/i2cmst.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/iommu/griommu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/irq/genirq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/l2c/l2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/mem/mctrl.c
+if HAS_NETWORKING
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/net/greth.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/net/network_interface_add.c
+endif
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/gr_701.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/grpci2.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/grpci2dma.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/grpci.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/gr_rasta_adcdac.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/gr_rasta_io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/gr_rasta_spw_router.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/gr_rasta_tmtc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/gr_tmtc_1553.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pci/pcif.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/pwm/grpwm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/scrub/memscrub.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/slink/grslink.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/spi/spictrl.c
+if !HAS_SMP
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/spw/grspw.c
+endif
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/spw/grspw_pkt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/spw/grspw_router.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/spw/spwtdp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/stat/l4stat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/time/grctm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/time/spwcuc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/tmtc/grtc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/tmtc/grtm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/uart/apbuart_cons.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/uart/apbuart_polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/uart/apbuart_termios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/uart/cons.c
diff --git a/bsps/sparc/shared/1553/b1553brm.c b/bsps/shared/grlib/1553/b1553brm.c
index 5575abb525..5575abb525 100644
--- a/bsps/sparc/shared/1553/b1553brm.c
+++ b/bsps/shared/grlib/1553/b1553brm.c
diff --git a/bsps/sparc/shared/1553/b1553rt.c b/bsps/shared/grlib/1553/b1553rt.c
index 35afd901c8..35afd901c8 100644
--- a/bsps/sparc/shared/1553/b1553rt.c
+++ b/bsps/shared/grlib/1553/b1553rt.c
diff --git a/bsps/sparc/shared/1553/gr1553b.c b/bsps/shared/grlib/1553/gr1553b.c
index 777b6dc743..777b6dc743 100644
--- a/bsps/sparc/shared/1553/gr1553b.c
+++ b/bsps/shared/grlib/1553/gr1553b.c
diff --git a/bsps/sparc/shared/1553/gr1553bc.c b/bsps/shared/grlib/1553/gr1553bc.c
index a22e2d8007..a22e2d8007 100644
--- a/bsps/sparc/shared/1553/gr1553bc.c
+++ b/bsps/shared/grlib/1553/gr1553bc.c
diff --git a/bsps/sparc/shared/1553/gr1553bm.c b/bsps/shared/grlib/1553/gr1553bm.c
index 482e574d78..482e574d78 100644
--- a/bsps/sparc/shared/1553/gr1553bm.c
+++ b/bsps/shared/grlib/1553/gr1553bm.c
diff --git a/bsps/sparc/shared/1553/gr1553rt.c b/bsps/shared/grlib/1553/gr1553rt.c
index 339e856c76..339e856c76 100644
--- a/bsps/sparc/shared/1553/gr1553rt.c
+++ b/bsps/shared/grlib/1553/gr1553rt.c
diff --git a/bsps/sparc/shared/amba/ahbstat.c b/bsps/shared/grlib/amba/ahbstat.c
index af3d778feb..af3d778feb 100644
--- a/bsps/sparc/shared/amba/ahbstat.c
+++ b/bsps/shared/grlib/amba/ahbstat.c
diff --git a/bsps/sparc/shared/amba/ambapp.c b/bsps/shared/grlib/amba/ambapp.c
index 69018f47e7..69018f47e7 100644
--- a/bsps/sparc/shared/amba/ambapp.c
+++ b/bsps/shared/grlib/amba/ambapp.c
diff --git a/bsps/sparc/shared/amba/ambapp_alloc.c b/bsps/shared/grlib/amba/ambapp_alloc.c
index 96fcb7961b..96fcb7961b 100644
--- a/bsps/sparc/shared/amba/ambapp_alloc.c
+++ b/bsps/shared/grlib/amba/ambapp_alloc.c
diff --git a/bsps/sparc/shared/amba/ambapp_count.c b/bsps/shared/grlib/amba/ambapp_count.c
index 9da4d93a19..9da4d93a19 100644
--- a/bsps/sparc/shared/amba/ambapp_count.c
+++ b/bsps/shared/grlib/amba/ambapp_count.c
diff --git a/bsps/sparc/shared/amba/ambapp_depth.c b/bsps/shared/grlib/amba/ambapp_depth.c
index 2fe0b142e9..2fe0b142e9 100644
--- a/bsps/sparc/shared/amba/ambapp_depth.c
+++ b/bsps/shared/grlib/amba/ambapp_depth.c
diff --git a/bsps/sparc/shared/amba/ambapp_find_by_idx.c b/bsps/shared/grlib/amba/ambapp_find_by_idx.c
index 55d9022881..55d9022881 100644
--- a/bsps/sparc/shared/amba/ambapp_find_by_idx.c
+++ b/bsps/shared/grlib/amba/ambapp_find_by_idx.c
diff --git a/bsps/sparc/shared/amba/ambapp_freq.c b/bsps/shared/grlib/amba/ambapp_freq.c
index 9e6e9c1765..9e6e9c1765 100644
--- a/bsps/sparc/shared/amba/ambapp_freq.c
+++ b/bsps/shared/grlib/amba/ambapp_freq.c
diff --git a/bsps/sparc/shared/amba/ambapp_names.c b/bsps/shared/grlib/amba/ambapp_names.c
index 8d168f283b..8d168f283b 100644
--- a/bsps/sparc/shared/amba/ambapp_names.c
+++ b/bsps/shared/grlib/amba/ambapp_names.c
diff --git a/bsps/sparc/shared/amba/ambapp_old.c b/bsps/shared/grlib/amba/ambapp_old.c
index a51e692fbf..a51e692fbf 100644
--- a/bsps/sparc/shared/amba/ambapp_old.c
+++ b/bsps/shared/grlib/amba/ambapp_old.c
diff --git a/bsps/sparc/shared/amba/ambapp_parent.c b/bsps/shared/grlib/amba/ambapp_parent.c
index b77b6eec68..b77b6eec68 100644
--- a/bsps/sparc/shared/amba/ambapp_parent.c
+++ b/bsps/shared/grlib/amba/ambapp_parent.c
diff --git a/bsps/sparc/shared/amba/ambapp_show.c b/bsps/shared/grlib/amba/ambapp_show.c
index 12cefa2c0f..12cefa2c0f 100644
--- a/bsps/sparc/shared/amba/ambapp_show.c
+++ b/bsps/shared/grlib/amba/ambapp_show.c
diff --git a/bsps/sparc/shared/analog/gradcdac.c b/bsps/shared/grlib/analog/gradcdac.c
index 02939e58f0..02939e58f0 100644
--- a/bsps/sparc/shared/analog/gradcdac.c
+++ b/bsps/shared/grlib/analog/gradcdac.c
diff --git a/bsps/sparc/shared/ascs/grascs.c b/bsps/shared/grlib/ascs/grascs.c
index 1d9541ce85..1d9541ce85 100644
--- a/bsps/sparc/shared/ascs/grascs.c
+++ b/bsps/shared/grlib/ascs/grascs.c
diff --git a/bsps/sparc/shared/btimer/gptimer.c b/bsps/shared/grlib/btimer/gptimer.c
index 4b3ec8c4b8..4b3ec8c4b8 100644
--- a/bsps/sparc/shared/btimer/gptimer.c
+++ b/bsps/shared/grlib/btimer/gptimer.c
diff --git a/bsps/sparc/shared/btimer/tlib.c b/bsps/shared/grlib/btimer/tlib.c
index d66a472fe9..d66a472fe9 100644
--- a/bsps/sparc/shared/btimer/tlib.c
+++ b/bsps/shared/grlib/btimer/tlib.c
diff --git a/bsps/sparc/shared/btimer/tlib_ckinit.c b/bsps/shared/grlib/btimer/tlib_ckinit.c
index e43c8fdd8e..e43c8fdd8e 100644
--- a/bsps/sparc/shared/btimer/tlib_ckinit.c
+++ b/bsps/shared/grlib/btimer/tlib_ckinit.c
diff --git a/bsps/sparc/shared/can/canmux.c b/bsps/shared/grlib/can/canmux.c
index 369cb3dd0a..369cb3dd0a 100644
--- a/bsps/sparc/shared/can/canmux.c
+++ b/bsps/shared/grlib/can/canmux.c
diff --git a/bsps/sparc/shared/can/grcan.c b/bsps/shared/grlib/can/grcan.c
index 55154d823a..55154d823a 100644
--- a/bsps/sparc/shared/can/grcan.c
+++ b/bsps/shared/grlib/can/grcan.c
diff --git a/bsps/sparc/shared/can/occan.c b/bsps/shared/grlib/can/occan.c
index 59b4f234f6..59b4f234f6 100644
--- a/bsps/sparc/shared/can/occan.c
+++ b/bsps/shared/grlib/can/occan.c
diff --git a/bsps/sparc/shared/can/satcan.c b/bsps/shared/grlib/can/satcan.c
index c6d58aaed4..c6d58aaed4 100644
--- a/bsps/sparc/shared/can/satcan.c
+++ b/bsps/shared/grlib/can/satcan.c
diff --git a/bsps/sparc/shared/drvmgr/ambapp_bus.c b/bsps/shared/grlib/drvmgr/ambapp_bus.c
index 931d5d2a61..931d5d2a61 100644
--- a/bsps/sparc/shared/drvmgr/ambapp_bus.c
+++ b/bsps/shared/grlib/drvmgr/ambapp_bus.c
diff --git a/bsps/sparc/shared/drvmgr/ambapp_bus_grlib.c b/bsps/shared/grlib/drvmgr/ambapp_bus_grlib.c
index 9e8c37daf2..9e8c37daf2 100644
--- a/bsps/sparc/shared/drvmgr/ambapp_bus_grlib.c
+++ b/bsps/shared/grlib/drvmgr/ambapp_bus_grlib.c
diff --git a/bsps/sparc/shared/drvmgr/get_resarray_count.c b/bsps/shared/grlib/drvmgr/get_resarray_count.c
index 7b5850d982..7b5850d982 100644
--- a/bsps/sparc/shared/drvmgr/get_resarray_count.c
+++ b/bsps/shared/grlib/drvmgr/get_resarray_count.c
diff --git a/bsps/sparc/shared/gpio/gpiolib.c b/bsps/shared/grlib/gpio/gpiolib.c
index cf0038c5bb..cf0038c5bb 100644
--- a/bsps/sparc/shared/gpio/gpiolib.c
+++ b/bsps/shared/grlib/gpio/gpiolib.c
diff --git a/bsps/sparc/shared/gpio/grgpio.c b/bsps/shared/grlib/gpio/grgpio.c
index 05504ef020..05504ef020 100644
--- a/bsps/sparc/shared/gpio/grgpio.c
+++ b/bsps/shared/grlib/gpio/grgpio.c
diff --git a/bsps/sparc/shared/i2c/i2cmst.c b/bsps/shared/grlib/i2c/i2cmst.c
index fad0937df2..fad0937df2 100644
--- a/bsps/sparc/shared/i2c/i2cmst.c
+++ b/bsps/shared/grlib/i2c/i2cmst.c
diff --git a/bsps/sparc/shared/iommu/griommu.c b/bsps/shared/grlib/iommu/griommu.c
index d0d22723ca..d0d22723ca 100644
--- a/bsps/sparc/shared/iommu/griommu.c
+++ b/bsps/shared/grlib/iommu/griommu.c
diff --git a/bsps/sparc/shared/irq/genirq.c b/bsps/shared/grlib/irq/genirq.c
index 285416b0d3..285416b0d3 100644
--- a/bsps/sparc/shared/irq/genirq.c
+++ b/bsps/shared/grlib/irq/genirq.c
diff --git a/bsps/sparc/shared/l2c/l2c.c b/bsps/shared/grlib/l2c/l2c.c
index ddef0ada5c..ddef0ada5c 100644
--- a/bsps/sparc/shared/l2c/l2c.c
+++ b/bsps/shared/grlib/l2c/l2c.c
diff --git a/bsps/sparc/shared/mem/mctrl.c b/bsps/shared/grlib/mem/mctrl.c
index a384547de8..a384547de8 100644
--- a/bsps/sparc/shared/mem/mctrl.c
+++ b/bsps/shared/grlib/mem/mctrl.c
diff --git a/bsps/sparc/shared/net/README b/bsps/shared/grlib/net/README
index 3ef086f223..3ef086f223 100644
--- a/bsps/sparc/shared/net/README
+++ b/bsps/shared/grlib/net/README
diff --git a/bsps/sparc/shared/net/greth.c b/bsps/shared/grlib/net/greth.c
index 30eb4cc8a9..30eb4cc8a9 100644
--- a/bsps/sparc/shared/net/greth.c
+++ b/bsps/shared/grlib/net/greth.c
diff --git a/bsps/sparc/shared/net/network_interface_add.c b/bsps/shared/grlib/net/network_interface_add.c
index 011137404f..011137404f 100644
--- a/bsps/sparc/shared/net/network_interface_add.c
+++ b/bsps/shared/grlib/net/network_interface_add.c
diff --git a/bsps/sparc/shared/pci/gr_701.c b/bsps/shared/grlib/pci/gr_701.c
index c9ac0db0f2..c9ac0db0f2 100644
--- a/bsps/sparc/shared/pci/gr_701.c
+++ b/bsps/shared/grlib/pci/gr_701.c
diff --git a/bsps/sparc/shared/pci/gr_rasta_adcdac.c b/bsps/shared/grlib/pci/gr_rasta_adcdac.c
index 12e35acbc5..12e35acbc5 100644
--- a/bsps/sparc/shared/pci/gr_rasta_adcdac.c
+++ b/bsps/shared/grlib/pci/gr_rasta_adcdac.c
diff --git a/bsps/sparc/shared/pci/gr_rasta_io.c b/bsps/shared/grlib/pci/gr_rasta_io.c
index f4c9d50a7b..f4c9d50a7b 100644
--- a/bsps/sparc/shared/pci/gr_rasta_io.c
+++ b/bsps/shared/grlib/pci/gr_rasta_io.c
diff --git a/bsps/sparc/shared/pci/gr_rasta_spw_router.c b/bsps/shared/grlib/pci/gr_rasta_spw_router.c
index 6efbaa463d..6efbaa463d 100644
--- a/bsps/sparc/shared/pci/gr_rasta_spw_router.c
+++ b/bsps/shared/grlib/pci/gr_rasta_spw_router.c
diff --git a/bsps/sparc/shared/pci/gr_rasta_tmtc.c b/bsps/shared/grlib/pci/gr_rasta_tmtc.c
index bef2927926..bef2927926 100644
--- a/bsps/sparc/shared/pci/gr_rasta_tmtc.c
+++ b/bsps/shared/grlib/pci/gr_rasta_tmtc.c
diff --git a/bsps/sparc/shared/pci/gr_tmtc_1553.c b/bsps/shared/grlib/pci/gr_tmtc_1553.c
index ce02b8a256..ce02b8a256 100644
--- a/bsps/sparc/shared/pci/gr_tmtc_1553.c
+++ b/bsps/shared/grlib/pci/gr_tmtc_1553.c
diff --git a/bsps/sparc/shared/pci/grpci.c b/bsps/shared/grlib/pci/grpci.c
index fc2f06a063..fc2f06a063 100644
--- a/bsps/sparc/shared/pci/grpci.c
+++ b/bsps/shared/grlib/pci/grpci.c
diff --git a/bsps/sparc/shared/pci/grpci2.c b/bsps/shared/grlib/pci/grpci2.c
index 21c09f47a5..21c09f47a5 100644
--- a/bsps/sparc/shared/pci/grpci2.c
+++ b/bsps/shared/grlib/pci/grpci2.c
diff --git a/bsps/sparc/shared/pci/grpci2dma.c b/bsps/shared/grlib/pci/grpci2dma.c
index 7e39ca691d..7e39ca691d 100644
--- a/bsps/sparc/shared/pci/grpci2dma.c
+++ b/bsps/shared/grlib/pci/grpci2dma.c
diff --git a/bsps/sparc/shared/pci/pcif.c b/bsps/shared/grlib/pci/pcif.c
index 17708a9c0b..17708a9c0b 100644
--- a/bsps/sparc/shared/pci/pcif.c
+++ b/bsps/shared/grlib/pci/pcif.c
diff --git a/bsps/sparc/shared/pwm/grpwm.c b/bsps/shared/grlib/pwm/grpwm.c
index a824201795..a824201795 100644
--- a/bsps/sparc/shared/pwm/grpwm.c
+++ b/bsps/shared/grlib/pwm/grpwm.c
diff --git a/bsps/sparc/shared/scrub/memscrub.c b/bsps/shared/grlib/scrub/memscrub.c
index 7c6ceb43e0..7c6ceb43e0 100644
--- a/bsps/sparc/shared/scrub/memscrub.c
+++ b/bsps/shared/grlib/scrub/memscrub.c
diff --git a/bsps/sparc/shared/slink/grslink.c b/bsps/shared/grlib/slink/grslink.c
index 5a3b5b5ea6..5a3b5b5ea6 100644
--- a/bsps/sparc/shared/slink/grslink.c
+++ b/bsps/shared/grlib/slink/grslink.c
diff --git a/bsps/sparc/shared/spi/spictrl.c b/bsps/shared/grlib/spi/spictrl.c
index 0c9f88c10f..0c9f88c10f 100644
--- a/bsps/sparc/shared/spi/spictrl.c
+++ b/bsps/shared/grlib/spi/spictrl.c
diff --git a/bsps/sparc/shared/spw/grspw.c b/bsps/shared/grlib/spw/grspw.c
index ca0f63edd8..ca0f63edd8 100644
--- a/bsps/sparc/shared/spw/grspw.c
+++ b/bsps/shared/grlib/spw/grspw.c
diff --git a/bsps/sparc/shared/spw/grspw_pkt.c b/bsps/shared/grlib/spw/grspw_pkt.c
index 208f5a14f7..208f5a14f7 100644
--- a/bsps/sparc/shared/spw/grspw_pkt.c
+++ b/bsps/shared/grlib/spw/grspw_pkt.c
diff --git a/bsps/sparc/shared/spw/grspw_router.c b/bsps/shared/grlib/spw/grspw_router.c
index d8ba8feef3..d8ba8feef3 100644
--- a/bsps/sparc/shared/spw/grspw_router.c
+++ b/bsps/shared/grlib/spw/grspw_router.c
diff --git a/bsps/sparc/shared/spw/spwtdp.c b/bsps/shared/grlib/spw/spwtdp.c
index df74675355..df74675355 100644
--- a/bsps/sparc/shared/spw/spwtdp.c
+++ b/bsps/shared/grlib/spw/spwtdp.c
diff --git a/bsps/sparc/shared/stat/l4stat.c b/bsps/shared/grlib/stat/l4stat.c
index ee4ae7d6a4..ee4ae7d6a4 100644
--- a/bsps/sparc/shared/stat/l4stat.c
+++ b/bsps/shared/grlib/stat/l4stat.c
diff --git a/bsps/sparc/shared/time/grctm.c b/bsps/shared/grlib/time/grctm.c
index 038c3ddf34..038c3ddf34 100644
--- a/bsps/sparc/shared/time/grctm.c
+++ b/bsps/shared/grlib/time/grctm.c
diff --git a/bsps/sparc/shared/time/spwcuc.c b/bsps/shared/grlib/time/spwcuc.c
index d742f2d225..d742f2d225 100644
--- a/bsps/sparc/shared/time/spwcuc.c
+++ b/bsps/shared/grlib/time/spwcuc.c
diff --git a/bsps/sparc/shared/tmtc/grtc.c b/bsps/shared/grlib/tmtc/grtc.c
index 44e9685c3a..44e9685c3a 100644
--- a/bsps/sparc/shared/tmtc/grtc.c
+++ b/bsps/shared/grlib/tmtc/grtc.c
diff --git a/bsps/sparc/shared/tmtc/grtm.c b/bsps/shared/grlib/tmtc/grtm.c
index 43476aaaad..43476aaaad 100644
--- a/bsps/sparc/shared/tmtc/grtm.c
+++ b/bsps/shared/grlib/tmtc/grtm.c
diff --git a/bsps/sparc/shared/uart/apbuart_cons.c b/bsps/shared/grlib/uart/apbuart_cons.c
index 8cd8a1ebf0..8cd8a1ebf0 100644
--- a/bsps/sparc/shared/uart/apbuart_cons.c
+++ b/bsps/shared/grlib/uart/apbuart_cons.c
diff --git a/bsps/sparc/shared/uart/apbuart_polled.c b/bsps/shared/grlib/uart/apbuart_polled.c
index 0fbfbc51ba..0fbfbc51ba 100644
--- a/bsps/sparc/shared/uart/apbuart_polled.c
+++ b/bsps/shared/grlib/uart/apbuart_polled.c
diff --git a/bsps/sparc/shared/uart/apbuart_termios.c b/bsps/shared/grlib/uart/apbuart_termios.c
index 81df89c171..81df89c171 100644
--- a/bsps/sparc/shared/uart/apbuart_termios.c
+++ b/bsps/shared/grlib/uart/apbuart_termios.c
diff --git a/bsps/sparc/shared/uart/cons.c b/bsps/shared/grlib/uart/cons.c
index 5fa41e6914..5fa41e6914 100644
--- a/bsps/sparc/shared/uart/cons.c
+++ b/bsps/shared/grlib/uart/cons.c
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