diff options
| author | Kinsey Moore <kinsey.moore@oarcorp.com> | 2020-12-03 10:58:26 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2020-12-04 12:42:06 -0600 |
| commit | 2365c93745617232bd4173e39331b6fb6c8b0a20 (patch) | |
| tree | 02def3a6e60d87bd8a11333cc957770cc5c9507b /spec/build/bsps | |
| parent | spec/optconminor: Fix value type (diff) | |
| download | rtems-2365c93745617232bd4173e39331b6fb6c8b0a20.tar.bz2 | |
spec: Move zynq-uart into its own object
Currently, zynq-uart code is always built and has some requirements for
BSPs that use it. Instead of making all BSPs satisfy that requirement or
working around it by setting defaults, this moves the zynq-uart code
into its own spec build object so it can be included if needed.
Diffstat (limited to 'spec/build/bsps')
| -rw-r--r-- | spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml | 2 | ||||
| -rw-r--r-- | spec/build/bsps/arm/xilinx-zynq/grp.yml | 2 | ||||
| -rw-r--r-- | spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml | 2 | ||||
| -rw-r--r-- | spec/build/bsps/obj.yml | 4 | ||||
| -rw-r--r-- | spec/build/bsps/objdevserialzynq.yml | 19 |
5 files changed, 25 insertions, 4 deletions
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml index 499947eddf..552723c61c 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml +++ b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml @@ -32,6 +32,8 @@ links: - role: build-dependency uid: ../../objirq - role: build-dependency + uid: ../../objdevserialzynq +- role: build-dependency uid: ../../optcachedata - role: build-dependency uid: ../../optcacheinst diff --git a/spec/build/bsps/arm/xilinx-zynq/grp.yml b/spec/build/bsps/arm/xilinx-zynq/grp.yml index 47f38ebcfd..a0580619f0 100644 --- a/spec/build/bsps/arm/xilinx-zynq/grp.yml +++ b/spec/build/bsps/arm/xilinx-zynq/grp.yml @@ -56,6 +56,8 @@ links: - role: build-dependency uid: ../../objirq - role: build-dependency + uid: ../../objdevserialzynq +- role: build-dependency uid: linkcmds - role: build-dependency uid: ../../bspopts diff --git a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml index 0704c691b2..95cbc51436 100644 --- a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml +++ b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml @@ -68,6 +68,8 @@ links: - role: build-dependency uid: ../../objirq - role: build-dependency + uid: ../../objdevserialzynq +- role: build-dependency uid: ../../opto2 - role: build-dependency uid: linkcmds diff --git a/spec/build/bsps/obj.yml b/spec/build/bsps/obj.yml index 7ea560b47d..a454783d51 100644 --- a/spec/build/bsps/obj.yml +++ b/spec/build/bsps/obj.yml @@ -52,8 +52,6 @@ install: source: - bsps/include/dev/serial/arm-pl011-regs.h - bsps/include/dev/serial/arm-pl011.h - - bsps/include/dev/serial/zynq-uart-regs.h - - bsps/include/dev/serial/zynq-uart.h - destination: ${BSP_INCLUDEDIR}/rtems/zilog source: - bsps/include/rtems/zilog/z8036.h @@ -96,8 +94,6 @@ source: - bsps/shared/dev/serial/ns16550.c - bsps/shared/dev/serial/ns16550-context.c - bsps/shared/dev/serial/serprobe.c -- bsps/shared/dev/serial/zynq-uart.c -- bsps/shared/dev/serial/zynq-uart-polled.c - bsps/shared/start/bootcard.c - bsps/shared/rtems-version.c type: build diff --git a/spec/build/bsps/objdevserialzynq.yml b/spec/build/bsps/objdevserialzynq.yml new file mode 100644 index 0000000000..e890ebc459 --- /dev/null +++ b/spec/build/bsps/objdevserialzynq.yml @@ -0,0 +1,19 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +build-type: objects +cflags: [] +copyrights: +- Copyright (C) 2020 On-Line Applications Research (OAR) +cppflags: [] +cxxflags: [] +enabled-by: true +includes: [] +install: +- destination: ${BSP_INCLUDEDIR}/dev/serial + source: + - bsps/include/dev/serial/zynq-uart-regs.h + - bsps/include/dev/serial/zynq-uart.h +links: [] +source: +- bsps/shared/dev/serial/zynq-uart.c +- bsps/shared/dev/serial/zynq-uart-polled.c +type: build |