summaryrefslogtreecommitdiff
path: root/src/openocd.c
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-01-09 15:58:01 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-01-09 15:58:01 +0000
commit0160320060cab521f66ea100d67a31b0b906d35f (patch)
tree84e6d208afe665c7d0091b942144bf67d43d5518 /src/openocd.c
parent2e01a1ad1930aabb9e3bc7a0e3eb98b2b3331b1c (diff)
downloadopenocd+libswd-0160320060cab521f66ea100d67a31b0b906d35f.tar.gz
openocd+libswd-0160320060cab521f66ea100d67a31b0b906d35f.tar.bz2
openocd+libswd-0160320060cab521f66ea100d67a31b0b906d35f.tar.xz
openocd+libswd-0160320060cab521f66ea100d67a31b0b906d35f.zip
- rename flash_init and flash_erase to flash_init_drivers and flash_erase_address_range - stops conflicts with redboot. Thanks Øyvind Harboe
- gdb connection not dropped if we fail to allocate memory in query packets git-svn-id: svn://svn.berlios.de/openocd/trunk@249 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/openocd.c')
-rw-r--r--src/openocd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openocd.c b/src/openocd.c
index 2362e60f..92305fb7 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
DEBUG("target init complete");
- if (flash_init(cmd_ctx) != ERROR_OK)
+ if (flash_init_drivers(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
DEBUG("flash init complete");