Skip to content

Commit 74a7735

Browse files
Radimlidleach02
authored andcommitted
mcux: middleware: usb: fix USB MW to use new OSA
- Added includes of OSA when used with USB MW - Added include path on global level to avoid undefined #include <fsl_os_abstraction.h> and other headers Signed-off-by: Radim Lipka <[email protected]>
1 parent 78b3972 commit 74a7735

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

mcux/hal_nxp.cmake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,12 +398,19 @@ if(CONFIG_ETH_MCUX)
398398
endif()
399399

400400
if (CONFIG_USB_DEVICE_DRIVER)
401+
set(CONFIG_USE_component_osa_zephyr true)
402+
403+
list(APPEND CMAKE_MODULE_PATH
404+
${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/components/osa
405+
)
406+
401407
list(APPEND CMAKE_MODULE_PATH
402408
${CMAKE_CURRENT_LIST_DIR}/middleware/mcux-sdk-middleware-usb
403409
)
404410
include(middleware_usb_phy)
405411
include_ifdef(CONFIG_USB_DC_NXP_EHCI middleware_usb_device_ehci)
406412
include_ifdef(CONFIG_USB_DC_NXP_LPCIP3511 middleware_usb_device_ip3511fs)
413+
include(set_component_osa)
407414

408415
zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/middleware/mcux-sdk-middleware-usb/device)
409416
zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/middleware/mcux-sdk-middleware-usb/phy)
@@ -412,12 +419,19 @@ endif()
412419

413420

414421
if (CONFIG_UDC_DRIVER)
422+
set(CONFIG_USE_component_osa_zephyr true)
423+
424+
list(APPEND CMAKE_MODULE_PATH
425+
${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/components/osa
426+
)
427+
415428
list(APPEND CMAKE_MODULE_PATH
416429
${CMAKE_CURRENT_LIST_DIR}/middleware/mcux-sdk-middleware-usb
417430
)
418431
include_ifdef(CONFIG_DT_HAS_NXP_USBPHY_ENABLED middleware_usb_phy)
419432
include_ifdef(CONFIG_UDC_NXP_EHCI middleware_usb_device_ehci)
420433
include_ifdef(CONFIG_UDC_NXP_IP3511 middleware_usb_device_ip3511fs)
434+
include(set_component_osa)
421435

422436
zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/middleware/mcux-sdk-middleware-usb/device)
423437
zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/middleware/mcux-sdk-middleware-usb/phy)
@@ -435,6 +449,10 @@ if(${MCUX_DEVICE} MATCHES "RW61")
435449
endif()
436450
endif()
437451

452+
if(${CONFIG_USE_component_osa_zephyr})
453+
zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mcux-sdk/components/osa)
454+
endif()
455+
438456
include_ifdef(CONFIG_USE_component_osa_zephyr set_component_osa)
439457

440458
if(CONFIG_WIFI_NXP)

0 commit comments

Comments
 (0)