X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fat91sam3.c;h=de792ecec6d2e5036a17c51346cdb14471cb000d;hb=e26ddb627ba035ab9bfc9c54a5585865a6c89132;hp=37b6dd78b3a2d074abb88d180b0e7f84c3eb0d12;hpb=fdbf70601dffa6a3a8ca1ce9a10d7b6b86f19eba;p=fw%2Fopenocd

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 37b6dd78b..de792ecec 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -82,6 +82,9 @@
 #define	FLASH_BANK1_BASE_256K_AX	0x000A0000
 #define	FLASH_BANK1_BASE_512K_AX	0x000C0000
 
+#define FLASH_BANK0_BASE_SD FLASH_BANK_BASE_S
+#define FLASH_BANK1_BASE_512K_SD (FLASH_BANK0_BASE_SD+(512*1024/2))
+
 #define         AT91C_EFC_FCMD_GETD                 (0x0)	/* (EFC) Get Flash Descriptor */
 #define         AT91C_EFC_FCMD_WP                   (0x1)	/* (EFC) Write Page */
 #define         AT91C_EFC_FCMD_WPL                  (0x2)	/* (EFC) Write Page and Lock */
@@ -727,6 +730,46 @@ static const struct sam3_chip_details all_sam3_details[] = {
 			},
 		},
 	},
+	{
+		.chipid_cidr    = 0x29ab0a60,
+		.name           = "at91sam3sd8c",
+		.total_flash_size     = 512 * 1024,
+		.total_sram_size      = 64 * 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 = 6,	/* workaround silicon bug */
+				.present = 1,
+				.size_bytes =  256 * 1024,
+				.nsectors   =  16,
+				.sector_size = 16384,
+				.page_size   = 256,
+			  },
+/*			.bank[1] = { */
+			  {
+				.probed = 0,
+				.pChip  = NULL,
+				.pBank  = NULL,
+				.bank_number = 1,
+				.base_address = FLASH_BANK1_BASE_512K_SD,
+				.controller_address = 0x400e0a00,
+				.flash_wait_states = 6,	/* workaround silicon bug */
+				.present = 1,
+				.size_bytes =  256 * 1024,
+				.nsectors   =  16,
+				.sector_size = 16384,
+				.page_size   = 256,
+			},
+		},
+	},
 	{
 		.chipid_cidr    = 0x288A0760,
 		.name           = "at91sam3s2a",
@@ -2975,7 +3018,7 @@ static int sam3_page_read(struct sam3_bank_private *pPrivate, unsigned pagenum,
 	int r;
 
 	adr = pagenum * pPrivate->page_size;
-	adr += adr + pPrivate->base_address;
+	adr += pPrivate->base_address;
 
 	r = target_read_memory(pPrivate->pChip->target,
 			adr,
@@ -3083,7 +3126,7 @@ static int sam3_page_write(struct sam3_bank_private *pPrivate, unsigned pagenum,
 	int r;
 
 	adr = pagenum * pPrivate->page_size;
-	adr += (adr + pPrivate->base_address);
+	adr += pPrivate->base_address;
 
 	/* Get flash mode register value */
 	r = target_read_u32(pPrivate->pChip->target, pPrivate->controller_address, &fmr);
@@ -3274,7 +3317,6 @@ static int sam3_write(struct flash_bank *bank,
 		r = sam3_page_write(pPrivate, page_cur, pagebuffer);
 		if (r != ERROR_OK)
 			goto done;
-		buffer += count;
 	}
 	LOG_DEBUG("Done!");
 	r = ERROR_OK;