From 3eed4f30e431737a9b54a0e0db3d585cf8fad9b2 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 4 Jan 2018 08:10:48 +0100
Subject: bsp/altera-cyclone-v: Use public include path

Update #3254.
---
 .../libbsp/arm/altera-cyclone-v/console/console-config.c |  8 ++++----
 .../libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi.h |  2 +-
 .../altera-cyclone-v/hwlib/src/hwmgr/alt_16550_uart.c    | 12 ++++++------
 .../altera-cyclone-v/hwlib/src/hwmgr/alt_address_space.c | 10 +++++-----
 .../altera-cyclone-v/hwlib/src/hwmgr/alt_clock_manager.c | 12 ++++++------
 .../arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma.c       | 16 ++++++++--------
 .../altera-cyclone-v/hwlib/src/hwmgr/alt_dma_program.c   |  4 ++--
 .../hwlib/src/hwmgr/alt_generalpurpose_io.c              | 12 ++++++------
 .../arm/altera-cyclone-v/hwlib/src/hwmgr/alt_i2c.c       |  4 ++--
 .../arm/altera-cyclone-v/hwlib/src/hwmgr/alt_qspi.c      | 16 ++++++++--------
 .../altera-cyclone-v/hwlib/src/hwmgr/alt_reset_manager.c |  8 ++++----
 c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspsmp.c   |  8 ++++----
 c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstart.c |  2 +-
 .../libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c  |  8 ++++----
 14 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c b/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c
index 5ee02d0bb5..e4dfec9f62 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/console/console-config.c
@@ -20,10 +20,10 @@
 #include <bsp/irq.h>
 #include <bsp/alt_clock_manager.h>
 #include <bsp/console-termios.h>
-#include "socal/alt_rstmgr.h"
-#include "socal/socal.h"
-#include "socal/alt_uart.h"
-#include "socal/hps.h"
+#include <bsp/socal/alt_rstmgr.h>
+#include <bsp/socal/socal.h>
+#include <bsp/socal/alt_uart.h>
+#include <bsp/socal/hps.h>
 
 #ifdef BSP_USE_UART_INTERRUPTS
   #define DEVICE_FNS &ns16550_handler_interrupt
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi.h b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi.h
index d09ccf2f69..982c0aceae 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi.h
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/include/alt_qspi.h
@@ -52,7 +52,7 @@
 #ifndef __ALT_QSPI_H__
 #define __ALT_QSPI_H__
 
-#include "hwlib.h"
+#include <bsp/hwlib.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_16550_uart.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_16550_uart.c
index a5dfc5f22c..7ed75c39d3 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_16550_uart.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_16550_uart.c
@@ -28,12 +28,12 @@
  * 
  ******************************************************************************/
 
-#include "alt_16550_uart.h"
-#include "alt_clock_manager.h"
-#include "socal/alt_rstmgr.h"
-#include "socal/alt_uart.h"
-#include "socal/hps.h"
-#include "socal/socal.h"
+#include <bsp/alt_16550_uart.h>
+#include <bsp/alt_clock_manager.h>
+#include <bsp/socal/alt_rstmgr.h>
+#include <bsp/socal/alt_uart.h>
+#include <bsp/socal/hps.h>
+#include <bsp/socal/socal.h>
 
 /////
 
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_address_space.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_address_space.c
index 93b7f8866d..d64ac33ec8 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_address_space.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_address_space.c
@@ -35,11 +35,11 @@
  ******************************************************************************/
 
 #include <stddef.h>
-#include "alt_address_space.h"
-#include "socal/alt_l3.h"
-#include "socal/socal.h"
-#include "socal/alt_acpidmap.h"
-#include "hwlib.h"
+#include <bsp/alt_address_space.h>
+#include <bsp/socal/alt_l3.h>
+#include <bsp/socal/socal.h>
+#include <bsp/socal/alt_acpidmap.h>
+#include <bsp/hwlib.h>
 
 
 #define ALT_ACP_ID_MAX_INPUT_ID     7
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_clock_manager.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_clock_manager.c
index 12912437c6..95404c1c13 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_clock_manager.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_clock_manager.c
@@ -33,12 +33,12 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "socal/hps.h"
-#include "socal/socal.h"
-#include "socal/alt_sysmgr.h"
-#include "hwlib.h"
-#include "alt_clock_manager.h"
-#include "alt_mpu_registers.h"
+#include <bsp/socal/hps.h>
+#include <bsp/socal/socal.h>
+#include <bsp/socal/alt_sysmgr.h>
+#include <bsp/hwlib.h>
+#include <bsp/alt_clock_manager.h>
+#include <bsp/alt_mpu_registers.h>
 
 #define UINT12_MAX              (4096)
 
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma.c
index 2bdc519eee..0fa69141ea 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma.c
@@ -29,19 +29,19 @@
  ******************************************************************************/
 
 #include <stdio.h>
-#include "alt_dma.h"
-#include "socal/socal.h"
-#include "socal/hps.h"
-#include "socal/alt_rstmgr.h"
-#include "socal/alt_sysmgr.h"
+#include <bsp/alt_dma.h>
+#include <bsp/socal/socal.h>
+#include <bsp/socal/hps.h>
+#include <bsp/socal/alt_rstmgr.h>
+#include <bsp/socal/alt_sysmgr.h>
 
 #if ALT_DMA_PERIPH_PROVISION_16550_SUPPORT
-#include "alt_16550_uart.h"
-#include "socal/alt_uart.h"
+#include <bsp/alt_16550_uart.h>
+#include <bsp/socal/alt_uart.h>
 #endif
 
 #if ALT_DMA_PERIPH_PROVISION_QSPI_SUPPORT
-#include "socal/alt_qspi.h"
+#include <bsp/socal/alt_qspi.h>
 #endif
 
 /////
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma_program.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma_program.c
index 26de4c7f0c..c13957bcf8 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma_program.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_dma_program.c
@@ -28,8 +28,8 @@
  *
  ******************************************************************************/
 
-#include "alt_dma_program.h"
-#include "alt_cache.h"
+#include <bsp/alt_dma_program.h>
+#include <bsp/alt_cache.h>
 #include <stdio.h>
 
 /////
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_generalpurpose_io.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_generalpurpose_io.c
index d5b6afad04..b52e5002a3 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_generalpurpose_io.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_generalpurpose_io.c
@@ -32,12 +32,12 @@
 #include    <stdlib.h>
 #include    <stdbool.h>
 
-#include    "socal/hps.h"
-#include    "socal/socal.h"
-#include    "socal/alt_gpio.h"
-#include    "socal/alt_rstmgr.h"
-#include    "hwlib.h"
-#include    "alt_generalpurpose_io.h"
+#include    <bsp/socal/hps.h>
+#include    <bsp/socal/socal.h>
+#include    <bsp/socal/alt_gpio.h>
+#include    <bsp/socal/alt_rstmgr.h>
+#include    <bsp/hwlib.h>
+#include    <bsp/alt_generalpurpose_io.h>
 
 
 /****************************************************************************************/
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_i2c.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_i2c.c
index 1519f4f713..b6279a7938 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_i2c.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_i2c.c
@@ -28,8 +28,8 @@
  * 
  ******************************************************************************/
 
-#include "alt_i2c.h"
-#include "alt_reset_manager.h"
+#include <bsp/alt_i2c.h>
+#include <bsp/alt_reset_manager.h>
 #include <stdio.h>
 
 /////
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_qspi.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_qspi.c
index 458ef71f46..3e591fc044 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_qspi.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_qspi.c
@@ -37,15 +37,15 @@
 #include <string.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include "hwlib.h"
-#include "alt_clock_manager.h"
+#include <bsp/hwlib.h>
+#include <bsp/alt_clock_manager.h>
 #include "alt_qspi.h"
-#include "alt_qspi_private.h"
-#include "socal/alt_qspi.h"
-#include "socal/alt_rstmgr.h"
-#include "socal/alt_sysmgr.h"
-#include "socal/hps.h"
-#include "socal/socal.h"
+#include <bsp/alt_qspi_private.h>
+#include <bsp/socal/alt_qspi.h>
+#include <bsp/socal/alt_rstmgr.h>
+#include <bsp/socal/alt_sysmgr.h>
+#include <bsp/socal/hps.h>
+#include <bsp/socal/socal.h>
 
 /////
 
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_reset_manager.c b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_reset_manager.c
index d065890314..e37e5a7be3 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_reset_manager.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/hwlib/src/hwmgr/alt_reset_manager.c
@@ -35,10 +35,10 @@
 * 
 ******************************************************************************/
 
-#include "alt_reset_manager.h"
-#include "socal/socal.h"
-#include "socal/hps.h"
-#include "socal/alt_rstmgr.h"
+#include <bsp/alt_reset_manager.h>
+#include <bsp/socal/socal.h>
+#include <bsp/socal/hps.h>
+#include <bsp/socal/alt_rstmgr.h>
 
 /////
 
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspsmp.c b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspsmp.c
index 0d95218c5b..9c3c9dcffe 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspsmp.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspsmp.c
@@ -16,10 +16,10 @@
 
 #include <bsp/start.h>
 
-#include <socal/alt_rstmgr.h>
-#include <socal/alt_sysmgr.h>
-#include <socal/hps.h>
-#include <socal/socal.h>
+#include <bsp/socal/alt_rstmgr.h>
+#include <bsp/socal/alt_sysmgr.h>
+#include <bsp/socal/hps.h>
+#include <bsp/socal/socal.h>
 
 bool _CPU_SMP_Start_processor(uint32_t cpu_index)
 {
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstart.c b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstart.c
index ef62790259..fa0c9d17bf 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstart.c
@@ -18,7 +18,7 @@
 #include <bsp/irq-generic.h>
 #include <bsp/linker-symbols.h>
 
-#include <alt_clock_manager.h>
+#include <bsp/alt_clock_manager.h>
 
 #include <libfdt.h>
 
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c
index bd1f1c8121..69a178e3ad 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c
@@ -19,10 +19,10 @@
 #include <bsp/arm-cp15-start.h>
 #include <bsp/arm-a9mpcore-start.h>
 #include <bsp/linker-symbols.h>
-#include <alt_address_space.h>
-#include <socal/socal.h>
-#include <socal/alt_sdr.h>
-#include <socal/hps.h>
+#include <bsp/alt_address_space.h>
+#include <bsp/socal/socal.h>
+#include <bsp/socal/alt_sdr.h>
+#include <bsp/socal/hps.h>
 
 /* 1 MB reset default value for address filtering start */
 #define BSPSTART_L2_CACHE_ADDR_FILTERING_START_RESET 0x100000
-- 
cgit v1.2.3