[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-526-g1354ff7ad

[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  1354ff7adfeff5d0c1024c2f2e9a9cd714a753d8 (commit)
      from  46ae39c6236ec04f7e518d876b3cd9dafb6eb878 (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 1354ff7adfeff5d0c1024c2f2e9a9cd714a753d8
Author: Tomas Vanek <va...@fb...>
Date:   Sun Jan 21 15:55:37 2024 +0100

    flash/nor/nrf5, target/nrf51: deprecate nrf51 flash driver
    
    Use the newer driver name 'nrf5' instead.
    
    While on it set the unused parameters of flash bank
    creation to zero.
    
    While on it remove 2 empty comments.
    
    Change-Id: I9cf0eadc5b696e6c8b7e6aec0ea3345967523e87
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8103
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c
index 001843d39..18efae5c6 100644
--- a/src/flash/nor/nrf5.c
+++ b/src/flash/nor/nrf5.c
@@ -1144,6 +1144,9 @@ FLASH_BANK_COMMAND_HANDLER(nrf5_flash_bank_command)
 	struct nrf5_info *chip;
 	struct nrf5_bank *nbank = NULL;
 
+	if (bank->driver == &nrf51_flash)
+		LOG_WARNING("Flash driver 'nrf51' is deprecated! Use 'nrf5' instead.");
+
 	switch (bank->base) {
 	case NRF5_FLASH_BASE:
 	case NRF5_UICR_BASE:
diff --git a/tcl/target/nrf51.cfg b/tcl/target/nrf51.cfg
index 48c2715d1..53ac3069f 100644
--- a/tcl/target/nrf51.cfg
+++ b/tcl/target/nrf51.cfg
@@ -45,13 +45,11 @@ if {![using_hla]} {
    cortex_m reset_config sysresetreq
 }
 
-flash bank $_CHIPNAME.flash nrf51 0x00000000 0 1 1 $_TARGETNAME
-flash bank $_CHIPNAME.uicr nrf51 0x10001000 0 1 1 $_TARGETNAME
+flash bank $_CHIPNAME.flash nrf5 0x00000000 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.uicr nrf5 0x10001000 0 0 0 $_TARGETNAME
 
-#
 #  The chip should start up from internal 16Mhz RC, so setting adapter
 #  clock to 1Mhz should be OK
-#
 adapter speed 1000
 
 proc enable_all_ram {} {

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

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


hooks/post-receive
-- 
Main OpenOCD repository