doc: Fix mismerges of fm4, kinetis and kinetis_ke flash drivers
Commitdfc6658cf9
("Kinetis: flash driver described in openocd.texi") inserted a kinetis section between fm3 and lpc2000. Then commit43ff5acd45
("flash: New Spansion FM4 flash driver") was merged, inserting the fm4 section between kinetis and lpc2000, instead of after fm3. Finally kinetis_ke was added between kinetis and fm4 in commit5396ec5dcc
("flash: Added support for Freescale Kinetis KE family."). Restore the alphabetical order by moving the fm4 section to before kinetis. Change-Id: I77e47c3cd5b2cd8570b62ff2f7be8526aaf57ad0 Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-on: http://openocd.zylin.com/3484 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz> Reviewed-by: Marc Schink <openocd-dev@marcschink.de>
This commit is contained in:
parent
9ad6ebc89a
commit
56a889f4d4
|
@ -5246,6 +5246,24 @@ flash bank $_FLASHNAME fm3 0 0 0 0 $_TARGETNAME
|
|||
@end example
|
||||
@end deffn
|
||||
|
||||
@deffn {Flash Driver} fm4
|
||||
All members of the FM4 microcontroller family from Spansion (formerly Fujitsu)
|
||||
include internal flash and use ARM Cortex-M4 cores.
|
||||
The @var{fm4} driver uses a @var{family} parameter to select the
|
||||
correct bank config, it can currently be one of the following:
|
||||
@code{MB9BFx64}, @code{MB9BFx65}, @code{MB9BFx66}, @code{MB9BFx67}, @code{MB9BFx68},
|
||||
@code{S6E2Cx8}, @code{S6E2Cx9}, @code{S6E2CxA} or @code{S6E2Dx},
|
||||
with @code{x} treated as wildcard and otherwise case (and any trailing
|
||||
characters) ignored.
|
||||
|
||||
@example
|
||||
flash bank $@{_FLASHNAME@}0 fm4 0x00000000 0 0 0 $_TARGETNAME S6E2CCAJ0A
|
||||
flash bank $@{_FLASHNAME@}1 fm4 0x00100000 0 0 0 $_TARGETNAME S6E2CCAJ0A
|
||||
@end example
|
||||
@emph{The current implementation is incomplete. Protection is not supported,
|
||||
nor is Chip Erase (only Sector Erase is implemented).}
|
||||
@end deffn
|
||||
|
||||
@deffn {Flash Driver} kinetis
|
||||
@cindex kinetis
|
||||
Kx and KLx members of the Kinetis microcontroller family from Freescale include
|
||||
|
@ -5331,24 +5349,6 @@ Command disables watchdog timer.
|
|||
@end deffn
|
||||
@end deffn
|
||||
|
||||
@deffn {Flash Driver} fm4
|
||||
All members of the FM4 microcontroller family from Spansion (formerly Fujitsu)
|
||||
include internal flash and use ARM Cortex-M4 cores.
|
||||
The @var{fm4} driver uses a @var{family} parameter to select the
|
||||
correct bank config, it can currently be one of the following:
|
||||
@code{MB9BFx64}, @code{MB9BFx65}, @code{MB9BFx66}, @code{MB9BFx67}, @code{MB9BFx68},
|
||||
@code{S6E2Cx8}, @code{S6E2Cx9}, @code{S6E2CxA} or @code{S6E2Dx},
|
||||
with @code{x} treated as wildcard and otherwise case (and any trailing
|
||||
characters) ignored.
|
||||
|
||||
@example
|
||||
flash bank $@{_FLASHNAME@}0 fm4 0x00000000 0 0 0 $_TARGETNAME S6E2CCAJ0A
|
||||
flash bank $@{_FLASHNAME@}1 fm4 0x00100000 0 0 0 $_TARGETNAME S6E2CCAJ0A
|
||||
@end example
|
||||
@emph{The current implementation is incomplete. Protection is not supported,
|
||||
nor is Chip Erase (only Sector Erase is implemented).}
|
||||
@end deffn
|
||||
|
||||
@deffn {Flash Driver} lpc2000
|
||||
This is the driver to support internal flash of all members of the
|
||||
LPC11(x)00 and LPC1300 microcontroller families and most members of
|
||||
|
|
Loading…
Reference in New Issue