On 16/04/2020 10:27, Vijay Kumar Banerjee wrote:
>
>
> On Thu, Apr 16, 2020 at 1:51 PM Christian Mauderer
> <christian.maude...@embedded-brains.de
> <mailto:christian.maude...@embedded-brains.de>> wrote:
>
>
>
> On 16/04/2020 09:41, Christian Mauderer wrote:
> > On 16/04/2020 09:21, Vijay Kumar Banerjee wrote:
> >>
> >>
> >> On Thu, Apr 16, 2020 at 12:41 PM Christian Mauderer
> >> <christian.maude...@embedded-brains.de
> <mailto:christian.maude...@embedded-brains.de>
> >> <mailto:christian.maude...@embedded-brains.de
> <mailto:christian.maude...@embedded-brains.de>>> wrote:
> >>
> >> Hello Vijay,
> >>
> >> On 16/04/2020 09:04, Vijay Kumar Banerjee wrote:
> >> > Hi Christian,
> >> >
> >> > I'm not able to build libbsd with this patch. I'm getting the
> >> following
> >> > error:
> >> > ```
> >> > ../../freebsd/sys/dev/usb/controller/ehci_imx.c:70:10:
> fatal error:
> >> > arm/freescale/imx/imx_ccmvar.h: No such file or directory
> >> > #include <arm/freescale/imx/imx_ccmvar.h>
> >> > ```
> >> > From git blame I got to know that this file was introduced
> by the
> >> commit
> >> > from this patch.
> >> > Am I missing something or is it really a bug?
> >>
> >> Thanks for the report. On what BSP and which exact commit did
> you try to
> >> build? I had no trouble building the patch set from a clean
> checkout
> >> yesterday before committing it.
> >>
> >> I did a pull from the upstream master and tried the build on
> >> arm/beagleboneblack
> >> I see that the header file is not present in the freebsd/ directory
> >> ```
> >> rtems-libbsd $>find -iname imx_ccmvar.h
> >> ./freebsd-org/sys/arm/freescale/imx/imx_ccmvar.h
> >> ```
> >
> > Hello Vijay,
> >
> > that's quite clearly a bug that I introduced. I'll create a patch.
> >
> > The imx_ccmvar.h is a file that is provided by the BSP I used for
> testing.
> >
> > Best regards
> >
> > Christian
>
> I've sent a patch. Can you test it?
>
> Sure. I don't see the patch on the list yet, I'll test it as soon as it
> comes :)
Odd. It's already sent out and I CCd you directly. But the archive
hasn't seen it either. To be sure, I attached the patch here.
>
> >
> >>
> >> >
> >> > Sorry for commenting on the patch that has already been
> committed,
> >> > please let me know of
> >> > the preferred way to comment on a commit if this is not the
> right way.
> >>
> >> No problem. That's exactly the right way to do it. If there
> is a bug it
> >> has to be solved and everyone should know that someone is
> having a look
> >> at it.
> >>
> >> Best regards
> >>
> >> Christian
> >>
[...]
--
--------------------------------------------
embedded brains GmbH
Herr Christian Mauderer
Dornierstr. 4
D-82178 Puchheim
Germany
email: christian.maude...@embedded-brains.de
Phone: +49-89-18 94 741 - 18
Fax: +49-89-18 94 741 - 08
PGP: Public key available on request.
Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
>From cc3ab6266ef0e0d037f45016e35190631177dd80 Mon Sep 17 00:00:00 2001
From: Christian Mauderer <christian.maude...@embedded-brains.de>
Date: Thu, 16 Apr 2020 09:52:12 +0200
Subject: [PATCH rtems-libbsd] 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 cef79933..78bbd5c1 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 7df2e124..3a3495bb 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 544a63b5..23f7e3a9 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>
--
2.16.4
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
