[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-946-gba03d13c2

[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  ba03d13c29fba9f5e4e97121c47eb3b7857aa92d (commit)
      from  8f92e520bbd76917fd3ed18b9b9bb4099044da14 (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 ba03d13c29fba9f5e4e97121c47eb3b7857aa92d
Author: Tomas Vanek <va...@fb...>
Date:   Tue Aug 6 17:39:44 2024 +0200

    flash/nor/rp2040: allow flash size override from cfg
    
    Do not enforce hard-wired size 32 MiB
    
    Signed-off-by: Tomas Vanek <va...@fb...>
    Change-Id: I54608f75cc13996fda38ebd5d330e3b1893c2fd9
    Reviewed-on: https://review.openocd.org/c/openocd/+/8446
    Tested-by: jenkins
    Reviewed-by: Jonathan Bell <jon...@ra...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/rp2040.c b/src/flash/nor/rp2040.c
index ed8341d1f..5faba57a0 100644
--- a/src/flash/nor/rp2040.c
+++ b/src/flash/nor/rp2040.c
@@ -887,7 +887,10 @@ static int rp2040_flash_probe(struct flash_bank *bank)
 	bank->write_end_alignment = 256;
 
 	// Max size -- up to two devices (two chip selects) in adjacent 24-bit address windows
-	bank->size = 32 * 1024 * 1024;
+	if (bank->size == 0) {
+		/* TODO: get real flash size */
+		bank->size = 32 * 1024 * 1024;
+	}
 
 	bank->num_sectors = bank->size / 4096;
 

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

Summary of changes:
 src/flash/nor/rp2040.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository