devices: MCXNxxx: Update system file to remove SDK sepecific defines

mcux/CMakeLists.txt

@@ -58,8 +58,11 @@ if (${MCUX_DEVICE} MATCHES "MIMXRT11")
   zephyr_library_sources(mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_romapi.c)
   zephyr_library_sources(mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_pmu.c)
   zephyr_library_sources(mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_dcdc.c)
+  zephyr_library_sources_ifdef(CONFIG_SOC_MIMXRT1189 mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_ele_base_api.c)
+if (${MCUX_DEVICE} MATCHES "MIMXRT117|MIMXRT116")
   zephyr_library_sources(mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_anatop_ai.c)
 endif()
+endif()
 
 zephyr_library_sources_ifdef(CONFIG_HAS_MCUX_AUDIOMIX mcux-sdk/devices/${MCUX_DEVICE_PATH}/drivers/fsl_audiomix.c)
 

mcux/README

@@ -4,7 +4,7 @@ MCUXpresso SDK
 Origin:
    NXP MCUXpresso SDK
    https://github.com/nxp-mcuxpresso/mcux-sdk
-   SHA: a6bf851f65020c437704e53d2d9587ae21789d65
+   SHA: 8a4072476daecf1168c69fb288f9f02f7b91bb45
 
    NXP Kinetis Connectivity Software
    https://www.nxp.com/webapp/Download?colCode=KW40Z-CONNECTIVITY-SOFTWARE&appType=license&Parent_nodeId=1432854896956716810497&Parent_pageType=product
@@ -13,7 +13,8 @@ Origin:
    NXP MCUXpresso SDK USB
 
    https://github.com/nxp-mcuxpresso/mcux-sdk-middleware-usb
-   SHA: c8317a37546b18bef2072d6075e061d668b3f1c7
+   SHA: e0f1fc8488508db2f92ae454f4378513d96e83e2
+   SDK 2.16.000 merge
 
    NXP MCUXpresso SDK Connectivity Framework
 
@@ -66,24 +67,30 @@ License Link:
    https://spdx.org/licenses/BSD-3-Clause.html
 
 Patch List:
-  1. mcux-sdk/drivers/caam/fsl_caam.c: Move used job descriptors in the CAAM driver from the stack to noncacheable section. At time of writing, there should
+  - mcux-sdk/drivers/caam/fsl_caam.c: Move used job descriptors in the CAAM driver from the stack to noncacheable section. At time of writing, there should
      be four being used for entropy in zephyr.
-  2. Patched middleware_usb_common_header.cmake file to address build issue. PR submitted to upstream
-  3. exclude the following directories and files from mcux-sdk update to reduce HAL size:
+
+  - Patched middleware\mcux-sdk-middleware-usb\middleware_usb_common_header.cmake to remove "#include(component_osa)". PR submitted to upstream
+
+
+  - exclude the following directories and files from mcux-sdk update to reduce HAL size:
      - All *.a binary archive files. Files are still present in the SDK github repo but are not allowed in Zephyr Project
      - mcux-sdk\manifests
      - mcux-sdk\docs
-  4. devices: MCXN947: clock: Updated the clock frequency, case 3 on GetWdtClkFreq returns 1MHZ
-  5. drivers: flexio lcd: Pass a parameter to the GPIO callback functions.
-  6. Add usb_device_mcux_drv_port.h file for using MCUX SDK USB device controller driver easily in Zephyr.
-      - usb_device_mcux_drv_port.h contains the simplified structs, enums and APIs that MCUX SDK USB device controller drivers need.
-      - Update usb_device_ehci.c and usb_device_lpcip3511.c if in Zephyr environment.
-        - Add include of usb_device_mcux_drv_port.h.
-        - Remove include of usb_device.h and usb_device_dci.h.
-  7. drivers: csi: Rework to fix the low framerate issue
-  8. drivers: flexio: Enable flexio hal driver to support flexio IP on S32 SoCs
-  9. drivers: elcdif: Fix register writting issue in SetPixelFormat
-  10. mcux-sdk-middleware-connectivity-framework: Add new CMake file connectivity_framework.cmake
-  11. mcux-sdk-middleware-connectivity-framework: rw61x: Fix assertion OSA Mutex Alloc fail
-  12. mcux-sdk-middleware-connectivity-framework: rw61x: Remove static from hci_cal_data buffers to be used inside Zephyr
-  13. devices: MCXN947: added missing inputmux_connections.cmake file
+
+
+  - skipped update of mcux-sdk\components\osa\ due to build errors
+  - skipped update of mcux-sdk\components\conn_fwloader\mcux-sdk\components\conn_fwloader\ due to build errors
+
+  - mcux-sdk-middleware-connectivity-framework: Add new CMake file connectivity_framework.cmake
+  - mcux-sdk-middleware-connectivity-framework: rw61x: Fix assertion OSA Mutex Alloc fail
+  - mcux-sdk-middleware-connectivity-framework: rw61x: Remove static from hci_cal_data buffers to be used inside Zephyr
+  - mcux-sdk/drivers/s3mu/fsl_s3mu.c: rename _BIT macro to avoid collision from util_macro.h in Zephyr
+
+  - Skipped updates from mcux-sdk\devices\MIMX9352\ as this overrides the Cortex A support
+  - Modifed mcux\mcux-sdk\drivers\mipi_dsi_split\fsl_mipi_dsi.c line 541 to force 8.0 to float (8.0f) to avoid [-Double-promotion] warning
+  - Wrap conditional code setting SCB->VTOR with !defined(__ZEPHYR__) in: 
+      - MCXN946/system_MCXN946_cm33_core0.c
+      - MCXN946/system_MCXN946_cm33_core1.c
+      - MCXN947/system_MCXN947_cm33_core0.c
+      - MCXN947/system_MCXN947_cm33_core1.c

mcux/hal_nxp.cmake

@@ -103,6 +103,10 @@ elseif (CONFIG_SOC_MIMXRT1176_CM4)
 include(device_system_MIMXRT1176_cm4)
 elseif (CONFIG_SOC_MIMXRT1176_CM7)
 include(device_system_MIMXRT1176_cm7)
+elseif (CONFIG_SOC_MIMXRT1189_CM33)
+include(device_system_MIMXRT1189_cm33)
+elseif (CONFIG_SOC_MIMXRT1189_CM7)
+include(device_system_MIMXRT1189_cm7)
 elseif (CONFIG_SOC_LPC55S69_CPU0)
 include(device_system_LPC55S69_cm33_core0)
 elseif (CONFIG_SOC_LPC55S69_CPU1)
@@ -115,6 +119,8 @@ elseif (CONFIG_SOC_MCXN947_CPU0)
 include(device_system_MCXN947_cm33_core0)
 elseif (CONFIG_SOC_MCXN947_CPU1)
 include(device_system_MCXN947_cm33_core1)
+elseif (CONFIG_SOC_MCXN236)
+include(device_system_MCXN236)
 else()
 include(device_system)
 endif()
@@ -244,19 +250,25 @@ include_driver_ifdef(CONFIG_DAC_MCUX_LPDAC		dac_1		driver_dac_1)
 include_driver_ifdef(CONFIG_NXP_IRQSTEER		irqsteer	driver_irqsteer)
 include_driver_ifdef(CONFIG_AUDIO_DMIC_MCUX		dmic		driver_dmic)
 include_driver_ifdef(CONFIG_DMA_NXP_EDMA		edma_rev2	driver_edma_rev2)
+if(NOT DEFINED CONFIG_SOC_SERIES_MCXC)
 include_driver_ifdef(CONFIG_SOC_FAMILY_NXP_MCX		mcx_spc		driver_mcx_spc)
+endif()
 include_driver_ifdef(CONFIG_ADC_MCUX_GAU		cns_adc		driver_cns_adc)
 include_driver_ifdef(CONFIG_DAC_MCUX_GAU		cns_dac		driver_cns_dac)
 include_driver_ifdef(CONFIG_DAI_NXP_ESAI		esai		driver_esai)
 include_driver_ifdef(CONFIG_MCUX_LPCMP		        lpcmp		driver_lpcmp)
 include_driver_ifdef(CONFIG_NXP_RF_IMU			imu		driver_imu)
+include_driver_ifdef(CONFIG_TRDC_MCUX_TRDC              trdc            driver_trdc)
+include_driver_ifdef(CONFIG_S3MU_MCUX_S3MU              s3mu            driver_s3mu)
 
-if ((${MCUX_DEVICE} MATCHES "MIMXRT1[0-9][0-9][0-9]") AND (NOT (CONFIG_SOC_MIMXRT1166_CM4 OR CONFIG_SOC_MIMXRT1176_CM4)))
+if ((${MCUX_DEVICE} MATCHES "MIMXRT1[0-9][0-9][0-9]") AND (NOT (CONFIG_SOC_MIMXRT1166_CM4 OR CONFIG_SOC_MIMXRT1176_CM4 OR CONFIG_SOC_MIMXRT1189_CM33)))
   include_driver_ifdef(CONFIG_HAS_MCUX_CACHE		cache/armv7-m7	driver_cache_armv7_m7)
 elseif((${MCUX_DEVICE} MATCHES "MIMXRT(5|6)") OR (${MCUX_DEVICE} MATCHES "RW61") OR (${MCUX_DEVICE} MATCHES "MCXN.4."))
   include_driver_ifdef(CONFIG_HAS_MCUX_CACHE		cache/cache64	driver_cache_cache64)
 elseif((${MCUX_DEVICE} MATCHES "MK(28|66)") OR (${MCUX_DEVICE} MATCHES "MKE(14|16|18)") OR (CONFIG_SOC_MIMXRT1166_CM4) OR (CONFIG_SOC_MIMXRT1176_CM4))
   include_driver_ifdef(CONFIG_HAS_MCUX_CACHE		cache/lmem	driver_cache_lmem)
+elseif(CONFIG_SOC_MIMXRT1189_CM33)
+  include_driver_ifdef(CONFIG_HAS_MCUX_CACHE    cache/xcache  driver_cache_xcache)
 endif()
 
 if(CONFIG_CPU_CORTEX_A)
@@ -295,13 +307,17 @@ if("${CONFIG_SOC_FAMILY}" STREQUAL "nxp_kinetis")
 endif()
 
 if("${CONFIG_SOC_FAMILY}" STREQUAL "nxp_mcx")
+  if(CONFIG_SOC_SERIES_MCXC)
+    include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		flash		driver_flash)
+    include(${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/drivers/port/driver_port.cmake)
+    zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/drivers/port)
+  else()
+    include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		mcx_romapi	driver_flashiap)
+    zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/drivers/mcx_romapi/flash)
 
-  include_driver_ifdef(CONFIG_SOC_FLASH_MCUX		mcx_romapi	driver_flashiap)
-  zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/drivers/mcx_romapi/flash)
-
-  include(${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/drivers/port/driver_port.cmake)
-  zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/drivers/port)
-
+    include(${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/drivers/port/driver_port.cmake)
+    zephyr_include_directories(${CMAKE_CURRENT_LIST_DIR}/mcux-sdk/drivers/port)
+  endif()
 endif()
 
 # Temporary change to handle LPC SOC family name change between HWMv1 and HWMv2