From 4d4c45cfd25703f39f9e2413b22d91a48c4b4565 Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Fri, 21 Mar 2025 21:56:39 +0100 Subject: [PATCH] flash/nor/rp2xxx: define macro BOOTROM_MAGIC_MASK and use it instead of magic value. Change-Id: I5d006aaf990d4ef3a82e622b1e41cd2bfec359f7 Signed-off-by: Tomas Vanek Reported-by: Antonio Borneo Reviewed-on: https://review.openocd.org/c/openocd/+/8810 Reviewed-by: Antonio Borneo Tested-by: jenkins --- src/flash/nor/rp2xxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/flash/nor/rp2xxx.c b/src/flash/nor/rp2xxx.c index 2b22e52eb..85c591104 100644 --- a/src/flash/nor/rp2xxx.c +++ b/src/flash/nor/rp2xxx.c @@ -16,6 +16,7 @@ #define BOOTROM_RP2040_MAGIC 0x01754d /* this is 'M' 'u', 2 (version) */ #define BOOTROM_RP2350_MAGIC 0x02754d +#define BOOTROM_MAGIC_MASK 0xffffff #define BOOTROM_MAGIC_ADDR 0x00000010 #define MAKE_TAG(a, b) (((b)<<8) | a) @@ -368,7 +369,7 @@ static int rp2xxx_lookup_rom_symbol(struct target *target, uint16_t tag, uint16_ return err; /* Ignore version */ - magic &= 0xffffff; + magic &= BOOTROM_MAGIC_MASK; if (magic == BOOTROM_RP2350_MAGIC) { /* Distinguish old-style RP2350 ROM table (A0, and earlier A1 builds)