Commit 24c30275 authored by Tomas Vanek's avatar Tomas Vanek Committed by Freddie Chopin
Browse files

flash/nor/at91sam4: remove FWS=6, rename at91samg to atsamg

FWS=6 workaround removed, as this appears to be a copy-paste error
from the SAM3X family. Originally addressed in http://openocd.zylin.com/3837


but not all occurences were removed.

Atmel changed chip naming and removed 91 prefix for atsamg, samd...

Change-Id: Ia2b43da82b2ff9b1c85fdb456a0a198ab095243d
Signed-off-by: default avatarTomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/3926


Tested-by: jenkins
Reviewed-by: default avatarFreddie Chopin <freddie.chopin@gmail.com>
parent 1025be36
...@@ -464,7 +464,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -464,7 +464,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 0, .bank_number = 0,
.base_address = FLASH_BANK_BASE_S, .base_address = FLASH_BANK_BASE_S,
.controller_address = 0x400e0a00, .controller_address = 0x400e0a00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 1024 * 1024, .size_bytes = 1024 * 1024,
.nsectors = 128, .nsectors = 128,
...@@ -499,7 +499,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -499,7 +499,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 0, .bank_number = 0,
.base_address = FLASH_BANK_BASE_S, .base_address = FLASH_BANK_BASE_S,
.controller_address = 0x400e0a00, .controller_address = 0x400e0a00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 512 * 1024, .size_bytes = 512 * 1024,
.nsectors = 64, .nsectors = 64,
...@@ -532,7 +532,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -532,7 +532,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 0, .bank_number = 0,
.base_address = FLASH_BANK_BASE_S, .base_address = FLASH_BANK_BASE_S,
.controller_address = 0x400e0a00, .controller_address = 0x400e0a00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 512 * 1024, .size_bytes = 512 * 1024,
.nsectors = 64, .nsectors = 64,
...@@ -565,7 +565,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -565,7 +565,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 0, .bank_number = 0,
.base_address = FLASH_BANK_BASE_S, .base_address = FLASH_BANK_BASE_S,
.controller_address = 0x400e0a00, .controller_address = 0x400e0a00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 512 * 1024, .size_bytes = 512 * 1024,
.nsectors = 64, .nsectors = 64,
...@@ -598,7 +598,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -598,7 +598,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 0, .bank_number = 0,
.base_address = FLASH_BANK_BASE_S, .base_address = FLASH_BANK_BASE_S,
.controller_address = 0x400e0a00, .controller_address = 0x400e0a00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 1024 * 1024, .size_bytes = 1024 * 1024,
.nsectors = 128, .nsectors = 128,
...@@ -631,7 +631,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -631,7 +631,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 0, .bank_number = 0,
.base_address = FLASH_BANK_BASE_S, .base_address = FLASH_BANK_BASE_S,
.controller_address = 0x400e0a00, .controller_address = 0x400e0a00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 1024 * 1024, .size_bytes = 1024 * 1024,
.nsectors = 128, .nsectors = 128,
...@@ -1279,7 +1279,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -1279,7 +1279,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 0, .bank_number = 0,
.base_address = FLASH_BANK0_BASE_SD, .base_address = FLASH_BANK0_BASE_SD,
.controller_address = 0x400e0a00, .controller_address = 0x400e0a00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 512 * 1024, .size_bytes = 512 * 1024,
.nsectors = 64, .nsectors = 64,
...@@ -1295,7 +1295,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -1295,7 +1295,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 1, .bank_number = 1,
.base_address = FLASH_BANK1_BASE_1024K_SD, .base_address = FLASH_BANK1_BASE_1024K_SD,
.controller_address = 0x400e0c00, .controller_address = 0x400e0c00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 512 * 1024, .size_bytes = 512 * 1024,
.nsectors = 64, .nsectors = 64,
...@@ -1305,10 +1305,10 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -1305,10 +1305,10 @@ static const struct sam4_chip_details all_sam4_details[] = {
}, },
}, },
/* at91samg53n19 */ /* atsamg53n19 */
{ {
.chipid_cidr = 0x247e0ae0, .chipid_cidr = 0x247e0ae0,
.name = "at91samg53n19", .name = "atsamg53n19",
.total_flash_size = 512 * 1024, .total_flash_size = 512 * 1024,
.total_sram_size = 96 * 1024, .total_sram_size = 96 * 1024,
.n_gpnvms = 2, .n_gpnvms = 2,
...@@ -1323,7 +1323,7 @@ static const struct sam4_chip_details all_sam4_details[] = { ...@@ -1323,7 +1323,7 @@ static const struct sam4_chip_details all_sam4_details[] = {
.bank_number = 0, .bank_number = 0,
.base_address = FLASH_BANK_BASE_S, .base_address = FLASH_BANK_BASE_S,
.controller_address = 0x400e0a00, .controller_address = 0x400e0a00,
.flash_wait_states = 6, /* workaround silicon bug */ .flash_wait_states = 5,
.present = 1, .present = 1,
.size_bytes = 512 * 1024, .size_bytes = 512 * 1024,
.nsectors = 64, .nsectors = 64,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment