target algo: do not write reg_param if direction is PARAM_IN
[openocd.git] / src / flash / nor / kinetis.c
index 3177473..eca74a8 100644 (file)
 
 #define FLEXRAM                0x14000000
 
+#define MSCM_OCMDR0    0x40001400
 #define FMC_PFB01CR    0x4001f004
 #define FTFx_FSTAT     0x40020000
 #define FTFx_FCNFG     0x40020001
 #define FTFx_FCCOB3    0x40020004
 #define FTFx_FPROT3    0x40020010
 #define FTFx_FDPROT    0x40020017
-#define SIM_SDID       0x40048024
-#define SIM_SOPT1      0x40047000
-#define SIM_FCFG1      0x4004804c
-#define SIM_FCFG2      0x40048050
-#define WDOG_STCTRH    0x40052000
+#define SIM_BASE       0x40047000
+#define SIM_BASE_KL28  0x40074000
+#define SIM_COPC       0x40048100
+       /* SIM_COPC does not exist on devices with changed SIM_BASE */
+#define WDOG_BASE      0x40052000
+#define WDOG32_KE1X    0x40052000
+#define WDOG32_KL28    0x40076000
 #define SMC_PMCTRL     0x4007E001
 #define SMC_PMSTAT     0x4007E003
+#define SMC32_PMCTRL   0x4007E00C
+#define SMC32_PMSTAT   0x4007E014
 #define MCM_PLACR      0xF000300C
 
+/* Offsets */
+#define SIM_SOPT1_OFFSET    0x0000
+#define SIM_SDID_OFFSET            0x1024
+#define SIM_FCFG1_OFFSET    0x104c
+#define SIM_FCFG2_OFFSET    0x1050
+
+#define WDOG_STCTRLH_OFFSET      0
+#define WDOG32_CS_OFFSET         0
+
 /* Values */
 #define PM_STAT_RUN            0x01
 #define PM_STAT_VLPR           0x04
 #define KINETIS_SDID_SERIESID_MASK 0x00F00000
 #define KINETIS_SDID_SERIESID_K   0x00000000
 #define KINETIS_SDID_SERIESID_KL   0x00100000
+#define KINETIS_SDID_SERIESID_KE   0x00200000
 #define KINETIS_SDID_SERIESID_KW   0x00500000
 #define KINETIS_SDID_SERIESID_KV   0x00600000
 
+#define KINETIS_SDID_SUBFAMID_SHIFT 24
 #define KINETIS_SDID_SUBFAMID_MASK  0x0F000000
 #define KINETIS_SDID_SUBFAMID_KX0   0x00000000
 #define KINETIS_SDID_SUBFAMID_KX1   0x01000000
 #define KINETIS_SDID_SUBFAMID_KX4   0x04000000
 #define KINETIS_SDID_SUBFAMID_KX5   0x05000000
 #define KINETIS_SDID_SUBFAMID_KX6   0x06000000
+#define KINETIS_SDID_SUBFAMID_KX7   0x07000000
+#define KINETIS_SDID_SUBFAMID_KX8   0x08000000
 
+#define KINETIS_SDID_FAMILYID_SHIFT 28
 #define KINETIS_SDID_FAMILYID_MASK  0xF0000000
 #define KINETIS_SDID_FAMILYID_K0X   0x00000000
 #define KINETIS_SDID_FAMILYID_K1X   0x10000000
 #define KINETIS_SDID_FAMILYID_K2X   0x20000000
 #define KINETIS_SDID_FAMILYID_K3X   0x30000000
 #define KINETIS_SDID_FAMILYID_K4X   0x40000000
+#define KINETIS_SDID_FAMILYID_K5X   0x50000000
 #define KINETIS_SDID_FAMILYID_K6X   0x60000000
 #define KINETIS_SDID_FAMILYID_K7X   0x70000000
+#define KINETIS_SDID_FAMILYID_K8X   0x80000000
+#define KINETIS_SDID_FAMILYID_KL8X  0x90000000
+
+/* The field originally named DIEID has new name/meaning on KE1x */
+#define KINETIS_SDID_PROJECTID_MASK  KINETIS_SDID_DIEID_MASK
+#define KINETIS_SDID_PROJECTID_KE1xF 0x00000080
+#define KINETIS_SDID_PROJECTID_KE1xZ 0x00000100
 
 struct kinetis_flash_bank {
+       struct kinetis_chip *k_chip;
        bool probed;
+       unsigned bank_number;           /* bank number in particular chip */
+       struct flash_bank *bank;
+
        uint32_t sector_size;
-       uint32_t max_flash_prog_size;
        uint32_t protection_size;
        uint32_t prog_base;             /* base address for FTFx operations */
-                                       /* same as bank->base for pflash, differs for FlexNVM */
+                                       /* usually same as bank->base for pflash, differs for FlexNVM */
        uint32_t protection_block;      /* number of first protection block in this bank */
 
-       uint32_t sim_sdid;
-       uint32_t sim_fcfg1;
-       uint32_t sim_fcfg2;
-
        enum {
                FC_AUTO = 0,
                FC_PFLASH,
                FC_FLEX_NVM,
                FC_FLEX_RAM,
        } flash_class;
+};
+
+#define KINETIS_MAX_BANKS 4u
+
+struct kinetis_chip {
+       struct target *target;
+       bool probed;
+
+       uint32_t sim_sdid;
+       uint32_t sim_fcfg1;
+       uint32_t sim_fcfg2;
+       uint32_t fcfg2_maxaddr0_shifted;
+       uint32_t fcfg2_maxaddr1_shifted;
+
+       unsigned num_pflash_blocks, num_nvm_blocks;
+       unsigned pflash_sector_size, nvm_sector_size;
+       unsigned max_flash_prog_size;
+
+       uint32_t pflash_base;
+       uint32_t pflash_size;
+       uint32_t nvm_base;
+       uint32_t nvm_size;              /* whole FlexNVM */
+       uint32_t dflash_size;           /* accessible rest of FlexNVM if EEPROM backup uses part of FlexNVM */
+
+       uint32_t progr_accel_ram;
+       uint32_t sim_base;
 
        enum {
                FS_PROGRAM_SECTOR = 1,
                FS_PROGRAM_LONGWORD = 2,
-               FS_PROGRAM_PHRASE = 4, /* Unsupported */
-               FS_INVALIDATE_CACHE_K = 8,
-               FS_INVALIDATE_CACHE_L = 0x10,
+               FS_PROGRAM_PHRASE = 4,          /* Unsupported */
+
+               FS_NO_CMD_BLOCKSTAT = 0x40,
+               FS_WIDTH_256BIT = 0x80,
+               FS_ECC = 0x100,
        } flash_support;
+
+       enum {
+               KINETIS_CACHE_NONE,
+               KINETIS_CACHE_K,        /* invalidate using FMC->PFB0CR/PFB01CR */
+               KINETIS_CACHE_L,        /* invalidate using MCM->PLACR */
+               KINETIS_CACHE_MSCM,     /* devices like KE1xF, invalidate MSCM->OCMDR0 */
+       } cache_type;
+
+       enum {
+               KINETIS_WDOG_NONE,
+               KINETIS_WDOG_K,
+               KINETIS_WDOG_COP,
+               KINETIS_WDOG32_KE1X,
+               KINETIS_WDOG32_KL28,
+       } watchdog_type;
+
+       enum {
+               KINETIS_SMC,
+               KINETIS_SMC32,
+       } sysmodectrlr_type;
+
+       char name[40];
+
+       unsigned num_banks;
+       struct kinetis_flash_bank banks[KINETIS_MAX_BANKS];
 };
 
+struct kinetis_type {
+       uint32_t sdid;
+       char *name;
+};
+
+static const struct kinetis_type kinetis_types_old[] = {
+       { KINETIS_K_SDID_K10_M50,  "MK10D%s5" },
+       { KINETIS_K_SDID_K10_M72,  "MK10D%s7" },
+       { KINETIS_K_SDID_K10_M100, "MK10D%s10" },
+       { KINETIS_K_SDID_K10_M120, "MK10F%s12" },
+       { KINETIS_K_SDID_K11,      "MK11D%s5" },
+       { KINETIS_K_SDID_K12,      "MK12D%s5" },
+
+       { KINETIS_K_SDID_K20_M50,  "MK20D%s5" },
+       { KINETIS_K_SDID_K20_M72,  "MK20D%s7" },
+       { KINETIS_K_SDID_K20_M100, "MK20D%s10" },
+       { KINETIS_K_SDID_K20_M120, "MK20F%s12" },
+       { KINETIS_K_SDID_K21_M50,  "MK21D%s5" },
+       { KINETIS_K_SDID_K21_M120, "MK21F%s12" },
+       { KINETIS_K_SDID_K22_M50,  "MK22D%s5" },
+       { KINETIS_K_SDID_K22_M120, "MK22F%s12" },
+
+       { KINETIS_K_SDID_K30_M72,  "MK30D%s7" },
+       { KINETIS_K_SDID_K30_M100, "MK30D%s10" },
+
+       { KINETIS_K_SDID_K40_M72,  "MK40D%s7" },
+       { KINETIS_K_SDID_K40_M100, "MK40D%s10" },
+
+       { KINETIS_K_SDID_K50_M72,  "MK50D%s7" },
+       { KINETIS_K_SDID_K51_M72,  "MK51D%s7" },
+       { KINETIS_K_SDID_K53,      "MK53D%s10" },
+
+       { KINETIS_K_SDID_K60_M100, "MK60D%s10" },
+       { KINETIS_K_SDID_K60_M150, "MK60F%s15" },
+
+       { KINETIS_K_SDID_K70_M150, "MK70F%s15" },
+};
+
+
 #define MDM_AP                 1
 
 #define MDM_REG_STAT           0x00
@@ -271,11 +389,14 @@ struct kinetis_flash_bank {
 
 static bool allow_fcf_writes;
 static uint8_t fcf_fopt = 0xff;
+static bool fcf_fopt_configured;
+static bool create_banks;
 
 
 struct flash_driver kinetis_flash;
 static int kinetis_write_inner(struct flash_bank *bank, const uint8_t *buffer,
                        uint32_t offset, uint32_t count);
+static int kinetis_probe_chip(struct kinetis_chip *k_chip);
 static int kinetis_auto_probe(struct flash_bank *bank);
 
 
@@ -592,6 +713,7 @@ deassert_reset_and_exit:
 static const uint32_t kinetis_known_mdm_ids[] = {
        0x001C0000,     /* Kinetis-K Series */
        0x001C0020,     /* Kinetis-L/M/V/E Series */
+       0x001C0030,     /* Kinetis with a Cortex-M7, in time of writing KV58 */
 };
 
 /*
@@ -714,29 +836,230 @@ COMMAND_HANDLER(kinetis_check_flash_security_status)
        return ERROR_OK;
 }
 
+
+static struct kinetis_chip *kinetis_get_chip(struct target *target)
+{
+       struct flash_bank *bank_iter;
+       struct kinetis_flash_bank *k_bank;
+
+       /* iterate over all kinetis banks */
+       for (bank_iter = flash_bank_list(); bank_iter; bank_iter = bank_iter->next) {
+               if (bank_iter->driver != &kinetis_flash
+                   || bank_iter->target != target)
+                       continue;
+
+               k_bank = bank_iter->driver_priv;
+               if (!k_bank)
+                       continue;
+
+               if (k_bank->k_chip)
+                       return k_bank->k_chip;
+       }
+       return NULL;
+}
+
+static int kinetis_chip_options(struct kinetis_chip *k_chip, int argc, const char *argv[])
+{
+       int i;
+       for (i = 0; i < argc; i++) {
+               if (strcmp(argv[i], "-sim-base") == 0) {
+                       if (i + 1 < argc)
+                               k_chip->sim_base = strtoul(argv[++i], NULL, 0);
+               } else
+                       LOG_ERROR("Unsupported flash bank option %s", argv[i]);
+       }
+       return ERROR_OK;
+}
+
 FLASH_BANK_COMMAND_HANDLER(kinetis_flash_bank_command)
 {
-       struct kinetis_flash_bank *bank_info;
+       struct target *target = bank->target;
+       struct kinetis_chip *k_chip;
+       struct kinetis_flash_bank *k_bank;
+       int retval;
 
        if (CMD_ARGC < 6)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        LOG_INFO("add flash_bank kinetis %s", bank->name);
 
-       bank_info = malloc(sizeof(struct kinetis_flash_bank));
+       k_chip = kinetis_get_chip(target);
 
-       memset(bank_info, 0, sizeof(struct kinetis_flash_bank));
+       if (k_chip == NULL) {
+               k_chip = calloc(sizeof(struct kinetis_chip), 1);
+               if (k_chip == NULL) {
+                       LOG_ERROR("No memory");
+                       return ERROR_FAIL;
+               }
+
+               k_chip->target = target;
 
-       bank->driver_priv = bank_info;
+               /* only the first defined bank can define chip options */
+               retval = kinetis_chip_options(k_chip, CMD_ARGC - 6, CMD_ARGV + 6);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
+
+       if (k_chip->num_banks >= KINETIS_MAX_BANKS) {
+               LOG_ERROR("Only %u Kinetis flash banks are supported", KINETIS_MAX_BANKS);
+               return ERROR_FAIL;
+       }
+
+       bank->driver_priv = k_bank = &(k_chip->banks[k_chip->num_banks]);
+       k_bank->k_chip = k_chip;
+       k_bank->bank_number = k_chip->num_banks;
+       k_bank->bank = bank;
+       k_chip->num_banks++;
 
        return ERROR_OK;
 }
 
-/* Disable the watchdog on Kinetis devices */
-int kinetis_disable_wdog(struct target *target, uint32_t sim_sdid)
+
+static void kinetis_free_driver_priv(struct flash_bank *bank)
+{
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       if (k_bank == NULL)
+               return;
+
+       struct kinetis_chip *k_chip = k_bank->k_chip;
+       if (k_chip == NULL)
+               return;
+
+       k_chip->num_banks--;
+       if (k_chip->num_banks == 0)
+               free(k_chip);
+}
+
+
+static int kinetis_create_missing_banks(struct kinetis_chip *k_chip)
+{
+       unsigned bank_idx;
+       unsigned num_blocks;
+       struct kinetis_flash_bank *k_bank;
+       struct flash_bank *bank;
+       char base_name[69], name[80], num[4];
+       char *class, *p;
+
+       num_blocks = k_chip->num_pflash_blocks + k_chip->num_nvm_blocks;
+       if (num_blocks > KINETIS_MAX_BANKS) {
+               LOG_ERROR("Only %u Kinetis flash banks are supported", KINETIS_MAX_BANKS);
+               return ERROR_FAIL;
+       }
+
+       bank = k_chip->banks[0].bank;
+       if (bank && bank->name) {
+               strncpy(base_name, bank->name, sizeof(base_name) - 1);
+               base_name[sizeof(base_name) - 1] = '\0';
+               p = strstr(base_name, ".pflash");
+               if (p) {
+                       *p = '\0';
+                       if (k_chip->num_pflash_blocks > 1) {
+                               /* rename first bank if numbering is needed */
+                               snprintf(name, sizeof(name), "%s.pflash0", base_name);
+                               free(bank->name);
+                               bank->name = strdup(name);
+                       }
+               }
+       } else {
+               strncpy(base_name, target_name(k_chip->target), sizeof(base_name) - 1);
+               base_name[sizeof(base_name) - 1] = '\0';
+               p = strstr(base_name, ".cpu");
+               if (p)
+                       *p = '\0';
+       }
+
+       for (bank_idx = 1; bank_idx < num_blocks; bank_idx++) {
+               k_bank = &(k_chip->banks[bank_idx]);
+               bank = k_bank->bank;
+
+               if (bank)
+                       continue;
+
+               num[0] = '\0';
+
+               if (bank_idx < k_chip->num_pflash_blocks) {
+                       class = "pflash";
+                       if (k_chip->num_pflash_blocks > 1)
+                               snprintf(num, sizeof(num), "%u", bank_idx);
+               } else {
+                       class = "flexnvm";
+                       if (k_chip->num_nvm_blocks > 1)
+                               snprintf(num, sizeof(num), "%u",
+                                        bank_idx - k_chip->num_pflash_blocks);
+               }
+
+               bank = calloc(sizeof(struct flash_bank), 1);
+               if (bank == NULL)
+                       return ERROR_FAIL;
+
+               bank->target = k_chip->target;
+               bank->driver = &kinetis_flash;
+               bank->default_padded_value = bank->erased_value = 0xff;
+
+               snprintf(name, sizeof(name), "%s.%s%s",
+                        base_name, class, num);
+               bank->name = strdup(name);
+
+               bank->driver_priv = k_bank = &(k_chip->banks[k_chip->num_banks]);
+               k_bank->k_chip = k_chip;
+               k_bank->bank_number = bank_idx;
+               k_bank->bank = bank;
+               if (k_chip->num_banks <= bank_idx)
+                       k_chip->num_banks = bank_idx + 1;
+
+               flash_bank_add(bank);
+       }
+       return ERROR_OK;
+}
+
+
+static int kinetis_disable_wdog_algo(struct target *target, size_t code_size, const uint8_t *code, uint32_t wdog_base)
 {
        struct working_area *wdog_algorithm;
        struct armv7m_algorithm armv7m_info;
+       struct reg_param reg_params[1];
+       int retval;
+
+       if (target->state != TARGET_HALTED) {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+
+       retval = target_alloc_working_area(target, code_size, &wdog_algorithm);
+       if (retval != ERROR_OK)
+               return retval;
+
+       retval = target_write_buffer(target, wdog_algorithm->address,
+                       code_size, code);
+       if (retval == ERROR_OK) {
+               armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
+               armv7m_info.core_mode = ARM_MODE_THREAD;
+
+               init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
+               buf_set_u32(reg_params[0].value, 0, 32, wdog_base);
+
+               retval = target_run_algorithm(target, 0, NULL, 1, reg_params,
+                       wdog_algorithm->address,
+                       wdog_algorithm->address + code_size - 2,
+                       500, &armv7m_info);
+
+               destroy_reg_param(&reg_params[0]);
+
+               if (retval != ERROR_OK)
+                       LOG_ERROR("Error executing Kinetis WDOG unlock algorithm");
+       }
+
+       target_free_working_area(target, wdog_algorithm);
+
+       return retval;
+}
+
+/* Disable the watchdog on Kinetis devices
+ * Standard Kx WDOG peripheral checks timing and therefore requires to run algo.
+ */
+static int kinetis_disable_wdog_kx(struct target *target)
+{
+       const uint32_t wdog_base = WDOG_BASE;
        uint16_t wdog;
        int retval;
 
@@ -744,14 +1067,7 @@ int kinetis_disable_wdog(struct target *target, uint32_t sim_sdid)
 #include "../../../contrib/loaders/watchdog/armv7m_kinetis_wdog.inc"
        };
 
-       /* Decide whether the connected device needs watchdog disabling.
-        * Disable for all Kx and KVx devices, return if it is a KLx */
-
-       if ((sim_sdid & KINETIS_SDID_SERIESID_MASK) == KINETIS_SDID_SERIESID_KL)
-               return ERROR_OK;
-
-       /* The connected device requires watchdog disabling. */
-       retval = target_read_u16(target, WDOG_STCTRH, &wdog);
+       retval = target_read_u16(target, wdog_base + WDOG_STCTRLH_OFFSET, &wdog);
        if (retval != ERROR_OK)
                return retval;
 
@@ -759,60 +1075,116 @@ int kinetis_disable_wdog(struct target *target, uint32_t sim_sdid)
                /* watchdog already disabled */
                return ERROR_OK;
        }
-       LOG_INFO("Disabling Kinetis watchdog (initial WDOG_STCTRLH = 0x%x)", wdog);
+       LOG_INFO("Disabling Kinetis watchdog (initial WDOG_STCTRLH = 0x%04" PRIx16 ")", wdog);
 
-       if (target->state != TARGET_HALTED) {
-               LOG_ERROR("Target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
+       retval = kinetis_disable_wdog_algo(target, sizeof(kinetis_unlock_wdog_code), kinetis_unlock_wdog_code, wdog_base);
+       if (retval != ERROR_OK)
+               return retval;
 
-       retval = target_alloc_working_area(target, sizeof(kinetis_unlock_wdog_code), &wdog_algorithm);
+       retval = target_read_u16(target, wdog_base + WDOG_STCTRLH_OFFSET, &wdog);
        if (retval != ERROR_OK)
                return retval;
 
-       retval = target_write_buffer(target, wdog_algorithm->address,
-                       sizeof(kinetis_unlock_wdog_code), (uint8_t *)kinetis_unlock_wdog_code);
-       if (retval != ERROR_OK) {
-               target_free_working_area(target, wdog_algorithm);
+       LOG_INFO("WDOG_STCTRLH = 0x%04" PRIx16, wdog);
+       return (wdog & 0x1) ? ERROR_FAIL : ERROR_OK;
+}
+
+static int kinetis_disable_wdog32(struct target *target, uint32_t wdog_base)
+{
+       uint32_t wdog_cs;
+       int retval;
+
+       static const uint8_t kinetis_unlock_wdog_code[] = {
+#include "../../../contrib/loaders/watchdog/armv7m_kinetis_wdog32.inc"
+       };
+
+       retval = target_read_u32(target, wdog_base + WDOG32_CS_OFFSET, &wdog_cs);
+       if (retval != ERROR_OK)
                return retval;
-       }
 
-       armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
-       armv7m_info.core_mode = ARM_MODE_THREAD;
+       if ((wdog_cs & 0x80) == 0)
+               return ERROR_OK; /* watchdog already disabled */
 
-       retval = target_run_algorithm(target, 0, NULL, 0, NULL, wdog_algorithm->address,
-                       wdog_algorithm->address + (sizeof(kinetis_unlock_wdog_code) - 2),
-                       10000, &armv7m_info);
+       LOG_INFO("Disabling Kinetis watchdog (initial WDOG_CS 0x%08" PRIx32 ")", wdog_cs);
 
+       retval = kinetis_disable_wdog_algo(target, sizeof(kinetis_unlock_wdog_code), kinetis_unlock_wdog_code, wdog_base);
        if (retval != ERROR_OK)
-               LOG_ERROR("error executing kinetis wdog unlock algorithm");
+               return retval;
 
-       retval = target_read_u16(target, WDOG_STCTRH, &wdog);
+       retval = target_read_u32(target, wdog_base + WDOG32_CS_OFFSET, &wdog_cs);
        if (retval != ERROR_OK)
                return retval;
-       LOG_INFO("WDOG_STCTRLH = 0x%x", wdog);
 
-       target_free_working_area(target, wdog_algorithm);
+       if ((wdog_cs & 0x80) == 0)
+               return ERROR_OK; /* watchdog disabled successfully */
 
-       return retval;
+       LOG_ERROR("Cannot disable Kinetis watchdog (WDOG_CS 0x%08" PRIx32 "), issue 'reset init'", wdog_cs);
+       return ERROR_FAIL;
+}
+
+static int kinetis_disable_wdog(struct kinetis_chip *k_chip)
+{
+       struct target *target = k_chip->target;
+       uint8_t sim_copc;
+       int retval;
+
+       if (!k_chip->probed) {
+               retval = kinetis_probe_chip(k_chip);
+               if (retval != ERROR_OK)
+                       return retval;
+       }
+
+       switch (k_chip->watchdog_type) {
+       case KINETIS_WDOG_K:
+               return kinetis_disable_wdog_kx(target);
+
+       case KINETIS_WDOG_COP:
+               retval = target_read_u8(target, SIM_COPC, &sim_copc);
+               if (retval != ERROR_OK)
+                       return retval;
+
+               if ((sim_copc & 0xc) == 0)
+                       return ERROR_OK; /* watchdog already disabled */
+
+               LOG_INFO("Disabling Kinetis watchdog (initial SIM_COPC 0x%02" PRIx8 ")", sim_copc);
+               retval = target_write_u8(target, SIM_COPC, sim_copc & ~0xc);
+               if (retval != ERROR_OK)
+                       return retval;
+
+               retval = target_read_u8(target, SIM_COPC, &sim_copc);
+               if (retval != ERROR_OK)
+                       return retval;
+
+               if ((sim_copc & 0xc) == 0)
+                       return ERROR_OK; /* watchdog disabled successfully */
+
+               LOG_ERROR("Cannot disable Kinetis watchdog (SIM_COPC 0x%02" PRIx8 "), issue 'reset init'", sim_copc);
+               return ERROR_FAIL;
+
+       case KINETIS_WDOG32_KE1X:
+               return kinetis_disable_wdog32(target, WDOG32_KE1X);
+
+       case KINETIS_WDOG32_KL28:
+               return kinetis_disable_wdog32(target, WDOG32_KL28);
+
+       default:
+               return ERROR_OK;
+       }
 }
 
 COMMAND_HANDLER(kinetis_disable_wdog_handler)
 {
        int result;
-       uint32_t sim_sdid;
        struct target *target = get_current_target(CMD_CTX);
+       struct kinetis_chip *k_chip = kinetis_get_chip(target);
+
+       if (k_chip == NULL)
+               return ERROR_FAIL;
 
        if (CMD_ARGC > 0)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       result = target_read_u32(target, SIM_SDID, &sim_sdid);
-       if (result != ERROR_OK) {
-               LOG_ERROR("Failed to read SIMSDID");
-               return result;
-       }
-
-       result = kinetis_disable_wdog(target, sim_sdid);
+       result = kinetis_disable_wdog(k_chip);
        return result;
 }
 
@@ -838,6 +1210,12 @@ static int kinetis_ftfx_decode_error(uint8_t fstat)
        return ERROR_FLASH_OPERATION_FAILED;
 }
 
+static int kinetis_ftfx_clear_error(struct target *target)
+{
+       /* reset error flags */
+       return target_write_u8(target, FTFx_FSTAT, 0x70);
+}
+
 
 static int kinetis_ftfx_prepare(struct target *target)
 {
@@ -860,7 +1238,7 @@ static int kinetis_ftfx_prepare(struct target *target)
        }
        if (fstat != 0x80) {
                /* reset error flags */
-               result = target_write_u8(target, FTFx_FSTAT, 0x70);
+               result = kinetis_ftfx_clear_error(target);
        }
        return result;
 }
@@ -878,8 +1256,8 @@ static int kinetis_write_block(struct flash_bank *bank, const uint8_t *buffer,
        uint32_t buffer_size = 2048;            /* Default minimum value */
        struct working_area *write_algorithm;
        struct working_area *source;
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
-       uint32_t address = kinfo->prog_base + offset;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       uint32_t address = k_bank->prog_base + offset;
        uint32_t end_address;
        struct reg_param reg_params[5];
        struct armv7m_algorithm armv7m_info;
@@ -989,12 +1367,12 @@ static int kinetis_protect(struct flash_bank *bank, int set, int first, int last
 
 static int kinetis_protect_check(struct flash_bank *bank)
 {
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
        int result;
        int i, b;
        uint32_t fprot;
 
-       if (kinfo->flash_class == FC_PFLASH) {
+       if (k_bank->flash_class == FC_PFLASH) {
 
                /* read protection register */
                result = target_read_u32(bank->target, FTFx_FPROT3, &fprot);
@@ -1003,7 +1381,7 @@ static int kinetis_protect_check(struct flash_bank *bank)
 
                /* Every bit protects 1/32 of the full flash (not necessarily just this bank) */
 
-       } else if (kinfo->flash_class == FC_FLEX_NVM) {
+       } else if (k_bank->flash_class == FC_FLEX_NVM) {
                uint8_t fdprot;
 
                /* read protection register */
@@ -1018,7 +1396,7 @@ static int kinetis_protect_check(struct flash_bank *bank)
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       b = kinfo->protection_block;
+       b = k_bank->protection_block;
        for (i = 0; i < bank->num_prot_blocks; i++) {
                if ((fprot >> b) & 1)
                        bank->prot_blocks[i].is_protected = 0;
@@ -1038,10 +1416,13 @@ static int kinetis_fill_fcf(struct flash_bank *bank, uint8_t *fcf)
        uint8_t fsec = 0xfe;             /* set MCU unsecure */
        uint8_t fdprot = 0xff;
        int i;
+       unsigned bank_idx;
+       unsigned num_blocks;
        uint32_t pflash_bit;
        uint8_t dflash_bit;
        struct flash_bank *bank_iter;
-       struct kinetis_flash_bank *kinfo;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       struct kinetis_chip *k_chip = k_bank->k_chip;
 
        memset(fcf, 0xff, FCF_SIZE);
 
@@ -1050,18 +1431,19 @@ static int kinetis_fill_fcf(struct flash_bank *bank, uint8_t *fcf)
 
        /* iterate over all kinetis banks */
        /* current bank is bank 0, it contains FCF */
-       for (bank_iter = bank; bank_iter; bank_iter = bank_iter->next) {
-               if (bank_iter->driver != &kinetis_flash
-                   || bank_iter->target != bank->target)
+       num_blocks = k_chip->num_pflash_blocks + k_chip->num_nvm_blocks;
+       for (bank_idx = 0; bank_idx < num_blocks; bank_idx++) {
+               k_bank = &(k_chip->banks[bank_idx]);
+               bank_iter = k_bank->bank;
+
+               if (bank_iter == NULL) {
+                       LOG_WARNING("Missing bank %u configuration, FCF protection flags may be incomplette", bank_idx);
                        continue;
+               }
 
                kinetis_auto_probe(bank_iter);
 
-               kinfo = bank->driver_priv;
-               if (!kinfo)
-                       continue;
-
-               if (kinfo->flash_class == FC_PFLASH) {
+               if (k_bank->flash_class == FC_PFLASH) {
                        for (i = 0; i < bank_iter->num_prot_blocks; i++) {
                                if (bank_iter->prot_blocks[i].is_protected == 1)
                                        fprot &= ~pflash_bit;
@@ -1069,7 +1451,7 @@ static int kinetis_fill_fcf(struct flash_bank *bank, uint8_t *fcf)
                                pflash_bit <<= 1;
                        }
 
-               } else if (kinfo->flash_class == FC_FLEX_NVM) {
+               } else if (k_bank->flash_class == FC_FLEX_NVM) {
                        for (i = 0; i < bank_iter->num_prot_blocks; i++) {
                                if (bank_iter->prot_blocks[i].is_protected == 1)
                                        fdprot &= ~dflash_bit;
@@ -1136,17 +1518,44 @@ static int kinetis_ftfx_command(struct target *target, uint8_t fcmd, uint32_t fa
 }
 
 
-static int kinetis_check_run_mode(struct target *target)
+static int kinetis_read_pmstat(struct kinetis_chip *k_chip, uint8_t *pmstat)
+{
+       int result;
+       uint32_t stat32;
+       struct target *target = k_chip->target;
+
+       switch (k_chip->sysmodectrlr_type) {
+       case KINETIS_SMC:
+               result = target_read_u8(target, SMC_PMSTAT, pmstat);
+               return result;
+
+       case KINETIS_SMC32:
+               result = target_read_u32(target, SMC32_PMSTAT, &stat32);
+               if (result == ERROR_OK)
+                       *pmstat = stat32 & 0xff;
+               return result;
+       }
+       return ERROR_FAIL;
+}
+
+static int kinetis_check_run_mode(struct kinetis_chip *k_chip)
 {
        int result, i;
-       uint8_t pmctrl, pmstat;
+       uint8_t pmstat;
+       struct target *target;
+
+       if (k_chip == NULL) {
+               LOG_ERROR("Chip not probed.");
+               return ERROR_FAIL;
+       }
+       target = k_chip->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       result = target_read_u8(target, SMC_PMSTAT, &pmstat);
+       result = kinetis_read_pmstat(k_chip, &pmstat);
        if (result != ERROR_OK)
                return result;
 
@@ -1156,13 +1565,21 @@ static int kinetis_check_run_mode(struct target *target)
        if (pmstat == PM_STAT_VLPR) {
                /* It is safe to switch from VLPR to RUN mode without changing clock */
                LOG_INFO("Switching from VLPR to RUN mode.");
-               pmctrl = PM_CTRL_RUNM_RUN;
-               result = target_write_u8(target, SMC_PMCTRL, pmctrl);
+
+               switch (k_chip->sysmodectrlr_type) {
+               case KINETIS_SMC:
+                       result = target_write_u8(target, SMC_PMCTRL, PM_CTRL_RUNM_RUN);
+                       break;
+
+               case KINETIS_SMC32:
+                       result = target_write_u32(target, SMC32_PMCTRL, PM_CTRL_RUNM_RUN);
+                       break;
+               }
                if (result != ERROR_OK)
                        return result;
 
                for (i = 100; i; i--) {
-                       result = target_read_u8(target, SMC_PMSTAT, &pmstat);
+                       result = kinetis_read_pmstat(k_chip, &pmstat);
                        if (result != ERROR_OK)
                                return result;
 
@@ -1177,26 +1594,40 @@ static int kinetis_check_run_mode(struct target *target)
 }
 
 
-static void kinetis_invalidate_flash_cache(struct flash_bank *bank)
+static void kinetis_invalidate_flash_cache(struct kinetis_chip *k_chip)
 {
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       struct target *target = k_chip->target;
+
+       switch (k_chip->cache_type) {
+       case KINETIS_CACHE_K:
+               target_write_u8(target, FMC_PFB01CR + 2, 0xf0);
+               /* Set CINV_WAY bits - request invalidate of all cache ways */
+               /* FMC_PFB0CR has same address and CINV_WAY bits as FMC_PFB01CR */
+               break;
 
-       if (kinfo->flash_support & FS_INVALIDATE_CACHE_K)
-               target_write_u8(bank->target, FMC_PFB01CR + 2, 0xf0);
+       case KINETIS_CACHE_L:
+               target_write_u8(target, MCM_PLACR + 1, 0x04);
+               /* set bit CFCC - Clear Flash Controller Cache */
+               break;
 
-       else if (kinfo->flash_support & FS_INVALIDATE_CACHE_L)
-               target_write_u8(bank->target, MCM_PLACR + 1, 0x04);
+       case KINETIS_CACHE_MSCM:
+               target_write_u32(target, MSCM_OCMDR0, 0x30);
+               /* disable data prefetch and flash speculate */
+               break;
 
-       return;
+       default:
+               break;
+       }
 }
 
 
 static int kinetis_erase(struct flash_bank *bank, int first, int last)
 {
        int result, i;
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       struct kinetis_chip *k_chip = k_bank->k_chip;
 
-       result = kinetis_check_run_mode(bank->target);
+       result = kinetis_check_run_mode(k_chip);
        if (result != ERROR_OK)
                return result;
 
@@ -1215,7 +1646,7 @@ static int kinetis_erase(struct flash_bank *bank, int first, int last)
         */
        for (i = first; i <= last; i++) {
                /* set command and sector address */
-               result = kinetis_ftfx_command(bank->target, FTFx_CMD_SECTERASE, kinfo->prog_base + bank->sectors[i].offset,
+               result = kinetis_ftfx_command(bank->target, FTFx_CMD_SECTERASE, k_bank->prog_base + bank->sectors[i].offset,
                                0, 0, 0, 0,  0, 0, 0, 0,  NULL);
 
                if (result != ERROR_OK) {
@@ -1225,7 +1656,7 @@ static int kinetis_erase(struct flash_bank *bank, int first, int last)
 
                bank->sectors[i].is_erased = 1;
 
-               if (bank->base == 0
+               if (k_bank->prog_base == 0
                        && bank->sectors[i].offset <= FCF_ADDRESS
                        && bank->sectors[i].offset + bank->sectors[i].size > FCF_ADDRESS + FCF_SIZE) {
                        if (allow_fcf_writes) {
@@ -1243,7 +1674,7 @@ static int kinetis_erase(struct flash_bank *bank, int first, int last)
                }
        }
 
-       kinetis_invalidate_flash_cache(bank);
+       kinetis_invalidate_flash_cache(k_bank->k_chip);
 
        return ERROR_OK;
 }
@@ -1283,7 +1714,8 @@ static int kinetis_write_sections(struct flash_bank *bank, const uint8_t *buffer
                         uint32_t offset, uint32_t count)
 {
        int result = ERROR_OK;
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       struct kinetis_chip *k_chip = k_bank->k_chip;
        uint8_t *buffer_aligned = NULL;
        /*
         * Kinetis uses different terms for the granularity of
@@ -1291,8 +1723,8 @@ static int kinetis_write_sections(struct flash_bank *bank, const uint8_t *buffer
         * the generic term "chunk". The largest possible
         * Kinetis "chunk" is 16 bytes (128 bits).
         */
-       uint32_t prog_section_chunk_bytes = kinfo->sector_size >> 8;
-       uint32_t prog_size_bytes = kinfo->max_flash_prog_size;
+       uint32_t prog_section_chunk_bytes = k_bank->sector_size >> 8;
+       uint32_t prog_size_bytes = k_chip->max_flash_prog_size;
 
        while (count > 0) {
                uint32_t size = prog_size_bytes - offset % prog_size_bytes;
@@ -1320,13 +1752,13 @@ static int kinetis_write_sections(struct flash_bank *bank, const uint8_t *buffer
                        memset(buffer_aligned, 0xff, size_aligned);
                        memcpy(buffer_aligned + align_begin, buffer, size);
 
-                       result = target_write_memory(bank->target, FLEXRAM,
+                       result = target_write_memory(bank->target, k_chip->progr_accel_ram,
                                                4, size_aligned / 4, buffer_aligned);
 
                        LOG_DEBUG("section @ %08" PRIx32 " aligned begin %" PRIu32 ", end %" PRIu32,
                                        bank->base + offset, align_begin, align_end);
                } else
-                       result = target_write_memory(bank->target, FLEXRAM,
+                       result = target_write_memory(bank->target, k_chip->progr_accel_ram,
                                                4, size_aligned / 4, buffer);
 
                LOG_DEBUG("write section @ %08" PRIx32 " with length %" PRIu32 " bytes",
@@ -1339,7 +1771,7 @@ static int kinetis_write_sections(struct flash_bank *bank, const uint8_t *buffer
 
                /* execute section-write command */
                result = kinetis_ftfx_command(bank->target, FTFx_CMD_SECTWRITE,
-                               kinfo->prog_base + offset - align_begin,
+                               k_bank->prog_base + offset - align_begin,
                                chunk_count>>8, chunk_count, 0, 0,
                                0, 0, 0, 0,  &ftfx_fstat);
 
@@ -1348,8 +1780,16 @@ static int kinetis_write_sections(struct flash_bank *bank, const uint8_t *buffer
                        break;
                }
 
-               if (ftfx_fstat & 0x01)
+               if (ftfx_fstat & 0x01) {
                        LOG_ERROR("Flash write error at %08" PRIx32, bank->base + offset);
+                       if (k_bank->prog_base == 0 && offset == FCF_ADDRESS + FCF_SIZE
+                                       && (k_chip->flash_support & FS_WIDTH_256BIT)) {
+                               LOG_ERROR("Flash write immediately after the end of Flash Config Field shows error");
+                               LOG_ERROR("because the flash memory is 256 bits wide (data were written correctly).");
+                               LOG_ERROR("Either change the linker script to add a gap of 16 bytes after FCF");
+                               LOG_ERROR("or set 'kinetis fcf_source write'");
+                       }
+               }
 
                buffer += size;
                offset += size;
@@ -1365,12 +1805,13 @@ static int kinetis_write_inner(struct flash_bank *bank, const uint8_t *buffer,
                         uint32_t offset, uint32_t count)
 {
        int result, fallback = 0;
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       struct kinetis_chip *k_chip = k_bank->k_chip;
 
-       if (!(kinfo->flash_support & FS_PROGRAM_SECTOR)) {
+       if (!(k_chip->flash_support & FS_PROGRAM_SECTOR)) {
                /* fallback to longword write */
                fallback = 1;
-               LOG_WARNING("This device supports Program Longword execution only.");
+               LOG_INFO("This device supports Program Longword execution only.");
        } else {
                result = kinetis_make_ram_ready(bank->target);
                if (result != ERROR_OK) {
@@ -1379,13 +1820,12 @@ static int kinetis_write_inner(struct flash_bank *bank, const uint8_t *buffer,
                }
        }
 
-       LOG_DEBUG("flash write @08%" PRIx32, bank->base + offset);
+       LOG_DEBUG("flash write @ %08" PRIx32, bank->base + offset);
 
        if (fallback == 0) {
                /* program section command */
                kinetis_write_sections(bank, buffer, offset, count);
-       }
-       else if (kinfo->flash_support & FS_PROGRAM_LONGWORD) {
+       } else if (k_chip->flash_support & FS_PROGRAM_LONGWORD) {
                /* program longword command, not supported in FTFE */
                uint8_t *new_buffer = NULL;
 
@@ -1412,7 +1852,7 @@ static int kinetis_write_inner(struct flash_bank *bank, const uint8_t *buffer,
 
                uint32_t words_remaining = count / 4;
 
-               kinetis_disable_wdog(bank->target, kinfo->sim_sdid);
+               kinetis_disable_wdog(k_chip);
 
                /* try using a block write */
                result = kinetis_write_block(bank, buffer, offset, words_remaining);
@@ -1428,7 +1868,7 @@ static int kinetis_write_inner(struct flash_bank *bank, const uint8_t *buffer,
 
                                LOG_DEBUG("write longword @ %08" PRIx32, (uint32_t)(bank->base + offset));
 
-                               result = kinetis_ftfx_command(bank->target, FTFx_CMD_LWORDPROG, kinfo->prog_base + offset,
+                               result = kinetis_ftfx_command(bank->target, FTFx_CMD_LWORDPROG, k_bank->prog_base + offset,
                                                buffer[3], buffer[2], buffer[1], buffer[0],
                                                0, 0, 0, 0,  &ftfx_fstat);
 
@@ -1451,7 +1891,7 @@ static int kinetis_write_inner(struct flash_bank *bank, const uint8_t *buffer,
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
-       kinetis_invalidate_flash_cache(bank);
+       kinetis_invalidate_flash_cache(k_chip);
        return result;
 }
 
@@ -1461,9 +1901,15 @@ static int kinetis_write(struct flash_bank *bank, const uint8_t *buffer,
 {
        int result;
        bool set_fcf = false;
+       bool fcf_in_data_valid = false;
        int sect = 0;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       struct kinetis_chip *k_chip = k_bank->k_chip;
+       uint8_t fcf_buffer[FCF_SIZE];
+       uint8_t fcf_current[FCF_SIZE];
+       uint8_t fcf_in_data[FCF_SIZE];
 
-       result = kinetis_check_run_mode(bank->target);
+       result = kinetis_check_run_mode(k_chip);
        if (result != ERROR_OK)
                return result;
 
@@ -1472,7 +1918,7 @@ static int kinetis_write(struct flash_bank *bank, const uint8_t *buffer,
        if (result != ERROR_OK)
                return result;
 
-       if (bank->base == 0 && !allow_fcf_writes) {
+       if (k_bank->prog_base == 0 && !allow_fcf_writes) {
                if (bank->sectors[1].offset <= FCF_ADDRESS)
                        sect = 1;       /* 1kb sector, FCF in 2nd sector */
 
@@ -1482,11 +1928,41 @@ static int kinetis_write(struct flash_bank *bank, const uint8_t *buffer,
        }
 
        if (set_fcf) {
-               uint8_t fcf_buffer[FCF_SIZE];
-               uint8_t fcf_current[FCF_SIZE];
-
                kinetis_fill_fcf(bank, fcf_buffer);
 
+               fcf_in_data_valid = offset <= FCF_ADDRESS
+                                        && offset + count >= FCF_ADDRESS + FCF_SIZE;
+               if (fcf_in_data_valid) {
+                       memcpy(fcf_in_data, buffer + FCF_ADDRESS - offset, FCF_SIZE);
+                       if (memcmp(fcf_in_data + FCF_FPROT, fcf_buffer, 4)) {
+                               fcf_in_data_valid = false;
+                               LOG_INFO("Flash protection requested in programmed file differs from current setting.");
+                       }
+                       if (fcf_in_data[FCF_FDPROT] != fcf_buffer[FCF_FDPROT]) {
+                               fcf_in_data_valid = false;
+                               LOG_INFO("Data flash protection requested in programmed file differs from current setting.");
+                       }
+                       if ((fcf_in_data[FCF_FSEC] & 3) != 2) {
+                               fcf_in_data_valid = false;
+                               LOG_INFO("Device security requested in programmed file!");
+                       } else if (k_chip->flash_support & FS_ECC
+                           && fcf_in_data[FCF_FSEC] != fcf_buffer[FCF_FSEC]) {
+                               fcf_in_data_valid = false;
+                               LOG_INFO("Strange unsecure mode 0x%02" PRIx8
+                                        "requested in programmed file!",
+                                        fcf_in_data[FCF_FSEC]);
+                       }
+                       if ((k_chip->flash_support & FS_ECC || fcf_fopt_configured)
+                           && fcf_in_data[FCF_FOPT] != fcf_fopt) {
+                               fcf_in_data_valid = false;
+                               LOG_INFO("FOPT requested in programmed file differs from current setting.");
+                       }
+                       if (!fcf_in_data_valid)
+                               LOG_INFO("Expect verify errors at FCF (0x408-0x40f).");
+               }
+       }
+
+       if (set_fcf && !fcf_in_data_valid) {
                if (offset < FCF_ADDRESS) {
                        /* write part preceding FCF */
                        result = kinetis_write_inner(bank, buffer, offset, FCF_ADDRESS - offset);
@@ -1494,7 +1970,7 @@ static int kinetis_write(struct flash_bank *bank, const uint8_t *buffer,
                                return result;
                }
 
-               result = target_read_memory(bank->target, FCF_ADDRESS, 4, FCF_SIZE / 4, fcf_current);
+               result = target_read_memory(bank->target, bank->base + FCF_ADDRESS, 4, FCF_SIZE / 4, fcf_current);
                if (result == ERROR_OK && memcmp(fcf_current, fcf_buffer, FCF_SIZE) == 0)
                        set_fcf = false;
 
@@ -1515,41 +1991,69 @@ static int kinetis_write(struct flash_bank *bank, const uint8_t *buffer,
                }
                return result;
 
-       } else
+       } else {
                /* no FCF fiddling, normal write */
                return kinetis_write_inner(bank, buffer, offset, count);
+       }
 }
 
 
-static int kinetis_probe(struct flash_bank *bank)
+static int kinetis_probe_chip(struct kinetis_chip *k_chip)
 {
-       int result, i;
+       int result;
        uint8_t fcfg1_nvmsize, fcfg1_pfsize, fcfg1_eesize, fcfg1_depart;
-       uint8_t fcfg2_maxaddr0, fcfg2_pflsh, fcfg2_maxaddr1;
-       uint32_t nvm_size = 0, pf_size = 0, df_size = 0, ee_size = 0;
-       unsigned num_blocks = 0, num_pflash_blocks = 0, num_nvm_blocks = 0, first_nvm_bank = 0,
-                       pflash_sector_size_bytes = 0, nvm_sector_size_bytes = 0;
-       struct target *target = bank->target;
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
-
-       kinfo->probed = false;
-
-       result = target_read_u32(target, SIM_SDID, &kinfo->sim_sdid);
+       uint8_t fcfg2_pflsh;
+       uint32_t ee_size = 0;
+       uint32_t pflash_size_k, nvm_size_k, dflash_size_k;
+       uint32_t pflash_size_m;
+       unsigned num_blocks = 0;
+       unsigned maxaddr_shift = 13;
+       struct target *target = k_chip->target;
+
+       unsigned familyid = 0, subfamid = 0;
+       unsigned cpu_mhz = 120;
+       unsigned idx;
+       bool use_nvm_marking = false;
+       char flash_marking[12], nvm_marking[2];
+       char name[40];
+
+       k_chip->probed = false;
+       k_chip->pflash_sector_size = 0;
+       k_chip->pflash_base = 0;
+       k_chip->nvm_base = 0x10000000;
+       k_chip->progr_accel_ram = FLEXRAM;
+
+       name[0] = '\0';
+
+       if (k_chip->sim_base)
+               result = target_read_u32(target, k_chip->sim_base + SIM_SDID_OFFSET, &k_chip->sim_sdid);
+       else {
+               result = target_read_u32(target, SIM_BASE + SIM_SDID_OFFSET, &k_chip->sim_sdid);
+               if (result == ERROR_OK)
+                       k_chip->sim_base = SIM_BASE;
+               else {
+                       result = target_read_u32(target, SIM_BASE_KL28 + SIM_SDID_OFFSET, &k_chip->sim_sdid);
+                       if (result == ERROR_OK)
+                               k_chip->sim_base = SIM_BASE_KL28;
+               }
+       }
        if (result != ERROR_OK)
                return result;
 
-       if ((kinfo->sim_sdid & (~KINETIS_SDID_K_SERIES_MASK)) == 0) {
+       if ((k_chip->sim_sdid & (~KINETIS_SDID_K_SERIES_MASK)) == 0) {
                /* older K-series MCU */
-               uint32_t mcu_type = kinfo->sim_sdid & KINETIS_K_SDID_TYPE_MASK;
+               uint32_t mcu_type = k_chip->sim_sdid & KINETIS_K_SDID_TYPE_MASK;
+               k_chip->cache_type = KINETIS_CACHE_K;
+               k_chip->watchdog_type = KINETIS_WDOG_K;
 
                switch (mcu_type) {
                case KINETIS_K_SDID_K10_M50:
                case KINETIS_K_SDID_K20_M50:
                        /* 1kB sectors */
-                       pflash_sector_size_bytes = 1<<10;
-                       nvm_sector_size_bytes = 1<<10;
+                       k_chip->pflash_sector_size = 1<<10;
+                       k_chip->nvm_sector_size = 1<<10;
                        num_blocks = 2;
-                       kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
+                       k_chip->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR;
                        break;
                case KINETIS_K_SDID_K10_M72:
                case KINETIS_K_SDID_K20_M72:
@@ -1559,11 +2063,11 @@ static int kinetis_probe(struct flash_bank *bank)
                case KINETIS_K_SDID_K40_M100:
                case KINETIS_K_SDID_K50_M72:
                        /* 2kB sectors, 1kB FlexNVM sectors */
-                       pflash_sector_size_bytes = 2<<10;
-                       nvm_sector_size_bytes = 1<<10;
+                       k_chip->pflash_sector_size = 2<<10;
+                       k_chip->nvm_sector_size = 1<<10;
                        num_blocks = 2;
-                       kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
-                       kinfo->max_flash_prog_size = 1<<10;
+                       k_chip->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR;
+                       k_chip->max_flash_prog_size = 1<<10;
                        break;
                case KINETIS_K_SDID_K10_M100:
                case KINETIS_K_SDID_K20_M100:
@@ -1575,161 +2079,347 @@ static int kinetis_probe(struct flash_bank *bank)
                case KINETIS_K_SDID_K53:
                case KINETIS_K_SDID_K60_M100:
                        /* 2kB sectors */
-                       pflash_sector_size_bytes = 2<<10;
-                       nvm_sector_size_bytes = 2<<10;
+                       k_chip->pflash_sector_size = 2<<10;
+                       k_chip->nvm_sector_size = 2<<10;
                        num_blocks = 2;
-                       kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
+                       k_chip->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR;
                        break;
                case KINETIS_K_SDID_K21_M120:
                case KINETIS_K_SDID_K22_M120:
                        /* 4kB sectors (MK21FN1M0, MK21FX512, MK22FN1M0, MK22FX512) */
-                       pflash_sector_size_bytes = 4<<10;
-                       kinfo->max_flash_prog_size = 1<<10;
-                       nvm_sector_size_bytes = 4<<10;
+                       k_chip->pflash_sector_size = 4<<10;
+                       k_chip->max_flash_prog_size = 1<<10;
+                       k_chip->nvm_sector_size = 4<<10;
                        num_blocks = 2;
-                       kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
+                       k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
                        break;
                case KINETIS_K_SDID_K10_M120:
                case KINETIS_K_SDID_K20_M120:
                case KINETIS_K_SDID_K60_M150:
                case KINETIS_K_SDID_K70_M150:
                        /* 4kB sectors */
-                       pflash_sector_size_bytes = 4<<10;
-                       nvm_sector_size_bytes = 4<<10;
+                       k_chip->pflash_sector_size = 4<<10;
+                       k_chip->nvm_sector_size = 4<<10;
                        num_blocks = 4;
-                       kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
+                       k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
                        break;
                default:
                        LOG_ERROR("Unsupported K-family FAMID");
                }
+
+               for (idx = 0; idx < ARRAY_SIZE(kinetis_types_old); idx++) {
+                       if (kinetis_types_old[idx].sdid == mcu_type) {
+                               strcpy(name, kinetis_types_old[idx].name);
+                               use_nvm_marking = true;
+                               break;
+                       }
+               }
+
        } else {
                /* Newer K-series or KL series MCU */
-               switch (kinfo->sim_sdid & KINETIS_SDID_SERIESID_MASK) {
+               familyid = (k_chip->sim_sdid & KINETIS_SDID_FAMILYID_MASK) >> KINETIS_SDID_FAMILYID_SHIFT;
+               subfamid = (k_chip->sim_sdid & KINETIS_SDID_SUBFAMID_MASK) >> KINETIS_SDID_SUBFAMID_SHIFT;
+
+               switch (k_chip->sim_sdid & KINETIS_SDID_SERIESID_MASK) {
                case KINETIS_SDID_SERIESID_K:
-                       switch (kinfo->sim_sdid & (KINETIS_SDID_FAMILYID_MASK | KINETIS_SDID_SUBFAMID_MASK)) {
+                       use_nvm_marking = true;
+                       k_chip->cache_type = KINETIS_CACHE_K;
+                       k_chip->watchdog_type = KINETIS_WDOG_K;
+
+                       switch (k_chip->sim_sdid & (KINETIS_SDID_FAMILYID_MASK | KINETIS_SDID_SUBFAMID_MASK)) {
                        case KINETIS_SDID_FAMILYID_K0X | KINETIS_SDID_SUBFAMID_KX2:
                                /* K02FN64, K02FN128: FTFA, 2kB sectors */
-                               pflash_sector_size_bytes = 2<<10;
+                               k_chip->pflash_sector_size = 2<<10;
                                num_blocks = 1;
-                               kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE_K;
+                               k_chip->flash_support = FS_PROGRAM_LONGWORD;
+                               cpu_mhz = 100;
                                break;
 
                        case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX2: {
                                /* MK24FN1M reports as K22, this should detect it (according to errata note 1N83J) */
                                uint32_t sopt1;
-                               result = target_read_u32(target, SIM_SOPT1, &sopt1);
+                               result = target_read_u32(target, k_chip->sim_base + SIM_SOPT1_OFFSET, &sopt1);
                                if (result != ERROR_OK)
                                        return result;
 
-                               if (((kinfo->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K24FN1M) &&
+                               if (((k_chip->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K24FN1M) &&
                                                ((sopt1 & KINETIS_SOPT1_RAMSIZE_MASK) == KINETIS_SOPT1_RAMSIZE_K24FN1M)) {
                                        /* MK24FN1M */
-                                       pflash_sector_size_bytes = 4<<10;
+                                       k_chip->pflash_sector_size = 4<<10;
                                        num_blocks = 2;
-                                       kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
-                                       kinfo->max_flash_prog_size = 1<<10;
+                                       k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+                                       k_chip->max_flash_prog_size = 1<<10;
+                                       subfamid = 4; /* errata 1N83J fix */
                                        break;
                                }
-                               if ((kinfo->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K22FN128
-                                       || (kinfo->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K22FN256
-                                       || (kinfo->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K22FN512) {
+                               if ((k_chip->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K22FN128
+                                       || (k_chip->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K22FN256
+                                       || (k_chip->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K22FN512) {
                                        /* K22 with new-style SDID - smaller pflash with FTFA, 2kB sectors */
-                                       pflash_sector_size_bytes = 2<<10;
+                                       k_chip->pflash_sector_size = 2<<10;
                                        /* autodetect 1 or 2 blocks */
-                                       kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE_K;
+                                       k_chip->flash_support = FS_PROGRAM_LONGWORD;
                                        break;
                                }
                                LOG_ERROR("Unsupported Kinetis K22 DIEID");
                                break;
                        }
                        case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX4:
-                               pflash_sector_size_bytes = 4<<10;
-                               if ((kinfo->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K24FN256) {
+                               k_chip->pflash_sector_size = 4<<10;
+                               if ((k_chip->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K24FN256) {
                                        /* K24FN256 - smaller pflash with FTFA */
                                        num_blocks = 1;
-                                       kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE_K;
+                                       k_chip->flash_support = FS_PROGRAM_LONGWORD;
                                        break;
                                }
                                /* K24FN1M without errata 7534 */
                                num_blocks = 2;
-                               kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
-                               kinfo->max_flash_prog_size = 1<<10;
+                               k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+                               k_chip->max_flash_prog_size = 1<<10;
                                break;
 
-                       case KINETIS_SDID_FAMILYID_K6X | KINETIS_SDID_SUBFAMID_KX3:
                        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:
-                       case KINETIS_SDID_FAMILYID_K6X | KINETIS_SDID_SUBFAMID_KX2:     /* errata 7534 - should be K64 */
                                /* K64FN1M0, K64FX512 */
-                               pflash_sector_size_bytes = 4<<10;
-                               nvm_sector_size_bytes = 4<<10;
-                               kinfo->max_flash_prog_size = 1<<10;
+                               k_chip->pflash_sector_size = 4<<10;
+                               k_chip->nvm_sector_size = 4<<10;
+                               k_chip->max_flash_prog_size = 1<<10;
                                num_blocks = 2;
-                               kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
+                               k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
                                break;
 
                        case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX6:
                                /* K26FN2M0 */
                        case KINETIS_SDID_FAMILYID_K6X | KINETIS_SDID_SUBFAMID_KX6:
                                /* K66FN2M0, K66FX1M0 */
-                               pflash_sector_size_bytes = 4<<10;
-                               nvm_sector_size_bytes = 4<<10;
-                               kinfo->max_flash_prog_size = 1<<10;
+                               k_chip->pflash_sector_size = 4<<10;
+                               k_chip->nvm_sector_size = 4<<10;
+                               k_chip->max_flash_prog_size = 1<<10;
                                num_blocks = 4;
-                               kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE_K;
+                               k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_ECC;
+                               cpu_mhz = 180;
+                               break;
+
+                       case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX7:
+                               /* K27FN2M0 */
+                       case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX8:
+                               /* K28FN2M0 */
+                               k_chip->pflash_sector_size = 4<<10;
+                               k_chip->max_flash_prog_size = 1<<10;
+                               num_blocks = 4;
+                               k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_ECC;
+                               cpu_mhz = 150;
+                               break;
+
+                       case KINETIS_SDID_FAMILYID_K8X | KINETIS_SDID_SUBFAMID_KX0:
+                       case KINETIS_SDID_FAMILYID_K8X | KINETIS_SDID_SUBFAMID_KX1:
+                       case KINETIS_SDID_FAMILYID_K8X | KINETIS_SDID_SUBFAMID_KX2:
+                               /* K80FN256, K81FN256, K82FN256 */
+                               k_chip->pflash_sector_size = 4<<10;
+                               num_blocks = 1;
+                               k_chip->flash_support = FS_PROGRAM_LONGWORD | FS_NO_CMD_BLOCKSTAT;
+                               cpu_mhz = 150;
+                               break;
+
+                       case KINETIS_SDID_FAMILYID_KL8X | KINETIS_SDID_SUBFAMID_KX1:
+                       case KINETIS_SDID_FAMILYID_KL8X | KINETIS_SDID_SUBFAMID_KX2:
+                               /* KL81Z128, KL82Z128 */
+                               k_chip->pflash_sector_size = 2<<10;
+                               num_blocks = 1;
+                               k_chip->flash_support = FS_PROGRAM_LONGWORD | FS_NO_CMD_BLOCKSTAT;
+                               k_chip->cache_type = KINETIS_CACHE_L;
+
+                               use_nvm_marking = false;
+                               snprintf(name, sizeof(name), "MKL8%uZ%%s7",
+                                        subfamid);
                                break;
+
                        default:
                                LOG_ERROR("Unsupported Kinetis FAMILYID SUBFAMID");
                        }
+
+                       if (name[0] == '\0')
+                               snprintf(name, sizeof(name), "MK%u%uF%%s%u",
+                                        familyid, subfamid, cpu_mhz / 10);
                        break;
 
                case KINETIS_SDID_SERIESID_KL:
                        /* KL-series */
-                       pflash_sector_size_bytes = 1<<10;
-                       nvm_sector_size_bytes = 1<<10;
+                       k_chip->pflash_sector_size = 1<<10;
+                       k_chip->nvm_sector_size = 1<<10;
                        /* autodetect 1 or 2 blocks */
-                       kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE_L;
+                       k_chip->flash_support = FS_PROGRAM_LONGWORD;
+                       k_chip->cache_type = KINETIS_CACHE_L;
+                       k_chip->watchdog_type = KINETIS_WDOG_COP;
+
+                       cpu_mhz = 48;
+                       switch (k_chip->sim_sdid & (KINETIS_SDID_FAMILYID_MASK | KINETIS_SDID_SUBFAMID_MASK)) {
+                       case KINETIS_SDID_FAMILYID_K1X | KINETIS_SDID_SUBFAMID_KX3:
+                       case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX3:
+                               subfamid = 7;
+                               break;
+
+                       case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX8:
+                               cpu_mhz = 72;
+                               k_chip->pflash_sector_size = 2<<10;
+                               num_blocks = 2;
+                               k_chip->watchdog_type = KINETIS_WDOG32_KL28;
+                               k_chip->sysmodectrlr_type = KINETIS_SMC32;
+                               break;
+                       }
+
+                       snprintf(name, sizeof(name), "MKL%u%uZ%%s%u",
+                                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 */
-                       switch (kinfo->sim_sdid & (KINETIS_SDID_FAMILYID_MASK | KINETIS_SDID_SUBFAMID_MASK)) {
+                       k_chip->watchdog_type = KINETIS_WDOG_K;
+                       switch (k_chip->sim_sdid & (KINETIS_SDID_FAMILYID_MASK | KINETIS_SDID_SUBFAMID_MASK)) {
                        case KINETIS_SDID_FAMILYID_K1X | KINETIS_SDID_SUBFAMID_KX0:
                                /* KV10: FTFA, 1kB sectors */
-                               pflash_sector_size_bytes = 1<<10;
+                               k_chip->pflash_sector_size = 1<<10;
                                num_blocks = 1;
-                               kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE_L;
+                               k_chip->flash_support = FS_PROGRAM_LONGWORD;
+                               k_chip->cache_type = KINETIS_CACHE_L;
+                               strcpy(name, "MKV10Z%s7");
                                break;
 
                        case KINETIS_SDID_FAMILYID_K1X | KINETIS_SDID_SUBFAMID_KX1:
                                /* KV11: FTFA, 2kB sectors */
-                               pflash_sector_size_bytes = 2<<10;
+                               k_chip->pflash_sector_size = 2<<10;
                                num_blocks = 1;
-                               kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE_L;
+                               k_chip->flash_support = FS_PROGRAM_LONGWORD;
+                               k_chip->cache_type = KINETIS_CACHE_L;
+                               strcpy(name, "MKV11Z%s7");
                                break;
 
                        case KINETIS_SDID_FAMILYID_K3X | KINETIS_SDID_SUBFAMID_KX0:
                                /* KV30: FTFA, 2kB sectors, 1 block */
                        case KINETIS_SDID_FAMILYID_K3X | KINETIS_SDID_SUBFAMID_KX1:
                                /* KV31: FTFA, 2kB sectors, 2 blocks */
-                               pflash_sector_size_bytes = 2<<10;
+                               k_chip->pflash_sector_size = 2<<10;
                                /* autodetect 1 or 2 blocks */
-                               kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE_K;
+                               k_chip->flash_support = FS_PROGRAM_LONGWORD;
+                               k_chip->cache_type = KINETIS_CACHE_K;
                                break;
 
                        case KINETIS_SDID_FAMILYID_K4X | KINETIS_SDID_SUBFAMID_KX2:
                        case KINETIS_SDID_FAMILYID_K4X | KINETIS_SDID_SUBFAMID_KX4:
                        case KINETIS_SDID_FAMILYID_K4X | KINETIS_SDID_SUBFAMID_KX6:
                                /* KV4x: FTFA, 4kB sectors */
-                               pflash_sector_size_bytes = 4<<10;
+                               k_chip->pflash_sector_size = 4<<10;
+                               num_blocks = 1;
+                               k_chip->flash_support = FS_PROGRAM_LONGWORD;
+                               k_chip->cache_type = KINETIS_CACHE_K;
+                               cpu_mhz = 168;
+                               break;
+
+                       case KINETIS_SDID_FAMILYID_K5X | KINETIS_SDID_SUBFAMID_KX6:
+                       case KINETIS_SDID_FAMILYID_K5X | KINETIS_SDID_SUBFAMID_KX8:
+                               /* KV5x: FTFE, 8kB sectors */
+                               k_chip->pflash_sector_size = 8<<10;
+                               k_chip->max_flash_prog_size = 1<<10;
                                num_blocks = 1;
-                               kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE_K;
+                               maxaddr_shift = 14;
+                               k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_WIDTH_256BIT | FS_ECC;
+                               k_chip->pflash_base = 0x10000000;
+                               k_chip->progr_accel_ram = 0x18000000;
+                               cpu_mhz = 240;
                                break;
 
                        default:
                                LOG_ERROR("Unsupported KV FAMILYID SUBFAMID");
                        }
+
+                       if (name[0] == '\0')
+                               snprintf(name, sizeof(name), "MKV%u%uF%%s%u",
+                                        familyid, subfamid, cpu_mhz / 10);
+                       break;
+
+               case KINETIS_SDID_SERIESID_KE:
+                       /* KE1x-series */
+                       k_chip->watchdog_type = KINETIS_WDOG32_KE1X;
+                       switch (k_chip->sim_sdid &
+                               (KINETIS_SDID_FAMILYID_MASK | KINETIS_SDID_SUBFAMID_MASK | KINETIS_SDID_PROJECTID_MASK)) {
+                       case KINETIS_SDID_FAMILYID_K1X | KINETIS_SDID_SUBFAMID_KX4 | KINETIS_SDID_PROJECTID_KE1xZ:
+                       case KINETIS_SDID_FAMILYID_K1X | KINETIS_SDID_SUBFAMID_KX5 | KINETIS_SDID_PROJECTID_KE1xZ:
+                               /* KE1xZ: FTFE, 2kB sectors */
+                               k_chip->pflash_sector_size = 2<<10;
+                               k_chip->nvm_sector_size = 2<<10;
+                               k_chip->max_flash_prog_size = 1<<9;
+                               num_blocks = 2;
+                               k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+                               k_chip->cache_type = KINETIS_CACHE_L;
+
+                               cpu_mhz = 72;
+                               snprintf(name, sizeof(name), "MKE%u%uZ%%s%u",
+                                        familyid, subfamid, cpu_mhz / 10);
+                               break;
+
+                       case KINETIS_SDID_FAMILYID_K1X | KINETIS_SDID_SUBFAMID_KX4 | KINETIS_SDID_PROJECTID_KE1xF:
+                       case KINETIS_SDID_FAMILYID_K1X | KINETIS_SDID_SUBFAMID_KX6 | KINETIS_SDID_PROJECTID_KE1xF:
+                       case KINETIS_SDID_FAMILYID_K1X | KINETIS_SDID_SUBFAMID_KX8 | KINETIS_SDID_PROJECTID_KE1xF:
+                               /* KE1xF: FTFE, 4kB sectors */
+                               k_chip->pflash_sector_size = 4<<10;
+                               k_chip->nvm_sector_size = 2<<10;
+                               k_chip->max_flash_prog_size = 1<<10;
+                               num_blocks = 2;
+                               k_chip->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+                               k_chip->cache_type = KINETIS_CACHE_MSCM;
+
+                               cpu_mhz = 168;
+                               snprintf(name, sizeof(name), "MKE%u%uF%%s%u",
+                                        familyid, subfamid, cpu_mhz / 10);
+                               break;
+
+                       default:
+                               LOG_ERROR("Unsupported KE FAMILYID SUBFAMID");
+                       }
                        break;
 
                default:
@@ -1737,37 +2427,39 @@ static int kinetis_probe(struct flash_bank *bank)
                }
        }
 
-       if (pflash_sector_size_bytes == 0) {
-               LOG_ERROR("MCU is unsupported, SDID 0x%08" PRIx32, kinfo->sim_sdid);
+       if (k_chip->pflash_sector_size == 0) {
+               LOG_ERROR("MCU is unsupported, SDID 0x%08" PRIx32, k_chip->sim_sdid);
                return ERROR_FLASH_OPER_UNSUPPORTED;
        }
 
-       result = target_read_u32(target, SIM_FCFG1, &kinfo->sim_fcfg1);
+       result = target_read_u32(target, k_chip->sim_base + SIM_FCFG1_OFFSET, &k_chip->sim_fcfg1);
        if (result != ERROR_OK)
                return result;
 
-       result = target_read_u32(target, SIM_FCFG2, &kinfo->sim_fcfg2);
+       result = target_read_u32(target, k_chip->sim_base + SIM_FCFG2_OFFSET, &k_chip->sim_fcfg2);
        if (result != ERROR_OK)
                return result;
 
-       LOG_DEBUG("SDID: 0x%08" PRIX32 " FCFG1: 0x%08" PRIX32 " FCFG2: 0x%08" PRIX32, kinfo->sim_sdid,
-                       kinfo->sim_fcfg1, kinfo->sim_fcfg2);
+       LOG_DEBUG("SDID: 0x%08" PRIX32 " FCFG1: 0x%08" PRIX32 " FCFG2: 0x%08" PRIX32, k_chip->sim_sdid,
+                       k_chip->sim_fcfg1, k_chip->sim_fcfg2);
 
-       fcfg1_nvmsize = (uint8_t)((kinfo->sim_fcfg1 >> 28) & 0x0f);
-       fcfg1_pfsize = (uint8_t)((kinfo->sim_fcfg1 >> 24) & 0x0f);
-       fcfg1_eesize = (uint8_t)((kinfo->sim_fcfg1 >> 16) & 0x0f);
-       fcfg1_depart = (uint8_t)((kinfo->sim_fcfg1 >> 8) & 0x0f);
+       fcfg1_nvmsize = (uint8_t)((k_chip->sim_fcfg1 >> 28) & 0x0f);
+       fcfg1_pfsize = (uint8_t)((k_chip->sim_fcfg1 >> 24) & 0x0f);
+       fcfg1_eesize = (uint8_t)((k_chip->sim_fcfg1 >> 16) & 0x0f);
+       fcfg1_depart = (uint8_t)((k_chip->sim_fcfg1 >> 8) & 0x0f);
 
-       fcfg2_pflsh = (uint8_t)((kinfo->sim_fcfg2 >> 23) & 0x01);
-       fcfg2_maxaddr0 = (uint8_t)((kinfo->sim_fcfg2 >> 24) & 0x7f);
-       fcfg2_maxaddr1 = (uint8_t)((kinfo->sim_fcfg2 >> 16) & 0x7f);
+       fcfg2_pflsh = (uint8_t)((k_chip->sim_fcfg2 >> 23) & 0x01);
+       k_chip->fcfg2_maxaddr0_shifted = ((k_chip->sim_fcfg2 >> 24) & 0x7f) << maxaddr_shift;
+       k_chip->fcfg2_maxaddr1_shifted = ((k_chip->sim_fcfg2 >> 16) & 0x7f) << maxaddr_shift;
 
        if (num_blocks == 0)
-               num_blocks = fcfg2_maxaddr1 ? 2 : 1;
-       else if (fcfg2_maxaddr1 == 0 && num_blocks >= 2) {
+               num_blocks = k_chip->fcfg2_maxaddr1_shifted ? 2 : 1;
+       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 (fcfg2_maxaddr1 != 0 && num_blocks == 1) {
+       } else if (k_chip->fcfg2_maxaddr1_shifted != 0 && num_blocks == 1) {
                num_blocks = 2;
                LOG_WARNING("MAXADDR1 is non zero, number of flash banks adjusted to 2");
        }
@@ -1780,17 +2472,17 @@ static int kinetis_probe(struct flash_bank *bank)
                case 0x07:
                case 0x09:
                case 0x0b:
-                       nvm_size = 1 << (14 + (fcfg1_nvmsize >> 1));
+                       k_chip->nvm_size = 1 << (14 + (fcfg1_nvmsize >> 1));
                        break;
                case 0x0f:
-                       if (pflash_sector_size_bytes >= 4<<10)
-                               nvm_size = 512<<10;
+                       if (k_chip->pflash_sector_size >= 4<<10)
+                               k_chip->nvm_size = 512<<10;
                        else
                                /* K20_100 */
-                               nvm_size = 256<<10;
+                               k_chip->nvm_size = 256<<10;
                        break;
                default:
-                       nvm_size = 0;
+                       k_chip->nvm_size = 0;
                        break;
                }
 
@@ -1819,136 +2511,204 @@ static int kinetis_probe(struct flash_bank *bank)
                case 0x04:
                case 0x05:
                case 0x06:
-                       df_size = nvm_size - (4096 << fcfg1_depart);
+                       k_chip->dflash_size = k_chip->nvm_size - (4096 << fcfg1_depart);
                        break;
+               case 0x07:
                case 0x08:
-                       df_size = 0;
+                       k_chip->dflash_size = 0;
                        break;
                case 0x09:
                case 0x0a:
                case 0x0b:
                case 0x0c:
                case 0x0d:
-                       df_size = 4096 << (fcfg1_depart & 0x7);
+                       k_chip->dflash_size = 4096 << (fcfg1_depart & 0x7);
                        break;
                default:
-                       df_size = nvm_size;
+                       k_chip->dflash_size = k_chip->nvm_size;
                        break;
                }
        }
 
        switch (fcfg1_pfsize) {
+       case 0x00:
+               k_chip->pflash_size = 8192;
+               break;
+       case 0x01:
        case 0x03:
        case 0x05:
        case 0x07:
        case 0x09:
        case 0x0b:
        case 0x0d:
-               pf_size = 1 << (14 + (fcfg1_pfsize >> 1));
+               k_chip->pflash_size = 1 << (14 + (fcfg1_pfsize >> 1));
                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
                 * K22P100M120SF5RM     1024 KB ... duplicate of code 0xd
                 * K26P169M180SF5RM     2048 KB ... the only unique value
-                * fcfg2_maxaddr0 seems to be the only clue to pf_size
-                * Checking fcfg2_maxaddr0 later in this routine is pointless then
+                * fcfg2_maxaddr0 seems to be the only clue to pflash_size
+                * Checking fcfg2_maxaddr0 in bank probe is pointless then
                 */
                if (fcfg2_pflsh)
-                       pf_size = ((uint32_t)fcfg2_maxaddr0 << 13) * num_blocks;
+                       k_chip->pflash_size = k_chip->fcfg2_maxaddr0_shifted * num_blocks;
                else
-                       pf_size = ((uint32_t)fcfg2_maxaddr0 << 13) * num_blocks / 2;
-               if (pf_size != 2048<<10)
-                       LOG_WARNING("SIM_FCFG1 PFSIZE = 0xf: please check if pflash is %u KB", pf_size>>10);
+                       k_chip->pflash_size = k_chip->fcfg2_maxaddr0_shifted * num_blocks / 2;
+               if (k_chip->pflash_size != 2048<<10)
+                       LOG_WARNING("SIM_FCFG1 PFSIZE = 0xf: please check if pflash is %u KB", k_chip->pflash_size>>10);
 
                break;
        default:
-               pf_size = 0;
+               k_chip->pflash_size = 0;
                break;
        }
 
-       LOG_DEBUG("FlexNVM: %" PRIu32 " PFlash: %" PRIu32 " FlexRAM: %" PRIu32 " PFLSH: %d",
-                 nvm_size, pf_size, ee_size, fcfg2_pflsh);
+       if (k_chip->flash_support & FS_PROGRAM_SECTOR && k_chip->max_flash_prog_size == 0) {
+               k_chip->max_flash_prog_size = k_chip->pflash_sector_size;
+               /* Program section size is equal to sector size by default */
+       }
+
+       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';
+               nvm_marking[1] = '\0';
+       } else
+               nvm_marking[0] = '\0';
+
+       pflash_size_k = k_chip->pflash_size / 1024;
+       pflash_size_m = pflash_size_k / 1024;
+       if (pflash_size_m)
+               snprintf(flash_marking, sizeof(flash_marking), "%s%" PRIu32 "M0xxx", nvm_marking, pflash_size_m);
+       else
+               snprintf(flash_marking, sizeof(flash_marking), "%s%" PRIu32 "xxx", nvm_marking, pflash_size_k);
+
+       snprintf(k_chip->name, sizeof(k_chip->name), name, flash_marking);
+       LOG_INFO("Kinetis %s detected: %u flash blocks", k_chip->name, num_blocks);
+       LOG_INFO("%u PFlash banks: %" PRIu32 "k total", k_chip->num_pflash_blocks, pflash_size_k);
+       if (k_chip->num_nvm_blocks) {
+               nvm_size_k = k_chip->nvm_size / 1024;
+               dflash_size_k = k_chip->dflash_size / 1024;
+               LOG_INFO("%u FlexNVM banks: %" PRIu32 "k total, %" PRIu32 "k available as data flash, %" PRIu32 "bytes FlexRAM",
+                        k_chip->num_nvm_blocks, nvm_size_k, dflash_size_k, ee_size);
+       }
+
+       k_chip->probed = true;
 
-       num_pflash_blocks = num_blocks / (2 - fcfg2_pflsh);
-       first_nvm_bank = num_pflash_blocks;
-       num_nvm_blocks = num_blocks - num_pflash_blocks;
+       if (create_banks)
+               kinetis_create_missing_banks(k_chip);
 
-       LOG_DEBUG("%d blocks total: %d PFlash, %d FlexNVM",
-                       num_blocks, num_pflash_blocks, num_nvm_blocks);
+       return ERROR_OK;
+}
+
+static int kinetis_probe(struct flash_bank *bank)
+{
+       int result, i;
+       uint8_t fcfg2_maxaddr0, fcfg2_pflsh, fcfg2_maxaddr1;
+       unsigned num_blocks, first_nvm_bank;
+       uint32_t size_k;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       struct kinetis_chip *k_chip = k_bank->k_chip;
+
+       k_bank->probed = false;
+
+       if (!k_chip->probed) {
+               result = kinetis_probe_chip(k_chip);
+               if (result != ERROR_OK)
+                       return result;
+       }
 
-       LOG_INFO("Probing flash info for bank %d", bank->bank_number);
+       num_blocks = k_chip->num_pflash_blocks + k_chip->num_nvm_blocks;
+       first_nvm_bank = k_chip->num_pflash_blocks;
 
-       if ((unsigned)bank->bank_number < num_pflash_blocks) {
+       if (k_bank->bank_number < k_chip->num_pflash_blocks) {
                /* pflash, banks start at address zero */
-               kinfo->flash_class = FC_PFLASH;
-               bank->size = (pf_size / num_pflash_blocks);
-               bank->base = 0x00000000 + bank->size * bank->bank_number;
-               kinfo->prog_base = bank->base;
-               kinfo->sector_size = pflash_sector_size_bytes;
+               k_bank->flash_class = FC_PFLASH;
+               bank->size = (k_chip->pflash_size / k_chip->num_pflash_blocks);
+               bank->base = k_chip->pflash_base + bank->size * k_bank->bank_number;
+               k_bank->prog_base = 0x00000000 + bank->size * k_bank->bank_number;
+               k_bank->sector_size = k_chip->pflash_sector_size;
                /* pflash is divided into 32 protection areas for
                 * parts with more than 32K of PFlash. For parts with
                 * less the protection unit is set to 1024 bytes */
-               kinfo->protection_size = MAX(pf_size / 32, 1024);
-               bank->num_prot_blocks = 32 / num_pflash_blocks;
-               kinfo->protection_block = bank->num_prot_blocks * bank->bank_number;
+               k_bank->protection_size = MAX(k_chip->pflash_size / 32, 1024);
+               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;
+               LOG_DEBUG("Kinetis bank %u: %" PRIu32 "k PFlash, FTFx base 0x%08" PRIx32 ", sect %u",
+                        k_bank->bank_number, size_k, k_bank->prog_base, k_bank->sector_size);
 
-       } else if ((unsigned)bank->bank_number < num_blocks) {
+       } else if (k_bank->bank_number < num_blocks) {
                /* nvm, banks start at address 0x10000000 */
-               unsigned nvm_ord = bank->bank_number - first_nvm_bank;
+               unsigned nvm_ord = k_bank->bank_number - first_nvm_bank;
                uint32_t limit;
 
-               kinfo->flash_class = FC_FLEX_NVM;
-               bank->size = (nvm_size / num_nvm_blocks);
-               bank->base = 0x10000000 + bank->size * nvm_ord;
-               kinfo->prog_base = 0x00800000 + bank->size * nvm_ord;
-               kinfo->sector_size = nvm_sector_size_bytes;
-               if (df_size == 0) {
-                       kinfo->protection_size = 0;
+               k_bank->flash_class = FC_FLEX_NVM;
+               bank->size = k_chip->nvm_size / k_chip->num_nvm_blocks;
+               bank->base = k_chip->nvm_base + bank->size * nvm_ord;
+               k_bank->prog_base = 0x00800000 + bank->size * nvm_ord;
+               k_bank->sector_size = k_chip->nvm_sector_size;
+               if (k_chip->dflash_size == 0) {
+                       k_bank->protection_size = 0;
                } else {
-                       for (i = df_size; ~i & 1; i >>= 1)
+                       for (i = k_chip->dflash_size; ~i & 1; i >>= 1)
                                ;
                        if (i == 1)
-                               kinfo->protection_size = df_size / 8;   /* data flash size = 2^^n */
+                               k_bank->protection_size = k_chip->dflash_size / 8;      /* data flash size = 2^^n */
                        else
-                               kinfo->protection_size = nvm_size / 8;  /* TODO: verify on SF1, not documented in RM */
+                               k_bank->protection_size = k_chip->nvm_size / 8; /* TODO: verify on SF1, not documented in RM */
                }
-               bank->num_prot_blocks = 8 / num_nvm_blocks;
-               kinfo->protection_block = bank->num_prot_blocks * nvm_ord;
+               bank->num_prot_blocks = 8 / k_chip->num_nvm_blocks;
+               k_bank->protection_block = bank->num_prot_blocks * nvm_ord;
 
-               /* EEPROM backup part of FlexNVM is not accessible, use df_size as a limit */
-               if (df_size > bank->size * nvm_ord)
-                       limit = df_size - bank->size * nvm_ord;
+               /* EEPROM backup part of FlexNVM is not accessible, use dflash_size as a limit */
+               if (k_chip->dflash_size > bank->size * nvm_ord)
+                       limit = k_chip->dflash_size - bank->size * nvm_ord;
                else
                        limit = 0;
 
                if (bank->size > limit) {
                        bank->size = limit;
                        LOG_DEBUG("FlexNVM bank %d limited to 0x%08" PRIx32 " due to active EEPROM backup",
-                               bank->bank_number, limit);
+                               k_bank->bank_number, limit);
                }
 
-       } else if ((unsigned)bank->bank_number == num_blocks) {
-               LOG_ERROR("FlexRAM support not yet implemented");
-               return ERROR_FLASH_OPER_UNSUPPORTED;
+               size_k = bank->size / 1024;
+               LOG_DEBUG("Kinetis bank %u: %" PRIu32 "k FlexNVM, FTFx base 0x%08" PRIx32 ", sect %u",
+                        k_bank->bank_number, size_k, k_bank->prog_base, k_bank->sector_size);
+
        } else {
                LOG_ERROR("Cannot determine parameters for bank %d, only %d banks on device",
-                               bank->bank_number, num_blocks);
+                               k_bank->bank_number, num_blocks);
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       if (bank->bank_number == 0 && ((uint32_t)fcfg2_maxaddr0 << 13) != bank->size)
+       fcfg2_pflsh = (uint8_t)((k_chip->sim_fcfg2 >> 23) & 0x01);
+       fcfg2_maxaddr0 = (uint8_t)((k_chip->sim_fcfg2 >> 24) & 0x7f);
+       fcfg2_maxaddr1 = (uint8_t)((k_chip->sim_fcfg2 >> 16) & 0x7f);
+
+       if (k_bank->bank_number == 0 && k_chip->fcfg2_maxaddr0_shifted != bank->size)
                LOG_WARNING("MAXADDR0 0x%02" PRIx8 " check failed,"
                                " please report to OpenOCD mailing list", fcfg2_maxaddr0);
+
        if (fcfg2_pflsh) {
-               if (bank->bank_number == 1 && ((uint32_t)fcfg2_maxaddr1 << 13) != bank->size)
+               if (k_bank->bank_number == 1 && k_chip->fcfg2_maxaddr1_shifted != bank->size)
                        LOG_WARNING("MAXADDR1 0x%02" PRIx8 " check failed,"
                                " please report to OpenOCD mailing list", fcfg2_maxaddr1);
        } else {
-               if ((unsigned)bank->bank_number == first_nvm_bank
-                               && ((uint32_t)fcfg2_maxaddr1 << 13) != df_size)
+               if (k_bank->bank_number == first_nvm_bank
+                               && k_chip->fcfg2_maxaddr1_shifted != k_chip->dflash_size)
                        LOG_WARNING("FlexNVM MAXADDR1 0x%02" PRIx8 " check failed,"
                                " please report to OpenOCD mailing list", fcfg2_maxaddr1);
        }
@@ -1962,26 +2722,20 @@ static int kinetis_probe(struct flash_bank *bank)
                bank->prot_blocks = NULL;
        }
 
-       if (kinfo->sector_size == 0) {
+       if (k_bank->sector_size == 0) {
                LOG_ERROR("Unknown sector size for bank %d", bank->bank_number);
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       if (kinfo->flash_support & FS_PROGRAM_SECTOR
-                        && kinfo->max_flash_prog_size == 0) {
-               kinfo->max_flash_prog_size = kinfo->sector_size;
-               /* Program section size is equal to sector size by default */
-       }
-
-       bank->num_sectors = bank->size / kinfo->sector_size;
+       bank->num_sectors = bank->size / k_bank->sector_size;
 
        if (bank->num_sectors > 0) {
                /* FlexNVM bank can be used for EEPROM backup therefore zero sized */
-               bank->sectors = alloc_block_array(0, kinfo->sector_size, bank->num_sectors);
+               bank->sectors = alloc_block_array(0, k_bank->sector_size, bank->num_sectors);
                if (!bank->sectors)
                        return ERROR_FAIL;
 
-               bank->prot_blocks = alloc_block_array(0, kinfo->protection_size, bank->num_prot_blocks);
+               bank->prot_blocks = alloc_block_array(0, k_bank->protection_size, bank->num_prot_blocks);
                if (!bank->prot_blocks)
                        return ERROR_FAIL;
 
@@ -1989,16 +2743,16 @@ static int kinetis_probe(struct flash_bank *bank)
                bank->num_prot_blocks = 0;
        }
 
-       kinfo->probed = true;
+       k_bank->probed = true;
 
        return ERROR_OK;
 }
 
 static int kinetis_auto_probe(struct flash_bank *bank)
 {
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
 
-       if (kinfo && kinfo->probed)
+       if (k_bank && k_bank->probed)
                return ERROR_OK;
 
        return kinetis_probe(bank);
@@ -2010,23 +2764,27 @@ static int kinetis_info(struct flash_bank *bank, char *buf, int buf_size)
                "(ANY)", "PFlash", "FlexNVM", "FlexRAM"
        };
 
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       struct kinetis_chip *k_chip = k_bank->k_chip;
+       uint32_t size_k = bank->size / 1024;
 
-       (void) snprintf(buf, buf_size,
-                       "%s driver for %s flash bank %s at 0x%8.8" PRIx32 "",
-                       bank->driver->name, bank_class_names[kinfo->flash_class],
-                       bank->name, bank->base);
+       snprintf(buf, buf_size,
+               "%s %s: %" PRIu32 "k %s bank %s at 0x%08" PRIx32,
+               bank->driver->name, k_chip->name,
+               size_k, bank_class_names[k_bank->flash_class],
+               bank->name, bank->base);
 
        return ERROR_OK;
 }
 
 static int kinetis_blank_check(struct flash_bank *bank)
 {
-       struct kinetis_flash_bank *kinfo = bank->driver_priv;
+       struct kinetis_flash_bank *k_bank = bank->driver_priv;
+       struct kinetis_chip *k_chip = k_bank->k_chip;
        int result;
 
        /* suprisingly blank check does not work in VLPR and HSRUN modes */
-       result = kinetis_check_run_mode(bank->target);
+       result = kinetis_check_run_mode(k_chip);
        if (result != ERROR_OK)
                return result;
 
@@ -2035,24 +2793,27 @@ static int kinetis_blank_check(struct flash_bank *bank)
        if (result != ERROR_OK)
                return result;
 
-       if (kinfo->flash_class == FC_PFLASH || kinfo->flash_class == FC_FLEX_NVM) {
-               bool block_dirty = false;
+       if (k_bank->flash_class == FC_PFLASH || k_bank->flash_class == FC_FLEX_NVM) {
+               bool block_dirty = true;
+               bool use_block_cmd = !(k_chip->flash_support & FS_NO_CMD_BLOCKSTAT);
                uint8_t ftfx_fstat;
 
-               if (kinfo->flash_class == FC_FLEX_NVM) {
-                       uint8_t fcfg1_depart = (uint8_t)((kinfo->sim_fcfg1 >> 8) & 0x0f);
+               if (use_block_cmd && k_bank->flash_class == FC_FLEX_NVM) {
+                       uint8_t fcfg1_depart = (uint8_t)((k_chip->sim_fcfg1 >> 8) & 0x0f);
                        /* block operation cannot be used on FlexNVM when EEPROM backup partition is set */
                        if (fcfg1_depart != 0xf && fcfg1_depart != 0)
-                               block_dirty = true;
+                               use_block_cmd = false;
                }
 
-               if (!block_dirty) {
+               if (use_block_cmd) {
                        /* check if whole bank is blank */
-                       result = kinetis_ftfx_command(bank->target, FTFx_CMD_BLOCKSTAT, kinfo->prog_base,
+                       result = kinetis_ftfx_command(bank->target, FTFx_CMD_BLOCKSTAT, k_bank->prog_base,
                                                         0, 0, 0, 0,  0, 0, 0, 0, &ftfx_fstat);
 
-                       if (result != ERROR_OK || (ftfx_fstat & 0x01))
-                               block_dirty = true;
+                       if (result != ERROR_OK)
+                               kinetis_ftfx_clear_error(bank->target);
+                       else if ((ftfx_fstat & 0x01) == 0)
+                               block_dirty = false;
                }
 
                if (block_dirty) {
@@ -2061,13 +2822,14 @@ static int kinetis_blank_check(struct flash_bank *bank)
                        for (i = 0; i < bank->num_sectors; i++) {
                                /* normal margin */
                                result = kinetis_ftfx_command(bank->target, FTFx_CMD_SECTSTAT,
-                                               kinfo->prog_base + bank->sectors[i].offset,
+                                               k_bank->prog_base + bank->sectors[i].offset,
                                                1, 0, 0, 0,  0, 0, 0, 0, &ftfx_fstat);
 
                                if (result == ERROR_OK) {
                                        bank->sectors[i].is_erased = !(ftfx_fstat & 0x01);
                                } else {
                                        LOG_DEBUG("Ignoring errored PFlash sector blank-check");
+                                       kinetis_ftfx_clear_error(bank->target);
                                        bank->sectors[i].is_erased = -1;
                                }
                        }
@@ -2088,7 +2850,9 @@ static int kinetis_blank_check(struct flash_bank *bank)
 
 COMMAND_HANDLER(kinetis_nvm_partition)
 {
-       int result, i;
+       int result;
+       unsigned bank_idx;
+       unsigned num_blocks, first_nvm_bank;
        unsigned long par, log2 = 0, ee1 = 0, ee2 = 0;
        enum { SHOW_INFO, DF_SIZE, EEBKP_SIZE } sz_type = SHOW_INFO;
        bool enable;
@@ -2097,10 +2861,11 @@ COMMAND_HANDLER(kinetis_nvm_partition)
        uint8_t flex_nvm_partition_code = 0;
        uint8_t ee_split = 3;
        struct target *target = get_current_target(CMD_CTX);
-       struct flash_bank *bank;
-       struct kinetis_flash_bank *kinfo;
+       struct kinetis_chip *k_chip;
        uint32_t sim_fcfg1;
 
+       k_chip = kinetis_get_chip(target);
+
        if (CMD_ARGC >= 2) {
                if (strcmp(CMD_ARGV[0], "dataflash") == 0)
                        sz_type = DF_SIZE;
@@ -2113,7 +2878,11 @@ COMMAND_HANDLER(kinetis_nvm_partition)
        }
        switch (sz_type) {
        case SHOW_INFO:
-               result = target_read_u32(target, SIM_FCFG1, &sim_fcfg1);
+               if (k_chip == NULL) {
+                       LOG_ERROR("Chip not probed.");
+                       return ERROR_FAIL;
+               }
+               result = target_read_u32(target, k_chip->sim_base + SIM_FCFG1_OFFSET, &sim_fcfg1);
                if (result != ERROR_OK)
                        return result;
 
@@ -2196,7 +2965,7 @@ COMMAND_HANDLER(kinetis_nvm_partition)
        LOG_INFO("DEPART 0x%" PRIx8 ", EEPROM size code 0x%" PRIx8,
                 flex_nvm_partition_code, ee_size_code);
 
-       result = kinetis_check_run_mode(target);
+       result = kinetis_check_run_mode(k_chip);
        if (result != ERROR_OK)
                return result;
 
@@ -2213,14 +2982,12 @@ COMMAND_HANDLER(kinetis_nvm_partition)
 
        command_print(CMD_CTX, "FlexNVM partition set. Please reset MCU.");
 
-       for (i = 1; i < 4; i++) {
-               bank = get_flash_bank_by_num_noprobe(i);
-               if (bank == NULL)
-                       break;
-
-               kinfo = bank->driver_priv;
-               if (kinfo && kinfo->flash_class == FC_FLEX_NVM)
-                       kinfo->probed = false;  /* re-probe before next use */
+       if (k_chip) {
+               first_nvm_bank = k_chip->num_pflash_blocks;
+               num_blocks = k_chip->num_pflash_blocks + k_chip->num_nvm_blocks;
+               for (bank_idx = first_nvm_bank; bank_idx < num_blocks; bank_idx++)
+                       k_chip->banks[bank_idx].probed = false; /* re-probe before next use */
+               k_chip->probed = false;
        }
 
        command_print(CMD_CTX, "FlexNVM banks will be re-probed to set new data flash size.");
@@ -2258,10 +3025,22 @@ COMMAND_HANDLER(kinetis_fopt_handler)
        if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       if (CMD_ARGC == 1)
+       if (CMD_ARGC == 1) {
                fcf_fopt = (uint8_t)strtoul(CMD_ARGV[0], NULL, 0);
-       else
+               fcf_fopt_configured = true;
+       } else {
                command_print(CMD_CTX, "FCF_FOPT 0x%02" PRIx8, fcf_fopt);
+       }
+
+       return ERROR_OK;
+}
+
+COMMAND_HANDLER(kinetis_create_banks_handler)
+{
+       if (CMD_ARGC > 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       create_banks = true;
 
        return ERROR_OK;
 }
@@ -2336,6 +3115,12 @@ static const struct command_registration kinetis_exec_command_handlers[] = {
                .usage = "[num]",
                .handler = kinetis_fopt_handler,
        },
+       {
+               .name = "create_banks",
+               .mode = COMMAND_CONFIG,
+               .help = "Driver creates additional banks if device with two/four flash blocks is probed",
+               .handler = kinetis_create_banks_handler,
+       },
        COMMAND_REGISTRATION_DONE
 };
 
@@ -2365,4 +3150,5 @@ struct flash_driver kinetis_flash = {
        .erase_check = kinetis_blank_check,
        .protect_check = kinetis_protect_check,
        .info = kinetis_info,
+       .free_driver_priv = kinetis_free_driver_priv,
 };