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

Fixup for LPC54114 and LPC55S69

Signed-off-by: Emilio Benavente <emilio.benavente@nxp.com>
Signed-off-by: David Leach <david.leach@nxp.com>

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

@@ -21,21 +21,21 @@ Requirements
 - :ref:`lpcxpresso54114` board
 - :ref:`lpcxpresso55s69` board
 
-Building the application for lpcxpresso54114_m4
+Building the application for lpcxpresso54114/lpc54114/m4
-***********************************************
+********************************************************
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/ipm/ipm_mcux
-   :board: lpcxpresso54114_m4
+   :board: lpcxpresso54114/lpc54114/m4
    :goals: debug
 
 
-Building the application for lpcxpresso55s69_cpu0
+Building the application for lpcxpresso55s69/lpc55s69/cpu0
-*************************************************
+**********************************************************
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/ipm/ipm_mcux
-   :board: lpcxpresso55s69_cpu0
+   :board: lpcxpresso55s69/lpc55s69/cpu0
    :goals: debug
 
 Running

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

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

samples/drivers/ipm/ipm_mcux/sample.yaml

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

samples/drivers/mbox/CMakeLists.txt

@@ -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/remote/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()

samples/drivers/mbox/sample.yaml

@@ -11,7 +11,7 @@ tests:
       - mimxrt1170_evk@B/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1160_evk/mimxrt1166/cm7
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
     harness: console

samples/drivers/mbox/sysbuild.cmake

@@ -23,7 +23,7 @@ native_simulator_set_final_executable(${DEFAULT_IMAGE})
 if ("${BOARD}" STREQUAL "mimxrt1170_evkb_cm7" OR
 	"${BOARD}" STREQUAL "mimxrt1170_evk_cm7"  OR
 	"${BOARD}" STREQUAL "mimxrt1160_evk_cm7" OR
-	"${BOARD}" STREQUAL "lpcxpresso55s69_cpu0"
+	"${BOARD}" STREQUAL "lpcxpresso55s69"
 	)
 	# For these NXP boards the main core application is dependent on
 	# 'zephyr_image_info.h' generated by remote application.

samples/drivers/mbox_data/CMakeLists.txt

@@ -12,7 +12,7 @@ set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
 if(("${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_data/remote/CMakeLists.txt

@@ -10,7 +10,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 if(("${BOARD}" STREQUAL "mimxrt1170_evkb") OR
   ("${BOARD}" STREQUAL "mimxrt1170_evk") OR
   ("${BOARD}" STREQUAL "mimxrt1160_evk") OR
-  ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu1"))
+  ("${BOARD}" STREQUAL "lpcxpresso55s69"))
   message(STATUS "${BOARD} compile as remote in this sample")
 else()
   message(FATAL_ERROR "${BOARD} is not supported for this sample")

samples/drivers/mbox_data/sample.yaml

@@ -9,10 +9,10 @@ tests:
       - mimxrt1170_evk@B/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1160_evk/mimxrt1166/cm7
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
     integration_platforms:
       - mimxrt1160_evk/mimxrt1166/cm7
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
     harness: console
     harness_config:
       type: multi_line

samples/net/sockets/echo_client/sample.yaml

@@ -61,7 +61,7 @@ tests:
     extra_args:
       - SHIELD=atmel_rf2xx_mikrobus
       - OVERLAY_CONFIG="overlay-802154.conf"
-    platform_allow: lpcxpresso55s69_ns
+    platform_allow: lpcxpresso55s69/lpc55s69/cpu0/ns
   sample.net.sockets.echo_client.bt:
     extra_args: OVERLAY_CONFIG="overlay-bt.conf"
     platform_allow: qemu_x86

samples/net/sockets/echo_server/sample.yaml

@@ -62,7 +62,7 @@ tests:
     extra_args:
       - SHIELD=atmel_rf2xx_mikrobus
       - OVERLAY_CONFIG="overlay-802154.conf"
-    platform_allow: lpcxpresso55s69_ns
+    platform_allow: lpcxpresso55s69/lpc55s69/cpu0/ns
   sample.net.sockets.echo_server.bt:
     extra_args: OVERLAY_CONFIG="overlay-bt.conf"
     platform_allow: qemu_x86

samples/net/wifi/sample.yaml

@@ -16,7 +16,7 @@ tests:
       - cc3220sf_launchxl
   sample.net.wifi.mikroe_wifi_bt_click:
     extra_args: SHIELD=mikroe_wifi_bt_click_mikrobus
-    platform_allow: lpcxpresso55s69_cpu0
+    platform_allow: lpcxpresso55s69/lpc55s69/cpu0
   sample.net.wifi.esp_8266:
     extra_args: SHIELD=esp_8266
     platform_allow: sam4e_xpro

samples/sensor/fxos8700/sample.yaml

@@ -32,7 +32,7 @@ tests:
     platform_allow:
       - frdm_kl25z
       - bbc_microbit
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
       - reel_board@1
       - mimxrt685_evk
       - mimxrt595_evk/mimxrt595s/cm33

samples/subsys/fs/littlefs/sample.yaml

@@ -18,7 +18,7 @@ tests:
       - native_posix
       - native_sim
       - mimxrt1160_evk/mimxrt1166/cm7
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
       - mr_canhubk3
     integration_platforms:
       - nrf52840dk/nrf52840

samples/subsys/ipc/openamp/README.rst

@@ -17,16 +17,16 @@ Building the application for lpcxpresso54114_m4
 
 .. zephyr-app-commands::
    :zephyr-app: samples/subsys/ipc/openamp
-   :board: lpcxpresso54114_m4
+   :board: lpcxpresso54114/lpc54114/m4
    :goals: debug
    :west-args: --sysbuild
 
-Building the application for lpcxpresso55s69_cpu0
+Building the application for lpcxpresso55s69/lpc55s69/cpu0
-*************************************************
+**********************************************************
 
 .. zephyr-app-commands::
    :zephyr-app: samples/subsys/ipc/openamp
-   :board: lpcxpresso55s69_cpu0
+   :board: lpcxpresso55s69/lpc55s69/cpu0
    :goals: debug
    :west-args: --sysbuild
 

samples/subsys/ipc/openamp/remote/sample.yaml

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

samples/subsys/ipc/openamp/sample.yaml

@@ -4,8 +4,8 @@ sample:
 tests:
   sample.ipc.openamp:
     platform_allow:
-      - lpcxpresso54114_m4
+      - lpcxpresso54114/lpc54114/m4
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
       - mps2/an521/cpu0
       - v2m_musca_b1/musca_b1
     integration_platforms:

samples/subsys/usb/dfu/sample.yaml

@@ -18,7 +18,7 @@ common:
     - teensy41
     - b_u585i_iot02a
     - frdm_kl25z
-    - lpcxpresso55s69_cpu0
+    - lpcxpresso55s69/lpc55s69/cpu0
     - stm32l562e_dk/stm32l562xx/ns
   depends_on: usb_device
   filter: dt_label_with_parent_compat_enabled("slot0_partition", "fixed-partitions")

tests/boot/test_mcuboot/testcase.yaml

@@ -20,7 +20,7 @@ tests:
       - lpcxpresso55s16
       - lpcxpresso55s28
       - lpcxpresso55s36
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
       - mimxrt1010_evk
       - mimxrt1015_evk
       - mimxrt1020_evk

tests/drivers/dma/chan_link_transfer/testcase.yaml

@@ -14,7 +14,7 @@ tests:
       - mimxrt1160_evk/mimxrt1166/cm7
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1024_evk
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
       - lpcxpresso55s36
       - native_posix
       - native_posix_64

tests/drivers/mbox/mbox_data/CMakeLists.txt

@@ -12,7 +12,7 @@ set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr)
 if(("${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")

tests/drivers/mbox/mbox_data/Kconfig.sysbuild

@@ -9,4 +9,4 @@ string
 	default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb"
 	default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk"
 	default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk"
-	default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0"
+	default "lpcxpresso55s69/lpc55s69/cpu1" if $(BOARD) = "lpcxpresso55s69"

tests/drivers/mbox/mbox_data/remote/CMakeLists.txt

@@ -10,7 +10,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 if(("${BOARD}" STREQUAL "mimxrt1170_evkb") OR
   ("${BOARD}" STREQUAL "mimxrt1170_evk") OR
   ("${BOARD}" STREQUAL "mimxrt1160_evk") OR
-  ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu1"))
+  ("${BOARD}" STREQUAL "lpcxpresso55s69"))
   message(STATUS "${BOARD} compile as remote in this sample")
 else()
   message(FATAL_ERROR "${BOARD} is not supported for this sample")

tests/drivers/mbox/mbox_data/testcase.yaml

@@ -8,7 +8,7 @@ tests:
       - mimxrt1170_evk@B/mimxrt1176/cm7
       - mimxrt1170_evk/mimxrt1176/cm7
       - mimxrt1160_evk/mimxrt1166/cm7
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0
     integration_platforms:
       - mimxrt1170_evk@B/mimxrt1176/cm7
-      - lpcxpresso55s69_cpu0
+      - lpcxpresso55s69/lpc55s69/cpu0

tests/drivers/pwm/pwm_api/src/test_pwm.c

@@ -81,7 +81,7 @@
 #define DEFAULT_PWM_PORT 2 /* TCC1/WO[2] on PA18 (D7) */
 #elif defined CONFIG_BOARD_MIMXRT685_EVK
 #define DEFAULT_PWM_PORT 7 /* D3 on Arduino connector J27 */
-#elif defined CONFIG_BOARD_LPCXPRESSO55S69_CPU0
+#elif defined CONFIG_BOARD_LPCXPRESSO55S69_LPC55S69_CPU0
 #define DEFAULT_PWM_PORT 2 /* D2 on Arduino connector P18 */
 #elif DT_HAS_COMPAT_STATUS_OKAY(st_stm32_pwm)
 /* Default port should be adapted per board to fit the channel

tests/misc/test_build/testcase.yaml

@@ -1,7 +1,7 @@
 tests:
   buildsystem.debug.build:
     platform_exclude:
-      - lpcxpresso55s69_ns
+      - lpcxpresso55s69/lpc55s69/cpu0/ns
       - nrf9160dk@0.14.0/nrf9160/ns
       - nrf5340dk/nrf5340/cpuapp/ns
     build_only: true