flashalgo flags are introduced:

MarianSavchuk · MarianSavchuk · commit e023d73ddd40 · 2020-01-27T20:17:24.000+02:00
kAlgoVerifyReturnsAddress - Verify function returns address if this flag is set
kAlgoSingleInitType - The Init/UnInit functions contain just return, so can be skipped
kAlgoSkipChipErase - Skip region when erase.act action triggers. ChipErase on Some SPI Flash Memory take much more time that is allowed per drag-n-drop programming.
diff --git a/source/daplink/interface/swd_host.c b/source/daplink/interface/swd_host.c
@@ -4,6 +4,8 @@
  *
  * DAPLink Interface Firmware
  * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
+ * Copyright 2019, Cypress Semiconductor Corporation 
+ * or a subsidiary of Cypress Semiconductor Corporation.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -687,7 +689,7 @@ static uint8_t swd_wait_until_halted(void)
     return 0;
 }
 
-uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4)
+uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4, flash_algo_return_t return_type)
 {
     DEBUG_STATE state = {{0}, 0};
     // Call flash algorithm function on target and wait for result.
@@ -718,9 +720,17 @@ uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t e
         return 0;
     }
 
-    // Flash functions return 0 if successful.
-    if (state.r[0] != 0) {
-        return 0;
+    if ( return_type == FLASHALGO_RETURN_POINTER ) {
+        // Flash verify functions return pointer to byte following the buffer if successful.
+        if (state.r[0] != (arg1 + arg2)) {
+            return 0;
+        }
+    }
+    else {
+        // Flash functions return 0 if successful.
+        if (state.r[0] != 0) {
+            return 0;
+        }
     }
 
     return 1;
diff --git a/source/daplink/interface/swd_host.h b/source/daplink/interface/swd_host.h
@@ -4,6 +4,8 @@
  *
  * DAPLink Interface Firmware
  * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
+ * Copyright 2019, Cypress Semiconductor Corporation 
+ * or a subsidiary of Cypress Semiconductor Corporation.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -39,6 +41,11 @@ typedef enum {
     CONNECT_UNDER_RESET,
 } SWD_CONNECT_TYPE;
 
+typedef enum {
+    FLASHALGO_RETURN_BOOL,
+    FLASHALGO_RETURN_POINTER
+} flash_algo_return_t;
+
 uint8_t swd_init(void);
 uint8_t swd_off(void);
 uint8_t swd_init_debug(void);
@@ -55,7 +62,7 @@ uint8_t swd_read_memory(uint32_t address, uint8_t *data, uint32_t size);
 uint8_t swd_write_memory(uint32_t address, uint8_t *data, uint32_t size);
 uint8_t swd_read_core_register(uint32_t n, uint32_t *val);
 uint8_t swd_write_core_register(uint32_t n, uint32_t val);
-uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4);
+uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4, flash_algo_return_t return_type);
 uint8_t swd_set_target_state_hw(target_state_t state);
 uint8_t swd_set_target_state_sw(target_state_t state);
 uint8_t swd_transfer_retry(uint32_t req, uint32_t *data);
diff --git a/source/daplink/interface/swd_host_ca.c b/source/daplink/interface/swd_host_ca.c
@@ -4,6 +4,8 @@
  *
  * DAPLink Interface Firmware
  * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
+ * Copyright 2019, Cypress Semiconductor Corporation 
+ * or a subsidiary of Cypress Semiconductor Corporation.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -618,7 +620,7 @@ static uint8_t swd_wait_until_halted(void)
     return 0;
 }
 
-uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4)
+uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4, flash_algo_return_t return_type)
 {
     DEBUG_STATE state = {{0}, 0};
     // Call flash algorithm function on target and wait for result.
@@ -648,9 +650,17 @@ uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t e
         return 0;
     }
 
-    // Flash functions return 0 if successful.
-    if (state.r[0] != 0) {
-        return 0;
+    if ( return_type == FLASHALGO_RETURN_POINTER ) {
+        // Flash verify functions return pointer to byte following the buffer if successful.
+        if (state.r[0] != (arg1 + arg2)) {
+            return 0;
+        }
+    }
+    else {
+        // Flash functions return 0 if successful.
+        if (state.r[0] != 0) {
+            return 0;
+        }
     }
 
     return 1;
diff --git a/source/daplink/interface/target_flash.c b/source/daplink/interface/target_flash.c
@@ -4,6 +4,8 @@
  *
  * DAPLink Interface Firmware
  * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
+ * Copyright 2019, Cypress Semiconductor Corporation 
+ * or a subsidiary of Cypress Semiconductor Corporation.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -32,6 +34,8 @@
 #include "target_family.h"
 #include "target_board.h"
 
+#define DEFAULT_PROGRAM_PAGE_MIN_SIZE   (256u)
+
 typedef enum {
     STATE_CLOSED,
     STATE_OPEN,
@@ -107,13 +111,15 @@ static error_t flash_func_start(flash_func_t func)
     {
         // Finish the currently active function.
         if (FLASH_FUNC_NOP != last_flash_func &&
-            0 == swd_flash_syscall_exec(&flash->sys_call_s, flash->uninit, last_flash_func, 0, 0, 0)) {
+            ((flash->algo_flags & kAlgoSingleInitType) == 0 || FLASH_FUNC_NOP == func ) &&
+            0 == swd_flash_syscall_exec(&flash->sys_call_s, flash->uninit, last_flash_func, 0, 0, 0, FLASHALGO_RETURN_BOOL)) {
             return ERROR_UNINIT;
         }
 
         // Start a new function.
         if (FLASH_FUNC_NOP != func &&
-            0 == swd_flash_syscall_exec(&flash->sys_call_s, flash->init, flash_start, 0, func, 0)) {
+            ((flash->algo_flags & kAlgoSingleInitType) == 0 || FLASH_FUNC_NOP == last_flash_func ) &&
+            0 == swd_flash_syscall_exec(&flash->sys_call_s, flash->init, flash_start, 0, func, 0, FLASHALGO_RETURN_BOOL)) {
             return ERROR_INIT;
         }
 
@@ -237,7 +243,8 @@ static error_t target_flash_program_page(uint32_t addr, const uint8_t *buf, uint
                                         addr,
                                         write_size,
                                         flash->program_buffer,
-                                        0)) {
+                                        0,
+                                        FLASHALGO_RETURN_BOOL)) {
                 return ERROR_WRITE;
             }
 
@@ -248,12 +255,19 @@ static error_t target_flash_program_page(uint32_t addr, const uint8_t *buf, uint
                     if (status != ERROR_SUCCESS) {
                         return status;
                     }
+                    flash_algo_return_t return_type;
+                    if ((flash->algo_flags & kAlgoVerifyReturnsAddress) != 0) {
+                        return_type = FLASHALGO_RETURN_POINTER;
+                    } else {
+                        return_type = FLASHALGO_RETURN_BOOL;
+                    }
                     if (!swd_flash_syscall_exec(&flash->sys_call_s,
                                         flash->verify,
                                         addr,
                                         write_size,
                                         flash->program_buffer,
-                                        0)) {
+                                        0,
+                                        return_type)) {
                         return ERROR_WRITE_VERIFY;
                     }
                 } else {
@@ -308,7 +322,7 @@ static error_t target_flash_erase_sector(uint32_t addr)
             return status;
         }
 
-        if (0 == swd_flash_syscall_exec(&flash->sys_call_s, flash->erase_sector, addr, 0, 0, 0)) {
+        if (0 == swd_flash_syscall_exec(&flash->sys_call_s, flash->erase_sector, addr, 0, 0, 0, FLASHALGO_RETURN_BOOL)) {
             return ERROR_ERASE_SECTOR;
         }
 
@@ -325,6 +339,11 @@ static error_t target_flash_erase_chip(void)
         region_info_t * flash_region = g_board_info.target_cfg->flash_regions;
 
         for (; flash_region->start != 0 || flash_region->end != 0; ++flash_region) {
+            program_target_t *new_flash_algo = get_flash_algo(flash_region->start);
+            if ((new_flash_algo != NULL) && ((new_flash_algo->algo_flags & kAlgoSkipChipErase) != 0)) {
+                // skip flash region
+                continue;
+            }
             status = target_flash_set(flash_region->start);
             if (status != ERROR_SUCCESS) {
                 return status;
@@ -333,7 +352,7 @@ static error_t target_flash_erase_chip(void)
             if (status != ERROR_SUCCESS) {
                 return status;
             }
-            if (0 == swd_flash_syscall_exec(&current_flash_algo->sys_call_s, current_flash_algo->erase_chip, 0, 0, 0, 0)) {
+            if (0 == swd_flash_syscall_exec(&current_flash_algo->sys_call_s, current_flash_algo->erase_chip, 0, 0, 0, 0, FLASHALGO_RETURN_BOOL)) {
                 return ERROR_ERASE_ALL;
             }
         }
@@ -352,7 +371,7 @@ static error_t target_flash_erase_chip(void)
 static uint32_t target_flash_program_page_min_size(uint32_t addr)
 {
     if (g_board_info.target_cfg){
-        uint32_t size = 256;
+        uint32_t size = DEFAULT_PROGRAM_PAGE_MIN_SIZE;
         if (size > target_flash_erase_sector_size(addr)) {
             size = target_flash_erase_sector_size(addr);
         }
diff --git a/source/hic_hal/flash_blob.h b/source/hic_hal/flash_blob.h
@@ -4,6 +4,8 @@
  *
  * DAPLink Interface Firmware
  * Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
+ * Copyright 2019, Cypress Semiconductor Corporation 
+ * or a subsidiary of Cypress Semiconductor Corporation.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -28,6 +30,13 @@
 extern "C" {
 #endif
 
+// Flags for program_target
+enum { 
+    kAlgoVerifyReturnsAddress = (1u << 0u),     /*!< Verify function returns address if bit set */
+    kAlgoSingleInitType =       (1u << 1u),     /*!< The init function ignores the function code. */
+    kAlgoSkipChipErase =        (1u << 2u),     /*!< Skip region when erase.act action triggers. */
+};
+
 typedef struct __attribute__((__packed__)) {
     uint32_t breakpoint;
     uint32_t static_base;
@@ -47,6 +56,7 @@ typedef struct __attribute__((__packed__)) {
     const uint32_t  algo_size;
     const uint32_t *algo_blob;
     const uint32_t  program_buffer_size;
+    const uint32_t  algo_flags;         /*!< Combination of kAlgoVerifyReturnsAddress, kAlgoSingleInitType and kAlgoSkipChipErase*/
 } program_target_t;
 
 typedef struct __attribute__((__packed__)) {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`*`
`5`	`5`	`* DAPLink Interface Firmware`
`6`	`6`	`* Copyright (c) 2009-2019, ARM Limited, All Rights Reserved`
	`7`	`+ * Copyright 2019, Cypress Semiconductor Corporation`
	`8`	`+ * or a subsidiary of Cypress Semiconductor Corporation.`
`7`	`9`	`* SPDX-License-Identifier: Apache-2.0`
`8`	`10`	`*`
`9`	`11`	`* Licensed under the Apache License, Version 2.0 (the "License"); you may`
`@@ -687,7 +689,7 @@ static uint8_t swd_wait_until_halted(void)`
`687`	`689`	`return 0;`
`688`	`690`	`}`
`689`	`691`
`690`		`-uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4)`
	`692`	`+uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t entry, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4, flash_algo_return_t return_type)`
`691`	`693`	`{`
`692`	`694`	`DEBUG_STATE state = {{0}, 0};`
`693`	`695`	`// Call flash algorithm function on target and wait for result.`
`@@ -718,9 +720,17 @@ uint8_t swd_flash_syscall_exec(const program_syscall_t *sysCallParam, uint32_t e`
`718`	`720`	`return 0;`
`719`	`721`	`}`
`720`	`722`
`721`		`- // Flash functions return 0 if successful.`
`722`		`- if (state.r[0] != 0) {`
`723`		`- return 0;`
	`723`	`+ if ( return_type == FLASHALGO_RETURN_POINTER ) {`
	`724`	`+ // Flash verify functions return pointer to byte following the buffer if successful.`
	`725`	`+ if (state.r[0] != (arg1 + arg2)) {`
	`726`	`+ return 0;`
	`727`	`+ }`
	`728`	`+ }`
	`729`	`+ else {`
	`730`	`+ // Flash functions return 0 if successful.`
	`731`	`+ if (state.r[0] != 0) {`
	`732`	`+ return 0;`
	`733`	`+ }`
`724`	`734`	`}`
`725`	`735`
`726`	`736`	`return 1;`