[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-648-ga26ee5344

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  a26ee5344cf70e068265ac2f03a2915fae070e14 (commit)
       via  a213397323585188ad2622de7eb9d5fcddee7a02 (commit)
      from  5ebb1bdea1dfff9cce430bd17d08e340eea38e03 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a26ee5344cf70e068265ac2f03a2915fae070e14
Author: Julien Massot <jul...@io...h>
Date:   Fri Feb 4 09:11:39 2022 +0100

    rtos: zephyr: do not use deprecated symbols name
    
    Zephyr plan to remove openocd specific symbols in favour
    of more generic one.
    
    These generic symbols has been introduced in Zephyr 2.6.
    
    Signed-off-by: Julien Massot <jul...@io...h>
    Change-Id: I89418c9c378fb8b8baa29763fc6f1b6e652dc7ef
    Reviewed-on: https://review.openocd.org/c/openocd/+/6844
    Tested-by: jenkins
    Reviewed-by: Stephanos Ioannidis <ro...@st...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/zephyr.c b/src/rtos/zephyr.c
index 630511636..7f3325fea 100644
--- a/src/rtos/zephyr.c
+++ b/src/rtos/zephyr.c
@@ -375,15 +375,15 @@ static const struct symbol_table_elem zephyr_symbol_list[] = {
 		.optional = false
 	},
 	{
-		.symbol_name = "_kernel_openocd_offsets",
+		.symbol_name = "_kernel_thread_info_offsets",
 		.optional = false
 	},
 	{
-		.symbol_name = "_kernel_openocd_size_t_size",
+		.symbol_name = "_kernel_thread_info_size_t_size",
 		.optional = false
 	},
 	{
-		.symbol_name = "_kernel_openocd_num_offsets",
+		.symbol_name = "_kernel_thread_info_num_offsets",
 		.optional = true
 	},
 	{

commit a213397323585188ad2622de7eb9d5fcddee7a02
Author: Jan Matyas <ma...@co...>
Date:   Tue Apr 12 13:33:51 2022 +0200

    target/image: fix - p_flags field in ELF64 segment headers is 64 bits wide
    
    Fixed the reading of p_flags in ELF64 segment headers - that field
    is 64 bits wide.
    
    Change-Id: I053ca57d36efb54b7c638484acd6c7a2fbcbd05a
    Signed-off-by: Jan Matyas <ma...@co...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6927
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/image.c b/src/target/image.c
index eafa73eaa..130ea6c1f 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -596,7 +596,7 @@ static int image_elf64_read_headers(struct image *image)
 				image->sections[j].base_address = field64(elf,
 						elf->segments64[i].p_paddr);
 			image->sections[j].private = &elf->segments64[i];
-			image->sections[j].flags = field32(elf, elf->segments64[i].p_flags);
+			image->sections[j].flags = field64(elf, elf->segments64[i].p_flags);
 			j++;
 		}
 	}
@@ -1168,7 +1168,7 @@ int image_read_section(struct image *image,
 	return ERROR_OK;
 }
 
-int image_add_section(struct image *image, target_addr_t base, uint32_t size, int flags, uint8_t const *data)
+int image_add_section(struct image *image, target_addr_t base, uint32_t size, uint64_t flags, uint8_t const *data)
 {
 	struct imagesection *section;
 
diff --git a/src/target/image.h b/src/target/image.h
index 5b5d11f6b..bf06064ac 100644
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -52,7 +52,7 @@ enum image_type {
 struct imagesection {
 	target_addr_t base_address;
 	uint32_t size;
-	int flags;
+	uint64_t flags;
 	void *private;		/* private data */
 };
 
@@ -108,7 +108,7 @@ int image_read_section(struct image *image, int section, target_addr_t offset,
 void image_close(struct image *image);
 
 int image_add_section(struct image *image, target_addr_t base, uint32_t size,
-		int flags, uint8_t const *data);
+		uint64_t flags, uint8_t const *data);
 
 int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes,
 		uint32_t *checksum);

-----------------------------------------------------------------------

Summary of changes:
 src/rtos/zephyr.c  | 6 +++---
 src/target/image.c | 4 ++--
 src/target/image.h | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository