flash/at91sam4: emit flash bank info

[openocd.git] / src / flash / nor / at91sam4.c

diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index 04752169fbee0b0ed0bec362b06658e1a37d13bc..b8f4e1622cacf89e7db3d5a306a474e85aedabf5 100644 (file)
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -682,6 +682,40 @@ static const struct sam4_chip_details all_sam4_details[] = {
                  },
                },
        },
+       /*at91sam4sa16c - TFBGA100/VFBGA100/LQFP100*/
+       {
+               .chipid_cidr    = 0x28a70ce0,
+               .name           = "at91sam4sa16c",
+               .total_flash_size     = 1024 * 1024,
+               .total_sram_size      = 160 * 1024,
+               .n_gpnvms       = 2,
+               .n_banks        = 1,
+
+/*             .bank[0] = { */
+               {
+                 {
+                       .probed = 0,
+                       .pChip  = NULL,
+                       .pBank  = NULL,
+                       .bank_number = 0,
+                       .base_address = FLASH_BANK_BASE_S,
+                       .controller_address = 0x400e0a00,
+                       .flash_wait_states = 5,
+                       .present = 1,
+                       .size_bytes =  1024 * 1024,
+                       .nsectors   =  128,
+                       .sector_size = 8192,
+                       .page_size   = 512,
+                 },
+/*             .bank[1] = {*/
+                 {
+                       .present = 0,
+                       .probed = 0,
+                       .bank_number = 1,
+
+                 },
+               },
+       },
        /*atsam4s16b - LQFP64/QFN64/WLCSP64*/
        {
                .chipid_cidr    = 0x289C0CE0,
@@ -1243,50 +1277,6 @@ static const struct sam4_chip_details all_sam4_details[] = {
                                .page_size   = 512,
                        },
 
-/*             .bank[1] = { */
-                       {
-                               .probed = 0,
-                               .pChip  = NULL,
-                               .pBank  = NULL,
-                               .bank_number = 1,
-                               .base_address = FLASH_BANK1_BASE_1024K_SD,
-                               .controller_address = 0x400e0c00,
-                               .flash_wait_states = 5,
-                               .present = 1,
-                               .size_bytes =  512 * 1024,
-                               .nsectors   =  64,
-                               .sector_size = 8192,
-                               .page_size   = 512,
-                       },
-               },
-       },
-
-       /*at91sam4sa16c*/
-       {
-               .chipid_cidr    = 0x28a70ce0,
-               .name           = "at91sam4sa16c",
-               .total_flash_size     = 1024 * 1024,
-               .total_sram_size      = 160 * 1024,
-               .n_gpnvms       = 3,
-               .n_banks        = 2,
-
-/*             .bank[0] = { */
-               {
-                       {
-                               .probed = 0,
-                               .pChip  = NULL,
-                               .pBank  = NULL,
-                               .bank_number = 0,
-                               .base_address = FLASH_BANK0_BASE_SD,
-                               .controller_address = 0x400e0a00,
-                               .flash_wait_states = 5,
-                               .present = 1,
-                               .size_bytes =  512 * 1024,
-                               .nsectors   =  64,
-                               .sector_size = 8192,
-                               .page_size   = 512,
-                       },
-
 /*             .bank[1] = { */
                        {
                                .probed = 0,
@@ -2386,6 +2376,11 @@ static int sam4_GetInfo(struct sam4_chip *pChip)
 {
        const struct sam4_reg_list *pReg;
        uint32_t regval;
+       int r;
+
+       r = sam4_ReadAllRegs(pChip);
+       if (r != ERROR_OK)
+               return r;
 
        pReg = &(sam4_all_regs[0]);
        while (pReg->name) {
@@ -2554,6 +2549,8 @@ static int sam4_GetDetails(struct sam4_bank_private *pPrivate)
                        pPrivate->pChip->cfg.CHIPID_CIDR);
                sam4_explain_chipid_cidr(pPrivate->pChip);
                return ERROR_FAIL;
+       } else {
+               LOG_DEBUG("SAM4 Found chip %s, CIDR 0x%08x", pDetails->name, pDetails->chipid_cidr);
        }
 
        /* DANGER: THERE ARE DRAGONS HERE */
@@ -2589,14 +2586,35 @@ static int sam4_GetDetails(struct sam4_bank_private *pPrivate)
        return ERROR_OK;
 }
 
-static int _sam4_probe(struct flash_bank *bank, int noise)
+static int sam4_info(struct flash_bank *bank, char *buf, int buf_size)
+{
+       struct sam4_bank_private *pPrivate;
+       int k = bank->size / 1024;
+
+       pPrivate = get_sam4_bank_private(bank);
+       if (pPrivate == NULL) {
+               buf[0] = '\0';
+               return ERROR_FAIL;
+       }
+
+       snprintf(buf, buf_size,
+               "%s bank %d: %d kB at 0x%08" PRIx32,
+               pPrivate->pChip->details.name,
+               pPrivate->bank_number,
+               k,
+               bank->base);
+
+       return ERROR_OK;
+}
+
+static int sam4_probe(struct flash_bank *bank)
 {
        unsigned x;
        int r;
        struct sam4_bank_private *pPrivate;
 
 
-       LOG_DEBUG("Begin: Bank: %d, Noise: %d", bank->bank_number, noise);
+       LOG_DEBUG("Begin: Bank: %d", bank->bank_number);
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
@@ -2624,6 +2642,7 @@ static int _sam4_probe(struct flash_bank *bank, int noise)
        for (x = 0; x < SAM4_MAX_FLASH_BANKS; x++) {
                if (bank->base == pPrivate->pChip->details.bank[x].base_address) {
                        bank->size = pPrivate->pChip->details.bank[x].size_bytes;
+                       LOG_DEBUG("SAM4 Set flash bank to %08X - %08X, idx %d", bank->base, bank->base + bank->size, x);
                        break;
                }
        }
@@ -2662,14 +2681,15 @@ static int _sam4_probe(struct flash_bank *bank, int noise)
        return r;
 }
 
-static int sam4_probe(struct flash_bank *bank)
-{
-       return _sam4_probe(bank, 1);
-}
-
 static int sam4_auto_probe(struct flash_bank *bank)
 {
-       return _sam4_probe(bank, 0);
+       struct sam4_bank_private *pPrivate;
+
+       pPrivate = get_sam4_bank_private(bank);
+       if (pPrivate && pPrivate->probed)
+               return ERROR_OK;
+
+       return sam4_probe(bank);
 }
 
 static int sam4_erase(struct flash_bank *bank, int first, int last)
@@ -3210,5 +3230,6 @@ struct flash_driver at91sam4_flash = {
        .auto_probe = sam4_auto_probe,
        .erase_check = default_flash_blank_check,
        .protect_check = sam4_protect_check,
+       .info = sam4_info,
        .free_driver_priv = sam4_free_driver_priv,
 };