Skip to content
Snippets Groups Projects
Commit 56a889f4 authored by Andreas Färber's avatar Andreas Färber Committed by Andreas Fritiofson
Browse files

doc: Fix mismerges of fm4, kinetis and kinetis_ke flash drivers


Commit dfc6658c ("Kinetis: flash
driver described in openocd.texi") inserted a kinetis section between
fm3 and lpc2000. Then commit 43ff5acd
("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 commit
5396ec5d ("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: default avatarAndreas Färber <afaerber@suse.de>
Reviewed-on: http://openocd.zylin.com/3484


Tested-by: jenkins
Reviewed-by: default avatarTomas Vanek <vanekt@fbl.cz>
Reviewed-by: default avatarMarc Schink <openocd-dev@marcschink.de>
parent 9ad6ebc8
Branches
Tags
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment