diff options
author | Jeff Kubascik <jeff.kubascik@dornerworks.com> | 2019-04-10 19:38:53 -0400 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-04-11 07:29:06 +0200 |
commit | b0044305a635fcdb714e64f1d7c6ec85e5fc696e (patch) | |
tree | b1c5e6e341987e5ae82d0a87a9e77db181187714 | |
parent | bsp/zynq-uart: Remove zynq_uart_instances from header (diff) | |
download | rtems-b0044305a635fcdb714e64f1d7c6ec85e5fc696e.tar.bz2 |
bsp/zynq-uart: Move Zynq UART driver to shared directory
This driver will be shared with the xilinx-zynqmp BSP.
Update #3682.
-rw-r--r-- | bsps/arm/headers.am | 2 | ||||
-rw-r--r-- | bsps/arm/include/bsp/zynq-uart-regs.h (renamed from bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h) | 0 | ||||
-rw-r--r-- | bsps/arm/include/bsp/zynq-uart.h (renamed from bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h) | 0 | ||||
-rw-r--r-- | bsps/arm/shared/serial/zynq-uart.c (renamed from bsps/arm/xilinx-zynq/console/zynq-uart.c) | 0 | ||||
-rw-r--r-- | bsps/arm/xilinx-zynq/headers.am | 2 | ||||
-rw-r--r-- | 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 91b63f37db..3d2b09effa 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 index 8b6e7d513b..8b6e7d513b 100644 --- a/bsps/arm/xilinx-zynq/include/bsp/zynq-uart-regs.h +++ b/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 index 20c3c9b653..20c3c9b653 100644 --- a/bsps/arm/xilinx-zynq/include/bsp/zynq-uart.h +++ b/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 index 92a8c86009..92a8c86009 100644 --- a/bsps/arm/xilinx-zynq/console/zynq-uart.c +++ b/bsps/arm/shared/serial/zynq-uart.c diff --git a/bsps/arm/xilinx-zynq/headers.am b/bsps/arm/xilinx-zynq/headers.am index 708bd6411a..47738c62be 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 0ec2944d53..7b4e4aea94 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 |