Added test application, fixed hal

Author: danielinux

hal/mcxw.c

@@ -34,13 +34,13 @@
 
 /* Flash driver */
 #include "fsl_device_registers.h"
-#include "fsl_flash_api.h"
 #include "fsl_lpspi_flash.h"
-#include "fsl_ccm32k.h"
+#include "fsl_k4_flash.h"
 
 /*!< Core clock frequency: 48000000Hz */
 #define BOARD_BOOTCLOCKRUN_CORE_CLOCK              48000000U
 static flash_config_t pflash;
+static uint32_t pflash_sector_size = WOLFBOOT_SECTOR_SIZE;
 
 uint32_t SystemCoreClock;
 
@@ -58,30 +58,33 @@ void __assert_func(const char *a, int b, const char *c, const char *d)
         ;
 }
 
+
+void hal_prepare_boot(void)
+{
+
+}
+
+#endif
+
 void hal_init(void)
 {
+#ifdef __WOLFBOOT
     /* Clock setting  */
     BOARD_BootClockRUN();
+#endif
 
     /* Flash driver init */
     flash_config_t pflash;
-
     /* Clear the FLASH configuration structure */
     memset(&pflash, 0, sizeof(pflash));
     /* FLASH driver init */
     FLASH_Init(&pflash);
+    FLASH_GetProperty(&pflash, kFLASH_PropertyPflash0SectorSize,
+            &pflash_sector_size);
 }
 
-void hal_prepare_boot(void)
-{
-
-}
-
-#endif
-
 int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
 {
-#if 0
     int ret;
     int w = 0;
     const uint8_t empty_qword[16] = {
@@ -101,7 +104,7 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
                 aligned_qword[i] = data[w++];
             }
             if (memcmp(aligned_qword, empty_qword, 16) != 0) {
-                ret = FLASH_Program(&pflash, address_align, aligned_qword, 16);
+                ret = FLASH_Program(&pflash, FLASH, address_align, aligned_qword, 16);
                 if (ret != kStatus_Success)
                     return -1;
             }
@@ -110,14 +113,13 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
         }
         else {
             uint32_t len_align = len - (len & 0x0F);
-            ret = FLASH_Program(&pflash, address, (uint8_t*)data + w, len_align);
+            ret = FLASH_Program(&pflash, FLASH, address, (uint8_t*)data + w, len_align);
             if (ret != kStatus_Success)
                 return -1;
             len -= len_align;
             address += len_align;
         }
     }
-#endif
     return 0;
 }
 
@@ -131,12 +133,22 @@ void RAMFUNCTION hal_flash_lock(void)
 
 int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
 {
-#if 0
-    while ((address % 4) != 0)
-        address --;
-    if (FLASH_VerifyEraseSector(&pflash, address, len, kFLASH_ApiEraseKey) != kStatus_Success)
-        return -1;
-#endif
+    status_t result;
+    if (address % pflash_sector_size)
+        address -= address % pflash_sector_size;
+    while (len > 0) {
+        result = FLASH_Erase(&pflash, FLASH, address, pflash_sector_size,
+                kFLASH_ApiEraseKey);
+        if (kStatus_FLASH_Success != result)
+            return -1;
+
+        /* Verify sector if it's been erased. */
+        result = FLASH_VerifyEraseSector(&pflash, FLASH, address,
+                pflash_sector_size);
+        if (kStatus_FLASH_Success != result)
+            return -1;
+        len -= pflash_sector_size;
+    }
     return 0;
 }
 

test-app/ARM-mcxw.ld

@@ -0,0 +1,57 @@
+MEMORY
+{
+    FLASH (rx) : ORIGIN = @WOLFBOOT_TEST_APP_ADDRESS@, LENGTH = @WOLFBOOT_TEST_APP_SIZE@
+    RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 24K
+}
+
+SECTIONS
+{
+    .text :
+    {
+        _start_text = .;
+        KEEP(*(.isr_vector))
+        *(.init)
+        *(.fini)
+        *(.text*)
+        KEEP(*(.rodata*))
+        . = ALIGN(4);
+        _end_text = .;
+    } > FLASH
+
+    .ARM :
+    {
+      __exidx_start = .;
+      *(.ARM.exidx*)
+      __exidx_end = .;
+    } > FLASH
+
+    _stored_data = .;
+
+    .data : AT (_stored_data)
+    {
+        _start_data = .;
+        KEEP(*(.data*))
+        . = ALIGN(4);
+        KEEP(*(.ramcode))
+        . = ALIGN(4);
+        _end_data = .;
+    } > RAM
+
+    .bss :
+    {
+        _start_bss = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        _end_bss = .;
+        _end = .;
+    } > RAM
+}
+
+_wolfboot_partition_boot_address = @WOLFBOOT_PARTITION_BOOT_ADDRESS@;
+_wolfboot_partition_size = @WOLFBOOT_PARTITION_SIZE@;
+_wolfboot_partition_update_address = @WOLFBOOT_PARTITION_UPDATE_ADDRESS@;
+_wolfboot_partition_swap_address = @WOLFBOOT_PARTITION_SWAP_ADDRESS@;
+
+PROVIDE(_start_heap = _end);
+PROVIDE(_end_stack  = ORIGIN(RAM) + LENGTH(RAM));

test-app/Makefile

@@ -302,6 +302,16 @@ ifeq ($(TARGET),mcxa)
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_spc.o
 endif
 
+ifeq ($(TARGET),mcxw)
+    LSCRIPT_TEMPLATE=ARM-mcxw.ld
+    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o
+    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_gpio.o
+    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_spc.o
+    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/project_template/clock_config.o
+    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_ccm32k.o
+    APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_romapi.o
+endif
+
 ifeq ($(TARGET),imx_rt)
   LDFLAGS+=\
     -mcpu=cortex-m7 -Wall --specs=nosys.specs -fno-common -ffunction-sections -fdata-sections \

test-app/app_mcxw.c

@@ -0,0 +1,96 @@
+/* app_mcxa.c
+ *
+ * Test bare-metal boot-led-on application
+ *
+ * Copyright (C) 2024 wolfSSL Inc.
+ *
+ * This file is part of wolfBoot.
+ *
+ * wolfBoot is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfBoot is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include "fsl_common.h"
+#include "fsl_port.h"
+#include "fsl_gpio.h"
+#include "fsl_clock.h"
+
+#include "wolfboot/wolfboot.h"
+#include "target.h"
+
+extern void hal_init(void);
+
+/* init gpio for port 3 */
+void gpio_portA_init(int pin)
+{
+    const port_pin_config_t GPIO_OUT_LED = {
+        (uint16_t)kPORT_PullDisable,
+        (uint16_t)kPORT_LowPullResistor,
+        (uint16_t)kPORT_FastSlewRate,
+        (uint16_t)kPORT_PassiveFilterDisable,
+        (uint16_t)kPORT_OpenDrainDisable,
+        (uint16_t)kPORT_LowDriveStrength,
+        (uint16_t)kPORT_NormalDriveStrength,
+        (uint16_t)kPORT_MuxAsGpio,
+        (uint16_t)kPORT_UnlockRegister
+    };
+
+    const gpio_pin_config_t GPIO_OUT_LED_config = {
+        .pinDirection = kGPIO_DigitalOutput,
+        .outputLogic = 0U
+    };
+
+
+    /* Initialize GPIO functionality on pin */
+    GPIO_PinInit(GPIOA, pin, &GPIO_OUT_LED_config);
+    PORT_SetPinConfig(PORTA, pin, &GPIO_OUT_LED);
+    GPIO_PinWrite(GPIOA, pin, 1);
+}
+
+void main(void)
+{
+    int i = 0;
+    uint8_t* bootPart = (uint8_t*)WOLFBOOT_PARTITION_BOOT_ADDRESS;
+    uint32_t bootVer = wolfBoot_get_blob_version(bootPart);
+    /* Enable GPIO port clocks */
+    CLOCK_EnableClock(kCLOCK_GpioA);
+    CLOCK_EnableClock(kCLOCK_PortA);
+    CLOCK_EnableClock(kCLOCK_PortC);
+    gpio_portA_init(18);
+    gpio_portA_init(19);
+    gpio_portA_init(20);
+
+    hal_init();
+    if (bootVer == 1) {
+        GPIO_PinWrite(GPIOA, 20, 0);
+        wolfBoot_update_trigger();
+    }
+    else {
+        /* Green LED GPIOA port A pin 19 */
+        GPIO_PinWrite(GPIOA, 19, 0);
+        /* mark boot successful */
+        wolfBoot_success();
+    }
+
+
+
+    /* busy wait */
+    while (1) {
+        __WFI();
+    }
+}