interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AT91SAM7 Flash: fixed redundant assignation warning 

Change-Id: Iffacdce9ce90c4ea7e0c8647860a0056b952f387
Signed-off-by: Mirela Tauciuc <mirela.tauciuc@gmail.com>
Reviewed-on: http://openocd.zylin.com/691
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
This commit is contained in:
Mirela Tauciuc 2012-06-22 11:59:41 +03:00 committed by Øyvind Harboe
parent a21affa429
commit 7800045671
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/flash/nor/at91sam7.c
View File

@ -353,9 +353,8 @@ static int at91sam7_flash_command(struct flash_bank *bank, uint8_t cmd, uint16_t
/* Read device id register, main clock frequency register and fill in driver info structure */ /* Read device id register, main clock frequency register and fill in driver info structure */
static int at91sam7_read_part_info(struct flash_bank *bank) static int at91sam7_read_part_info(struct flash_bank *bank)
{ {
struct flash_bank *t_bank = bank;
struct at91sam7_flash_bank *at91sam7_info; struct at91sam7_flash_bank *at91sam7_info;
struct target *target = t_bank->target; struct target *target = bank->target;
uint16_t bnk, sec; uint16_t bnk, sec;
uint16_t arch; uint16_t arch;
@ -370,12 +369,12 @@ static int at91sam7_read_part_info(struct flash_bank *bank)
uint32_t base_address = 0; uint32_t base_address = 0;
char *target_name_t = "Unknown"; char *target_name_t = "Unknown";
at91sam7_info = t_bank->driver_priv; at91sam7_info = bank->driver_priv;
if (at91sam7_info->cidr != 0) { if (at91sam7_info->cidr != 0) {
/* flash already configured, update clock and check for protected sectors */ /* flash already configured, update clock and check for protected sectors */
struct flash_bank *fb = bank; struct flash_bank *fb = bank;
t_bank = fb; struct flash_bank *t_bank = bank;
while (t_bank) { while (t_bank) {
/* re-calculate master clock frequency */ /* re-calculate master clock frequency */
@ -404,7 +403,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank)
if (at91sam7_info->flash_autodetection == 0) { if (at91sam7_info->flash_autodetection == 0) {
/* banks and sectors are already created, based on data from input file */ /* banks and sectors are already created, based on data from input file */
struct flash_bank *fb = bank; struct flash_bank *fb = bank;
t_bank = fb; struct flash_bank *t_bank = bank;
while (t_bank) { while (t_bank) {
at91sam7_info = t_bank->driver_priv; at91sam7_info = t_bank->driver_priv;
@ -576,6 +575,7 @@ static int at91sam7_read_part_info(struct flash_bank *bank)
bank_size = sectors_num * pages_per_sector * page_size; bank_size = sectors_num * pages_per_sector * page_size;
for (bnk = 0; bnk < banks_num; bnk++) { for (bnk = 0; bnk < banks_num; bnk++) {
struct flash_bank *t_bank = bank;
if (bnk > 0) { if (bnk > 0) {
if (!t_bank->next) { if (!t_bank->next) {
/* create a new flash bank element */ /* create a new flash bank element */