zephyrproject-rtos · galak · May 19, 2021 · May 18, 2021 · May 19, 2021
diff --git a/boards/arm/lpcxpresso55s16/doc/index.rst b/boards/arm/lpcxpresso55s16/doc/index.rst
@@ -78,7 +78,7 @@ Other hardware features are not currently enabled.
 
 Currently available targets for this board are:
 
-- *lpcxpresso55s16_ns* non-secure (NS) address space
+- *lpcxpresso55s16*
 
 Connections and IOs
 ===================
@@ -176,7 +176,7 @@ Here is an example for the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: lpcxpresso55s16_ns
+   :board: lpcxpresso55s16
    :goals: flash
 
 Open a serial terminal, reset the board (press the RESET button), and you should
@@ -185,7 +185,7 @@ see the following message in the terminal:
 .. code-block:: console
 
    ***** Booting Zephyr OS v2.2.0 *****
-   Hello World! lpcxpresso55s16_ns
+   Hello World! lpcxpresso55s16
 
 Debugging
 =========

diff --git a/...rm/lpcxpresso55s16/lpcxpresso55s16_ns.dts → ...s/arm/lpcxpresso55s16/lpcxpresso55s16.dts b/...rm/lpcxpresso55s16/lpcxpresso55s16_ns.dts → ...s/arm/lpcxpresso55s16/lpcxpresso55s16.dts
@@ -10,6 +10,6 @@
 #include "lpcxpresso55s16_common.dtsi"
 
 / {
-	model = "NXP LPCXpresso55S16 board (non-secure)";
+	model = "NXP LPCXpresso55S16 board";
 	compatible = "nxp,lpc55xxx", "nxp,lpc";
 };
diff --git a/...m/lpcxpresso55s16/lpcxpresso55s16_ns.yaml → .../arm/lpcxpresso55s16/lpcxpresso55s16.yaml b/...m/lpcxpresso55s16/lpcxpresso55s16_ns.yaml → .../arm/lpcxpresso55s16/lpcxpresso55s16.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: lpcxpresso55s16_ns
+identifier: lpcxpresso55s16
 name: NXP LPCXpresso55S16
 type: mcu
 arch: arm

diff --git a/...xpresso55s16/lpcxpresso55s16_ns_defconfig → ...lpcxpresso55s16/lpcxpresso55s16_defconfig b/...xpresso55s16/lpcxpresso55s16_ns_defconfig → ...lpcxpresso55s16/lpcxpresso55s16_defconfig
@@ -17,8 +17,4 @@ CONFIG_PINMUX=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
 CONFIG_ARM_MPU=y
 
-# TrustZone-M non-secure
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-CONFIG_ARM_TRUSTZONE_M=y
-
 CONFIG_RUNTIME_NMI=y
diff --git a/...c_click/boards/lpcxpresso55s16_ns.overlay → ..._adc_click/boards/lpcxpresso55s16.overlay b/...c_click/boards/lpcxpresso55s16_ns.overlay → ..._adc_click/boards/lpcxpresso55s16.overlay
diff --git a/doc/releases/release-notes-2.6.rst b/doc/releases/release-notes-2.6.rst
@@ -260,6 +260,9 @@ Boards & SoC Support
   * cy8ckit_062_ble: Added board revision schema.
   * cy8ckit_062_wifi_bt: Refactored to configure by pinctrl.
   * cy8ckit_062_wifi_bt: Added support to SCB[uart] with interrupt.
+  * lpcxpresso55s16: Board renamed from lpcxpresso55s16_ns to
+    lpcxpresso55s16 since the board does not have Trusted Firmware M
+    (TF-M) support.
 
 * Added support for these following shields:
 

diff --git a/samples/sensor/fxos8700/sample.yaml b/samples/sensor/fxos8700/sample.yaml
@@ -7,7 +7,7 @@ sample:
 tests:
   sample.sensor.fxos8700.hybrid:
     platform_allow: frdm_k64f hexiwear_k64 warp7_m4 frdm_kw41z
-                        rv32m1_vega_ri5cy twr_ke18f lpcxpresso55s16_ns
+                        rv32m1_vega_ri5cy twr_ke18f lpcxpresso55s16
                         mimxrt685_evk_cm33 frdm_k22f
     integration_platforms:
       - frdm_k64f

diff --git a/samples/shields/x_nucleo_iks01a2/sensorhub/sample.yaml b/samples/shields/x_nucleo_iks01a2/sensorhub/sample.yaml
@@ -5,4 +5,4 @@ tests:
     harness: shield
     tags: shield
     depends_on: arduino_i2c arduino_gpio
-    platform_exclude: disco_l475_iot1 lpcxpresso55s16_ns stm32mp157c_dk2
+    platform_exclude: disco_l475_iot1 lpcxpresso55s16 stm32mp157c_dk2
diff --git a/samples/shields/x_nucleo_iks01a2/standard/sample.yaml b/samples/shields/x_nucleo_iks01a2/standard/sample.yaml
@@ -5,4 +5,4 @@ tests:
     harness: shield
     tags: shield
     depends_on: arduino_i2c arduino_gpio
-    platform_exclude: disco_l475_iot1 lpcxpresso55s16_ns stm32mp157c_dk2
+    platform_exclude: disco_l475_iot1 lpcxpresso55s16 stm32mp157c_dk2
diff --git a/samples/shields/x_nucleo_iks01a3/sensorhub/sample.yaml b/samples/shields/x_nucleo_iks01a3/sensorhub/sample.yaml
@@ -5,4 +5,4 @@ tests:
     harness: shield
     tags: shield
     depends_on: arduino_i2c arduino_gpio
-    platform_exclude: disco_l475_iot1 lpcxpresso55s16_ns
+    platform_exclude: disco_l475_iot1 lpcxpresso55s16
diff --git a/samples/shields/x_nucleo_iks01a3/standard/sample.yaml b/samples/shields/x_nucleo_iks01a3/standard/sample.yaml
@@ -7,4 +7,4 @@ tests:
     harness: shield
     tags: shield
     depends_on: arduino_i2c arduino_gpio
-    platform_exclude: disco_l475_iot1 lpcxpresso55s16_ns
+    platform_exclude: disco_l475_iot1 lpcxpresso55s16
diff --git a/samples/shields/x_nucleo_iks02a1/sensorhub/sample.yaml b/samples/shields/x_nucleo_iks02a1/sensorhub/sample.yaml
@@ -5,4 +5,4 @@ tests:
     harness: shield
     tags: shield
     depends_on: arduino_i2c arduino_gpio
-    platform_exclude: disco_l475_iot1 lpcxpresso55s16_ns stm32mp157c_dk2
+    platform_exclude: disco_l475_iot1 lpcxpresso55s16 stm32mp157c_dk2
diff --git a/samples/shields/x_nucleo_iks02a1/standard/sample.yaml b/samples/shields/x_nucleo_iks02a1/standard/sample.yaml
@@ -7,4 +7,4 @@ tests:
     harness: shield
     tags: shield
     depends_on: arduino_i2c arduino_gpio
-    platform_exclude: disco_l475_iot1 lpcxpresso55s16_ns stm32mp157c_dk2
+    platform_exclude: disco_l475_iot1 lpcxpresso55s16 stm32mp157c_dk2
diff --git a/...i_loopback/boards/lpcxpresso55s16_ns.conf → .../spi_loopback/boards/lpcxpresso55s16.conf b/...i_loopback/boards/lpcxpresso55s16_ns.conf → .../spi_loopback/boards/lpcxpresso55s16.conf