From b4d1c04978c84da99087ab342a91c1f52da684e9 Mon Sep 17 00:00:00 2001 From: Emilio Benavente Date: Tue, 20 Feb 2024 10:08:23 -0600 Subject: [PATCH] hwmv2: lpc: updated overlay and conf files in samples and tests Fixup for LPC54114 and LPC55S69 Signed-off-by: Emilio Benavente Signed-off-by: David Leach --- modules/hal_nxp/CMakeLists.txt | 8 ++++++-- modules/trusted-firmware-m/CMakeLists.txt | 2 +- modules/trusted-firmware-m/Kconfig.tfm | 2 +- samples/drivers/ipm/ipm_mcux/README.rst | 12 ++++++------ samples/drivers/ipm/ipm_mcux/remote/sample.yaml | 6 +++--- samples/drivers/ipm/ipm_mcux/sample.yaml | 6 +++--- samples/drivers/mbox/CMakeLists.txt | 2 +- ..._cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} | 0 ...overlay => lpcxpresso55s69_lpc55s69_cpu0.overlay} | 0 samples/drivers/mbox/remote/CMakeLists.txt | 2 +- ..._cpu1.conf => lpcxpresso55s69_lpc55s69_cpu1.conf} | 0 ...overlay => lpcxpresso55s69_lpc55s69_cpu1.overlay} | 0 samples/drivers/mbox/sample.yaml | 2 +- samples/drivers/mbox/sysbuild.cmake | 2 +- samples/drivers/mbox_data/CMakeLists.txt | 2 +- ..._cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} | 0 ...overlay => lpcxpresso55s69_lpc55s69_cpu0.overlay} | 0 samples/drivers/mbox_data/remote/CMakeLists.txt | 2 +- ..._cpu1.conf => lpcxpresso55s69_lpc55s69_cpu1.conf} | 0 ...overlay => lpcxpresso55s69_lpc55s69_cpu1.overlay} | 0 samples/drivers/mbox_data/sample.yaml | 4 ++-- samples/net/sockets/echo_client/sample.yaml | 2 +- samples/net/sockets/echo_server/sample.yaml | 2 +- samples/net/wifi/sample.yaml | 2 +- samples/sensor/fxos8700/sample.yaml | 2 +- ..._cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} | 0 samples/subsys/fs/littlefs/sample.yaml | 2 +- samples/subsys/ipc/openamp/README.rst | 8 ++++---- ..._cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} | 0 ...overlay => lpcxpresso55s69_lpc55s69_cpu0.overlay} | 0 ...4114_m0.conf => lpcxpresso54114_lpc54114_m0.conf} | 0 ...0.overlay => lpcxpresso54114_lpc54114_m0.overlay} | 0 ..._cpu1.conf => lpcxpresso55s69_lpc55s69_cpu1.conf} | 0 ...overlay => lpcxpresso55s69_lpc55s69_cpu1.overlay} | 0 samples/subsys/ipc/openamp/remote/sample.yaml | 6 +++--- samples/subsys/ipc/openamp/sample.yaml | 4 ++-- samples/subsys/usb/dfu/sample.yaml | 2 +- tests/boot/test_mcuboot/testcase.yaml | 2 +- tests/drivers/dma/chan_link_transfer/testcase.yaml | 2 +- tests/drivers/mbox/mbox_data/CMakeLists.txt | 2 +- tests/drivers/mbox/mbox_data/Kconfig.sysbuild | 2 +- ..._cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} | 0 ...overlay => lpcxpresso55s69_lpc55s69_cpu0.overlay} | 0 tests/drivers/mbox/mbox_data/remote/CMakeLists.txt | 2 +- ..._cpu1.conf => lpcxpresso55s69_lpc55s69_cpu1.conf} | 0 ...overlay => lpcxpresso55s69_lpc55s69_cpu1.overlay} | 0 tests/drivers/mbox/mbox_data/testcase.yaml | 4 ++-- tests/drivers/pwm/pwm_api/src/test_pwm.c | 2 +- tests/misc/test_build/testcase.yaml | 2 +- 49 files changed, 52 insertions(+), 48 deletions(-) rename samples/drivers/mbox/boards/{lpcxpresso55s69_cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} (100%) rename samples/drivers/mbox/boards/{lpcxpresso55s69_cpu0.overlay => lpcxpresso55s69_lpc55s69_cpu0.overlay} (100%) rename samples/drivers/mbox/remote/boards/{lpcxpresso55s69_cpu1.conf => lpcxpresso55s69_lpc55s69_cpu1.conf} (100%) rename samples/drivers/mbox/remote/boards/{lpcxpresso55s69_cpu1.overlay => lpcxpresso55s69_lpc55s69_cpu1.overlay} (100%) rename samples/drivers/mbox_data/boards/{lpcxpresso55s69_cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} (100%) rename samples/drivers/mbox_data/boards/{lpcxpresso55s69_cpu0.overlay => lpcxpresso55s69_lpc55s69_cpu0.overlay} (100%) rename samples/drivers/mbox_data/remote/boards/{lpcxpresso55s69_cpu1.conf => lpcxpresso55s69_lpc55s69_cpu1.conf} (100%) rename samples/drivers/mbox_data/remote/boards/{lpcxpresso55s69_cpu1.overlay => lpcxpresso55s69_lpc55s69_cpu1.overlay} (100%) rename samples/subsys/fs/littlefs/boards/{lpcxpresso55s69_cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} (100%) rename samples/subsys/ipc/openamp/boards/{lpcxpresso55s69_cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} (100%) rename samples/subsys/ipc/openamp/boards/{lpcxpresso55s69_cpu0.overlay => lpcxpresso55s69_lpc55s69_cpu0.overlay} (100%) rename samples/subsys/ipc/openamp/remote/boards/{lpcxpresso54114_m0.conf => lpcxpresso54114_lpc54114_m0.conf} (100%) rename samples/subsys/ipc/openamp/remote/boards/{lpcxpresso54114_m0.overlay => lpcxpresso54114_lpc54114_m0.overlay} (100%) rename samples/subsys/ipc/openamp/remote/boards/{lpcxpresso55s69_cpu1.conf => lpcxpresso55s69_lpc55s69_cpu1.conf} (100%) rename samples/subsys/ipc/openamp/remote/boards/{lpcxpresso55s69_cpu1.overlay => lpcxpresso55s69_lpc55s69_cpu1.overlay} (100%) rename tests/drivers/mbox/mbox_data/boards/{lpcxpresso55s69_cpu0.conf => lpcxpresso55s69_lpc55s69_cpu0.conf} (100%) rename tests/drivers/mbox/mbox_data/boards/{lpcxpresso55s69_cpu0.overlay => lpcxpresso55s69_lpc55s69_cpu0.overlay} (100%) rename tests/drivers/mbox/mbox_data/remote/boards/{lpcxpresso55s69_cpu1.conf => lpcxpresso55s69_lpc55s69_cpu1.conf} (100%) rename tests/drivers/mbox/mbox_data/remote/boards/{lpcxpresso55s69_cpu1.overlay => lpcxpresso55s69_lpc55s69_cpu1.overlay} (100%) diff --git a/modules/hal_nxp/CMakeLists.txt b/modules/hal_nxp/CMakeLists.txt index 8bf1d9a9345..2f2e53d22ea 100644 --- a/modules/hal_nxp/CMakeLists.txt +++ b/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() diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt index 45e48a2b4a2..146d1751203 100644 --- a/modules/trusted-firmware-m/CMakeLists.txt +++ b/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}) diff --git a/modules/trusted-firmware-m/Kconfig.tfm b/modules/trusted-firmware-m/Kconfig.tfm index 1cc4ec814e6..6d3b8a40c04 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm +++ b/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 diff --git a/samples/drivers/ipm/ipm_mcux/README.rst b/samples/drivers/ipm/ipm_mcux/README.rst index 1fcd1e9818e..887437403f5 100644 --- a/samples/drivers/ipm/ipm_mcux/README.rst +++ b/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 diff --git a/samples/drivers/ipm/ipm_mcux/remote/sample.yaml b/samples/drivers/ipm/ipm_mcux/remote/sample.yaml index 2daa7126308..82d8dc9e3de 100644 --- a/samples/drivers/ipm/ipm_mcux/remote/sample.yaml +++ b/samples/drivers/ipm/ipm_mcux/remote/sample.yaml @@ -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 diff --git a/samples/drivers/ipm/ipm_mcux/sample.yaml b/samples/drivers/ipm/ipm_mcux/sample.yaml index 6d46791d7a4..4df4045e454 100644 --- a/samples/drivers/ipm/ipm_mcux/sample.yaml +++ b/samples/drivers/ipm/ipm_mcux/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 diff --git a/samples/drivers/mbox/CMakeLists.txt b/samples/drivers/mbox/CMakeLists.txt index e0d3be12d83..382aefad0dd 100644 --- a/samples/drivers/mbox/CMakeLists.txt +++ b/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") diff --git a/samples/drivers/mbox/boards/lpcxpresso55s69_cpu0.conf b/samples/drivers/mbox/boards/lpcxpresso55s69_lpc55s69_cpu0.conf similarity index 100% rename from samples/drivers/mbox/boards/lpcxpresso55s69_cpu0.conf rename to samples/drivers/mbox/boards/lpcxpresso55s69_lpc55s69_cpu0.conf diff --git a/samples/drivers/mbox/boards/lpcxpresso55s69_cpu0.overlay b/samples/drivers/mbox/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay similarity index 100% rename from samples/drivers/mbox/boards/lpcxpresso55s69_cpu0.overlay rename to samples/drivers/mbox/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay diff --git a/samples/drivers/mbox/remote/CMakeLists.txt b/samples/drivers/mbox/remote/CMakeLists.txt index 1bfaab23454..5fbec71ce41 100644 --- a/samples/drivers/mbox/remote/CMakeLists.txt +++ b/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() diff --git a/samples/drivers/mbox/remote/boards/lpcxpresso55s69_cpu1.conf b/samples/drivers/mbox/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.conf similarity index 100% rename from samples/drivers/mbox/remote/boards/lpcxpresso55s69_cpu1.conf rename to samples/drivers/mbox/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.conf diff --git a/samples/drivers/mbox/remote/boards/lpcxpresso55s69_cpu1.overlay b/samples/drivers/mbox/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay similarity index 100% rename from samples/drivers/mbox/remote/boards/lpcxpresso55s69_cpu1.overlay rename to samples/drivers/mbox/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay diff --git a/samples/drivers/mbox/sample.yaml b/samples/drivers/mbox/sample.yaml index 34890f279bb..1e0feb4e3f0 100644 --- a/samples/drivers/mbox/sample.yaml +++ b/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 diff --git a/samples/drivers/mbox/sysbuild.cmake b/samples/drivers/mbox/sysbuild.cmake index 063f6157ddb..2e7d69d9da5 100644 --- a/samples/drivers/mbox/sysbuild.cmake +++ b/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. diff --git a/samples/drivers/mbox_data/CMakeLists.txt b/samples/drivers/mbox_data/CMakeLists.txt index 6905cada0a2..fa444f592df 100644 --- a/samples/drivers/mbox_data/CMakeLists.txt +++ b/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") diff --git a/samples/drivers/mbox_data/boards/lpcxpresso55s69_cpu0.conf b/samples/drivers/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.conf similarity index 100% rename from samples/drivers/mbox_data/boards/lpcxpresso55s69_cpu0.conf rename to samples/drivers/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.conf diff --git a/samples/drivers/mbox_data/boards/lpcxpresso55s69_cpu0.overlay b/samples/drivers/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay similarity index 100% rename from samples/drivers/mbox_data/boards/lpcxpresso55s69_cpu0.overlay rename to samples/drivers/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay diff --git a/samples/drivers/mbox_data/remote/CMakeLists.txt b/samples/drivers/mbox_data/remote/CMakeLists.txt index 2ab94102d08..234d58a2164 100644 --- a/samples/drivers/mbox_data/remote/CMakeLists.txt +++ b/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") diff --git a/samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_cpu1.conf b/samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.conf similarity index 100% rename from samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_cpu1.conf rename to samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.conf diff --git a/samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_cpu1.overlay b/samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay similarity index 100% rename from samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_cpu1.overlay rename to samples/drivers/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay diff --git a/samples/drivers/mbox_data/sample.yaml b/samples/drivers/mbox_data/sample.yaml index 277b201f189..53390b5b16a 100644 --- a/samples/drivers/mbox_data/sample.yaml +++ b/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 diff --git a/samples/net/sockets/echo_client/sample.yaml b/samples/net/sockets/echo_client/sample.yaml index 7b14e3fb04b..008920a33bf 100644 --- a/samples/net/sockets/echo_client/sample.yaml +++ b/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 diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml index ffd1b5b4e96..a04c96fe4a0 100644 --- a/samples/net/sockets/echo_server/sample.yaml +++ b/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 diff --git a/samples/net/wifi/sample.yaml b/samples/net/wifi/sample.yaml index 6ff1b3e84fb..4b3a08d4991 100644 --- a/samples/net/wifi/sample.yaml +++ b/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 diff --git a/samples/sensor/fxos8700/sample.yaml b/samples/sensor/fxos8700/sample.yaml index bbf3e47fe73..d327904e5c4 100644 --- a/samples/sensor/fxos8700/sample.yaml +++ b/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 diff --git a/samples/subsys/fs/littlefs/boards/lpcxpresso55s69_cpu0.conf b/samples/subsys/fs/littlefs/boards/lpcxpresso55s69_lpc55s69_cpu0.conf similarity index 100% rename from samples/subsys/fs/littlefs/boards/lpcxpresso55s69_cpu0.conf rename to samples/subsys/fs/littlefs/boards/lpcxpresso55s69_lpc55s69_cpu0.conf diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml index cfef9d490e3..6ba8e33e5a7 100644 --- a/samples/subsys/fs/littlefs/sample.yaml +++ b/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 diff --git a/samples/subsys/ipc/openamp/README.rst b/samples/subsys/ipc/openamp/README.rst index 89e8e2f27de..a75ef69017d 100644 --- a/samples/subsys/ipc/openamp/README.rst +++ b/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 diff --git a/samples/subsys/ipc/openamp/boards/lpcxpresso55s69_cpu0.conf b/samples/subsys/ipc/openamp/boards/lpcxpresso55s69_lpc55s69_cpu0.conf similarity index 100% rename from samples/subsys/ipc/openamp/boards/lpcxpresso55s69_cpu0.conf rename to samples/subsys/ipc/openamp/boards/lpcxpresso55s69_lpc55s69_cpu0.conf diff --git a/samples/subsys/ipc/openamp/boards/lpcxpresso55s69_cpu0.overlay b/samples/subsys/ipc/openamp/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay similarity index 100% rename from samples/subsys/ipc/openamp/boards/lpcxpresso55s69_cpu0.overlay rename to samples/subsys/ipc/openamp/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay diff --git a/samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_m0.conf b/samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_lpc54114_m0.conf similarity index 100% rename from samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_m0.conf rename to samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_lpc54114_m0.conf diff --git a/samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_m0.overlay b/samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_lpc54114_m0.overlay similarity index 100% rename from samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_m0.overlay rename to samples/subsys/ipc/openamp/remote/boards/lpcxpresso54114_lpc54114_m0.overlay diff --git a/samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_cpu1.conf b/samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.conf similarity index 100% rename from samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_cpu1.conf rename to samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.conf diff --git a/samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_cpu1.overlay b/samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay similarity index 100% rename from samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_cpu1.overlay rename to samples/subsys/ipc/openamp/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay diff --git a/samples/subsys/ipc/openamp/remote/sample.yaml b/samples/subsys/ipc/openamp/remote/sample.yaml index 60a8d38681d..906449cfdc3 100644 --- a/samples/subsys/ipc/openamp/remote/sample.yaml +++ b/samples/subsys/ipc/openamp/remote/sample.yaml @@ -4,9 +4,9 @@ sample: tests: sample.ipc.openamp.remote: platform_allow: - - lpcxpresso54114_m0 - - lpcxpresso55s69_cpu1 + - lpcxpresso54114/lpc54114/m0 + - lpcxpresso55s69/lpc55s69/cpu1 integration_platforms: - - lpcxpresso54114_m0 + - lpcxpresso54114/lpc54114/m0 tags: ipm harness: remote diff --git a/samples/subsys/ipc/openamp/sample.yaml b/samples/subsys/ipc/openamp/sample.yaml index d0ab3d4e172..63268230d9b 100644 --- a/samples/subsys/ipc/openamp/sample.yaml +++ b/samples/subsys/ipc/openamp/sample.yaml @@ -4,8 +4,8 @@ sample: tests: sample.ipc.openamp: platform_allow: - - lpcxpresso54114_m4 - - lpcxpresso55s69_cpu0 + - lpcxpresso54114/lpc54114/m4 + - lpcxpresso55s69/lpc55s69/cpu0 - mps2/an521/cpu0 - v2m_musca_b1/musca_b1 integration_platforms: diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml index 47f0f006d68..1700b087473 100644 --- a/samples/subsys/usb/dfu/sample.yaml +++ b/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") diff --git a/tests/boot/test_mcuboot/testcase.yaml b/tests/boot/test_mcuboot/testcase.yaml index ada9119897f..6669dc5efdb 100644 --- a/tests/boot/test_mcuboot/testcase.yaml +++ b/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 diff --git a/tests/drivers/dma/chan_link_transfer/testcase.yaml b/tests/drivers/dma/chan_link_transfer/testcase.yaml index 9632e2201e6..23bb9c6bc8a 100644 --- a/tests/drivers/dma/chan_link_transfer/testcase.yaml +++ b/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 diff --git a/tests/drivers/mbox/mbox_data/CMakeLists.txt b/tests/drivers/mbox/mbox_data/CMakeLists.txt index 6905cada0a2..fa444f592df 100644 --- a/tests/drivers/mbox/mbox_data/CMakeLists.txt +++ b/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") diff --git a/tests/drivers/mbox/mbox_data/Kconfig.sysbuild b/tests/drivers/mbox/mbox_data/Kconfig.sysbuild index 6d02e7a7a65..66a4e929ae2 100644 --- a/tests/drivers/mbox/mbox_data/Kconfig.sysbuild +++ b/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" diff --git a/tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_cpu0.conf b/tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.conf similarity index 100% rename from tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_cpu0.conf rename to tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.conf diff --git a/tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_cpu0.overlay b/tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay similarity index 100% rename from tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_cpu0.overlay rename to tests/drivers/mbox/mbox_data/boards/lpcxpresso55s69_lpc55s69_cpu0.overlay diff --git a/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt b/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt index 2ab94102d08..234d58a2164 100644 --- a/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt +++ b/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") diff --git a/tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_cpu1.conf b/tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.conf similarity index 100% rename from tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_cpu1.conf rename to tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.conf diff --git a/tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_cpu1.overlay b/tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay similarity index 100% rename from tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_cpu1.overlay rename to tests/drivers/mbox/mbox_data/remote/boards/lpcxpresso55s69_lpc55s69_cpu1.overlay diff --git a/tests/drivers/mbox/mbox_data/testcase.yaml b/tests/drivers/mbox/mbox_data/testcase.yaml index 667c35bb8fa..0044581cdb8 100644 --- a/tests/drivers/mbox/mbox_data/testcase.yaml +++ b/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 diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c index 867025d99b1..88cceeb3f66 100644 --- a/tests/drivers/pwm/pwm_api/src/test_pwm.c +++ b/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 diff --git a/tests/misc/test_build/testcase.yaml b/tests/misc/test_build/testcase.yaml index 2b869ebee97..f3a2bd7e431 100644 --- a/tests/misc/test_build/testcase.yaml +++ b/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