mcux: imx: Make nxp hal a zephyr_library

Stops leaking long source paths in build directories and makes them
deterministic.

When building samples/hello_world for frdm_k64f, this changes the build
directories from:

build
└── zephyr
    └── CMakeFiles
        └── zephyr.dir
            └── home
                └── maureen
                    └── zephyrproject
                        └── modules
                            └── hal
                                └── nxp
                                    └── mcux
                                        ├── devices
                                        │   └── MK64F12
                                        │       └── fsl_clock.c.obj
                                        └── drivers
                                            └── kinetis
                                                └── fsl_uart.c.obj

to:

build/
└── modules
    └── nxp
        └── lib..__modules__hal__nxp.a

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2020-05-29 16:53:12 -05:00
parent e30ff27145
commit a239b33c64
15 changed files with 74 additions and 70 deletions

View File

@ -1,3 +1,7 @@
if(CONFIG_HAS_MCUX OR CONFIG_HAS_IMX_HAL)
zephyr_library()
endif()
add_subdirectory_ifdef(
CONFIG_HAS_MCUX
mcux

View File

@ -1,2 +1,2 @@
zephyr_include_directories(.)
zephyr_sources(clock_freq.c)
zephyr_library_sources(clock_freq.c)

View File

@ -1,2 +1,2 @@
zephyr_include_directories(.)
zephyr_sources(clock_freq.c)
zephyr_library_sources(clock_freq.c)

View File

@ -1,21 +1,21 @@
zephyr_include_directories(.)
if(CONFIG_SOC_MCIMX7_M4)
zephyr_sources(
zephyr_library_sources(
ccm_imx7d.c
ccm_analog_imx7d.c
)
endif()
if(CONFIG_SOC_MCIMX6X_M4)
zephyr_sources(
zephyr_library_sources(
ccm_imx6sx.c
ccm_analog_imx6sx.c
)
endif()
zephyr_sources_ifdef(CONFIG_COUNTER_IMX_EPIT epit.c)
zephyr_sources_ifdef(CONFIG_GPIO_IMX gpio_imx.c)
zephyr_sources_ifdef(CONFIG_I2C_IMX i2c_imx.c)
zephyr_sources_ifdef(CONFIG_IPM_IMX mu_imx.c)
zephyr_sources_ifdef(CONFIG_UART_IMX uart_imx.c)
zephyr_library_sources_ifdef(CONFIG_COUNTER_IMX_EPIT epit.c)
zephyr_library_sources_ifdef(CONFIG_GPIO_IMX gpio_imx.c)
zephyr_library_sources_ifdef(CONFIG_I2C_IMX i2c_imx.c)
zephyr_library_sources_ifdef(CONFIG_IPM_IMX mu_imx.c)
zephyr_library_sources_ifdef(CONFIG_UART_IMX uart_imx.c)

View File

@ -34,10 +34,10 @@ zephyr_compile_definitions(${MCUX_CPU})
# Build mcux device-specific objects. Although it is not normal
# practice, drilling down like this avoids the need for repetitive
# build scripts for every mcux device.
zephyr_sources(devices/${MCUX_DEVICE}/fsl_clock.c)
zephyr_library_sources(devices/${MCUX_DEVICE}/fsl_clock.c)
if (${MCUX_DEVICE} MATCHES "LPC")
zephyr_sources(devices/${MCUX_DEVICE}/fsl_power.c)
zephyr_sources(devices/${MCUX_DEVICE}/fsl_reset.c)
zephyr_library_sources(devices/${MCUX_DEVICE}/fsl_power.c)
zephyr_library_sources(devices/${MCUX_DEVICE}/fsl_reset.c)
endif()
@ -58,4 +58,4 @@ add_subdirectory_ifdef(
enable_language(C ASM)
zephyr_sources_ifdef(CONFIG_SOC_LPC54114_M4 devices/${MCUX_DEVICE}/gcc/startup_LPC54114_cm4.S)
zephyr_library_sources_ifdef(CONFIG_SOC_LPC54114_M4 devices/${MCUX_DEVICE}/gcc/startup_LPC54114_cm4.S)

View File

@ -23,6 +23,6 @@ zephyr_compile_definitions_ifdef(CONFIG_DEVICE_CONFIGURATION_DATA XIP_BOOT_HEADE
zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE)
if(MCUX_BOARD)
zephyr_sources_ifdef(CONFIG_BOOT_FLEXSPI_NOR ${MCUX_BOARD}/${MCUX_BOARD}_flexspi_nor_config.c)
zephyr_sources_ifdef(CONFIG_DEVICE_CONFIGURATION_DATA ${MCUX_BOARD}/${MCUX_BOARD}_sdram_ini_dcd.c)
zephyr_library_sources_ifdef(CONFIG_BOOT_FLEXSPI_NOR ${MCUX_BOARD}/${MCUX_BOARD}_flexspi_nor_config.c)
zephyr_library_sources_ifdef(CONFIG_DEVICE_CONFIGURATION_DATA ${MCUX_BOARD}/${MCUX_BOARD}_sdram_ini_dcd.c)
endif()

View File

@ -6,4 +6,4 @@ if(CONFIG_ETH_MCUX)
zephyr_include_directories(phyksz8081)
endif()
zephyr_sources_ifdef(CONFIG_ETH_MCUX phyksz8081/fsl_phy.c)
zephyr_library_sources_ifdef(CONFIG_ETH_MCUX phyksz8081/fsl_phy.c)

View File

@ -14,18 +14,18 @@ zephyr_library_compile_definitions_ifdef(
CONFIG_HAS_MCUX_CACHE FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL
)
zephyr_sources_ifdef(CONFIG_COUNTER_MCUX_GPT fsl_gpt.c)
zephyr_sources_ifdef(CONFIG_DISPLAY_MCUX_ELCDIF fsl_elcdif.c)
zephyr_sources_ifdef(CONFIG_DMA_MCUX_EDMA fsl_edma.c)
zephyr_sources_ifdef(CONFIG_DMA_MCUX_EDMA fsl_dmamux.c)
zephyr_sources_ifdef(CONFIG_ENTROPY_MCUX_TRNG fsl_trng.c)
zephyr_sources_ifdef(CONFIG_ETH_MCUX fsl_enet.c)
zephyr_sources_ifdef(CONFIG_GPIO_MCUX_IGPIO fsl_gpio.c)
zephyr_sources_ifdef(CONFIG_HAS_MCUX_CACHE fsl_cache.c)
zephyr_sources_ifdef(CONFIG_I2C_MCUX_LPI2C fsl_lpi2c.c)
zephyr_sources_ifdef(CONFIG_I2S_MCUX_SAI fsl_sai.c)
zephyr_sources_ifdef(CONFIG_I2S_MCUX_SAI fsl_sai_edma.c)
zephyr_sources_ifdef(CONFIG_PWM_MCUX fsl_pwm.c)
zephyr_sources_ifdef(CONFIG_SPI_MCUX_LPSPI fsl_lpspi.c)
zephyr_sources_ifdef(CONFIG_UART_MCUX_LPUART fsl_lpuart.c)
zephyr_sources_ifdef(CONFIG_VIDEO_MCUX_CSI fsl_csi.c)
zephyr_library_sources_ifdef(CONFIG_COUNTER_MCUX_GPT fsl_gpt.c)
zephyr_library_sources_ifdef(CONFIG_DISPLAY_MCUX_ELCDIF fsl_elcdif.c)
zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_EDMA fsl_edma.c)
zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_EDMA fsl_dmamux.c)
zephyr_library_sources_ifdef(CONFIG_ENTROPY_MCUX_TRNG fsl_trng.c)
zephyr_library_sources_ifdef(CONFIG_ETH_MCUX fsl_enet.c)
zephyr_library_sources_ifdef(CONFIG_GPIO_MCUX_IGPIO fsl_gpio.c)
zephyr_library_sources_ifdef(CONFIG_HAS_MCUX_CACHE fsl_cache.c)
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX_LPI2C fsl_lpi2c.c)
zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_SAI fsl_sai.c)
zephyr_library_sources_ifdef(CONFIG_I2S_MCUX_SAI fsl_sai_edma.c)
zephyr_library_sources_ifdef(CONFIG_PWM_MCUX fsl_pwm.c)
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI fsl_lpspi.c)
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPUART fsl_lpuart.c)
zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_CSI fsl_csi.c)

View File

@ -11,33 +11,33 @@ zephyr_compile_definitions_ifdef(
ENET_ENHANCEDBUFFERDESCRIPTOR_MODE
)
zephyr_sources_ifdef(CONFIG_ADC_MCUX_ADC12 fsl_adc12.c)
zephyr_sources_ifdef(CONFIG_ADC_MCUX_ADC16 fsl_adc16.c)
zephyr_sources_ifdef(CONFIG_CAN_MCUX_FLEXCAN fsl_flexcan.c)
zephyr_sources_ifdef(CONFIG_COUNTER_MCUX_LPTMR fsl_lptmr.c)
zephyr_sources_ifdef(CONFIG_COUNTER_MCUX_RTC fsl_rtc.c)
zephyr_sources_ifdef(CONFIG_DAC_MCUX_DAC fsl_dac.c)
zephyr_sources_ifdef(CONFIG_DAC_MCUX_DAC32 fsl_dac32.c)
zephyr_sources_ifdef(CONFIG_DMA_MCUX_EDMA fsl_edma.c)
zephyr_sources_ifdef(CONFIG_DMA_MCUX_EDMA fsl_dmamux.c)
zephyr_sources_ifdef(CONFIG_ENTROPY_MCUX_RNGA fsl_rnga.c)
zephyr_sources_ifdef(CONFIG_ENTROPY_MCUX_TRNG fsl_trng.c)
zephyr_sources_ifdef(CONFIG_ETH_MCUX fsl_enet.c)
zephyr_sources_ifdef(CONFIG_HAS_MCUX_CACHE fsl_cache.c)
zephyr_sources_ifdef(CONFIG_HAS_MCUX_SMC fsl_smc.c)
zephyr_sources_ifdef(CONFIG_I2C_MCUX fsl_i2c.c)
zephyr_sources_ifdef(CONFIG_I2C_MCUX_LPI2C fsl_lpi2c.c)
zephyr_sources_ifdef(CONFIG_PWM_MCUX_FTM fsl_ftm.c)
zephyr_sources_ifdef(CONFIG_PWM_MCUX_TPM fsl_tpm.c)
zephyr_sources_ifdef(CONFIG_RTC_MCUX fsl_rtc.c)
zephyr_sources_ifdef(CONFIG_SOC_FLASH_MCUX fsl_ftfx_flash.c fsl_ftfx_controller.c)
zephyr_sources_ifdef(CONFIG_SPI_MCUX_DSPI fsl_dspi.c)
zephyr_sources_ifdef(CONFIG_SPI_MCUX_LPSPI fsl_lpspi.c)
zephyr_sources_ifdef(CONFIG_UART_MCUX fsl_uart.c)
zephyr_sources_ifdef(CONFIG_UART_MCUX_LPSCI fsl_lpsci.c)
zephyr_sources_ifdef(CONFIG_UART_MCUX_LPUART fsl_lpuart.c)
zephyr_sources_ifdef(CONFIG_WDT_MCUX_WDOG fsl_wdog.c)
zephyr_sources_ifdef(CONFIG_WDT_MCUX_WDOG32 fsl_wdog32.c)
zephyr_library_sources_ifdef(CONFIG_ADC_MCUX_ADC12 fsl_adc12.c)
zephyr_library_sources_ifdef(CONFIG_ADC_MCUX_ADC16 fsl_adc16.c)
zephyr_library_sources_ifdef(CONFIG_CAN_MCUX_FLEXCAN fsl_flexcan.c)
zephyr_library_sources_ifdef(CONFIG_COUNTER_MCUX_LPTMR fsl_lptmr.c)
zephyr_library_sources_ifdef(CONFIG_COUNTER_MCUX_RTC fsl_rtc.c)
zephyr_library_sources_ifdef(CONFIG_DAC_MCUX_DAC fsl_dac.c)
zephyr_library_sources_ifdef(CONFIG_DAC_MCUX_DAC32 fsl_dac32.c)
zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_EDMA fsl_edma.c)
zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_EDMA fsl_dmamux.c)
zephyr_library_sources_ifdef(CONFIG_ENTROPY_MCUX_RNGA fsl_rnga.c)
zephyr_library_sources_ifdef(CONFIG_ENTROPY_MCUX_TRNG fsl_trng.c)
zephyr_library_sources_ifdef(CONFIG_ETH_MCUX fsl_enet.c)
zephyr_library_sources_ifdef(CONFIG_HAS_MCUX_CACHE fsl_cache.c)
zephyr_library_sources_ifdef(CONFIG_HAS_MCUX_SMC fsl_smc.c)
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX fsl_i2c.c)
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX_LPI2C fsl_lpi2c.c)
zephyr_library_sources_ifdef(CONFIG_PWM_MCUX_FTM fsl_ftm.c)
zephyr_library_sources_ifdef(CONFIG_PWM_MCUX_TPM fsl_tpm.c)
zephyr_library_sources_ifdef(CONFIG_RTC_MCUX fsl_rtc.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX fsl_ftfx_flash.c fsl_ftfx_controller.c)
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_DSPI fsl_dspi.c)
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_LPSPI fsl_lpspi.c)
zephyr_library_sources_ifdef(CONFIG_UART_MCUX fsl_uart.c)
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPSCI fsl_lpsci.c)
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPUART fsl_lpuart.c)
zephyr_library_sources_ifdef(CONFIG_WDT_MCUX_WDOG fsl_wdog.c)
zephyr_library_sources_ifdef(CONFIG_WDT_MCUX_WDOG32 fsl_wdog32.c)
if(NOT CONFIG_ASSERT OR CONFIG_FORCE_NO_ASSERT)

View File

@ -6,10 +6,10 @@
zephyr_include_directories(.)
zephyr_sources(fsl_common.c)
zephyr_sources_ifdef(CONFIG_ENTROPY_MCUX_RNG fsl_rng.c)
zephyr_sources_ifdef(CONFIG_GPIO_MCUX_LPC fsl_gpio.c fsl_pint.c fsl_inputmux.c)
zephyr_sources_ifdef(CONFIG_I2C_MCUX_FLEXCOMM fsl_i2c.c fsl_flexcomm.c)
zephyr_sources_ifdef(CONFIG_SOC_FLASH_MCUX fsl_iap.c)
zephyr_sources_ifdef(CONFIG_SPI_MCUX_FLEXCOMM fsl_spi.c fsl_flexcomm.c)
zephyr_sources_ifdef(CONFIG_UART_MCUX_FLEXCOMM fsl_usart.c fsl_flexcomm.c)
zephyr_library_sources(fsl_common.c)
zephyr_library_sources_ifdef(CONFIG_ENTROPY_MCUX_RNG fsl_rng.c)
zephyr_library_sources_ifdef(CONFIG_GPIO_MCUX_LPC fsl_gpio.c fsl_pint.c fsl_inputmux.c)
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX_FLEXCOMM fsl_i2c.c fsl_flexcomm.c)
zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_MCUX fsl_iap.c)
zephyr_library_sources_ifdef(CONFIG_SPI_MCUX_FLEXCOMM fsl_spi.c fsl_flexcomm.c)
zephyr_library_sources_ifdef(CONFIG_UART_MCUX_FLEXCOMM fsl_usart.c fsl_flexcomm.c)

View File

@ -6,4 +6,4 @@
zephyr_include_directories(.)
zephyr_include_directories(./port/zephyr)
zephyr_sources_ifdef(CONFIG_USB_DC_NXP_EHCI usb_device_ehci.c)
zephyr_library_sources_ifdef(CONFIG_USB_DC_NXP_EHCI usb_device_ehci.c)

View File

@ -5,4 +5,4 @@
#
zephyr_include_directories(.)
zephyr_sources_ifdef(CONFIG_USB_DC_NXP_EHCI usb_phy.c)
zephyr_library_sources_ifdef(CONFIG_USB_DC_NXP_EHCI usb_phy.c)

View File

@ -4,4 +4,4 @@ zephyr_include_directories(XCVR/${MCUX_DEVICE})
add_subdirectory(XCVR/${MCUX_DEVICE})
zephyr_sources(OSAbstraction/Source/fsl_os_abstraction_zephyr.c)
zephyr_library_sources(OSAbstraction/Source/fsl_os_abstraction_zephyr.c)

View File

@ -1,4 +1,4 @@
zephyr_sources(
zephyr_library_sources(
ifr_mkw40z4_radio.c
KW4xXcvrDrv.c
tsm_ll_timing.c

View File

@ -1,4 +1,4 @@
zephyr_sources(
zephyr_library_sources(
cfgs_kw4x_3x_2x/fsl_xcvr_ant_config.c
cfgs_kw4x_3x_2x/fsl_xcvr_ble_config.c
cfgs_kw4x_3x_2x/fsl_xcvr_common_config.c