Clean up NXP LPC54S018M port and align with LPC55S69 patterns

  - HAL: Remove debug spifi_test_mode_switch(), use wolfBoot_printf
    instead of raw uart_write, add printf.h include
  - Test app: Use check_parts() (was defined but unused), replace
    custom print_str/print_hex32 with wolfBoot_printf, fix LED logic
    to show LED1 for v1 and LED2 for v2+ (was always LED1)
  - Docs: Remove incorrect MCUXpresso SDK section (port is bare-metal),
    fix typo, add swap timing note, add flash script references
  - Build: Add --no-warn-rwx-segments to arch.mk, improve Makefile
    comments
  - Add tools/scripts/nxp-lpc54s018m-flash.sh following the
    nxp-s32k142-flash.sh pattern (build, sign, flash via pyocd)

  Tested: full boot + firmware update cycle (v1 -> v2 swap) verified
  on LPC54S018M-EVK hardware.

Author: aidangarske

arch.mk

@@ -1191,6 +1191,7 @@ endif
 
 ifeq ($(TARGET),nxp_lpc54s018m)
   ARCH_FLASH_OFFSET=0x10000000
+  LDFLAGS+=-Wl,--no-warn-rwx-segments
   # Bare-metal HAL — no NXP SDK dependencies
 endif
 

docs/Targets.md

@@ -2001,33 +2001,15 @@ sudo /usr/local/LinkServer/lpcscrypt/bin/lpcscrypt -d /dev/ttyACMx \
     program /usr/local/LinkServer/lpcscrypt/probe_firmware/LPCLink2/LPC432x_CMSIS_DAP_V5_460.bin.hdr BankA
 ```
 
-### LPC54S018M: MCUXpresso SDK setup
+### LPC54S018M: Toolchain
 
-This requires the NXP MCUXpresso SDK. We tested using
-[mcuxsdk-manifests](https://github.com/nxp-mcuxpresso/mcuxsdk-manifests) and
-[CMSIS_5](https://github.com/nxp-mcuxpresso/CMSIS_5) placed under "../NXP".
+This port uses bare-metal register access and does not require the NXP
+MCUXpresso SDK. Only an ARM GCC toolchain (`arm-none-eabi-gcc`) and
+[pyocd](https://pyocd.io/) are needed.
 
 ```sh
-cd ../NXP
-
-# Install west
-python -m venv west-venv
-source west-venv/bin/activate
-pip install west
-
-# Set up the repository
-west init -m https://github.com/nxp-mcuxpresso/mcuxsdk-manifests.git mcuxpresso-sdk
-cd mcuxpresso-sdk
-west update
-
-deactivate
-```
-
-The CMSIS headers are also needed:
-
-```sh
-cd ../NXP
-git clone https://github.com/nxp-mcuxpresso/CMSIS_5.git
+pip install pyocd
+pyocd pack install LPC54S018J4MET180
 ```
 
 ### LPC54S018M: Flash partition layout
@@ -2084,39 +2066,66 @@ instead of booting from SPIFI flash.
 
 ### LPC54S018M: Testing firmware update
 
+A convenience script automates the full build, sign, and flash process:
+
+```sh
+# Build and flash v1 only
+./tools/scripts/nxp-lpc54s018m-flash.sh
+
+# Build, sign v2, and flash both (full update test)
+./tools/scripts/nxp-lpc54s018m-flash.sh --test-update
+
+# Flash existing images without rebuilding
+./tools/scripts/nxp-lpc54s018m-flash.sh --test-update --skip-build
+```
+
+**Manual steps** (if not using the script):
+
 1. Build and flash factory.bin (version 1). USR_LED1 (P3.14) lights up.
 
 2. Sign a version 2 update image and load it to the update partition:
 
 ```sh
 # Build update image (version 2)
-make test-app/image_v2_signed.bin
+./tools/keytools/sign --ecc256 test-app/image.bin wolfboot_signing_private_key.der 2
 ```
 
+**Using JLink:**
+
 ```
 JLinkExe -device LPC54S018M -if SWD -speed 4000
 loadbin test-app/image_v2_signed.bin 0x10100000
 r
 g
 ```
 
+**Using pyocd:**
+
+```sh
+pyocd flash -t LPC54S018J4MET180 test-app/image_v2_signed.bin --base-address 0x10100000
+```
+
 3. The test application detects the update, triggers a swap via
-   `wolfBoot_update_trigger()`, and resets. After the swap, USR_LED2 (P3.3)
-   lights up indicating version 2 is running.
+   `wolfBoot_update_trigger()`, and resets. After the swap (~60 seconds),
+   USR_LED2 (P3.3) lights up indicating version 2 is running.
 
 4. The application calls `wolfBoot_success()` to confirm the update and
    prevent rollback.
 
 ### LPC54S018M: LED indicators
 
-The test application uses three user LEDs (accent LEDs accent active low):
+The test application uses three user LEDs (accent LEDs, active low):
 
 | LED       | GPIO   | Meaning                    |
 |-----------|--------|----------------------------|
 | USR_LED1  | P3.14  | Version 1 running          |
 | USR_LED2  | P3.3   | Version 2+ running         |
 | USR_LED3  | P2.2   | Update activity in progress |
 
+**Note:** The firmware swap takes approximately 60 seconds due to the SPIFI
+controller mode-switch overhead for each of the 240 sector operations (960KB
+partition with 4KB sectors).
+
 ### LPC54S018M: Debugging with JLink
 
 ```

hal/nxp_lpc54s018m.c

@@ -32,6 +32,7 @@
 #include <string.h>
 #include <target.h>
 #include "image.h"
+#include "printf.h"
 
 /* -------------------------------------------------------------------------- */
 /*  SPIFI controller registers (base 0x40080000)                              */
@@ -289,8 +290,8 @@ void hal_init(void)
      */
 #ifdef DEBUG_UART
     uart_init();
-    uart_write("wolfBoot HAL init\n", 18);
 #endif
+    wolfBoot_printf("wolfBoot HAL init\n");
 }
 
 void hal_prepare_boot(void)
@@ -390,33 +391,6 @@ static void RAMFUNCTION spifi_wait_busy(void)
     SPIFI_CLIMIT = saved_climit;                /* restore cache limit */
 }
 
-/*
- * Minimal SPIFI mode-switch test: exit memory mode, immediately re-enter.
- * Used to verify the basic exit/enter cycle works before testing flash ops.
- */
-void RAMFUNCTION spifi_test_mode_switch(void)
-{
-    uint32_t ctrl = SPIFI_CTRL;
-    uint32_t climit = SPIFI_CLIMIT;
-
-    /* Exit memory mode */
-    SPIFI_STAT = SPIFI_STAT_RESET;
-    while (SPIFI_STAT & SPIFI_STAT_RESET)
-        ;
-
-    /* Restore all config */
-    SPIFI_CTRL = ctrl;
-    SPIFI_CLIMIT = climit;
-
-    /* Re-enter memory mode */
-    SPIFI_MCMD = MCMD_READ_QUAD;
-    while (!(SPIFI_STAT & SPIFI_STAT_MCINIT))
-        ;
-
-    __asm__ volatile ("dsb");
-    __asm__ volatile ("isb");
-}
-
 /*
  * Flash write — 256-byte page program via SPIFI
  *

test-app/Makefile

@@ -703,7 +703,7 @@ ifeq ($(TARGET),nxp_lpc54s018m)
     LSCRIPT_TEMPLATE=ARM-nxp_lpc54s018m.ld
     # Enable RAMFUNCTION for test app (flash ops must run from RAM)
     CFLAGS+=-DRAM_CODE -D__WOLFBOOT
-    # SPIFI XIP: memcpy/memset must be in RAM for use during flash operations
+    # string.o provides RAMFUNCTION memcpy; already added when DEBUG_UART=1 (line ~108)
     ifeq ($(DEBUG_UART),)
       APP_OBJS+=../src/string.o
     endif

test-app/app_nxp_lpc54s018m.c

@@ -24,30 +24,7 @@
 #include <stdint.h>
 #include "target.h"
 #include "wolfboot/wolfboot.h"
-
-#ifdef DEBUG_UART
-extern void uart_write(const char *buf, unsigned int sz);
-
-static void print_str(const char *s)
-{
-    unsigned int len = 0;
-    while (s[len] != '\0')
-        len++;
-    uart_write(s, len);
-}
-
-static void print_hex32(uint32_t val)
-{
-    static const char hex[] = "0123456789abcdef";
-    char buf[10];
-    int i;
-    buf[0] = '0';
-    buf[1] = 'x';
-    for (i = 0; i < 8; i++)
-        buf[2 + i] = hex[(val >> (28 - i * 4)) & 0xF];
-    uart_write(buf, 10);
-}
-#endif
+#include "printf.h"
 
 /* LPC54S018M-EVK GPIO register definitions */
 /* GPIO base: 0x4008C000 */
@@ -108,17 +85,10 @@ static void check_parts(uint32_t *pboot_ver, uint32_t *pupdate_ver,
     if (wolfBoot_get_partition_state(PART_UPDATE, pupdate_state) != 0)
         *pupdate_state = IMG_STATE_NEW;
 
-#ifdef DEBUG_UART
-    print_str("    boot:   ver=");
-    print_hex32(*pboot_ver);
-    print_str(" state=");
-    print_hex32(*pboot_state);
-    print_str("\n    update: ver=");
-    print_hex32(*pupdate_ver);
-    print_str(" state=");
-    print_hex32(*pupdate_state);
-    print_str("\n");
-#endif
+    wolfBoot_printf("    boot:   ver=0x%lx state=0x%02x\n",
+        *pboot_ver, *pboot_state);
+    wolfBoot_printf("    update: ver=0x%lx state=0x%02x\n",
+        *pupdate_ver, *pupdate_state);
 }
 
 void main(void)
@@ -127,37 +97,36 @@ void main(void)
     uint8_t boot_state, update_state;
 
     leds_init();
-
-    boot_ver = wolfBoot_current_firmware_version();
-    update_ver = wolfBoot_update_firmware_version();
-    if (wolfBoot_get_partition_state(PART_BOOT, &boot_state) != 0)
-        boot_state = IMG_STATE_NEW;
-    if (wolfBoot_get_partition_state(PART_UPDATE, &update_state) != 0)
-        update_state = IMG_STATE_NEW;
-
-    /* LED1 on immediately to show app is running */
-    led_on(LED1_PORT, LED1_PIN);
+    check_parts(&boot_ver, &update_ver, &boot_state, &update_state);
 
     /* Confirm boot if state is TESTING or NEW */
     if (boot_ver != 0 &&
         (boot_state == IMG_STATE_TESTING || boot_state == IMG_STATE_NEW))
     {
+        wolfBoot_printf("Calling wolfBoot_success()\n");
         wolfBoot_success();
+        check_parts(&boot_ver, &update_ver, &boot_state, &update_state);
     }
 
-    if (boot_ver == 1 && update_ver != 0) {
-        /* Update available: LED3 on, trigger update */
-        led_on(LED3_PORT, LED3_PIN);
-        wolfBoot_update_trigger();
+    if (boot_ver == 1) {
+        /* v1: LED1 on */
+        led_on(LED1_PORT, LED1_PIN);
+
+        if (update_ver != 0) {
+            wolfBoot_printf("Update detected, triggering update...\n");
+            wolfBoot_update_trigger();
+            check_parts(&boot_ver, &update_ver, &boot_state, &update_state);
+            /* LED3 on to indicate update triggered */
+            led_on(LED3_PORT, LED3_PIN);
+            wolfBoot_printf("...done. Reboot to apply.\n");
+        }
     }
-    else if (boot_ver != 1) {
+    else {
         /* v2+: LED2 on */
         led_on(LED2_PORT, LED2_PIN);
     }
 
-#ifdef DEBUG_UART
-    print_str("App running\n");
-#endif
+    wolfBoot_printf("App running\n");
     while (1) {
         __asm__ volatile ("wfi");
     }