[rtems commit] bsp/zynq-uart: Move Zynq UART driver to shared directory

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    b0044305a635fcdb714e64f1d7c6ec85e5fc696e
Changeset: http://git.rtems.org/rtems/commit/?id=b0044305a635fcdb714e64f1d7c6ec85e5fc696e

Author:    Jeff Kubascik <jeff.kubascik at dornerworks.com>
Date:      Wed Apr 10 19:38:53 2019 -0400

bsp/zynq-uart: Move Zynq UART driver to shared directory

This driver will be shared with the xilinx-zynqmp BSP.

Update #3682.

---

 bsps/arm/headers.am                                         | 2 ++
 bsps/arm/{xilinx-zynq => }/include/bsp/zynq-uart-regs.h     | 0
 bsps/arm/{xilinx-zynq => }/include/bsp/zynq-uart.h          | 0
 bsps/arm/{xilinx-zynq/console => shared/serial}/zynq-uart.c | 0
 bsps/arm/xilinx-zynq/headers.am                             | 2 --
 c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am                | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bsps/arm/headers.am b/bsps/arm/headers.am
index 91b63f3..3d2b09e 100644
--- a/bsps/arm/headers.am
+++ b/bsps/arm/headers.am
@@ -37,6 +37,8 @@ include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-i2s.h
 include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-lcd.h
 include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/lpc-timer.h
 include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/start.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/zynq-uart-regs.h
+include_bsp_HEADERS += ../../../../../bsps/arm/include/bsp/zynq-uart.h
 
 include_libcpudir = $(includedir)/libcpu
 include_libcpu_HEADERS =
diff --git a/bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h b/bsps/arm/include/bsp/zynq-uart-regs.h
similarity index 100%
rename from bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h
rename to bsps/arm/include/bsp/zynq-uart-regs.h
diff --git a/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h b/bsps/arm/include/bsp/zynq-uart.h
similarity index 100%
rename from bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
rename to bsps/arm/include/bsp/zynq-uart.h
diff --git a/bsps/arm/xilinx-zynq/console/zynq-uart.c b/bsps/arm/shared/serial/zynq-uart.c
similarity index 100%
rename from bsps/arm/xilinx-zynq/console/zynq-uart.c
rename to bsps/arm/shared/serial/zynq-uart.c
diff --git a/bsps/arm/xilinx-zynq/headers.am b/bsps/arm/xilinx-zynq/headers.am
index 708bd64..47738c6 100644
--- a/bsps/arm/xilinx-zynq/headers.am
+++ b/bsps/arm/xilinx-zynq/headers.am
@@ -11,5 +11,3 @@ include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/cadenc
 include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
 include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/i2c.h
 include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/irq.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h
-include_bsp_HEADERS += ../../../../../../bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 0ec2944..7b4e4ae 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -61,7 +61,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-gic.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/console/console-config.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/console/debug-console.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/console/zynq-uart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/serial/zynq-uart.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-a9mpcore.c