rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-26 18:05:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

imx: Remove ccm functions alredy defined in RTEMS

Browse Source 
The imx_ccm_*_hz are all defined in RTEMS. So don't duplicate them in
libbsd. Otherwise some applications get linker errors.

Update #3869
This commit is contained in:
Christian Mauderer 2020-09-09 11:34:22 +02:00
parent 7e282d2506
commit b7c51ac449
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freebsd/sys/arm/freescale/imx/imx6_ccm.c
View File

@ -368,6 +368,7 @@ imx6_ccm_sata_enable(void)
return 0; return 0;
} }
#ifndef __rtems__
uint32_t uint32_t
imx_ccm_ecspi_hz(void) imx_ccm_ecspi_hz(void)
{ {
@ -408,6 +409,7 @@ imx_ccm_ahb_hz(void)
{ {
return (132000000); return (132000000);
} }
#endif /* __rtems__ */
void void
imx_ccm_ipu_enable(int ipu) imx_ccm_ipu_enable(int ipu)

6
rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
View File

@ -2636,17 +2636,11 @@
#define imo_multi_filter _bsd_imo_multi_filter #define imo_multi_filter _bsd_imo_multi_filter
#define imx6_anatop_write_4 _bsd_imx6_anatop_write_4 #define imx6_anatop_write_4 _bsd_imx6_anatop_write_4
#define imx6_ccm_sata_enable _bsd_imx6_ccm_sata_enable #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_get_cacrr _bsd_imx_ccm_get_cacrr
#define imx_ccm_hdmi_enable _bsd_imx_ccm_hdmi_enable #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_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_set_cacrr _bsd_imx_ccm_set_cacrr
#define imx_ccm_ssi_configure _bsd_imx_ccm_ssi_configure #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_usb_enable _bsd_imx_ccm_usb_enable
#define imx_ccm_usbphy_enable _bsd_imx_ccm_usbphy_enable #define imx_ccm_usbphy_enable _bsd_imx_ccm_usbphy_enable
#define in4_cksum _bsd_in4_cksum #define in4_cksum _bsd_in4_cksum