hwmv2: lpc: updated overlay and conf files in samples and tests

Fixup for LPC54114 and LPC55S69

Signed-off-by: Emilio Benavente <[email protected]>
Signed-off-by: David Leach <[email protected]>

Author: EmilioCBen

modules/hal_nxp/CMakeLists.txt

@@ -16,7 +16,11 @@ if(CONFIG_HAS_MCUX OR CONFIG_HAS_IMX_HAL OR CONFIG_HAS_NXP_S32_HAL)
   zephyr_compile_definitions_ifdef(CONFIG_CAN_MCUX_FLEXCAN
     FLEXCAN_WAIT_TIMEOUT=${CONFIG_CAN_MCUX_FLEXCAN_WAIT_TIMEOUT})
 
-  zephyr_compile_definitions_ifdef(CONFIG_ENTROPY_MCUX_CAAM CACHE_MODE_WRITE_THROUGH)
+  if(CONFIG_CPU_HAS_DCACHE)
+    zephyr_compile_definitions_ifdef(CONFIG_ENTROPY_MCUX_CAAM CACHE_MODE_WRITE_THROUGH)
+  endif()
 
-  zephyr_compile_definitions_ifdef(CONFIG_USB_DEVICE_DRIVER DATA_SECTION_IS_CACHEABLE=1)
+  if(CONFIG_NOCACHE_MEMORY)
+    zephyr_compile_definitions_ifdef(CONFIG_USB_DEVICE_DRIVER DATA_SECTION_IS_CACHEABLE=1)
+  endif()
 endif()

modules/trusted-firmware-m/CMakeLists.txt

@@ -226,7 +226,7 @@ if (CONFIG_BUILD_WITH_TFM)
 
   string(REPLACE "toolchain" "toolchain_ns" TFM_TOOLCHAIN_NS_FILE ${TFM_TOOLCHAIN_FILE})
 
-  if(CONFIG_BOARD_LPCXPRESSO55S69_CPU0)
+  if(CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0)
     # Supply path to NXP HAL sources used for TF-M build
     set(TFM_PLATFORM_NXP_HAL_FILE_PATH ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/platform/ext/target/nxp/)
     list(APPEND TFM_CMAKE_ARGS -DTFM_PLATFORM_NXP_HAL_FILE_PATH=${TFM_PLATFORM_NXP_HAL_FILE_PATH})

modules/trusted-firmware-m/Kconfig.tfm

@@ -9,7 +9,7 @@ config ZEPHYR_TRUSTED_FIRMWARE_M_MODULE
 
 config TFM_BOARD
 	string
-	default "nxp/lpcxpresso55s69" if BOARD_LPCXPRESSO55S69_CPU0
+	default "nxp/lpcxpresso55s69" if BOARD_LPCXPRESSO55S69_LPC55S69_CPU0
 	default "arm/mps2/an521" if BOARD_MPS2_AN521_CPU0_NS
 	default "arm/mps3/an547" if BOARD_MPS3_AN547
 	default "stm/b_u585i_iot02a" if BOARD_B_U585I_IOT02A

samples/drivers/ipm/ipm_mcux/README.rst

@@ -5,9 +5,9 @@ sample:
 tests:
   sample.ipm.ipm_mcux.remote:
     platform_allow:
-      - lpcxpresso54114_m0
-      - lpcxpresso55s69_cpu1
+      - lpcxpresso54114/lpc54114/m0
+      - lpcxpresso55s69/lpc55s69/cpu1
     integration_platforms:
-      - lpcxpresso54114_m0
+      - lpcxpresso54114/lpc54114/m0
     tags: ipm
     harness: remote

samples/drivers/ipm/ipm_mcux/remote/sample.yaml

@@ -5,10 +5,10 @@ sample:
 tests:
   sample.ipm.ipm_mcux:
     platform_allow:
-      - lpcxpresso54114_m4
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso54114/lpc54114/m4
+      - lpcxpresso55s69/lpc55s69/cpu0
     integration_platforms:
-      - lpcxpresso54114_m4
+      - lpcxpresso54114/lpc54114/m4
     tags: ipm
     harness: console
     sysbuild: true

samples/drivers/ipm/ipm_mcux/sample.yaml

@@ -17,7 +17,7 @@ if(("${BOARD}" STREQUAL "nrf5340dk") OR
    ("${BOARD}" STREQUAL "mimxrt1170_evkb") OR
    ("${BOARD}" STREQUAL "mimxrt1170_evk") OR
    ("${BOARD}" STREQUAL "mimxrt1160_evk") OR
-   ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu0"))
+   ("${BOARD}" STREQUAL "lpcxpresso55s69"))
   message(STATUS "${BOARD} compile as Main in this sample")
 else()
   message(FATAL_ERROR "${BOARD} is not supported for this sample")

samples/drivers/mbox/CMakeLists.txt

@@ -14,7 +14,7 @@ if(("${BOARD}" STREQUAL "nrf5340dk") OR
   ("${BOARD}" STREQUAL "mimxrt1170_evkb") OR
   ("${BOARD}" STREQUAL "mimxrt1170_evk") OR
   ("${BOARD}" STREQUAL "mimxrt1160_evk") OR
-  ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu1") OR
+  ("${BOARD}" STREQUAL "lpcxpresso55s69") OR
   ("${BOARD}" STREQUAL "adp_xc7k"))
   message(STATUS "${BOARD} compile as remote in this sample")
 else()