From: Sebastian Huber <sebastian.hu...@embedded-brains.de>
---
.../include/bsp => include/grlib}/ahbstat.h | 0
.../{sparc/include => include/grlib}/ambapp.h | 0
.../drvmgr => include/grlib}/ambapp_bus.h | 0
.../grlib}/ambapp_bus_grlib.h | 0
.../include => include/grlib}/ambapp_ids.h | 0
.../include/bsp => include/grlib}/apbuart.h | 0
.../bsp => include/grlib}/apbuart_cons.h | 0
.../bsp => include/grlib}/apbuart_termios.h | 0
.../include/bsp => include/grlib}/b1553brm.h | 0
.../include/bsp => include/grlib}/b1553rt.h | 0
.../drvmgr => include/grlib}/bspcommon.h | 0
.../include/bsp => include/grlib}/canmux.h | 0
.../include/bsp => include/grlib}/cons.h | 0
.../bsp => include/grlib}/debug_defs.h | 0
.../include/bsp => include/grlib}/genirq.h | 0
.../include/bsp => include/grlib}/gpiolib.h | 0
.../include/bsp => include/grlib}/gptimer.h | 0
.../include/bsp => include/grlib}/gr1553b.h | 0
.../include/bsp => include/grlib}/gr1553bc.h | 0
.../bsp => include/grlib}/gr1553bc_list.h | 0
.../include/bsp => include/grlib}/gr1553bm.h | 0
.../include/bsp => include/grlib}/gr1553rt.h | 0
.../include/bsp => include/grlib}/gr_701.h | 0
.../bsp => include/grlib}/gr_cpci_gr740.h | 0
.../bsp => include/grlib}/gr_rasta_adcdac.h | 0
.../bsp => include/grlib}/gr_rasta_io.h | 0
.../grlib}/gr_rasta_spw_router.h | 0
.../bsp => include/grlib}/gr_rasta_tmtc.h | 0
.../bsp => include/grlib}/gr_tmtc_1553.h | 0
.../include/bsp => include/grlib}/gradcdac.h | 0
.../include/bsp => include/grlib}/grascs.h | 0
.../include/bsp => include/grlib}/grcan.h | 0
.../include/bsp => include/grlib}/grctm.h | 0
.../include/bsp => include/grlib}/greth.h | 0
.../include/bsp => include/grlib}/grgpio.h | 0
.../include/bsp => include/grlib}/griommu.h | 0
bsps/{sparc/include => include/grlib}/grlib.h | 0
.../include => include/grlib}/grlib_impl.h | 0
.../include/bsp => include/grlib}/grpci.h | 0
.../include/bsp => include/grlib}/grpci2.h | 0
.../include/bsp => include/grlib}/grpci2dma.h | 0
.../include/bsp => include/grlib}/grpwm.h | 0
.../include/bsp => include/grlib}/grslink.h | 0
.../include/bsp => include/grlib}/grspw.h | 0
.../include/bsp => include/grlib}/grspw_pkt.h | 0
.../bsp => include/grlib}/grspw_router.h | 0
.../include/bsp => include/grlib}/grtc.h | 0
.../include/bsp => include/grlib}/grtm.h | 0
.../include/bsp => include/grlib}/i2cmst.h | 0
.../include/bsp => include/grlib}/l2c.h | 0
.../include/bsp => include/grlib}/l4stat.h | 0
.../include/bsp => include/grlib}/mctrl.h | 0
.../include/bsp => include/grlib}/memscrub.h | 0
.../grlib}/network_interface_add.h | 0
.../include/bsp => include/grlib}/occan.h | 0
.../include/bsp => include/grlib}/pcif.h | 0
.../include/bsp => include/grlib}/satcan.h | 0
.../include/bsp => include/grlib}/spictrl.h | 0
.../include/bsp => include/grlib}/spwcuc.h | 0
.../include/bsp => include/grlib}/spwtdp.h | 0
.../include/bsp => include/grlib}/tlib.h | 0
bsps/sparc/headers.am | 63 -------------------
bsps/sparc/leon3/btimer/watchdog.c | 2 +-
bsps/sparc/leon3/clock/ckinit.c | 2 +-
bsps/sparc/leon3/console/console.c | 2 +-
bsps/sparc/leon3/console/printk_support.c | 2 +-
bsps/sparc/leon3/include/amba.h | 4 +-
bsps/sparc/leon3/net/leon_smc91111.c | 2 +-
bsps/sparc/leon3/start/amba.c | 4 +-
bsps/sparc/shared/pci/gr_cpci_gr740.c | 14 ++---
bsps/sparc/shared/pci/gr_leon4_n2x.c | 12 ++--
71 files changed, 22 insertions(+), 85 deletions(-)
rename bsps/{sparc/include/bsp => include/grlib}/ahbstat.h (100%)
rename bsps/{sparc/include => include/grlib}/ambapp.h (100%)
rename bsps/{sparc/include/drvmgr => include/grlib}/ambapp_bus.h (100%)
rename bsps/{sparc/include/drvmgr => include/grlib}/ambapp_bus_grlib.h (100%)
rename bsps/{sparc/include => include/grlib}/ambapp_ids.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/apbuart.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/apbuart_cons.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/apbuart_termios.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/b1553brm.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/b1553rt.h (100%)
rename bsps/{sparc/include/drvmgr => include/grlib}/bspcommon.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/canmux.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/cons.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/debug_defs.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/genirq.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gpiolib.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gptimer.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr1553b.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr1553bc.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr1553bc_list.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr1553bm.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr1553rt.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr_701.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr_cpci_gr740.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr_rasta_adcdac.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr_rasta_io.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr_rasta_spw_router.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr_rasta_tmtc.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gr_tmtc_1553.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/gradcdac.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grascs.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grcan.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grctm.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/greth.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grgpio.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/griommu.h (100%)
rename bsps/{sparc/include => include/grlib}/grlib.h (100%)
rename bsps/{sparc/include => include/grlib}/grlib_impl.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grpci.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grpci2.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grpci2dma.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grpwm.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grslink.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grspw.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grspw_pkt.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grspw_router.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grtc.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/grtm.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/i2cmst.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/l2c.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/l4stat.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/mctrl.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/memscrub.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/network_interface_add.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/occan.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/pcif.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/satcan.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/spictrl.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/spwcuc.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/spwtdp.h (100%)
rename bsps/{sparc/include/bsp => include/grlib}/tlib.h (100%)
diff --git a/bsps/sparc/include/bsp/ahbstat.h b/bsps/include/grlib/ahbstat.h
similarity index 100%
rename from bsps/sparc/include/bsp/ahbstat.h
rename to bsps/include/grlib/ahbstat.h
diff --git a/bsps/sparc/include/ambapp.h b/bsps/include/grlib/ambapp.h
similarity index 100%
rename from bsps/sparc/include/ambapp.h
rename to bsps/include/grlib/ambapp.h
diff --git a/bsps/sparc/include/drvmgr/ambapp_bus.h
b/bsps/include/grlib/ambapp_bus.h
similarity index 100%
rename from bsps/sparc/include/drvmgr/ambapp_bus.h
rename to bsps/include/grlib/ambapp_bus.h
diff --git a/bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
b/bsps/include/grlib/ambapp_bus_grlib.h
similarity index 100%
rename from bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
rename to bsps/include/grlib/ambapp_bus_grlib.h
diff --git a/bsps/sparc/include/ambapp_ids.h b/bsps/include/grlib/ambapp_ids.h
similarity index 100%
rename from bsps/sparc/include/ambapp_ids.h
rename to bsps/include/grlib/ambapp_ids.h
diff --git a/bsps/sparc/include/bsp/apbuart.h b/bsps/include/grlib/apbuart.h
similarity index 100%
rename from bsps/sparc/include/bsp/apbuart.h
rename to bsps/include/grlib/apbuart.h
diff --git a/bsps/sparc/include/bsp/apbuart_cons.h
b/bsps/include/grlib/apbuart_cons.h
similarity index 100%
rename from bsps/sparc/include/bsp/apbuart_cons.h
rename to bsps/include/grlib/apbuart_cons.h
diff --git a/bsps/sparc/include/bsp/apbuart_termios.h
b/bsps/include/grlib/apbuart_termios.h
similarity index 100%
rename from bsps/sparc/include/bsp/apbuart_termios.h
rename to bsps/include/grlib/apbuart_termios.h
diff --git a/bsps/sparc/include/bsp/b1553brm.h b/bsps/include/grlib/b1553brm.h
similarity index 100%
rename from bsps/sparc/include/bsp/b1553brm.h
rename to bsps/include/grlib/b1553brm.h
diff --git a/bsps/sparc/include/bsp/b1553rt.h b/bsps/include/grlib/b1553rt.h
similarity index 100%
rename from bsps/sparc/include/bsp/b1553rt.h
rename to bsps/include/grlib/b1553rt.h
diff --git a/bsps/sparc/include/drvmgr/bspcommon.h
b/bsps/include/grlib/bspcommon.h
similarity index 100%
rename from bsps/sparc/include/drvmgr/bspcommon.h
rename to bsps/include/grlib/bspcommon.h
diff --git a/bsps/sparc/include/bsp/canmux.h b/bsps/include/grlib/canmux.h
similarity index 100%
rename from bsps/sparc/include/bsp/canmux.h
rename to bsps/include/grlib/canmux.h
diff --git a/bsps/sparc/include/bsp/cons.h b/bsps/include/grlib/cons.h
similarity index 100%
rename from bsps/sparc/include/bsp/cons.h
rename to bsps/include/grlib/cons.h
diff --git a/bsps/sparc/include/bsp/debug_defs.h
b/bsps/include/grlib/debug_defs.h
similarity index 100%
rename from bsps/sparc/include/bsp/debug_defs.h
rename to bsps/include/grlib/debug_defs.h
diff --git a/bsps/sparc/include/bsp/genirq.h b/bsps/include/grlib/genirq.h
similarity index 100%
rename from bsps/sparc/include/bsp/genirq.h
rename to bsps/include/grlib/genirq.h
diff --git a/bsps/sparc/include/bsp/gpiolib.h b/bsps/include/grlib/gpiolib.h
similarity index 100%
rename from bsps/sparc/include/bsp/gpiolib.h
rename to bsps/include/grlib/gpiolib.h
diff --git a/bsps/sparc/include/bsp/gptimer.h b/bsps/include/grlib/gptimer.h
similarity index 100%
rename from bsps/sparc/include/bsp/gptimer.h
rename to bsps/include/grlib/gptimer.h
diff --git a/bsps/sparc/include/bsp/gr1553b.h b/bsps/include/grlib/gr1553b.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr1553b.h
rename to bsps/include/grlib/gr1553b.h
diff --git a/bsps/sparc/include/bsp/gr1553bc.h b/bsps/include/grlib/gr1553bc.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr1553bc.h
rename to bsps/include/grlib/gr1553bc.h
diff --git a/bsps/sparc/include/bsp/gr1553bc_list.h
b/bsps/include/grlib/gr1553bc_list.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr1553bc_list.h
rename to bsps/include/grlib/gr1553bc_list.h
diff --git a/bsps/sparc/include/bsp/gr1553bm.h b/bsps/include/grlib/gr1553bm.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr1553bm.h
rename to bsps/include/grlib/gr1553bm.h
diff --git a/bsps/sparc/include/bsp/gr1553rt.h b/bsps/include/grlib/gr1553rt.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr1553rt.h
rename to bsps/include/grlib/gr1553rt.h
diff --git a/bsps/sparc/include/bsp/gr_701.h b/bsps/include/grlib/gr_701.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr_701.h
rename to bsps/include/grlib/gr_701.h
diff --git a/bsps/sparc/include/bsp/gr_cpci_gr740.h
b/bsps/include/grlib/gr_cpci_gr740.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr_cpci_gr740.h
rename to bsps/include/grlib/gr_cpci_gr740.h
diff --git a/bsps/sparc/include/bsp/gr_rasta_adcdac.h
b/bsps/include/grlib/gr_rasta_adcdac.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr_rasta_adcdac.h
rename to bsps/include/grlib/gr_rasta_adcdac.h
diff --git a/bsps/sparc/include/bsp/gr_rasta_io.h
b/bsps/include/grlib/gr_rasta_io.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr_rasta_io.h
rename to bsps/include/grlib/gr_rasta_io.h
diff --git a/bsps/sparc/include/bsp/gr_rasta_spw_router.h
b/bsps/include/grlib/gr_rasta_spw_router.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr_rasta_spw_router.h
rename to bsps/include/grlib/gr_rasta_spw_router.h
diff --git a/bsps/sparc/include/bsp/gr_rasta_tmtc.h
b/bsps/include/grlib/gr_rasta_tmtc.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr_rasta_tmtc.h
rename to bsps/include/grlib/gr_rasta_tmtc.h
diff --git a/bsps/sparc/include/bsp/gr_tmtc_1553.h
b/bsps/include/grlib/gr_tmtc_1553.h
similarity index 100%
rename from bsps/sparc/include/bsp/gr_tmtc_1553.h
rename to bsps/include/grlib/gr_tmtc_1553.h
diff --git a/bsps/sparc/include/bsp/gradcdac.h b/bsps/include/grlib/gradcdac.h
similarity index 100%
rename from bsps/sparc/include/bsp/gradcdac.h
rename to bsps/include/grlib/gradcdac.h
diff --git a/bsps/sparc/include/bsp/grascs.h b/bsps/include/grlib/grascs.h
similarity index 100%
rename from bsps/sparc/include/bsp/grascs.h
rename to bsps/include/grlib/grascs.h
diff --git a/bsps/sparc/include/bsp/grcan.h b/bsps/include/grlib/grcan.h
similarity index 100%
rename from bsps/sparc/include/bsp/grcan.h
rename to bsps/include/grlib/grcan.h
diff --git a/bsps/sparc/include/bsp/grctm.h b/bsps/include/grlib/grctm.h
similarity index 100%
rename from bsps/sparc/include/bsp/grctm.h
rename to bsps/include/grlib/grctm.h
diff --git a/bsps/sparc/include/bsp/greth.h b/bsps/include/grlib/greth.h
similarity index 100%
rename from bsps/sparc/include/bsp/greth.h
rename to bsps/include/grlib/greth.h
diff --git a/bsps/sparc/include/bsp/grgpio.h b/bsps/include/grlib/grgpio.h
similarity index 100%
rename from bsps/sparc/include/bsp/grgpio.h
rename to bsps/include/grlib/grgpio.h
diff --git a/bsps/sparc/include/bsp/griommu.h b/bsps/include/grlib/griommu.h
similarity index 100%
rename from bsps/sparc/include/bsp/griommu.h
rename to bsps/include/grlib/griommu.h
diff --git a/bsps/sparc/include/grlib.h b/bsps/include/grlib/grlib.h
similarity index 100%
rename from bsps/sparc/include/grlib.h
rename to bsps/include/grlib/grlib.h
diff --git a/bsps/sparc/include/grlib_impl.h b/bsps/include/grlib/grlib_impl.h
similarity index 100%
rename from bsps/sparc/include/grlib_impl.h
rename to bsps/include/grlib/grlib_impl.h
diff --git a/bsps/sparc/include/bsp/grpci.h b/bsps/include/grlib/grpci.h
similarity index 100%
rename from bsps/sparc/include/bsp/grpci.h
rename to bsps/include/grlib/grpci.h
diff --git a/bsps/sparc/include/bsp/grpci2.h b/bsps/include/grlib/grpci2.h
similarity index 100%
rename from bsps/sparc/include/bsp/grpci2.h
rename to bsps/include/grlib/grpci2.h
diff --git a/bsps/sparc/include/bsp/grpci2dma.h b/bsps/include/grlib/grpci2dma.h
similarity index 100%
rename from bsps/sparc/include/bsp/grpci2dma.h
rename to bsps/include/grlib/grpci2dma.h
diff --git a/bsps/sparc/include/bsp/grpwm.h b/bsps/include/grlib/grpwm.h
similarity index 100%
rename from bsps/sparc/include/bsp/grpwm.h
rename to bsps/include/grlib/grpwm.h
diff --git a/bsps/sparc/include/bsp/grslink.h b/bsps/include/grlib/grslink.h
similarity index 100%
rename from bsps/sparc/include/bsp/grslink.h
rename to bsps/include/grlib/grslink.h
diff --git a/bsps/sparc/include/bsp/grspw.h b/bsps/include/grlib/grspw.h
similarity index 100%
rename from bsps/sparc/include/bsp/grspw.h
rename to bsps/include/grlib/grspw.h
diff --git a/bsps/sparc/include/bsp/grspw_pkt.h b/bsps/include/grlib/grspw_pkt.h
similarity index 100%
rename from bsps/sparc/include/bsp/grspw_pkt.h
rename to bsps/include/grlib/grspw_pkt.h
diff --git a/bsps/sparc/include/bsp/grspw_router.h
b/bsps/include/grlib/grspw_router.h
similarity index 100%
rename from bsps/sparc/include/bsp/grspw_router.h
rename to bsps/include/grlib/grspw_router.h
diff --git a/bsps/sparc/include/bsp/grtc.h b/bsps/include/grlib/grtc.h
similarity index 100%
rename from bsps/sparc/include/bsp/grtc.h
rename to bsps/include/grlib/grtc.h
diff --git a/bsps/sparc/include/bsp/grtm.h b/bsps/include/grlib/grtm.h
similarity index 100%
rename from bsps/sparc/include/bsp/grtm.h
rename to bsps/include/grlib/grtm.h
diff --git a/bsps/sparc/include/bsp/i2cmst.h b/bsps/include/grlib/i2cmst.h
similarity index 100%
rename from bsps/sparc/include/bsp/i2cmst.h
rename to bsps/include/grlib/i2cmst.h
diff --git a/bsps/sparc/include/bsp/l2c.h b/bsps/include/grlib/l2c.h
similarity index 100%
rename from bsps/sparc/include/bsp/l2c.h
rename to bsps/include/grlib/l2c.h
diff --git a/bsps/sparc/include/bsp/l4stat.h b/bsps/include/grlib/l4stat.h
similarity index 100%
rename from bsps/sparc/include/bsp/l4stat.h
rename to bsps/include/grlib/l4stat.h
diff --git a/bsps/sparc/include/bsp/mctrl.h b/bsps/include/grlib/mctrl.h
similarity index 100%
rename from bsps/sparc/include/bsp/mctrl.h
rename to bsps/include/grlib/mctrl.h
diff --git a/bsps/sparc/include/bsp/memscrub.h b/bsps/include/grlib/memscrub.h
similarity index 100%
rename from bsps/sparc/include/bsp/memscrub.h
rename to bsps/include/grlib/memscrub.h
diff --git a/bsps/sparc/include/bsp/network_interface_add.h
b/bsps/include/grlib/network_interface_add.h
similarity index 100%
rename from bsps/sparc/include/bsp/network_interface_add.h
rename to bsps/include/grlib/network_interface_add.h
diff --git a/bsps/sparc/include/bsp/occan.h b/bsps/include/grlib/occan.h
similarity index 100%
rename from bsps/sparc/include/bsp/occan.h
rename to bsps/include/grlib/occan.h
diff --git a/bsps/sparc/include/bsp/pcif.h b/bsps/include/grlib/pcif.h
similarity index 100%
rename from bsps/sparc/include/bsp/pcif.h
rename to bsps/include/grlib/pcif.h
diff --git a/bsps/sparc/include/bsp/satcan.h b/bsps/include/grlib/satcan.h
similarity index 100%
rename from bsps/sparc/include/bsp/satcan.h
rename to bsps/include/grlib/satcan.h
diff --git a/bsps/sparc/include/bsp/spictrl.h b/bsps/include/grlib/spictrl.h
similarity index 100%
rename from bsps/sparc/include/bsp/spictrl.h
rename to bsps/include/grlib/spictrl.h
diff --git a/bsps/sparc/include/bsp/spwcuc.h b/bsps/include/grlib/spwcuc.h
similarity index 100%
rename from bsps/sparc/include/bsp/spwcuc.h
rename to bsps/include/grlib/spwcuc.h
diff --git a/bsps/sparc/include/bsp/spwtdp.h b/bsps/include/grlib/spwtdp.h
similarity index 100%
rename from bsps/sparc/include/bsp/spwtdp.h
rename to bsps/include/grlib/spwtdp.h
diff --git a/bsps/sparc/include/bsp/tlib.h b/bsps/include/grlib/tlib.h
similarity index 100%
rename from bsps/sparc/include/bsp/tlib.h
rename to bsps/include/grlib/tlib.h
diff --git a/bsps/sparc/headers.am b/bsps/sparc/headers.am
index 14d92f741c..92c9b254f3 100644
--- a/bsps/sparc/headers.am
+++ b/bsps/sparc/headers.am
@@ -1,73 +1,10 @@
## This file was generated by "./boostrap -H".
-include_HEADERS =
-include_HEADERS += ../../../../../bsps/sparc/include/ambapp.h
-include_HEADERS += ../../../../../bsps/sparc/include/ambapp_ids.h
-include_HEADERS += ../../../../../bsps/sparc/include/grlib.h
-include_HEADERS += ../../../../../bsps/sparc/include/grlib_impl.h
-
include_bspdir = $(includedir)/bsp
include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/ahbstat.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart_cons.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/apbuart_termios.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/b1553brm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/b1553rt.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/canmux.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/cons.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/debug_defs.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/genirq.h
include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gnatcommon.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gpiolib.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gptimer.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553b.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bc.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bc_list.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553bm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr1553rt.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_701.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_cpci_gr740.h
include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_leon4_n2x.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_adcdac.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_io.h
-include_bsp_HEADERS +=
../../../../../bsps/sparc/include/bsp/gr_rasta_spw_router.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_rasta_tmtc.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gr_tmtc_1553.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/gradcdac.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grascs.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grcan.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grctm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/greth.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grgpio.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/griommu.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci2.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpci2dma.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grpwm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grslink.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw_pkt.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grspw_router.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grtc.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/grtm.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/i2cmst.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/l2c.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/l4stat.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/mctrl.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/memscrub.h
-include_bsp_HEADERS +=
../../../../../bsps/sparc/include/bsp/network_interface_add.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/occan.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/pcif.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/satcan.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spictrl.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spwcuc.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/spwtdp.h
-include_bsp_HEADERS += ../../../../../bsps/sparc/include/bsp/tlib.h
include_drvmgrdir = $(includedir)/drvmgr
include_drvmgr_HEADERS =
-include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/ambapp_bus.h
-include_drvmgr_HEADERS +=
../../../../../bsps/sparc/include/drvmgr/ambapp_bus_grlib.h
-include_drvmgr_HEADERS += ../../../../../bsps/sparc/include/drvmgr/bspcommon.h
include_drvmgr_HEADERS +=
../../../../../bsps/sparc/include/drvmgr/leon2_amba_bus.h
diff --git a/bsps/sparc/leon3/btimer/watchdog.c
b/bsps/sparc/leon3/btimer/watchdog.c
index 5ce8e32354..4e8f428f78 100644
--- a/bsps/sparc/leon3/btimer/watchdog.c
+++ b/bsps/sparc/leon3/btimer/watchdog.c
@@ -12,7 +12,7 @@
#include <bsp.h>
#include <bsp/watchdog.h>
-#include <grlib.h>
+#include <grlib/grlib.h>
extern volatile struct gptimer_regs *LEON3_Timer_Regs;
diff --git a/bsps/sparc/leon3/clock/ckinit.c b/bsps/sparc/leon3/clock/ckinit.c
index fecbf32c1b..ad233ddb90 100644
--- a/bsps/sparc/leon3/clock/ckinit.c
+++ b/bsps/sparc/leon3/clock/ckinit.c
@@ -25,7 +25,7 @@
#include <bspopts.h>
#include <bsp/fatal.h>
#include <rtems/rtems/intr.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
#include <rtems/score/profiling.h>
#include <rtems/score/sparcimpl.h>
#include <rtems/timecounter.h>
diff --git a/bsps/sparc/leon3/console/console.c
b/bsps/sparc/leon3/console/console.c
index acab893399..3522dc7529 100644
--- a/bsps/sparc/leon3/console/console.c
+++ b/bsps/sparc/leon3/console/console.c
@@ -28,7 +28,7 @@
#include <bsp.h>
#include <bsp/fatal.h>
-#include <bsp/apbuart_termios.h>
+#include <grlib/apbuart_termios.h>
#include <rtems/console.h>
#include <string.h>
diff --git a/bsps/sparc/leon3/console/printk_support.c
b/bsps/sparc/leon3/console/printk_support.c
index aa9441a87d..c7811687f3 100644
--- a/bsps/sparc/leon3/console/printk_support.c
+++ b/bsps/sparc/leon3/console/printk_support.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <assert.h>
#include <stdio.h>
-#include <bsp/apbuart.h>
+#include <grlib/apbuart.h>
int leon3_debug_uart_index __attribute__((weak)) = 0;
struct apbuart_regs *leon3_debug_uart = NULL;
diff --git a/bsps/sparc/leon3/include/amba.h b/bsps/sparc/leon3/include/amba.h
index 059b28ca07..2d11096034 100644
--- a/bsps/sparc/leon3/include/amba.h
+++ b/bsps/sparc/leon3/include/amba.h
@@ -31,8 +31,8 @@
#define LEON3_AHB_SLAVES 64
#define LEON3_APB_SLAVES 16
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
#ifdef __cplusplus
extern "C" {
diff --git a/bsps/sparc/leon3/net/leon_smc91111.c
b/bsps/sparc/leon3/net/leon_smc91111.c
index 5111f4936a..70b2dcc109 100644
--- a/bsps/sparc/leon3/net/leon_smc91111.c
+++ b/bsps/sparc/leon3/net/leon_smc91111.c
@@ -18,7 +18,7 @@
#include <bsp.h>
#include <libchip/smc91111exp.h>
#include <rtems/bspIo.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
#define SMC91111_BASE_ADDR (void*)0x20000300
#define SMC91111_BASE_IRQ 4
diff --git a/bsps/sparc/leon3/start/amba.c b/bsps/sparc/leon3/start/amba.c
index 4b55a49f35..e7ff29808c 100644
--- a/bsps/sparc/leon3/start/amba.c
+++ b/bsps/sparc/leon3/start/amba.c
@@ -14,7 +14,7 @@
#include <bsp.h>
#include <bsp/fatal.h>
#include <leon.h>
-#include <ambapp.h>
+#include <grlib/ambapp.h>
#include <rtems/sysinit.h>
unsigned int leon3_timer_prescaler __attribute__((weak)) = 0;
@@ -32,7 +32,7 @@ struct ambapp_bus ambapp_plb;
*/
#ifdef RTEMS_DRVMGR_STARTUP
#include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus_grlib.h>
+#include <grlib/ambapp_bus_grlib.h>
extern void gptimer_register_drv (void);
extern void apbuart_cons_register_drv(void);
diff --git a/bsps/sparc/shared/pci/gr_cpci_gr740.c
b/bsps/sparc/shared/pci/gr_cpci_gr740.c
index a9a614996c..95f5b9492e 100644
--- a/bsps/sparc/shared/pci/gr_cpci_gr740.c
+++ b/bsps/sparc/shared/pci/gr_cpci_gr740.c
@@ -36,17 +36,17 @@
#include <rtems/bspIo.h>
#include <pci.h>
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
#include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
#include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
-#include <bsp/gr_cpci_gr740.h>
+#include <grlib/gr_cpci_gr740.h>
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
/* Determines which PCI address the AHB masters on the GR740 board will
* access when accessing the AHB to PCI window, it should be set so that the
diff --git a/bsps/sparc/shared/pci/gr_leon4_n2x.c
b/bsps/sparc/shared/pci/gr_leon4_n2x.c
index 4dd9005f67..9baf73e2e0 100644
--- a/bsps/sparc/shared/pci/gr_leon4_n2x.c
+++ b/bsps/sparc/shared/pci/gr_leon4_n2x.c
@@ -35,17 +35,17 @@
#include <rtems/bspIo.h>
#include <pci.h>
-#include <ambapp.h>
-#include <grlib.h>
+#include <grlib/ambapp.h>
+#include <grlib/grlib.h>
#include <drvmgr/drvmgr.h>
-#include <drvmgr/ambapp_bus.h>
+#include <grlib/ambapp_bus.h>
#include <drvmgr/pci_bus.h>
-#include <drvmgr/bspcommon.h>
-#include <bsp/genirq.h>
+#include <grlib/bspcommon.h>
+#include <grlib/genirq.h>
#include <bsp/gr_leon4_n2x.h>
-#include <grlib_impl.h>
+#include <grlib/grlib_impl.h>
/* Determines which PCI address the AHB masters on the LEON-N2X board will
* access when accessing the AHB to PCI window, it should be set so that the
--
2.17.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
