[rtems-libbsd commit] imx: Fix build for all other BSPs.

[Christian Mauderer]

Module:    rtems-libbsd
Branch:    5-freebsd-12
Commit:    592003fa3e401adfe344df9a0f18296c338d19bc
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=592003fa3e401adfe344df9a0f18296c338d19bc

Author:    Christian Mauderer <christian.mauderer at embedded-brains.de>
Date:      Thu Apr 16 09:52:12 2020 +0200

imx: Fix build for all other BSPs.

---

 freebsd/sys/arm/freescale/imx/imx6_ccm.c    | 7 +++++++
 freebsd/sys/arm/freescale/imx/imx6_usbphy.c | 4 ++++
 freebsd/sys/dev/usb/controller/ehci_imx.c   | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/freebsd/sys/arm/freescale/imx/imx6_ccm.c b/freebsd/sys/arm/freescale/imx/imx6_ccm.c
index cef7993..78bbd5c 100644
--- a/freebsd/sys/arm/freescale/imx/imx6_ccm.c
+++ b/freebsd/sys/arm/freescale/imx/imx6_ccm.c
@@ -51,7 +51,14 @@ __FBSDID("$FreeBSD$");
 #include <arm/freescale/imx/imx6_anatopvar.h>
 #include <arm/freescale/imx/imx6_ccmreg.h>
 #include <arm/freescale/imx/imx_machdep.h>
+#ifndef __rtems__
+#include <arm/freescale/imx/imx_ccmvar.h>
+#else /* __rtems__ */
+#include <bsp.h>
+#ifdef LIBBSP_ARM_IMX_BSP_H
 #include <arm/freescale/imx/imx_ccmvar.h>
+#endif /* LIBBSP_ARM_IMX_BSP_H */
+#endif /* __rtems__ */
 
 #ifndef CCGR_CLK_MODE_ALWAYS
 #define	CCGR_CLK_MODE_OFF		0
diff --git a/freebsd/sys/arm/freescale/imx/imx6_usbphy.c b/freebsd/sys/arm/freescale/imx/imx6_usbphy.c
index 7df2e12..3a3495b 100644
--- a/freebsd/sys/arm/freescale/imx/imx6_usbphy.c
+++ b/freebsd/sys/arm/freescale/imx/imx6_usbphy.c
@@ -49,7 +49,11 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
+#ifndef __rtems__
 #include <arm/freescale/imx/imx_ccmvar.h>
+#else /* __rtems__ */
+void imx_ccm_usbphy_enable(device_t _phydev);
+#endif /* __rtems__ */
 #include <arm/freescale/imx/imx6_anatopreg.h>
 #include <arm/freescale/imx/imx6_anatopvar.h>
 #ifdef __rtems__
diff --git a/freebsd/sys/dev/usb/controller/ehci_imx.c b/freebsd/sys/dev/usb/controller/ehci_imx.c
index 544a63b..23f7e3a 100644
--- a/freebsd/sys/dev/usb/controller/ehci_imx.c
+++ b/freebsd/sys/dev/usb/controller/ehci_imx.c
@@ -67,7 +67,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/resource.h>
 
+#ifndef __rtems__
 #include <arm/freescale/imx/imx_ccmvar.h>
+#endif /* __rtems__ */
 
 #include <rtems/bsd/local/opt_platform.h>