Things are always moving around in RTEMS - adapt.

The latest RTEMS (2019/07) has restructured Leon/AMBA header files,
putting them under a grlib folder. Detect this by a combination of checks,
that depends on the fact that our custom cross build in TASTE
enables Ada (which Gaisler's RCC doesn't).

include/po_hi_common.h

@@ -35,7 +35,18 @@
    #include <drvmgr/drvmgr.h>
    // #include <amba.h>
    // #include <bsp/grspw.h>
+
+   // Things are always moving around in RTEMS.
+   // Adapt... the latest RTEMS (2019/07) has restructured Leon/AMBA
+   // headers under grlib. Detect this by a combination of checks,
+   // that depends on the fact that our custom cross build in TASTE
+   // enabled Ada (which Gaisler's RCC doesn't).
+#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
+   #include <grlib/ambapp_bus.h>
+#else
    #include <drvmgr/ambapp_bus.h>
+#endif
+
 #endif
 
    #define CONFIGURE_INIT

src/drivers/config_leon3_drvmgr.c

@@ -3,9 +3,20 @@
  * Any modification there should be carefully weighted.
  */
 
+// Things are always moving around in RTEMS.
+// Adapt... the latest RTEMS (2019/07) has restructured Leon/AMBA
+// headers under grlib. Detect this by a combination of checks,
+// that depends on the fact that our custom cross build in TASTE
+// enabled Ada (which Gaisler's RCC doesn't).
+#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
+#include <grlib/ambapp_bus_grlib.h>
+#include <grlib/ambapp_bus.h>
+#include <grlib/ambapp_ids.h>
+#else
 #include <drvmgr/ambapp_bus_grlib.h>
 #include <drvmgr/ambapp_bus.h>
 #include <ambapp_ids.h>
+#endif
 
 /* B1553RT driver configuration (optional) */
 struct drvmgr_key grlib_drv_res_b1553rt0[] =