[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1424-gfc7edd57a

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  fc7edd57ac6678d1113bc09265798de3fdc68347 (commit)
      from  3ffa14b043225b9766132b1979db7ddb8d91ba5e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc7edd57ac6678d1113bc09265798de3fdc68347
Author: Benedikt-Alexander Mokroß <mo...@ge...>
Date:   Mon Aug 24 10:59:27 2020 +0200

    flash/nor/at91sam4: ATSAMG55x19 Rev.B
    
    Add support for ATSAMG55x19 Rev.B.
    Both chips have nearly the same cidr, however, Rev.B has an incremented version.
    
    Change-Id: I5939c41fa5d54c4d3bfb850964974b878f709d13
    Signed-off-by: Benedikt-Alexander Mokroß <mo...@ge...>
    Reviewed-on: http://openocd.zylin.com/5825
    Reviewed-by: Tomas Vanek <va...@fb...>
    Tested-by: jenkins

diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index 1c6106425..86abf7005 100644
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -1330,7 +1330,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
 		}
 	},
 
-	/* atsamg55g19 */
+	/* atsamg55g19 Rev.A */
 	{
 		.chipid_cidr    = 0x24470ae0,
 		.name           = "atsamg55g19",
@@ -1364,7 +1364,41 @@ static const struct sam4_chip_details all_sam4_details[] = {
 		}
 	},
 
-	/* atsamg55j19 */
+	/* atsamg55g19 Rev.B */
+	{
+		.chipid_cidr    = 0x24470ae1,
+		.name           = "atsamg55g19b",
+		.total_flash_size     = 512 * 1024,
+		.total_sram_size      = 160 * 1024,
+		.n_gpnvms       = 2,
+		.n_banks        = 1,
+
+		{
+/*			.bank[0] = */
+			{
+				.probed = false,
+				.pChip  = NULL,
+				.pBank  = NULL,
+				.bank_number = 0,
+				.base_address = FLASH_BANK_BASE_S,
+				.controller_address = 0x400e0a00,
+				.flash_wait_states = 5,
+				.present = true,
+				.size_bytes =  512 * 1024,
+				.nsectors   =  64,
+				.sector_size = 8192,
+				.page_size   = 512,
+			},
+/*			.bank[1] = */
+			{
+				.present = false,
+				.probed = false,
+				.bank_number = 1,
+			},
+		}
+	},
+
+	/* atsamg55j19 Rev.A */
 	{
 		.chipid_cidr    = 0x24570ae0,
 		.name           = "atsamg55j19",
@@ -1398,6 +1432,40 @@ static const struct sam4_chip_details all_sam4_details[] = {
 		}
 	},
 
+	/* atsamg55j19 Rev.B */
+	{
+		.chipid_cidr    = 0x24570ae1,
+		.name           = "atsamg55j19b",
+		.total_flash_size     = 512 * 1024,
+		.total_sram_size      = 160 * 1024,
+		.n_gpnvms       = 2,
+		.n_banks        = 1,
+
+		{
+/*			.bank[0] = */
+			{
+				.probed = false,
+				.pChip  = NULL,
+				.pBank  = NULL,
+				.bank_number = 0,
+				.base_address = FLASH_BANK_BASE_S,
+				.controller_address = 0x400e0a00,
+				.flash_wait_states = 5,
+				.present = true,
+				.size_bytes =  512 * 1024,
+				.nsectors   =  64,
+				.sector_size = 8192,
+				.page_size   = 512,
+			},
+/*			.bank[1] = */
+			{
+				.present = false,
+				.probed = false,
+				.bank_number = 1,
+			},
+		}
+	},
+
 	/* terminate */
 	{
 		.chipid_cidr    = 0,

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/at91sam4.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 70 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository