X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fkinetis.c;h=4ef4385070183f38f035e7466ac0a90f0f41c393;hp=f57579dda3efe72a201c30e9ee31eb45b343c59c;hb=02bc718d1a49dd04bffa446f1dadd6b86d0d107c;hpb=dbd0d90af9ba12934eabd68d82aac9d7eb7e1e6a

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index f57579dda3..4ef4385070 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -2387,7 +2387,9 @@ static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 
 	if (num_blocks == 0)
 		num_blocks = k_chip->fcfg2_maxaddr1_shifted ? 2 : 1;
-	else if (k_chip->fcfg2_maxaddr1_shifted == 0 && num_blocks >= 2) {
+	else if (k_chip->fcfg2_maxaddr1_shifted == 0 && num_blocks >= 2 && fcfg2_pflsh) {
+		/* fcfg2_maxaddr1 may be zero due to partitioning whole NVM as EEPROM backup
+		 * Do not adjust block count in this case! */
 		num_blocks = 1;
 		LOG_WARNING("MAXADDR1 is zero, number of flash banks adjusted to 1");
 	} else if (k_chip->fcfg2_maxaddr1_shifted != 0 && num_blocks == 1) {
@@ -2444,6 +2446,7 @@ static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 		case 0x06:
 			k_chip->dflash_size = k_chip->nvm_size - (4096 << fcfg1_depart);
 			break;
+		case 0x07:
 		case 0x08:
 			k_chip->dflash_size = 0;
 			break;
@@ -2502,8 +2505,13 @@ static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 		/* Program section size is equal to sector size by default */
 	}
 
-	k_chip->num_pflash_blocks = num_blocks / (2 - fcfg2_pflsh);
-	k_chip->num_nvm_blocks = num_blocks - k_chip->num_pflash_blocks;
+	if (fcfg2_pflsh) {
+		k_chip->num_pflash_blocks = num_blocks;
+		k_chip->num_nvm_blocks = 0;
+	} else {
+		k_chip->num_pflash_blocks = (num_blocks + 1) / 2;
+		k_chip->num_nvm_blocks = num_blocks - k_chip->num_pflash_blocks;
+	}
 
 	if (use_nvm_marking) {
 		nvm_marking[0] = k_chip->num_nvm_blocks ? 'X' : 'N';