grlib: Move header files

Update #3678.

bsps/headers.am

@@ -23,6 +23,70 @@ include_bsp_HEADERS += ../../bsps/include/bsp/u-boot.h
 include_bsp_HEADERS += ../../bsps/include/bsp/uart-output-char.h
 include_bsp_HEADERS += ../../bsps/include/bsp/utility.h
 
+include_grlibdir = $(includedir)/grlib
+include_grlib_HEADERS =
+include_grlib_HEADERS += ../../bsps/include/grlib/ahbstat.h
+include_grlib_HEADERS += ../../bsps/include/grlib/ambapp.h
+include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_bus.h
+include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_bus_grlib.h
+include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_ids.h
+include_grlib_HEADERS += ../../bsps/include/grlib/apbuart.h
+include_grlib_HEADERS += ../../bsps/include/grlib/apbuart_cons.h
+include_grlib_HEADERS += ../../bsps/include/grlib/apbuart_termios.h
+include_grlib_HEADERS += ../../bsps/include/grlib/b1553brm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/b1553rt.h
+include_grlib_HEADERS += ../../bsps/include/grlib/bspcommon.h
+include_grlib_HEADERS += ../../bsps/include/grlib/canmux.h
+include_grlib_HEADERS += ../../bsps/include/grlib/cons.h
+include_grlib_HEADERS += ../../bsps/include/grlib/debug_defs.h
+include_grlib_HEADERS += ../../bsps/include/grlib/genirq.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gpiolib.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gptimer.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553b.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bc.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bc_list.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr1553rt.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_701.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_cpci_gr740.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_adcdac.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_io.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_spw_router.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_tmtc.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gr_tmtc_1553.h
+include_grlib_HEADERS += ../../bsps/include/grlib/gradcdac.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grascs.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grcan.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grctm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/greth.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grgpio.h
+include_grlib_HEADERS += ../../bsps/include/grlib/griommu.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grlib.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grlib_impl.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grpci.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grpci2.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grpci2dma.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grpwm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grslink.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grspw.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grspw_pkt.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grspw_router.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grtc.h
+include_grlib_HEADERS += ../../bsps/include/grlib/grtm.h
+include_grlib_HEADERS += ../../bsps/include/grlib/i2cmst.h
+include_grlib_HEADERS += ../../bsps/include/grlib/l2c.h
+include_grlib_HEADERS += ../../bsps/include/grlib/l4stat.h
+include_grlib_HEADERS += ../../bsps/include/grlib/mctrl.h
+include_grlib_HEADERS += ../../bsps/include/grlib/memscrub.h
+include_grlib_HEADERS += ../../bsps/include/grlib/network_interface_add.h
+include_grlib_HEADERS += ../../bsps/include/grlib/occan.h
+include_grlib_HEADERS += ../../bsps/include/grlib/pcif.h
+include_grlib_HEADERS += ../../bsps/include/grlib/satcan.h
+include_grlib_HEADERS += ../../bsps/include/grlib/spictrl.h
+include_grlib_HEADERS += ../../bsps/include/grlib/spwcuc.h
+include_grlib_HEADERS += ../../bsps/include/grlib/spwtdp.h
+include_grlib_HEADERS += ../../bsps/include/grlib/tlib.h
+
 include_libchipdir = $(includedir)/libchip
 include_libchip_HEADERS =
 include_libchip_HEADERS += ../../bsps/include/libchip/am29lv160.h

bsps/include/grlib/ambapp.h

@@ -19,7 +19,7 @@
 #define __AMBAPP_H__
 
 /* Include VENDOR and DEVICE definitions */
-#include <ambapp_ids.h>
+#include "ambapp_ids.h"
 
 #ifdef __cplusplus
 extern "C" {

bsps/include/grlib/ambapp_bus.h

@@ -17,7 +17,7 @@
 #define __AMBAPP_BUS_H__
 
 #include <drvmgr/drvmgr.h>
-#include <ambapp.h>
+#include "ambapp.h"
 
 #ifdef __cplusplus
 extern "C" {

bsps/include/grlib/apbuart.h

@@ -19,8 +19,8 @@
 #ifndef __APBUART_H__
 #define __APBUART_H__
 
-#include <ambapp.h>
-#include <grlib.h>
+#include "ambapp.h"
+#include "grlib.h"
 
 #ifdef __cplusplus
 extern "C" {

bsps/include/grlib/apbuart_termios.h

@@ -15,7 +15,7 @@
 #define APBUART_TERMIOS_H
 
 #include <rtems/termiostypes.h>
-#include <grlib.h>
+#include "grlib.h"
 
 #ifdef __cplusplus
 extern "C" {

bsps/include/grlib/gr1553bc.h

@@ -40,7 +40,7 @@ struct gr1553bc_major_cfg;
 #endif
 
 #include <stdint.h>
-#include <bsp/gr1553bc_list.h>
+#include "gr1553bc_list.h"
 
 #ifdef __cplusplus
 extern "C" {

bsps/include/grlib/gr1553bc_list.h

@@ -193,7 +193,7 @@
  */
 
 #include <stdint.h>
-#include <bsp/gr1553bc.h>
+#include "gr1553bc.h"
 
 /**** CONFIGURATION OPTIONS ****/
 

bsps/include/grlib/grlib_impl.h

@@ -90,6 +90,8 @@ RTEMS_INLINE_ROUTINE void *grlib_calloc(size_t nelem, size_t elsize)
 
 #endif
 
+extern struct ambapp_bus ambapp_plb;
+
 #ifdef __cplusplus
 }
 #endif

bsps/include/grlib/grspw.h

@@ -18,7 +18,7 @@
 #ifndef __GRSPW_H__
 #define __GRSPW_H__
 
-#include <ambapp.h>
+#include <grlib/ambapp.h>
 
 #ifdef __cplusplus
 extern "C" {

bsps/include/grlib/i2cmst.h

@@ -19,7 +19,7 @@
 #define _I2CMST_H
 
 #include <rtems/libi2c.h>
-#include <ambapp.h>
+#include "ambapp.h"
 
 #ifdef __cplusplus
 extern "C" {