[PATCH rtems v1 1/2] bsps/zynq: Moved general i2c files to shared directories

Stephen Clark stephen.clark at oarcorp.com
Mon Aug 23 22:24:45 UTC 2021


Certain files related to the Zynq BSP's I2C driver are useable by the ZynqMP BSP as well.
Moved these files to shared directory in anticipation of I2C support for ZynqMP.
---
 .../include/bsp => include/dev/i2c}/cadence-i2c-regs.h      | 0
 .../include/bsp => include/dev/i2c}/cadence-i2c.h           | 0
 bsps/{arm/xilinx-zynq => shared/dev}/i2c/cadence-i2c.c      | 4 ++--
 spec/build/bsps/arm/xilinx-zynq/obj.yml                     | 6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename bsps/{arm/xilinx-zynq/include/bsp => include/dev/i2c}/cadence-i2c-regs.h (100%)
 rename bsps/{arm/xilinx-zynq/include/bsp => include/dev/i2c}/cadence-i2c.h (100%)
 rename bsps/{arm/xilinx-zynq => shared/dev}/i2c/cadence-i2c.c (99%)

diff --git a/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h b/bsps/include/dev/i2c/cadence-i2c-regs.h
similarity index 100%
rename from bsps/arm/xilinx-zynq/include/bsp/cadence-i2c-regs.h
rename to bsps/include/dev/i2c/cadence-i2c-regs.h
diff --git a/bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h b/bsps/include/dev/i2c/cadence-i2c.h
similarity index 100%
rename from bsps/arm/xilinx-zynq/include/bsp/cadence-i2c.h
rename to bsps/include/dev/i2c/cadence-i2c.h
diff --git a/bsps/arm/xilinx-zynq/i2c/cadence-i2c.c b/bsps/shared/dev/i2c/cadence-i2c.c
similarity index 99%
rename from bsps/arm/xilinx-zynq/i2c/cadence-i2c.c
rename to bsps/shared/dev/i2c/cadence-i2c.c
index 07379992ce..91774fb926 100644
--- a/bsps/arm/xilinx-zynq/i2c/cadence-i2c.c
+++ b/bsps/shared/dev/i2c/cadence-i2c.c
@@ -25,8 +25,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <bsp/cadence-i2c.h>
-#include <bsp/cadence-i2c-regs.h>
+#include <dev/i2c/cadence-i2c.h>
+#include <dev/i2c/cadence-i2c-regs.h>
 
 #include <rtems/irq-extension.h>
 #include <rtems/score/assert.h>
diff --git a/spec/build/bsps/arm/xilinx-zynq/obj.yml b/spec/build/bsps/arm/xilinx-zynq/obj.yml
index e81decaa3d..8a11a45dd3 100644
--- a/spec/build/bsps/arm/xilinx-zynq/obj.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/obj.yml
@@ -14,8 +14,8 @@ 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/include/dev/i2c/cadence-i2c-regs.h
+  - bsps/include/dev/i2c/cadence-i2c.h
   - bsps/arm/xilinx-zynq/include/bsp/i2c.h
   - bsps/arm/xilinx-zynq/include/bsp/irq.h
 links: []
@@ -28,7 +28,7 @@ source:
 - bsps/arm/xilinx-zynq/console/console-config.c
 - bsps/arm/xilinx-zynq/console/console-init.c
 - bsps/arm/xilinx-zynq/console/debug-console.c
-- bsps/arm/xilinx-zynq/i2c/cadence-i2c.c
+- bsps/shared/dev/i2c/cadence-i2c.c
 - bsps/arm/xilinx-zynq/start/bspreset.c
 - bsps/arm/xilinx-zynq/start/bspstart.c
 - bsps/arm/xilinx-zynq/start/bspstarthooks.c
-- 
2.27.0



More information about the devel mailing list