imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- renamed x7926 driver to aduc702x to match other flash drivers

Browse Source 
- removed c99 types (mingw issues) from aduc driver and cleanup
- updated docs for aduc702x flash driver

git-svn-id: svn://svn.berlios.de/openocd/trunk@995 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
ntfreak 2008-09-24 22:15:22 +00:00
parent f9a3c36cf2
commit bdb5fd8c98
7 changed files with 220 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/openocd.texi
View File

@ -703,6 +703,13 @@ stellaris flash plugin only require the @var{target#}.
@b{flash bank stm32x} <@var{base}> <@var{size}> 0 0 <@var{target#}>
stm32x flash plugin only require the @var{target#}.
@subsection aduc702x options
@cindex aduc702x options
@b{flash bank aduc702x} <@var{base}> <@var{size}> 0 0 <@var{target#}>
aduc702x flash plugin require the flash @var{base}, @var{size} and @var{target#}.
currently only the aduc7206 is supported.
@node Target library
@chapter Target library
@cindex Target library

2
src/flash/Makefile.am
View File

@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/s
AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
METASOURCES = AUTO
noinst_LIBRARIES = libflash.a
libflash_a_SOURCES = flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c str7x.c str9x.c x7026.c nand.c lpc3180_nand_controller.c \
libflash_a_SOURCES = flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c str7x.c str9x.c aduc702x.c nand.c lpc3180_nand_controller.c \
stellaris.c str9xpec.c stm32x.c tms470.c ecos.c \
s3c24xx_nand.c s3c2410_nand.c s3c2412_nand.c s3c2440_nand.c s3c2443_nand.c lpc288x.c ocl.c
noinst_HEADERS = flash.h lpc2000.h cfi.h non_cfi.h at91sam7.h str7x.h str9x.h nand.h lpc3180_nand_controller.h \

209
src/flash/aduc702x.c Normal file
View File

@ -0,0 +1,209 @@
/***************************************************************************
* Copyright (C) 2008 by Kevin McGuire *
* Copyright (C) 2008 by Marcel Wijlaars *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "armv4_5.h"
#include "algorithm.h"
#include "binarybuffer.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
int aduc702x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
int aduc702x_register_commands(struct command_context_s *cmd_ctx);
int aduc702x_erase(struct flash_bank_s *bank, int first, int last);
int aduc702x_protect(struct flash_bank_s *bank, int set, int first, int last);
int aduc702x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
int aduc702x_probe(struct flash_bank_s *bank);
int aduc702x_info(struct flash_bank_s *bank, char *buf, int buf_size);
int aduc702x_protect_check(struct flash_bank_s *bank);
#define ADUC702x_FLASH 0xfffff800
#define ADUC702x_FLASH_FEESTA (0*4)
#define ADUC702x_FLASH_FEEMOD (1*4)
#define ADUC702x_FLASH_FEECON (2*4)
#define ADUC702x_FLASH_FEEDAT (3*4)
#define ADUC702x_FLASH_FEEADR (4*4)
#define ADUC702x_FLASH_FEESIGN (5*4)
#define ADUC702x_FLASH_FEEPRO (6*4)
#define ADUC702x_FLASH_FEEHIDE (7*4)
typedef struct {
u32 feesta;
u32 feemod;
u32 feecon;
u32 feedat;
u32 feeadr;
u32 feesign;
u32 feepro;
u32 feehide;
} ADUC702x_FLASH_MMIO;
typedef struct
{
unsigned char tmp;
} aduc702x_bank;
flash_driver_t aduc702x_flash =
{
.name = "aduc702x",
.register_commands = aduc702x_register_commands,
.flash_bank_command = aduc702x_flash_bank_command,
.erase = aduc702x_erase,
.protect = aduc702x_protect,
.write = aduc702x_write,
.probe = aduc702x_probe,
.auto_probe = aduc702x_probe,
.erase_check = default_flash_blank_check,
.protect_check = aduc702x_protect_check,
.info = aduc702x_info
};
int aduc702x_register_commands(struct command_context_s *cmd_ctx)
{
return ERROR_OK;
}
/* flash bank aduc702x <base> <size> 0 0 <target#> */
int aduc702x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
{
aduc702x_bank *nbank;
if (argc < 6)
{
LOG_WARNING("incomplete flash_bank aduc702x configuration");
return ERROR_FLASH_BANK_INVALID;
}
nbank = malloc(sizeof(aduc702x_bank));
/* just warn that we are used to normally using 0x80000 */
if (bank->base != 0x80000)
{
LOG_WARNING("Default base address is 0x80000 on the ADuC7026!");
}
nbank->tmp = 1;
bank->driver_priv = nbank;
return ERROR_OK;
}
int aduc702x_protect_check(struct flash_bank_s *bank)
{
printf("aduc702x_protect_check not implemented yet.\n");
return ERROR_OK;
}
int aduc702x_erase(struct flash_bank_s *bank, int first, int last)
{
int x;
int count;
u32 v;
target_t *target = bank->target;
/* mass erase */
if ((first | last) == 0)
{
LOG_DEBUG("performing mass erase.\n");
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEDAT, 0x3cff);
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEADR, 0xffc3);
target_read_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEMOD, &v);
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEMOD, v | 0x8);
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEECON, 0x06);
for (v = 0x4; v & 0x4;
target_read_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEESTA, &v));
if (!(v & 0x1))
{
LOG_ERROR("mass erase failed.\n");
return ERROR_FLASH_SECTOR_NOT_ERASED;
}
LOG_DEBUG("mass erase successful.\n");
return ERROR_OK;
}
count = last - first;
for (x = 0; x < count; ++x)
{
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEADR, bank->base + first * 512 + x * 512);
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEECON, 0x05);
for (v = 0x4; v & 0x4; target_read_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEESTA, &v));
if (!(v & 0x1))
{
LOG_ERROR("erase failed for page address %x\n", bank->base + first * 512 + x * 512);
return ERROR_FLASH_SECTOR_NOT_ERASED;
}
LOG_DEBUG("erased page address %x\n", bank->base + first * 512 + x * 512);
}
return ERROR_OK;
}
int aduc702x_protect(struct flash_bank_s *bank, int set, int first, int last)
{
printf("aduc702x_protect not implemented yet.\n");
return ERROR_FLASH_OPERATION_FAILED;
}
int aduc702x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
{
int x;
u32 v;
target_t *target = bank->target;
for (x = 0; x < count; x += 2)
{
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEADR, offset + x);
/* if we able to encounter a single byte instead of a word */
if ((x + 1) == count) {
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEDAT, buffer[x]);
}
else {
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEDAT, buffer[x] | (buffer[x+1] << 8));
}
target_write_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEECON, 0x02);
for (v = 0x4; v & 0x4; target_read_u32(target, ADUC702x_FLASH + ADUC702x_FLASH_FEESTA, &v));
if (!(v & 0x1))
{
LOG_ERROR("single write failed for address %x.\n", offset + x);
return ERROR_FLASH_OPERATION_FAILED;
}
LOG_DEBUG("single write for address %x.\n", offset + x);
}
return ERROR_OK;
}
int aduc702x_probe(struct flash_bank_s *bank)
{
return ERROR_OK;
}
int aduc702x_info(struct flash_bank_s *bank, char *buf, int buf_size)
{
snprintf(buf, buf_size, "aduc702x flash driver info" );
return ERROR_OK;
}

4
src/flash/flash.c
View File

@ -69,7 +69,7 @@ extern flash_driver_t cfi_flash;
extern flash_driver_t at91sam7_flash;
extern flash_driver_t str7x_flash;
extern flash_driver_t str9x_flash;
extern flash_driver_t x7026_flash;
extern flash_driver_t aduc702x_flash;
extern flash_driver_t stellaris_flash;
extern flash_driver_t str9xpec_flash;
extern flash_driver_t stm32x_flash;
@ -85,7 +85,7 @@ flash_driver_t *flash_drivers[] =
&at91sam7_flash,
&str7x_flash,
&str9x_flash,
&x7026_flash,
&aduc702x_flash,
&stellaris_flash,
&str9xpec_flash,
&stm32x_flash,

217
src/flash/x7026.c
View File

@ -1,217 +0,0 @@
/***************************************************************************
* Copyright (C) 2008 by Kevin McGuire *
* Copyright (C) 2008 by Marcel Wijlaars *
*
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include "flash.h"
#include "target.h"
#include "log.h"
#include "armv4_5.h"
#include "algorithm.h"
#include "binarybuffer.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
int x7026_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
int x7026_register_commands(struct command_context_s *cmd_ctx);
int x7026_erase(struct flash_bank_s *bank, int first, int last);
int x7026_protect(struct flash_bank_s *bank, int set, int first, int last);
int x7026_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
int x7026_probe(struct flash_bank_s *bank);
int x7026_info(struct flash_bank_s *bank, char *buf, int buf_size);
int x7026_protect_check(struct flash_bank_s *bank);
int x7026_erase_check(struct flash_bank_s *bank);
#define ADUC7026_FLASH 0xfffff800
#define ADUC7026_FLASH_FEESTA (0*4)
#define ADUC7026_FLASH_FEEMOD (1*4)
#define ADUC7026_FLASH_FEECON (2*4)
#define ADUC7026_FLASH_FEEDAT (3*4)
#define ADUC7026_FLASH_FEEADR (4*4)
#define ADUC7026_FLASH_FEESIGN (5*4)
#define ADUC7026_FLASH_FEEPRO (6*4)
#define ADUC7026_FLASH_FEEHIDE (7*4)
typedef struct{
uint32_t feesta;
uint32_t feemod;
uint32_t feecon;
uint32_t feedat;
uint32_t feeadr;
uint32_t feesign;
uint32_t feepro;
uint32_t feehide;
} ADUC7026_FLASH_MMIO;
typedef struct
{
unsigned char tmp;
} X7026_BANK;
flash_driver_t x7026_flash =
{
.name = "x7026",
.register_commands = x7026_register_commands,
.flash_bank_command = x7026_flash_bank_command,
.erase = x7026_erase,
.protect = x7026_protect,
.write = x7026_write,
.probe = x7026_probe,
.auto_probe = x7026_probe,
.erase_check = x7026_erase_check,
.protect_check = x7026_protect_check,
.info = x7026_info
};
int x7026_register_commands(struct command_context_s *cmd_ctx)
{
printf("x7026_register_commands not implemented yet.\n");
return ERROR_OK;
}
/* flash bank str7x <base> <size> 0 0 <target#> */
int x7026_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
{
X7026_BANK *nbank;
if (argc < 6)
{
LOG_WARNING("incomplete flash_bank x7026 configuration");
return ERROR_FLASH_BANK_INVALID;
}
nbank = malloc(sizeof(X7026_BANK));
/* just warn that we are used to normally using 0x80000 */
if(bank->base != 0x80000)
{
LOG_WARNING("Default base address is 0x80000 on the ADuC7026!");
}
nbank->tmp = 1;
bank->driver_priv = nbank;
return ERROR_OK;
}
int x7026_protect_check(struct flash_bank_s *bank)
{
printf("x7026_protect_check not implemented yet.\n");
return ERROR_OK;
}
int x7026_erase(struct flash_bank_s *bank, int first, int last)
{
unsigned int x;
int count;
u32 v;
target_t *target = bank->target;
/* mass erase */
if((first | last) == 0)
{
printf("performing mass erase.\n");
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEEDAT, 0x3cff);
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEEADR, 0xffc3);
target_read_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEEMOD, &v);
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEEMOD, v | 0x8);
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEECON, 0x06);
for(v = 0x4; v & 0x4;
target_read_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEESTA, &v));
if(!(v & 0x1))
{
printf("mass erase failed.\n");
return -1;
}
printf("mass erase successful.\n");
return ERROR_OK;
}
count = last - first;
for(x = 0; x < (unsigned int)count; ++x)
{
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEEADR, bank->base + first * 512 + x * 512);
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEECON, 0x05);
for(v = 0x4; v & 0x4; target_read_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEESTA, &v));
if(!(v & 0x1))
{
printf("erase failed for page address %x\n", bank->base + first * 512 + x * 512);
return -1;
}
printf("erased page address %x\n", bank->base + first * 512 + x * 512);
}
return ERROR_OK;
}
int x7026_protect(struct flash_bank_s *bank, int set, int first, int last)
{
printf("x7026_protect not implemented yet.\n");
return -1;
}
int x7026_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
{
unsigned int x;
u32 v;
target_t *target = bank->target;
for(x = 0; x < count; x += 2)
{
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEEADR, offset + x);
/* if we able to encounter a single byte instead of a word */
if((x + 1) == count)
{
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEEDAT, buffer[x]);
}else{
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEEDAT, buffer[x] | (buffer[x+1] << 8));
}
target_write_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEECON, 0x02);
for(v = 0x4; v & 0x4; target_read_u32(target, ADUC7026_FLASH + ADUC7026_FLASH_FEESTA, &v));
if(!(v & 0x1))
{
printf("single write failed for address %x.\n", offset + x);
return -1;
}
printf("single write for address %x.\n", offset + x);
}
return ERROR_OK;
}
int x7026_probe(struct flash_bank_s *bank)
{
printf("x7026_probe not implemented yet.\n");
return ERROR_OK;
}
int x7026_info(struct flash_bank_s *bank, char *buf, int buf_size)
{
snprintf(buf, buf_size, "x7026 flash driver info" );
return -1;
}
int x7026_erase_check(struct flash_bank_s *bank)
{
printf("x7026_erase_check not implemented yet.\n");
return -1;
}

6
src/openocd.c
View File

@ -60,7 +60,6 @@
#include "replacements.h"
/* Give TELNET a way to find out what version this is */
int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
@ -69,7 +68,6 @@ int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **
return ERROR_OK;
}
void exit_handler(void)
{
/* close JTAG interface */
@ -91,8 +89,6 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
return ERROR_OK;
}
/* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
@ -148,8 +144,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
tcl_init(); /* allows tcl to just connect without going thru telnet */
target_register_event_callback(log_target_callback_event_handler, cmd_ctx);
return ERROR_OK;
}

2
src/target/target/aduc702x.cfg
View File

@ -24,7 +24,7 @@ target arm7tdmi little 0
#working_area 0 0x11C00 0x400 backup
## flash configuration
flash bank x7026 0x80000 0x10000 2 2 0
flash bank aduc702x 0x80000 0x10000 2 2 0
## If you use the watchdog, the following code makes sure that the board
## doesn't reboot when halted via JTAG. Yes, on the older generation