[PATCH v2 2/3] bsps/xilinx_zynq: Add SPI driver to waf

[Kinsey Moore]

The header locations in spec/build/bsps/arm/xilinx-zynq/obj.yml don't look correct due to the relocation and should probably be removed entirely since they're now broken out into spec/build/bsps/objdevspizynq.yml, instead.

Kinsey

-----Original Message-----
From: devel <devel-bounces at rtems.org> On Behalf Of Jan Sommer
Sent: Saturday, February 13, 2021 08:19
To: devel at rtems.org
Subject: [PATCH v2 2/3] bsps/xilinx_zynq: Add SPI driver to waf

---
 spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml  |  2 ++
 spec/build/bsps/arm/xilinx-zynq/grp.yml        |  2 ++
 spec/build/bsps/arm/xilinx-zynq/obj.yml        |  4 ++--
 .../bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml |  2 ++
 spec/build/bsps/objdevspizynq.yml              | 18 ++++++++++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 spec/build/bsps/objdevspizynq.yml

diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
index 552723c61c..c952b4f59e 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml
@@ -33,6 +33,8 @@ links:
   uid: ../../objirq
 - role: build-dependency
   uid: ../../objdevserialzynq
+- role: build-dependency
+  uid: ../../objdevspizynq
 - role: build-dependency
   uid: ../../optcachedata
 - role: build-dependency
diff --git a/spec/build/bsps/arm/xilinx-zynq/grp.yml b/spec/build/bsps/arm/xilinx-zynq/grp.yml
index 74adbd7fa7..0bbee1922c 100644
--- a/spec/build/bsps/arm/xilinx-zynq/grp.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/grp.yml
@@ -57,6 +57,8 @@ links:
   uid: ../../objirq
 - role: build-dependency
   uid: ../../objdevserialzynq
+- role: build-dependency
+  uid: ../../objdevspizynq
 - role: build-dependency
   uid: linkcmds
 - role: build-dependency
diff --git a/spec/build/bsps/arm/xilinx-zynq/obj.yml b/spec/build/bsps/arm/xilinx-zynq/obj.yml
index 6602b20a03..8b7e65ed40 100644
--- a/spec/build/bsps/arm/xilinx-zynq/obj.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/obj.yml
@@ -14,9 +14,9 @@ install:
   - bsps/arm/xilinx-zynq/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
-  - bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h
-  - bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
   - bsps/arm/xilinx-zynq/include/bsp/i2c.h
+  - bsps/arm/xilinx-zynq/include/bsp/cadence-spi.h
+  - bsps/arm/xilinx-zynq/include/bsp/cadence-spi-regs.h
   - bsps/arm/xilinx-zynq/include/bsp/irq.h
 links: []
 source:
diff --git a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
index 51d3268e99..d4e8cbc1ce 100644
--- a/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
+++ b/spec/build/bsps/arm/xilinx-zynqmp/bspxilinxzynqmp.yml
@@ -69,6 +69,8 @@ links:
   uid: ../../objirq
 - role: build-dependency
   uid: ../../objdevserialzynq
+- role: build-dependency
+  uid: ../../objdevspizynq
 - role: build-dependency
   uid: ../../opto2
 - role: build-dependency
diff --git a/spec/build/bsps/objdevspizynq.yml b/spec/build/bsps/objdevspizynq.yml
new file mode 100644
index 0000000000..b778e756e1
--- /dev/null
+++ b/spec/build/bsps/objdevspizynq.yml
@@ -0,0 +1,18 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: objects
+cflags: []
+copyrights:
+- Copyright (C) 2021 German Aerospace Center (DLR)
+cppflags: []
+cxxflags: []
+enabled-by: true
+includes: []
+install:
+- destination: ${BSP_INCLUDEDIR}/dev/spi
+  source:
+  - bsps/include/dev/spi/cadence-spi-regs.h
+  - bsps/include/dev/spi/cadence-spi.h
+links: []
+source:
+- bsps/shared/dev/spi/cadence-spi.c
+type: build
-- 
2.17.1

_______________________________________________
devel mailing list
devel at rtems.org
http://lists.rtems.org/mailman/listinfo/devel