From 1524b5f9238902c22238e8f3868cdf94ac060bd9 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 4 Oct 2024 03:48:18 +0200
Subject: [PATCH] aarch64/xilinx-zynqmp: Move get I2C clocks

Not all applications use I2C.
---
 bsps/aarch64/xilinx-zynqmp/start/bspstart.c   | 12 +----
 bsps/aarch64/xilinx-zynqmp/start/i2c-clocks.c | 48 +++++++++++++++++++
 spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml |  1 +
 3 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 bsps/aarch64/xilinx-zynqmp/start/i2c-clocks.c

diff --git a/bsps/aarch64/xilinx-zynqmp/start/bspstart.c b/bsps/aarch64/xilinx-zynqmp/start/bspstart.c
index 0b161bf619..badfbbbcea 100644
--- a/bsps/aarch64/xilinx-zynqmp/start/bspstart.c
+++ b/bsps/aarch64/xilinx-zynqmp/start/bspstart.c
@@ -5,7 +5,7 @@
  *
  * @ingroup RTEMSBSPsAArch64XilinxZynqMP
  *
- * @brief This source file contains the implementatin of bsp_start().
+ * @brief This source file contains the implementation of bsp_start().
  */
 
 /*
@@ -40,16 +40,6 @@
 #include <bsp/irq-generic.h>
 #include <bsp/linker-symbols.h>
 
-__attribute__ ((weak)) uint32_t zynqmp_clock_i2c0(void)
-{
-  return ZYNQMP_CLOCK_I2C0;
-}
-
-__attribute__ ((weak)) uint32_t zynqmp_clock_i2c1(void)
-{
-  return ZYNQMP_CLOCK_I2C1;
-}
-
 void bsp_start( void )
 {
   bsp_interrupt_initialize();
diff --git a/bsps/aarch64/xilinx-zynqmp/start/i2c-clocks.c b/bsps/aarch64/xilinx-zynqmp/start/i2c-clocks.c
new file mode 100644
index 0000000000..4027223855
--- /dev/null
+++ b/bsps/aarch64/xilinx-zynqmp/start/i2c-clocks.c
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/**
+ * @file
+ *
+ * @ingroup RTEMSBSPsAArch64XilinxZynqMP
+ *
+ * @brief This source file contains the implementation of zynqmp_clock_i2c0()
+ *   and zynqmp_clock_i2c1().
+ */
+
+/*
+ * Copyright (C) 2020 On-Line Applications Research Corporation (OAR)
+ * Written by Kinsey Moore <kinsey.moore@oarcorp.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <bsp.h>
+
+RTEMS_WEAK uint32_t zynqmp_clock_i2c0(void)
+{
+  return ZYNQMP_CLOCK_I2C0;
+}
+
+RTEMS_WEAK uint32_t zynqmp_clock_i2c1(void)
+{
+  return ZYNQMP_CLOCK_I2C1;
+}
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml
index 57881aa62a..71b4ca63d3 100644
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/obj.yml
@@ -29,6 +29,7 @@ source:
 - bsps/aarch64/xilinx-zynqmp/start/bspstart.c
 - bsps/aarch64/xilinx-zynqmp/start/bspstarthooks.c
 - bsps/aarch64/xilinx-zynqmp/start/bspstartmmu.c
+- bsps/aarch64/xilinx-zynqmp/start/i2c-clocks.c
 - bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/irq/arm-gicv2-zynqmp.c