Added NVM_FLASH_WRITEONCE compile option. Optimized write in kinetis HAL.

danielinux · danielinux · commit 8eb837479518 · 2019-03-10T12:40:21.000+01:00
diff --git a/Makefile b/Makefile
@@ -17,6 +17,7 @@ CORTEX_M0?=0
 NO_ASM?=0
 EXT_FLASH?=0
 ALLOW_DOWNGRADE?=0
+NVM_FLASH_WRITEONCE?=0
 
 LSCRIPT:=hal/$(TARGET).ld
 
@@ -76,16 +77,20 @@ CFLAGS+=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-u
 	-DPLATFORM_$(TARGET)
 
 ifeq ($(TARGET),kinetis)
-  CFLAGS+=-I$(KINETIS)/drivers -I$(KINETIS) -DCPU_MK64FN1M0VLL12 -I$(KINETIS_CMSIS)/Include -DDEBUG_CONSOLE_ASSERT_DISABLE=1
-  OBJS+=$(KINETIS)/drivers/fsl_clock.o $(KINETIS)/drivers/fsl_ftfx_flash.o $(KINETIS)/drivers/fsl_ftfx_cache.o $(KINETIS)/drivers/fsl_ftfx_controller.o
+  CFLAGS+= -I$(KINETIS)/drivers -I$(KINETIS) -DCPU_MK64FN1M0VLL12 -I$(KINETIS_CMSIS)/Include -DDEBUG_CONSOLE_ASSERT_DISABLE=1
+  OBJS+= $(KINETIS)/drivers/fsl_clock.o $(KINETIS)/drivers/fsl_ftfx_flash.o $(KINETIS)/drivers/fsl_ftfx_cache.o $(KINETIS)/drivers/fsl_ftfx_controller.o
 endif
 
 ifeq ($(EXT_FLASH),1)
-  CFLAGS+=-DEXT_FLASH=1 -DPART_UPDATE_EXT=1 -DPART_SWAP_EXT=1
+  CFLAGS+= -DEXT_FLASH=1 -DPART_UPDATE_EXT=1 -DPART_SWAP_EXT=1
 endif
 
 ifeq ($(ALLOW_DOWNGRADE),1)
-  CFLAGS+=-DALLOW_DOWNGRADE
+  CFLAGS+= -DALLOW_DOWNGRADE
+endif
+
+ifeq ($(NVM_FLASH_WRITEONCE),1)
+  CFLAGS+= -DNVM_FLASH_WRITEONCE
 endif
 
 LDFLAGS:=-T $(LSCRIPT) -Wl,-gc-sections -Wl,-Map=wolfboot.map -ffreestanding -nostartfiles -mcpu=cortex-m3 -mthumb
diff --git a/hal/kinetis.c b/hal/kinetis.c
@@ -24,11 +24,16 @@
 #include "fsl_common.h"
 #include "fsl_flash.h"
 #include "fsl_ftfx_cache.h"
+#include "fsl_sysmpu.h"
 
 static flash_config_t pflash;
 static ftfx_cache_config_t pcache;
 static int flash_init = 0;
 
+#ifndef NVM_FLASH_WRITEONCE
+#   error "wolfBoot Kinetis HAL: no WRITEONCE support detected. Please define NVM_FLASH_WRITEONCE"
+#endif
+
 #ifdef __WOLFBOOT
 #define CPU_CORE_CLOCK             120000000U
 
@@ -124,13 +129,8 @@ const osc_config_t oscConfig_BOARD_BootClockRUN =
 
 void hal_init(void)
 {
-    // Disable Watchdog
-    //  Write 0xC520 to watchdog unlock register
-    *((volatile unsigned short *)0x4005200E) = 0xC520;
-    //  Followed by 0xD928 to complete the unlock
-    *((volatile unsigned short *)0x4005200E) = 0xD928;
-    // Now disable watchdog via STCTRLH register
-    *((volatile unsigned short *)0x40052000) = 0x01D2u;
+    /* Disable MPU */
+    SYSMPU_Enable(SYSMPU, false);
 
     /* Set the system clock dividers in SIM to safe value. */
     CLOCK_SetSimSafeDivs();
@@ -175,6 +175,7 @@ int hal_flash_write(uint32_t address, const uint8_t *data, int len)
 {
     int w = 0;
     int ret;
+    const uint8_t empty_dword[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
     do_flash_init();
 
     while (len > 0) {
@@ -186,9 +187,11 @@ int hal_flash_write(uint32_t address, const uint8_t *data, int len)
             memcpy(aligned_dword, address_align, 8);
             for (i = start_off; ((i < 8) && (i < len + start_off)); i++)
                 aligned_dword[i] = data[w++]; 
-            ret = FLASH_Program(&pflash, address_align, aligned_dword, 8);
-            if (ret != kStatus_FTFx_Success)
-                return -1;
+            if (memcmp(aligned_dword, empty_dword, 8) != 0) {
+                    ret = FLASH_Program(&pflash, address_align, aligned_dword, 8);
+                if (ret != kStatus_FTFx_Success)
+                    return -1;
+            }
             address += i;
             len -= i;
         } else {
diff --git a/hal/kinetis.ld b/hal/kinetis.ld
@@ -1,9 +1,7 @@
-ENTRY(isr_reset)
-
 MEMORY
 {
     FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x000A000
-    RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00010000
+    RAM (rwx)  : ORIGIN = 0x1FFF0000, LENGTH = 64K
 }
 
 SECTIONS
diff --git a/src/libwolfboot.c b/src/libwolfboot.c
@@ -35,6 +35,24 @@ uint32_t ext_cache;
 #define PART_BOOT_ENDFLAGS   ((WOLFBOOT_PARTITION_BOOT_ADDRESS + WOLFBOOT_PARTITION_SIZE) - TRAILER_SKIP)
 #define PART_UPDATE_ENDFLAGS ((WOLFBOOT_PARTITION_UPDATE_ADDRESS + WOLFBOOT_PARTITION_SIZE) - TRAILER_SKIP)
 
+#ifdef NVM_FLASH_WRITEONCE
+static uint8_t NVM_CACHE[WOLFBOOT_SECTOR_SIZE];
+int hal_trailer_write(uint32_t addr, uint8_t val) {
+    uint32_t addr_align = addr & (~(WOLFBOOT_SECTOR_SIZE - 1));
+    uint32_t addr_off = addr & (WOLFBOOT_SECTOR_SIZE - 1);
+    int ret = 0;
+    memcpy(NVM_CACHE, (void *)addr_align, WOLFBOOT_SECTOR_SIZE);
+    ret = hal_flash_erase(addr_align, WOLFBOOT_SECTOR_SIZE);
+    if (ret != 0)
+        return ret;
+    NVM_CACHE[addr_off] = val;
+    ret = hal_flash_write(addr_align, NVM_CACHE, WOLFBOOT_SECTOR_SIZE);
+    return ret;
+}
+#else
+#   define hal_trailer_write(addr, val) hal_flash_write(addr, (void *)&val, 1)
+#endif
+
 #if defined PART_UPDATE_EXT
 static uint8_t *get_trailer_at(uint8_t part, uint32_t at)
 {
@@ -50,7 +68,7 @@ static uint8_t *get_trailer_at(uint8_t part, uint32_t at)
 static void set_trailer_at(uint8_t part, uint32_t at, uint8_t val)
 {
     if (part == PART_BOOT) {
-        hal_flash_write(PART_BOOT_ENDFLAGS - (sizeof(uint32_t) + at), (void *)&val, 1);
+        hal_trailer_write(PART_BOOT_ENDFLAGS - (sizeof(uint32_t) + at), val);
     }
     else if (part == PART_UPDATE) {
         ext_flash_write(PART_UPDATE_ENDFLAGS - (sizeof(uint32_t) + at), (void *)&val, 1);
@@ -82,10 +100,10 @@ static uint8_t *get_trailer_at(uint8_t part, uint32_t at)
 static void set_trailer_at(uint8_t part, uint32_t at, uint8_t val)
 {
     if (part == PART_BOOT) {
-        hal_flash_write(PART_BOOT_ENDFLAGS - (sizeof(uint32_t) + at), (void *)&val, 1);
+        hal_trailer_write(PART_BOOT_ENDFLAGS - (sizeof(uint32_t) + at), val);
     }
     else if (part == PART_UPDATE) {
-        hal_flash_write(PART_UPDATE_ENDFLAGS - (sizeof(uint32_t) + at), (void *)&val, 1);
+        hal_trailer_write(PART_UPDATE_ENDFLAGS - (sizeof(uint32_t) + at), val);
     }
 }
 
diff --git a/src/loader.c b/src/loader.c
@@ -27,7 +27,6 @@ extern void do_boot(const uint32_t *app_offset);
 #define FLASHBUFFER_SIZE 256
 static int wolfBoot_copy_sector(struct wolfBoot_image *src, struct wolfBoot_image *dst, uint32_t sector)
 {
-    volatile uint32_t *orig, *copy;
     uint32_t pos = 0;
     uint32_t src_sector_offset = (sector * WOLFBOOT_SECTOR_SIZE);
     uint32_t dst_sector_offset = (sector * WOLFBOOT_SECTOR_SIZE);
@@ -52,7 +51,7 @@ static int wolfBoot_copy_sector(struct wolfBoot_image *src, struct wolfBoot_imag
 #endif
     wb_flash_erase(dst, dst_sector_offset, WOLFBOOT_SECTOR_SIZE);
     while (pos < WOLFBOOT_SECTOR_SIZE) {
-        orig = (volatile uint32_t *)(src->hdr + src_sector_offset + pos);
+        uint8_t *orig = (uint8_t*)(src->hdr + src_sector_offset + pos);
         wb_flash_write(dst, dst_sector_offset + pos, orig, FLASHBUFFER_SIZE);
         pos += FLASHBUFFER_SIZE;
     }
diff --git a/src/wolfboot.c b/src/wolfboot.c
@@ -32,8 +32,15 @@ extern uint32_t *END_STACK;
 extern void main(void);
 
 void isr_reset(void) {
-    unsigned int *src, *dst;
-
+    register unsigned int *src, *dst;
+#ifdef PLATFORM_kinetis 
+    /* Immediately disable Watchdog after boot */
+    /*  Write Keys to unlock register */
+    *((volatile unsigned short *)0x4005200E) = 0xC520;
+    *((volatile unsigned short *)0x4005200E) = 0xD928;
+    /* disable watchdog via STCTRLH register */
+    *((volatile unsigned short *)0x40052000) = 0x01D2u;
+#endif
     /* Copy the .data section from flash to RAM. */
     src = (unsigned int *) &_stored_data;
     dst = (unsigned int *) &_start_data;

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`		`-ENTRY(isr_reset)`
`2`		`-`
`3`	`1`	`MEMORY`
`4`	`2`	`{`
`5`	`3`	`FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x000A000`
`6`		`- RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00010000`
	`4`	`+ RAM (rwx) : ORIGIN = 0x1FFF0000, LENGTH = 64K`
`7`	`5`	`}`
`8`	`6`
`9`	`7`	`SECTIONS`