X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fnrf5.c;h=f0ae203678c607e788fce52c1ab029dca9859b32;hp=bd4ad0078f9e35c0f16ba9f396a31767891f3925;hb=e3fb76374c92264e5d684c3809b52fb2047e627b;hpb=b2dbaf9e1569ddc75f461b0b378f6614ecb7a45d

diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c
index bd4ad0078f..f0ae203678 100644
--- a/src/flash/nor/nrf5.c
+++ b/src/flash/nor/nrf5.c
@@ -748,46 +748,31 @@ static int nrf5_probe(struct flash_bank *bank)
 	}
 
 	if (bank->base == NRF5_FLASH_BASE) {
-		bank->num_sectors = num_sectors;
-		bank->size = num_sectors * flash_page_size;
-
 		/* Sanity check */
 		if (chip->spec && chip->flash_size_kb != chip->spec->flash_size_kb)
 			LOG_WARNING("Chip's reported Flash capacity does not match expected one");
 		if (chip->ficr_info_valid && chip->flash_size_kb != chip->ficr_info.flash)
 			LOG_WARNING("Chip's reported Flash capacity does not match FICR INFO.FLASH");
 
-		bank->sectors = calloc(bank->num_sectors,
-				       sizeof((bank->sectors)[0]));
-		if (!bank->sectors)
-			return ERROR_FLASH_BANK_NOT_PROBED;
-
-		/* Fill out the sector information: all NRF5 sectors are the same size and
-		 * there is always a fixed number of them. */
-		for (int i = 0; i < bank->num_sectors; i++) {
-			bank->sectors[i].size = flash_page_size;
-			bank->sectors[i].offset	= i * flash_page_size;
+		bank->num_sectors = num_sectors;
+		bank->size = num_sectors * flash_page_size;
 
-			/* mark as unknown */
-			bank->sectors[i].is_erased = -1;
-			bank->sectors[i].is_protected = -1;
-		}
+		bank->sectors = alloc_block_array(0, flash_page_size, num_sectors);
+		if (!bank->sectors)
+			return ERROR_FAIL;
 
 		nrf5_protect_check(bank);
 
 		chip->bank[0].probed = true;
+
 	} else {
-		bank->size = flash_page_size;
 		bank->num_sectors = 1;
-		bank->sectors = calloc(bank->num_sectors,
-				       sizeof((bank->sectors)[0]));
-		if (!bank->sectors)
-			return ERROR_FLASH_BANK_NOT_PROBED;
+		bank->size = flash_page_size;
 
-		bank->sectors[0].size = bank->size;
-		bank->sectors[0].offset	= 0;
+		bank->sectors = alloc_block_array(0, flash_page_size, num_sectors);
+		if (!bank->sectors)
+			return ERROR_FAIL;
 
-		bank->sectors[0].is_erased = 0;
 		bank->sectors[0].is_protected = 0;
 
 		chip->bank[1].probed = true;