>From 2a73358d3b81720c2a97646f2b5abf91b2195cda Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.hu...@embedded-brains.de>
Date: Sat, 22 Dec 2018 18:31:04 +0100
Subject: [PATCH 2/5] grlib: Move source files
---
bsps/shared/grlib-sources.am | 67 +++++++++++
.../shared => shared/grlib}/1553/b1553brm.c | 0
.../shared => shared/grlib}/1553/b1553rt.c | 0
.../shared => shared/grlib}/1553/gr1553b.c | 0
.../shared => shared/grlib}/1553/gr1553bc.c | 0
.../shared => shared/grlib}/1553/gr1553bm.c | 0
.../shared => shared/grlib}/1553/gr1553rt.c | 0
.../shared => shared/grlib}/amba/ahbstat.c | 0
.../shared => shared/grlib}/amba/ambapp.c | 0
.../grlib}/amba/ambapp_alloc.c | 0
.../grlib}/amba/ambapp_count.c | 0
.../grlib}/amba/ambapp_depth.c | 0
.../grlib}/amba/ambapp_find_by_idx.c | 0
.../grlib}/amba/ambapp_freq.c | 0
.../grlib}/amba/ambapp_names.c | 0
.../shared => shared/grlib}/amba/ambapp_old.c | 0
.../grlib}/amba/ambapp_parent.c | 0
.../grlib}/amba/ambapp_show.c | 0
.../shared => shared/grlib}/analog/gradcdac.c | 0
.../shared => shared/grlib}/ascs/grascs.c | 0
.../shared => shared/grlib}/btimer/gptimer.c | 0
.../shared => shared/grlib}/btimer/tlib.c | 0
.../grlib}/btimer/tlib_ckinit.c | 0
.../shared => shared/grlib}/can/canmux.c | 0
.../shared => shared/grlib}/can/grcan.c | 0
.../shared => shared/grlib}/can/occan.c | 0
.../shared => shared/grlib}/can/satcan.c | 0
.../grlib}/drvmgr/ambapp_bus.c | 0
.../grlib}/drvmgr/ambapp_bus_grlib.c | 0
.../grlib}/drvmgr/get_resarray_count.c | 0
.../shared => shared/grlib}/gpio/gpiolib.c | 0
.../shared => shared/grlib}/gpio/grgpio.c | 0
.../shared => shared/grlib}/i2c/i2cmst.c | 0
.../shared => shared/grlib}/iommu/griommu.c | 0
.../shared => shared/grlib}/irq/genirq.c | 0
bsps/{sparc/shared => shared/grlib}/l2c/l2c.c | 0
.../shared => shared/grlib}/mem/mctrl.c | 0
.../{sparc/shared => shared/grlib}/net/README | 0
.../shared => shared/grlib}/net/greth.c | 0
.../grlib}/net/network_interface_add.c | 0
.../shared => shared/grlib}/pci/gr_701.c | 0
.../grlib}/pci/gr_rasta_adcdac.c | 0
.../shared => shared/grlib}/pci/gr_rasta_io.c | 0
.../grlib}/pci/gr_rasta_spw_router.c | 0
.../grlib}/pci/gr_rasta_tmtc.c | 0
.../grlib}/pci/gr_tmtc_1553.c | 0
.../shared => shared/grlib}/pci/grpci.c | 0
.../shared => shared/grlib}/pci/grpci2.c | 0
.../shared => shared/grlib}/pci/grpci2dma.c | 0
.../{sparc/shared => shared/grlib}/pci/pcif.c | 0
.../shared => shared/grlib}/pwm/grpwm.c | 0
.../shared => shared/grlib}/scrub/memscrub.c | 0
.../shared => shared/grlib}/slink/grslink.c | 0
.../shared => shared/grlib}/spi/spictrl.c | 0
.../shared => shared/grlib}/spw/grspw.c | 0
.../shared => shared/grlib}/spw/grspw_pkt.c | 0
.../grlib}/spw/grspw_router.c | 0
.../shared => shared/grlib}/spw/spwtdp.c | 0
.../shared => shared/grlib}/stat/l4stat.c | 0
.../shared => shared/grlib}/time/grctm.c | 0
.../shared => shared/grlib}/time/spwcuc.c | 0
.../shared => shared/grlib}/tmtc/grtc.c | 0
.../shared => shared/grlib}/tmtc/grtm.c | 0
.../grlib}/uart/apbuart_cons.c | 0
.../grlib}/uart/apbuart_polled.c | 0
.../grlib}/uart/apbuart_termios.c | 0
.../shared => shared/grlib}/uart/cons.c | 0
c/src/lib/libbsp/sparc/leon3/Makefile.am | 107 +-----------------
68 files changed, 69 insertions(+), 105 deletions(-)
create mode 100644 bsps/shared/grlib-sources.am
rename bsps/{sparc/shared => shared/grlib}/1553/b1553brm.c (100%)
rename bsps/{sparc/shared => shared/grlib}/1553/b1553rt.c (100%)
rename bsps/{sparc/shared => shared/grlib}/1553/gr1553b.c (100%)
rename bsps/{sparc/shared => shared/grlib}/1553/gr1553bc.c (100%)
rename bsps/{sparc/shared => shared/grlib}/1553/gr1553bm.c (100%)
rename bsps/{sparc/shared => shared/grlib}/1553/gr1553rt.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ahbstat.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_alloc.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_count.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_depth.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_find_by_idx.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_freq.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_names.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_old.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_parent.c (100%)
rename bsps/{sparc/shared => shared/grlib}/amba/ambapp_show.c (100%)
rename bsps/{sparc/shared => shared/grlib}/analog/gradcdac.c (100%)
rename bsps/{sparc/shared => shared/grlib}/ascs/grascs.c (100%)
rename bsps/{sparc/shared => shared/grlib}/btimer/gptimer.c (100%)
rename bsps/{sparc/shared => shared/grlib}/btimer/tlib.c (100%)
rename bsps/{sparc/shared => shared/grlib}/btimer/tlib_ckinit.c (100%)
rename bsps/{sparc/shared => shared/grlib}/can/canmux.c (100%)
rename bsps/{sparc/shared => shared/grlib}/can/grcan.c (100%)
rename bsps/{sparc/shared => shared/grlib}/can/occan.c (100%)
rename bsps/{sparc/shared => shared/grlib}/can/satcan.c (100%)
rename bsps/{sparc/shared => shared/grlib}/drvmgr/ambapp_bus.c (100%)
rename bsps/{sparc/shared => shared/grlib}/drvmgr/ambapp_bus_grlib.c (100%)
rename bsps/{sparc/shared => shared/grlib}/drvmgr/get_resarray_count.c (100%)
rename bsps/{sparc/shared => shared/grlib}/gpio/gpiolib.c (100%)
rename bsps/{sparc/shared => shared/grlib}/gpio/grgpio.c (100%)
rename bsps/{sparc/shared => shared/grlib}/i2c/i2cmst.c (100%)
rename bsps/{sparc/shared => shared/grlib}/iommu/griommu.c (100%)
rename bsps/{sparc/shared => shared/grlib}/irq/genirq.c (100%)
rename bsps/{sparc/shared => shared/grlib}/l2c/l2c.c (100%)
rename bsps/{sparc/shared => shared/grlib}/mem/mctrl.c (100%)
rename bsps/{sparc/shared => shared/grlib}/net/README (100%)
rename bsps/{sparc/shared => shared/grlib}/net/greth.c (100%)
rename bsps/{sparc/shared => shared/grlib}/net/network_interface_add.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/gr_701.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/gr_rasta_adcdac.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/gr_rasta_io.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/gr_rasta_spw_router.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/gr_rasta_tmtc.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/gr_tmtc_1553.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/grpci.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/grpci2.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/grpci2dma.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pci/pcif.c (100%)
rename bsps/{sparc/shared => shared/grlib}/pwm/grpwm.c (100%)
rename bsps/{sparc/shared => shared/grlib}/scrub/memscrub.c (100%)
rename bsps/{sparc/shared => shared/grlib}/slink/grslink.c (100%)
rename bsps/{sparc/shared => shared/grlib}/spi/spictrl.c (100%)
rename bsps/{sparc/shared => shared/grlib}/spw/grspw.c (100%)
rename bsps/{sparc/shared => shared/grlib}/spw/grspw_pkt.c (100%)
rename bsps/{sparc/shared => shared/grlib}/spw/grspw_router.c (100%)
rename bsps/{sparc/shared => shared/grlib}/spw/spwtdp.c (100%)
rename bsps/{sparc/shared => shared/grlib}/stat/l4stat.c (100%)
rename bsps/{sparc/shared => shared/grlib}/time/grctm.c (100%)
rename bsps/{sparc/shared => shared/grlib}/time/spwcuc.c (100%)
rename bsps/{sparc/shared => shared/grlib}/tmtc/grtc.c (100%)
rename bsps/{sparc/shared => shared/grlib}/tmtc/grtm.c (100%)
rename bsps/{sparc/shared => shared/grlib}/uart/apbuart_cons.c (100%)
rename bsps/{sparc/shared => shared/grlib}/uart/apbuart_polled.c (100%)
rename bsps/{sparc/shared => shared/grlib}/uart/apbuart_termios.c (100%)
rename bsps/{sparc/shared => shared/grlib}/uart/cons.c (100%)
diff --git a/bsps/shared/grlib-sources.am b/bsps/shared/grlib-sources.am
new file mode 100644
index 0000000000..95310a7e94
--- /dev/null
+++ b/bsps/shared/grlib-sources.am
@@ -0,0 +1,67 @@
+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
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/net/greth.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/grlib/net/network_interface_add.c
+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
similarity index 100%
rename from bsps/sparc/shared/1553/b1553brm.c
rename to bsps/shared/grlib/1553/b1553brm.c
diff --git a/bsps/sparc/shared/1553/b1553rt.c b/bsps/shared/grlib/1553/b1553rt.c
similarity index 100%
rename from bsps/sparc/shared/1553/b1553rt.c
rename to bsps/shared/grlib/1553/b1553rt.c
diff --git a/bsps/sparc/shared/1553/gr1553b.c b/bsps/shared/grlib/1553/gr1553b.c
similarity index 100%
rename from bsps/sparc/shared/1553/gr1553b.c
rename to bsps/shared/grlib/1553/gr1553b.c
diff --git a/bsps/sparc/shared/1553/gr1553bc.c b/bsps/shared/grlib/1553/gr1553bc.c
similarity index 100%
rename from bsps/sparc/shared/1553/gr1553bc.c
rename to bsps/shared/grlib/1553/gr1553bc.c
diff --git a/bsps/sparc/shared/1553/gr1553bm.c b/bsps/shared/grlib/1553/gr1553bm.c
similarity index 100%
rename from bsps/sparc/shared/1553/gr1553bm.c
rename to bsps/shared/grlib/1553/gr1553bm.c
diff --git a/bsps/sparc/shared/1553/gr1553rt.c b/bsps/shared/grlib/1553/gr1553rt.c
similarity index 100%
rename from bsps/sparc/shared/1553/gr1553rt.c
rename to bsps/shared/grlib/1553/gr1553rt.c
diff --git a/bsps/sparc/shared/amba/ahbstat.c b/bsps/shared/grlib/amba/ahbstat.c
similarity index 100%
rename from bsps/sparc/shared/amba/ahbstat.c
rename to bsps/shared/grlib/amba/ahbstat.c
diff --git a/bsps/sparc/shared/amba/ambapp.c b/bsps/shared/grlib/amba/ambapp.c
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp.c
rename to bsps/shared/grlib/amba/ambapp.c
diff --git a/bsps/sparc/shared/amba/ambapp_alloc.c b/bsps/shared/grlib/amba/ambapp_alloc.c
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_alloc.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_count.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_depth.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_find_by_idx.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_freq.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_names.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_old.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_parent.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/amba/ambapp_show.c
rename to bsps/shared/grlib/amba/ambapp_show.c
diff --git a/bsps/sparc/shared/analog/gradcdac.c b/bsps/shared/grlib/analog/gradcdac.c
similarity index 100%
rename from bsps/sparc/shared/analog/gradcdac.c
rename to bsps/shared/grlib/analog/gradcdac.c
diff --git a/bsps/sparc/shared/ascs/grascs.c b/bsps/shared/grlib/ascs/grascs.c
similarity index 100%
rename from bsps/sparc/shared/ascs/grascs.c
rename to bsps/shared/grlib/ascs/grascs.c
diff --git a/bsps/sparc/shared/btimer/gptimer.c b/bsps/shared/grlib/btimer/gptimer.c
similarity index 100%
rename from bsps/sparc/shared/btimer/gptimer.c
rename to bsps/shared/grlib/btimer/gptimer.c
diff --git a/bsps/sparc/shared/btimer/tlib.c b/bsps/shared/grlib/btimer/tlib.c
similarity index 100%
rename from bsps/sparc/shared/btimer/tlib.c
rename to bsps/shared/grlib/btimer/tlib.c
diff --git a/bsps/sparc/shared/btimer/tlib_ckinit.c b/bsps/shared/grlib/btimer/tlib_ckinit.c
similarity index 100%
rename from bsps/sparc/shared/btimer/tlib_ckinit.c
rename to bsps/shared/grlib/btimer/tlib_ckinit.c
diff --git a/bsps/sparc/shared/can/canmux.c b/bsps/shared/grlib/can/canmux.c
similarity index 100%
rename from bsps/sparc/shared/can/canmux.c
rename to bsps/shared/grlib/can/canmux.c
diff --git a/bsps/sparc/shared/can/grcan.c b/bsps/shared/grlib/can/grcan.c
similarity index 100%
rename from bsps/sparc/shared/can/grcan.c
rename to bsps/shared/grlib/can/grcan.c
diff --git a/bsps/sparc/shared/can/occan.c b/bsps/shared/grlib/can/occan.c
similarity index 100%
rename from bsps/sparc/shared/can/occan.c
rename to bsps/shared/grlib/can/occan.c
diff --git a/bsps/sparc/shared/can/satcan.c b/bsps/shared/grlib/can/satcan.c
similarity index 100%
rename from bsps/sparc/shared/can/satcan.c
rename to bsps/shared/grlib/can/satcan.c
diff --git a/bsps/sparc/shared/drvmgr/ambapp_bus.c b/bsps/shared/grlib/drvmgr/ambapp_bus.c
similarity index 100%
rename from bsps/sparc/shared/drvmgr/ambapp_bus.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/drvmgr/ambapp_bus_grlib.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/drvmgr/get_resarray_count.c
rename to bsps/shared/grlib/drvmgr/get_resarray_count.c
diff --git a/bsps/sparc/shared/gpio/gpiolib.c b/bsps/shared/grlib/gpio/gpiolib.c
similarity index 100%
rename from bsps/sparc/shared/gpio/gpiolib.c
rename to bsps/shared/grlib/gpio/gpiolib.c
diff --git a/bsps/sparc/shared/gpio/grgpio.c b/bsps/shared/grlib/gpio/grgpio.c
similarity index 100%
rename from bsps/sparc/shared/gpio/grgpio.c
rename to bsps/shared/grlib/gpio/grgpio.c
diff --git a/bsps/sparc/shared/i2c/i2cmst.c b/bsps/shared/grlib/i2c/i2cmst.c
similarity index 100%
rename from bsps/sparc/shared/i2c/i2cmst.c
rename to bsps/shared/grlib/i2c/i2cmst.c
diff --git a/bsps/sparc/shared/iommu/griommu.c b/bsps/shared/grlib/iommu/griommu.c
similarity index 100%
rename from bsps/sparc/shared/iommu/griommu.c
rename to bsps/shared/grlib/iommu/griommu.c
diff --git a/bsps/sparc/shared/irq/genirq.c b/bsps/shared/grlib/irq/genirq.c
similarity index 100%
rename from bsps/sparc/shared/irq/genirq.c
rename to bsps/shared/grlib/irq/genirq.c
diff --git a/bsps/sparc/shared/l2c/l2c.c b/bsps/shared/grlib/l2c/l2c.c
similarity index 100%
rename from bsps/sparc/shared/l2c/l2c.c
rename to bsps/shared/grlib/l2c/l2c.c
diff --git a/bsps/sparc/shared/mem/mctrl.c b/bsps/shared/grlib/mem/mctrl.c
similarity index 100%
rename from bsps/sparc/shared/mem/mctrl.c
rename to bsps/shared/grlib/mem/mctrl.c
diff --git a/bsps/sparc/shared/net/README b/bsps/shared/grlib/net/README
similarity index 100%
rename from bsps/sparc/shared/net/README
rename to bsps/shared/grlib/net/README
diff --git a/bsps/sparc/shared/net/greth.c b/bsps/shared/grlib/net/greth.c
similarity index 100%
rename from bsps/sparc/shared/net/greth.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/net/network_interface_add.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/pci/gr_701.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/pci/gr_rasta_adcdac.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/pci/gr_rasta_io.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/pci/gr_rasta_spw_router.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/pci/gr_rasta_tmtc.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/pci/gr_tmtc_1553.c
rename to bsps/shared/grlib/pci/gr_tmtc_1553.c
diff --git a/bsps/sparc/shared/pci/grpci.c b/bsps/shared/grlib/pci/grpci.c
similarity index 100%
rename from bsps/sparc/shared/pci/grpci.c
rename to bsps/shared/grlib/pci/grpci.c
diff --git a/bsps/sparc/shared/pci/grpci2.c b/bsps/shared/grlib/pci/grpci2.c
similarity index 100%
rename from bsps/sparc/shared/pci/grpci2.c
rename to bsps/shared/grlib/pci/grpci2.c
diff --git a/bsps/sparc/shared/pci/grpci2dma.c b/bsps/shared/grlib/pci/grpci2dma.c
similarity index 100%
rename from bsps/sparc/shared/pci/grpci2dma.c
rename to bsps/shared/grlib/pci/grpci2dma.c
diff --git a/bsps/sparc/shared/pci/pcif.c b/bsps/shared/grlib/pci/pcif.c
similarity index 100%
rename from bsps/sparc/shared/pci/pcif.c
rename to bsps/shared/grlib/pci/pcif.c
diff --git a/bsps/sparc/shared/pwm/grpwm.c b/bsps/shared/grlib/pwm/grpwm.c
similarity index 100%
rename from bsps/sparc/shared/pwm/grpwm.c
rename to bsps/shared/grlib/pwm/grpwm.c
diff --git a/bsps/sparc/shared/scrub/memscrub.c b/bsps/shared/grlib/scrub/memscrub.c
similarity index 100%
rename from bsps/sparc/shared/scrub/memscrub.c
rename to bsps/shared/grlib/scrub/memscrub.c
diff --git a/bsps/sparc/shared/slink/grslink.c b/bsps/shared/grlib/slink/grslink.c
similarity index 100%
rename from bsps/sparc/shared/slink/grslink.c
rename to bsps/shared/grlib/slink/grslink.c
diff --git a/bsps/sparc/shared/spi/spictrl.c b/bsps/shared/grlib/spi/spictrl.c
similarity index 100%
rename from bsps/sparc/shared/spi/spictrl.c
rename to bsps/shared/grlib/spi/spictrl.c
diff --git a/bsps/sparc/shared/spw/grspw.c b/bsps/shared/grlib/spw/grspw.c
similarity index 100%
rename from bsps/sparc/shared/spw/grspw.c
rename to bsps/shared/grlib/spw/grspw.c
diff --git a/bsps/sparc/shared/spw/grspw_pkt.c b/bsps/shared/grlib/spw/grspw_pkt.c
similarity index 100%
rename from bsps/sparc/shared/spw/grspw_pkt.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/spw/grspw_router.c
rename to bsps/shared/grlib/spw/grspw_router.c
diff --git a/bsps/sparc/shared/spw/spwtdp.c b/bsps/shared/grlib/spw/spwtdp.c
similarity index 100%
rename from bsps/sparc/shared/spw/spwtdp.c
rename to bsps/shared/grlib/spw/spwtdp.c
diff --git a/bsps/sparc/shared/stat/l4stat.c b/bsps/shared/grlib/stat/l4stat.c
similarity index 100%
rename from bsps/sparc/shared/stat/l4stat.c
rename to bsps/shared/grlib/stat/l4stat.c
diff --git a/bsps/sparc/shared/time/grctm.c b/bsps/shared/grlib/time/grctm.c
similarity index 100%
rename from bsps/sparc/shared/time/grctm.c
rename to bsps/shared/grlib/time/grctm.c
diff --git a/bsps/sparc/shared/time/spwcuc.c b/bsps/shared/grlib/time/spwcuc.c
similarity index 100%
rename from bsps/sparc/shared/time/spwcuc.c
rename to bsps/shared/grlib/time/spwcuc.c
diff --git a/bsps/sparc/shared/tmtc/grtc.c b/bsps/shared/grlib/tmtc/grtc.c
similarity index 100%
rename from bsps/sparc/shared/tmtc/grtc.c
rename to bsps/shared/grlib/tmtc/grtc.c
diff --git a/bsps/sparc/shared/tmtc/grtm.c b/bsps/shared/grlib/tmtc/grtm.c
similarity index 100%
rename from bsps/sparc/shared/tmtc/grtm.c
rename to bsps/shared/grlib/tmtc/grtm.c
diff --git a/bsps/sparc/shared/uart/apbuart_cons.c b/bsps/shared/grlib/uart/apbuart_cons.c
similarity index 100%
rename from bsps/sparc/shared/uart/apbuart_cons.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/uart/apbuart_polled.c
rename to 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
similarity index 100%
rename from bsps/sparc/shared/uart/apbuart_termios.c
rename to bsps/shared/grlib/uart/apbuart_termios.c
diff --git a/bsps/sparc/shared/uart/cons.c b/bsps/shared/grlib/uart/cons.c
similarity index 100%
rename from bsps/sparc/shared/uart/cons.c
rename to bsps/shared/grlib/uart/cons.c
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
--
2.17.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
