[rtems commit] bsps/zynq: Moved general i2c files to shared directories

Joel Sherrill joel at rtems.org
Thu Sep 9 19:18:28 UTC 2021


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

Author:    Stephen Clark <stephen.clark at oarcorp.com>
Date:      Mon Aug 23 12:53:42 2021 -0500

bsps/zynq: Moved general i2c files to shared directories

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.

---

 .../xilinx-zynq/include/bsp => include/dev/i2c}/cadence-i2c-regs.h  | 0
 bsps/{arm/xilinx-zynq/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(-)

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 0737999..91774fb 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 e81deca..8a11a45 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



More information about the vc mailing list