From b7c51ac44996a93fa386fd1d3022afdebde59e54 Mon Sep 17 00:00:00 2001 From: Christian Mauderer Date: Wed, 9 Sep 2020 11:34:22 +0200 Subject: [PATCH] imx: Remove ccm functions alredy defined in RTEMS The imx_ccm_*_hz are all defined in RTEMS. So don't duplicate them in libbsd. Otherwise some applications get linker errors. Update #3869 --- freebsd/sys/arm/freescale/imx/imx6_ccm.c | 2 ++ rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/freebsd/sys/arm/freescale/imx/imx6_ccm.c b/freebsd/sys/arm/freescale/imx/imx6_ccm.c index 78bbd5c1..7fdb69b8 100644 --- a/freebsd/sys/arm/freescale/imx/imx6_ccm.c +++ b/freebsd/sys/arm/freescale/imx/imx6_ccm.c @@ -368,6 +368,7 @@ imx6_ccm_sata_enable(void) return 0; } +#ifndef __rtems__ uint32_t imx_ccm_ecspi_hz(void) { @@ -408,6 +409,7 @@ imx_ccm_ahb_hz(void) { return (132000000); } +#endif /* __rtems__ */ void imx_ccm_ipu_enable(int ipu) diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h index 9e91feac..94e0d56f 100644 --- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h +++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h @@ -2636,17 +2636,11 @@ #define imo_multi_filter _bsd_imo_multi_filter #define imx6_anatop_write_4 _bsd_imx6_anatop_write_4 #define imx6_ccm_sata_enable _bsd_imx6_ccm_sata_enable -#define imx_ccm_ahb_hz _bsd_imx_ccm_ahb_hz -#define imx_ccm_ecspi_hz _bsd_imx_ccm_ecspi_hz #define imx_ccm_get_cacrr _bsd_imx_ccm_get_cacrr #define imx_ccm_hdmi_enable _bsd_imx_ccm_hdmi_enable -#define imx_ccm_ipg_hz _bsd_imx_ccm_ipg_hz #define imx_ccm_ipu_enable _bsd_imx_ccm_ipu_enable -#define imx_ccm_perclk_hz _bsd_imx_ccm_perclk_hz -#define imx_ccm_sdhci_hz _bsd_imx_ccm_sdhci_hz #define imx_ccm_set_cacrr _bsd_imx_ccm_set_cacrr #define imx_ccm_ssi_configure _bsd_imx_ccm_ssi_configure -#define imx_ccm_uart_hz _bsd_imx_ccm_uart_hz #define imx_ccm_usb_enable _bsd_imx_ccm_usb_enable #define imx_ccm_usbphy_enable _bsd_imx_ccm_usbphy_enable #define in4_cksum _bsd_in4_cksum