diff options
author | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-12-17 22:12:57 +0000 |
---|---|---|
committer | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-12-17 22:12:57 +0000 |
commit | ed1e9d6abdece4fbf6251a11f0eca3c921221048 (patch) | |
tree | 3c38d8d383ee95bb801a157208f96c1b1f6bd760 /src/flash | |
parent | 9491aa15cd6d07fb12132b4b4160d10cdfc013e6 (diff) | |
download | openocd+libswd-ed1e9d6abdece4fbf6251a11f0eca3c921221048.tar.gz openocd+libswd-ed1e9d6abdece4fbf6251a11f0eca3c921221048.tar.bz2 openocd+libswd-ed1e9d6abdece4fbf6251a11f0eca3c921221048.tar.xz openocd+libswd-ed1e9d6abdece4fbf6251a11f0eca3c921221048.zip |
- only some cosmetic changes, convert \r\n to unix
git-svn-id: svn://svn.berlios.de/openocd/trunk@239 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash')
-rw-r--r-- | src/flash/cfi.c | 6 | ||||
-rw-r--r-- | src/flash/flash.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/flash/cfi.c b/src/flash/cfi.c index ddaaee7d..cc5a69e1 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -1014,15 +1014,15 @@ int cfi_intel_write_block(struct flash_bank_s *bank, u8 *buffer, u32 address, u3 armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM;
-
+ armv4_5_info.core_state = ARMV4_5_STATE_ARM; + /* If we are setting up the write_algorith, we need target_code_src */ /* if not we only need target_code_size. */ /* */ /* However, we don't want to create multiple code paths, so we */ /* do the unecessary evaluation of target_code_src, which the */ /* compiler will probably nicely optimize away if not needed */ -
+ /* prepare algorithm code for target endian */ switch (bank->bus_width) { diff --git a/src/flash/flash.c b/src/flash/flash.c index 4b18bc35..653a7ab2 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -176,8 +176,8 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char c->base = strtoul(args[1], NULL, 0); c->size = strtoul(args[2], NULL, 0); c->chip_width = strtoul(args[3], NULL, 0); - c->bus_width = strtoul(args[4], NULL, 0);
- c->num_sectors = 0;
+ c->bus_width = strtoul(args[4], NULL, 0); + c->num_sectors = 0; c->sectors = NULL; c->next = NULL; @@ -563,7 +563,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm } image.start_address_set = 0; -
+ retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL); if (retval != ERROR_OK) { |