interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flash: update stm32 driver names 

Use consistent names for the stm32 family flash drivers, eg.
stm32x -> stm32f1x
stm32f2xxx -> stm32f2x

this makes it easier to add support for newer stm32 families.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
This commit is contained in:
Spencer Oliver 2011-07-28 11:42:27 +01:00
parent b5a324e63c
commit b066a7db24
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/flash/nor/Makefile.am
View File

@ -24,8 +24,8 @@ NOR_DRIVERS = \
pic32mx.c \ pic32mx.c \
stmsmi.c \ stmsmi.c \
stellaris.c \ stellaris.c \
stm32x.c \ stm32f1x.c \
stm32f2xxx.c \ stm32f2x.c \
str7x.c \ str7x.c \
str9x.c \ str9x.c \
str9xpec.c \ str9xpec.c \

8
src/flash/nor/drivers.c
View File

@ -32,8 +32,8 @@ extern struct flash_driver str9x_flash;
extern struct flash_driver aduc702x_flash; extern struct flash_driver aduc702x_flash;
extern struct flash_driver stellaris_flash; extern struct flash_driver stellaris_flash;
extern struct flash_driver str9xpec_flash; extern struct flash_driver str9xpec_flash;
extern struct flash_driver stm32x_flash; extern struct flash_driver stm32f1x_flash;
extern struct flash_driver stm32xf2xxx_flash; extern struct flash_driver stm32f2x_flash;
extern struct flash_driver tms470_flash; extern struct flash_driver tms470_flash;
extern struct flash_driver ecosflash_flash; extern struct flash_driver ecosflash_flash;
extern struct flash_driver ocl_flash; extern struct flash_driver ocl_flash;
@ -62,8 +62,8 @@ static struct flash_driver *flash_drivers[] = {
&aduc702x_flash, &aduc702x_flash,
&stellaris_flash, &stellaris_flash,
&str9xpec_flash, &str9xpec_flash,
&stm32x_flash, &stm32f1x_flash,
&stm32xf2xxx_flash, &stm32f2x_flash,
&tms470_flash, &tms470_flash,
&ecosflash_flash, &ecosflash_flash,
&ocl_flash, &ocl_flash,

8
src/flash/nor/stm32x.c → src/flash/nor/stm32f1x.c
View File

@ -1544,16 +1544,16 @@ static const struct command_registration stm32x_exec_command_handlers[] = {
static const struct command_registration stm32x_command_handlers[] = { static const struct command_registration stm32x_command_handlers[] = {
{ {
.name = "stm32x", .name = "stm32f1x",
.mode = COMMAND_ANY, .mode = COMMAND_ANY,
.help = "stm32x flash command group", .help = "stm32f1x flash command group",
.chain = stm32x_exec_command_handlers, .chain = stm32x_exec_command_handlers,
}, },
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };
struct flash_driver stm32x_flash = { struct flash_driver stm32f1x_flash = {
.name = "stm32x", .name = "stm32f1x",
.commands = stm32x_command_handlers, .commands = stm32x_command_handlers,
.flash_bank_command = stm32x_flash_bank_command, .flash_bank_command = stm32x_flash_bank_command,
.erase = stm32x_erase, .erase = stm32x_erase,

21
src/flash/nor/stm32f2xxx.c → src/flash/nor/stm32f2x.c
View File

@ -48,8 +48,7 @@
* *
*/ */
/* Danger!!!! The STM32F1x and STM32F2x series actually have
/* Danger!!!! The STM32F1xxxx and STM32F2xxxx series actually have
* quite different flash controllers. * quite different flash controllers.
* *
* What's more scary is that the names of the registers and their * What's more scary is that the names of the registers and their
@ -57,7 +56,7 @@
* can be very different. * can be very different.
* *
* To reduce testing complexity and dangers of regressions, * To reduce testing complexity and dangers of regressions,
* a seperate file is used for stm32fx2222. * a seperate file is used for stm32fx2x.
* *
* 1mByte part with 4 x 16, 1 x 64, 7 x 128kBytes sectors * 1mByte part with 4 x 16, 1 x 64, 7 x 128kBytes sectors
* *
@ -73,16 +72,16 @@
* PM0059 * PM0059
* www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/PROGRAMMING_MANUAL/CD00233952.pdf * www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/PROGRAMMING_MANUAL/CD00233952.pdf
* *
* STM32F1xxx series - notice that this code was copy, pasted and knocked * STM32F1x series - notice that this code was copy, pasted and knocked
* into a stm32f2xxx driver, so in case something has been converted or * into a stm32f2x driver, so in case something has been converted or
* bugs haven't been fixed, here are the original manuals: * bugs haven't been fixed, here are the original manuals:
* *
* RM0008 - Reference manual * RM0008 - Reference manual
* *
* RM0042, the Flash programming manual for low-, medium- high-density and * RM0042, the Flash programming manual for low-, medium- high-density and
* connectivity line STM32F10xxx devices * connectivity line STM32F10x devices
* *
* PM0068, the Flash programming manual for XL-density STM32F10xxx devices. * PM0068, the Flash programming manual for XL-density STM32F10x devices.
* *
*/ */
@ -683,16 +682,16 @@ static const struct command_registration stm32x_exec_command_handlers[] = {
static const struct command_registration stm32x_command_handlers[] = { static const struct command_registration stm32x_command_handlers[] = {
{ {
.name = "stm32f2xxx", .name = "stm32f2x",
.mode = COMMAND_ANY, .mode = COMMAND_ANY,
.help = "stm32f2xxx flash command group", .help = "stm32f2x flash command group",
.chain = stm32x_exec_command_handlers, .chain = stm32x_exec_command_handlers,
}, },
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };
struct flash_driver stm32xf2xxx_flash = { struct flash_driver stm32f2x_flash = {
.name = "stm32f2xxx", .name = "stm32f2x",
.commands = stm32x_command_handlers, .commands = stm32x_command_handlers,
.flash_bank_command = stm32x_flash_bank_command, .flash_bank_command = stm32x_flash_bank_command,
.erase = stm32x_erase, .erase = stm32x_erase,