[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-528-g85bc32896

[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  85bc3289699a23dfb66bd10927aa1a6330e3668c (commit)
       via  19ef6634f021f545c2154cdd6d011608f1249308 (commit)
      from  1354ff7adfeff5d0c1024c2f2e9a9cd714a753d8 (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 85bc3289699a23dfb66bd10927aa1a6330e3668c
Author: Tomas Vanek <va...@fb...>
Date:   Sun Jan 21 18:00:06 2024 +0100

    flash/nor/nrf5: add missing package codes
    
    from Product Specification of nRF52805, 810, 811
    820, 833 and 840.
    
    While on it, rename the table to make sure the codes
    are valid for nRF52 series only.
    
    Change-Id: Id8f78fd214c5d345d1769378ae546a6be5a183ba
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8105
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c
index 18efae5c6..b6d712d3f 100644
--- a/src/flash/nor/nrf5.c
+++ b/src/flash/nor/nrf5.c
@@ -254,11 +254,16 @@ struct nrf5_device_package {
 
 /* Newer devices have FICR INFO.PACKAGE.
  * This table converts its value to two character code */
-static const struct nrf5_device_package nrf5_packages_table[] = {
+static const struct nrf5_device_package nrf52_packages_table[] = {
 	{ 0x2000, "QF" },
 	{ 0x2001, "CH" },
 	{ 0x2002, "CI" },
+	{ 0x2003, "QC" },
+	{ 0x2004, "QI/CA" },	/* differs nRF52805, 810, 811: CA, nRF52833, 840: QI */
 	{ 0x2005, "CK" },
+	{ 0x2007, "QD" },
+	{ 0x2008, "CJ" },
+	{ 0x2009, "CF" },
 };
 
 const struct flash_driver nrf5_flash, nrf51_flash;
@@ -591,9 +596,9 @@ static bool nrf5_info_variant_to_str(uint32_t variant, char *bf)
 
 static const char *nrf5_decode_info_package(uint32_t package)
 {
-	for (size_t i = 0; i < ARRAY_SIZE(nrf5_packages_table); i++) {
-		if (nrf5_packages_table[i].package == package)
-			return nrf5_packages_table[i].code;
+	for (size_t i = 0; i < ARRAY_SIZE(nrf52_packages_table); i++) {
+		if (nrf52_packages_table[i].package == package)
+			return nrf52_packages_table[i].code;
 	}
 	return "xx";
 }

commit 19ef6634f021f545c2154cdd6d011608f1249308
Author: Tomas Vanek <va...@fb...>
Date:   Sun Jan 21 16:01:00 2024 +0100

    target/nrf51: use PAN #16 workaround in reset-init only
    
    After 'reset run' or 'reset halt' the loaded application
    is expected to manipulate RAMON register to workaround
    the known silicon errata.
    
    Moreover, writing to RAMON register from 'reset-end' event
    after 'reset run' may collide with application intentions.
    
    Use the workaround in 'reset-init' event only to ensure
    correct function of target algorithms.
    
    Change-Id: I7d2d92e6805a05a83676edb46b3163ef39b9a7e4
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8104
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/target/nrf51.cfg b/tcl/target/nrf51.cfg
index 53ac3069f..3781eccb5 100644
--- a/tcl/target/nrf51.cfg
+++ b/tcl/target/nrf51.cfg
@@ -58,4 +58,4 @@ proc enable_all_ram {} {
 	# resetting we enable all banks via the RAMON register
 	mww 0x40000524 0xF
 }
-$_TARGETNAME configure -event reset-end {  enable_all_ram }
+$_TARGETNAME configure -event reset-init {  enable_all_ram }

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

Summary of changes:
 src/flash/nor/nrf5.c | 13 +++++++++----
 tcl/target/nrf51.cfg |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository