From 503f6139c7ed05339daea8c4984d32840d795222 Mon Sep 17 00:00:00 2001 From: Edgar Grimberg Date: Tue, 2 Feb 2010 10:39:52 +0100 Subject: [PATCH] flash/str7x: After reset init the flash is unlocked The default state of the STR7 flash after a reset init is unlocked. The information in the flash driver now reflects this. The information about the lock status cannot be read from the flash chip, so the user is informed that flash info might not contain accurate information. [dbrownell@users.sourceforge.net: line length shrinkage] Signed-off-by: Edgar Grimberg Signed-off-by: David Brownell --- src/flash/nor/str7x.c | 16 ++++++++++++++-- tcl/target/str710.cfg | 10 +++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c index a2e27dae..3bf07c95 100644 --- a/src/flash/nor/str7x.c +++ b/src/flash/nor/str7x.c @@ -93,7 +93,10 @@ static int str7x_build_block_list(struct flash_bank *bank) bank->sectors[num_sectors].offset = mem_layout_str7bank0[i].sector_start; bank->sectors[num_sectors].size = mem_layout_str7bank0[i].sector_size; bank->sectors[num_sectors].is_erased = -1; - bank->sectors[num_sectors].is_protected = 1; + /* the reset_init handler marks all the sectors unprotected, + * matching hardware after reset; keep the driver in sync + */ + bank->sectors[num_sectors].is_protected = 0; str7x_info->sector_bits[num_sectors++] = mem_layout_str7bank0[i].sector_bit; } @@ -102,7 +105,10 @@ static int str7x_build_block_list(struct flash_bank *bank) bank->sectors[num_sectors].offset = mem_layout_str7bank1[i].sector_start; bank->sectors[num_sectors].size = mem_layout_str7bank1[i].sector_size; bank->sectors[num_sectors].is_erased = -1; - bank->sectors[num_sectors].is_protected = 1; + /* the reset_init handler marks all the sectors unprotected, + * matching hardware after reset; keep the driver in sync + */ + bank->sectors[num_sectors].is_protected = 0; str7x_info->sector_bits[num_sectors++] = mem_layout_str7bank1[i].sector_bit; } @@ -600,6 +606,12 @@ COMMAND_HANDLER(str7x_handle_part_id_command) static int str7x_info(struct flash_bank *bank, char *buf, int buf_size) { snprintf(buf, buf_size, "str7x flash driver info"); + /* STR7x flash doesn't support sector protection interrogation. + * FLASH_NVWPAR acts as a write only register; its read value + * doesn't reflect the actual protection state of the sectors. + */ + LOG_WARNING("STR7x flash lock information might not be correct " + "due to hardware limitations."); return ERROR_OK; } diff --git a/tcl/target/str710.cfg b/tcl/target/str710.cfg index 9da69aca..028c6043 100644 --- a/tcl/target/str710.cfg +++ b/tcl/target/str710.cfg @@ -30,7 +30,15 @@ set _TARGETNAME $_CHIPNAME.cpu target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi $_TARGETNAME configure -event reset-start { jtag_khz 10 } -$_TARGETNAME configure -event reset-init { jtag_khz 6000 } +$_TARGETNAME configure -event reset-init { + jtag_khz 6000 + +# Because the hardware cannot be interrogated for the protection state +# of sectors, initialize all the sectors to be unprotected. The initial +# state is reflected by the driver, too. + flash protect 0 0 last off + flash protect 1 0 last off +} $_TARGETNAME configure -event gdb-flash-erase-start { flash protect 0 0 7 off flash protect 1 0 1 off -- 2.39.5