aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Vanek <vanekt@fbl.cz>2018-12-07 18:45:06 +0100
committerTomas Vanek <vanekt@fbl.cz>2018-12-19 13:16:25 +0000
commit270725f8ad7e7b9857bae16b8f78d73fe55a3401 (patch)
treeddf2d742093310e7b64b10281f90a580391c845a
parent71eeda5da1f840a19e1a0ac97fceda8b8457ba1e (diff)
target: allow moving and resizing working area on running target
target configure -work-area-xxx calls target_free_all_working_areas() and sets the desired new parameter. Without this change the working area does not get reallocated if it has been allocated before. target_free_all_working_areas() results in work area containing one block marked as free. Completely free working area in target_free_all_working_areas() Change-Id: I79c681082f32f2a96a2b40eb3b8751e427549693 Signed-off-by: Tomas Vanek <vanekt@fbl.cz> Reviewed-on: http://openocd.zylin.com/4797 Tested-by: jenkins Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
-rw-r--r--src/target/target.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/target/target.c b/src/target/target.c
index 3d33a43d..b4bf5d35 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1949,6 +1949,14 @@ static void target_free_all_working_areas_restore(struct target *target, int res
void target_free_all_working_areas(struct target *target)
{
target_free_all_working_areas_restore(target, 1);
+
+ /* Now we have none or only one working area marked as free */
+ if (target->working_areas) {
+ /* Free the last one to allow on-the-fly moving and resizing */
+ free(target->working_areas->backup);
+ free(target->working_areas);
+ target->working_areas = NULL;
+ }
}
/* Find the largest number of bytes that can be allocated */
@@ -1989,11 +1997,6 @@ static void target_destroy(struct target *target)
}
target_free_all_working_areas(target);
- /* Now we have none or only one working area marked as free */
- if (target->working_areas) {
- free(target->working_areas->backup);
- free(target->working_areas);
- }
/* release the targets SMP list */
if (target->smp) {