Commit 439930ae authored by Andrej Butok's avatar Andrej Butok Committed by Dominik Ermel
Browse files

boot_serial: Fix serial recovery for LPC55x and MCXNx 



- Increases the unaligned buffer default value
  for LPC55x and MCXNx.
- Fixes the serial recovery for LPC55x and MCXNx.

Signed-off-by: default avatarAndrej Butok <andrey.butok@nxp.com>
parent 6b2c93ce

boot/boot_serial/src/boot_serial.c

+2 −2
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ bs_upload(char *buf, int len) 
    const uint8_t *img_chunk = NULL;    /* Pointer to buffer with received image chunk */

    size_t img_chunk_len = 0;           /* Length of received image chunk */

    size_t img_chunk_off = SIZE_MAX;    /* Offset of image chunk within image  */

    uint8_t rem_bytes;                  /* Reminder bytes after aligning chunk write to

    size_t rem_bytes;                   /* Reminder bytes after aligning chunk write to

                                         * to flash alignment */

    uint32_t img_num_tmp = UINT_MAX;    /* Temp variable for image number */

    static uint32_t img_num = 0;
@@ -947,7 +947,7 @@ bs_upload(char *buf, int len) 
    if (flash_area_align(fap) > 1 &&

        (((size_t)img_chunk) & (flash_area_align(fap) - 1)) != 0) {

        /* Buffer address incompatible with write address, use buffer to write */

        uint8_t write_size = MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE;

        size_t write_size = MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE;

        uint8_t wbs_aligned[MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE];



        while (img_chunk_len >= flash_area_align(fap)) {

boot/zephyr/Kconfig.serial_recovery

+3 −1
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ config MCUBOOT_SERIAL_DIRECT_IMAGE_UPLOAD 


config BOOT_SERIAL_UNALIGNED_BUFFER_SIZE

	int "Stack buffer for unaligned memory writes"

	default 512 if SOC_SERIES_LPC55XXX

	default 128 if SOC_SERIES_MCXN

	default 64

	range 0 128

	range 0 1024

	help

	  Specifies the stack usage for a buffer which is used for unaligned

	  memory access when data is written to a device with memory alignment

CRA Git | Maintained and supported by SUSTech CRA and CCSE