From b0c420b92fe2ace36e02ba63a6a07fb77e277059 Mon Sep 17 00:00:00 2001
From: Jeff Kubascik <jeff.kubascik@dornerworks.com>
Date: Wed, 10 Apr 2019 19:38:52 -0400
Subject: bsp/zynq-uart: Remove zynq_uart_instances from header

This variable is BSP specific and should be removed from the driver
header file.

Update #3682.
---
 bsps/arm/xilinx-zynq/console/debug-console.c | 1 +
 bsps/arm/xilinx-zynq/include/bsp.h           | 3 +++
 bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h | 4 +---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bsps/arm/xilinx-zynq/console/debug-console.c b/bsps/arm/xilinx-zynq/console/debug-console.c
index 8930b4fda4..3b1e1e212b 100644
--- a/bsps/arm/xilinx-zynq/console/debug-console.c
+++ b/bsps/arm/xilinx-zynq/console/debug-console.c
@@ -28,6 +28,7 @@
 #include <rtems/bspIo.h>
 #include <rtems/sysinit.h>
 
+#include <bsp.h>
 #include <bsp/zynq-uart.h>
 
 #include <bspopts.h>
diff --git a/bsps/arm/xilinx-zynq/include/bsp.h b/bsps/arm/xilinx-zynq/include/bsp.h
index 111bacc8ab..6c2759ce50 100644
--- a/bsps/arm/xilinx-zynq/include/bsp.h
+++ b/bsps/arm/xilinx-zynq/include/bsp.h
@@ -54,6 +54,7 @@
 
 #include <bsp/default-initial-extension.h>
 #include <bsp/start.h>
+#include <bsp/zynq-uart.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,6 +74,8 @@ extern "C" {
 
 #define BSP_ARM_L2C_310_ID 0x410000c8
 
+extern zynq_uart_context zynq_uart_instances[2];
+
 /**
  * @brief Zynq specific set up of the MMU.
  *
diff --git a/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
index 3aabdca65d..20c3c9b653 100644
--- a/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
+++ b/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
@@ -53,9 +53,7 @@ typedef struct {
   rtems_vector_number irq;
 } zynq_uart_context;
 
-const rtems_termios_device_handler zynq_uart_handler;
-
-extern zynq_uart_context zynq_uart_instances[2];
+extern const rtems_termios_device_handler zynq_uart_handler;
 
 #define ZYNQ_UART_DEFAULT_BAUD 115200
 
-- 
cgit v1.2.3