X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fnor%2Fkinetis.c;h=5c0ffbd6f6f205196608fc0cae01346607f7123c;hb=079d78f7de917e33b58c5ea6147c818e573b3dc4;hp=cc86f971a4ee4c36a70b4bb1c8a9724685fb3cf5;hpb=8dcb91fb83e59d475af9da377066021ae2e03969;p=openocd.git

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index cc86f971a4..5c0ffbd6f6 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -1959,7 +1959,7 @@ static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 	unsigned cpu_mhz = 120;
 	unsigned idx;
 	bool use_nvm_marking = false;
-	char flash_marking[8], nvm_marking[2];
+	char flash_marking[11], nvm_marking[2];
 	char name[40];
 
 	k_chip->probed = false;
@@ -2126,6 +2126,7 @@ static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 			case KINETIS_SDID_FAMILYID_K6X | KINETIS_SDID_SUBFAMID_KX1:	/* errata 7534 - should be K63 */
 			case KINETIS_SDID_FAMILYID_K6X | KINETIS_SDID_SUBFAMID_KX2:	/* errata 7534 - should be K64 */
 				subfamid += 2; /* errata 7534 fix */
+				/* fallthrough */
 			case KINETIS_SDID_FAMILYID_K6X | KINETIS_SDID_SUBFAMID_KX3:
 				/* K63FN1M0 */
 			case KINETIS_SDID_FAMILYID_K6X | KINETIS_SDID_SUBFAMID_KX4:
@@ -2210,6 +2211,45 @@ static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 				 familyid, subfamid, cpu_mhz / 10);
 			break;
 
+		case KINETIS_SDID_SERIESID_KW:
+			/* Newer KW-series (all KW series except KW2xD, KW01Z) */
+			cpu_mhz = 48;
+			switch (k_chip->sim_sdid & (KINETIS_SDID_FAMILYID_MASK | KINETIS_SDID_SUBFAMID_MASK)) {
+			case KINETIS_SDID_FAMILYID_K4X | KINETIS_SDID_SUBFAMID_KX0:
+				/* KW40Z */
+			case KINETIS_SDID_FAMILYID_K3X | KINETIS_SDID_SUBFAMID_KX0:
+				/* KW30Z */
+			case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX0:
+				/* KW20Z */
+				/* FTFA, 1kB sectors */
+				k_chip->pflash_sector_size = 1<<10;
+				k_chip->nvm_sector_size = 1<<10;
+				/* autodetect 1 or 2 blocks */
+				k_chip->flash_support = FS_PROGRAM_LONGWORD;
+				k_chip->cache_type = KINETIS_CACHE_L;
+				k_chip->watchdog_type = KINETIS_WDOG_COP;
+				break;
+			case KINETIS_SDID_FAMILYID_K4X | KINETIS_SDID_SUBFAMID_KX1:
+				/* KW41Z */
+			case KINETIS_SDID_FAMILYID_K3X | KINETIS_SDID_SUBFAMID_KX1:
+				/* KW31Z */
+			case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX1:
+				/* KW21Z */
+				/* FTFA, 2kB sectors */
+				k_chip->pflash_sector_size = 2<<10;
+				k_chip->nvm_sector_size = 2<<10;
+				/* autodetect 1 or 2 blocks */
+				k_chip->flash_support = FS_PROGRAM_LONGWORD;
+				k_chip->cache_type = KINETIS_CACHE_L;
+				k_chip->watchdog_type = KINETIS_WDOG_COP;
+				break;
+			default:
+				LOG_ERROR("Unsupported KW FAMILYID SUBFAMID");
+			}
+			snprintf(name, sizeof(name), "MKW%u%uZ%%s%u",
+					 familyid, subfamid, cpu_mhz / 10);
+			break;
+
 		case KINETIS_SDID_SERIESID_KV:
 			/* KV-series */
 			k_chip->watchdog_type = KINETIS_WDOG_K;
@@ -2348,7 +2388,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) {
@@ -2405,6 +2447,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;
@@ -2422,6 +2465,10 @@ static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 	}
 
 	switch (fcfg1_pfsize) {
+	case 0x00:
+		k_chip->pflash_size = 8192;
+		break;
+	case 0x01:
 	case 0x03:
 	case 0x05:
 	case 0x07:
@@ -2432,6 +2479,7 @@ static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 		break;
 	case 0x0f:
 		/* a peculiar case: Freescale states different sizes for 0xf
+		 * KL03P24M48SF0RM	32 KB .... duplicate of code 0x3
 		 * K02P64M100SFARM	128 KB ... duplicate of code 0x7
 		 * K22P121M120SF8RM	256 KB ... duplicate of code 0x9
 		 * K22P121M120SF7RM	512 KB ... duplicate of code 0xb
@@ -2458,8 +2506,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';
@@ -2523,7 +2576,7 @@ static int kinetis_probe(struct flash_bank *bank)
 		 * parts with more than 32K of PFlash. For parts with
 		 * less the protection unit is set to 1024 bytes */
 		k_bank->protection_size = MAX(k_chip->pflash_size / 32, 1024);
-		bank->num_prot_blocks = 32 / k_chip->num_pflash_blocks;
+		bank->num_prot_blocks = bank->size / k_bank->protection_size;
 		k_bank->protection_block = bank->num_prot_blocks * k_bank->bank_number;
 
 		size_k = bank->size / 1024;