diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-08-30 17:30:14 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-08-30 17:30:14 +0000 |
| commit | d879faa3cb8200c1c31e1a52c42e9bbacb9fac40 (patch) | |
| tree | f4615c0c22e50f94c61a292ce3d582132ca2d789 /src/flash | |
| parent | 4b9bdd664a79d5713b22a178086b071abc049d01 (diff) | |
| download | openocd+libswd-d879faa3cb8200c1c31e1a52c42e9bbacb9fac40.tar.gz openocd+libswd-d879faa3cb8200c1c31e1a52c42e9bbacb9fac40.tar.bz2 openocd+libswd-d879faa3cb8200c1c31e1a52c42e9bbacb9fac40.tar.xz openocd+libswd-d879faa3cb8200c1c31e1a52c42e9bbacb9fac40.zip | |
David Brownell <david-b@pacbell.net> start phasing out integers as target IDs
git-svn-id: svn://svn.berlios.de/openocd/trunk@2650 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/at91sam7.c | 36 | ||||
| -rw-r--r-- | src/flash/orion_nand.c | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c index 04790617..315a3f3f 100644 --- a/src/flash/at91sam7.c +++ b/src/flash/at91sam7.c @@ -20,20 +20,30 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ****************************************************************************/ -/*************************************************************************************************************************************************************************************** +/*************************************************************************** * * New flash setup command: * -* flash bank <driver> <base_addr> <size> <chip_width> <bus_width> <target_number> [<target_name> <banks> <sectors_per_bank> <pages_per_sector> <page_size> <num_nvmbits> <ext_freq_khz>] +* flash bank <driver> <base_addr> <size> <chip_width> <bus_width> <target_id> +* [<chip_type> <banks> +* <sectors_per_bank> <pages_per_sector> +* <page_size> <num_nvmbits> +* <ext_freq_khz>] * * <ext_freq_khz> - MUST be used if clock is from external source, -* CAN be used if main oscillator frequency is known (recomended) +* CAN be used if main oscillator frequency is known (recommended) * Examples: -* flash bank at91sam7 0x00100000 0 0 4 0 0 AT91SAM7XC256 1 16 64 256 3 25000 ==== RECOMENDED ============ -* flash bank at91sam7 0 0 0 0 0 0 0 0 0 0 0 0 25000 (auto-detection, except for clock) ==== RECOMENDED ============ -* flash bank at91sam7 0x00100000 0 0 4 0 0 AT91SAM7XC256 1 16 64 256 3 0 ==== NOT RECOMENDED !!! ==== -* flash bank at91sam7 0 0 0 0 0 (old style, full auto-detection) ==== NOT RECOMENDED !!! ==== -****************************************************************************************************************************************************************************************/ +* ==== RECOMMENDED (covers clock speed) ============ +* flash bank at91sam7 0x00100000 0 0 4 $_TARGETNAME AT91SAM7XC256 1 16 64 256 3 25000 +* (if auto-detect fails; provides clock spec) +* flash bank at91sam7 0 0 0 0 $_TARGETNAME 0 0 0 0 0 0 25000 +* (auto-detect everything except the clock) +* ==== NOT RECOMMENDED !!! (clock speed is not configured) ==== +* flash bank at91sam7 0x00100000 0 0 4 $_TARGETNAME AT91SAM7XC256 1 16 64 256 3 0 +* (if auto-detect fails) +* flash bank at91sam7 0 0 0 0 $_TARGETNAME +* (old style, auto-detect everything) +****************************************************************************/ #ifdef HAVE_CONFIG_H #include "config.h" @@ -734,16 +744,6 @@ static int at91sam7_protect_check(struct flash_bank_s *bank) return ERROR_OK; } -/*************************************************************************************************************************************************************************************** -# flash bank <driver> <base_addr> <size> <chip_width> <bus_width> <target_number> [<target_name> <banks> <sectors_per_bank> <pages_per_sector> <page_size> <num_nvmbits> <ext_freq_khz>] -# <ext_freq_khz> - MUST be used if clock is from external source -# CAN be used if main oscillator frequency is known -# Examples: -# flash bank at91sam7 0x00100000 0 0 4 0 0 AT91SAM7XC256 1 16 64 256 3 25000 ==== RECOMENDED ============ -# flash bank at91sam7 0 0 0 0 0 0 0 0 0 0 0 0 25000 (auto-detection, except for clock) ==== RECOMENDED ============ -# flash bank at91sam7 0x00100000 0 0 4 0 0 AT91SAM7XC256 1 16 64 256 3 0 ==== NOT RECOMENDED !!! ==== -# flash bank at91sam7 0 0 0 0 0 (old style, full auto-detection) ==== NOT RECOMENDED !!! ==== -****************************************************************************************************************************************************************************************/ static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) { flash_bank_t *t_bank = bank; diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c index 6b50f1fb..dc9d78c5 100644 --- a/src/flash/orion_nand.c +++ b/src/flash/orion_nand.c @@ -198,7 +198,7 @@ int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, uint8_t ale, cle; if (argc != 3) { - LOG_ERROR("arguments must be: <target_number> <NAND_address>\n"); + LOG_ERROR("arguments must be: <target_id> <NAND_address>\n"); return ERROR_NAND_DEVICE_INVALID; } |