mirror of
https://github.com/openocd-org/openocd.git
synced 2025-10-14 19:48:47 +08:00
Compare commits
3 Commits
v0.6.0-rc2
...
v0.3.1
Author | SHA1 | Date | |
---|---|---|---|
![]() |
371530224c | ||
![]() |
c6ac97cf3b | ||
![]() |
7de1c892cd |
@@ -1,5 +1,5 @@
|
||||
AC_PREREQ(2.60)
|
||||
AC_INIT([openocd], [0.3.0],
|
||||
AC_INIT([openocd], [0.3.1],
|
||||
[OpenOCD Mailing List <openocd-development@lists.berlios.de>])
|
||||
AC_CONFIG_SRCDIR([src/openocd.c])
|
||||
|
||||
|
@@ -1040,32 +1040,33 @@ int target_alloc_working_area(struct target_s *target, uint32_t size, working_ar
|
||||
{
|
||||
int retval;
|
||||
int enabled;
|
||||
|
||||
retval = target->type->mmu(target, &enabled);
|
||||
if (retval != ERROR_OK)
|
||||
{
|
||||
return retval;
|
||||
}
|
||||
|
||||
if (enabled)
|
||||
{
|
||||
if (target->working_area_phys_spec)
|
||||
{
|
||||
LOG_DEBUG("MMU disabled, using physical address for working memory 0x%08x", (unsigned)target->working_area_phys);
|
||||
if (!enabled) {
|
||||
if (target->working_area_phys_spec) {
|
||||
LOG_DEBUG("MMU disabled, using physical "
|
||||
"address for working memory 0x%08x",
|
||||
(unsigned)target->working_area_phys);
|
||||
target->working_area = target->working_area_phys;
|
||||
} else
|
||||
{
|
||||
LOG_ERROR("No working memory available. Specify -work-area-phys to target.");
|
||||
} else {
|
||||
LOG_ERROR("No working memory available. "
|
||||
"Specify -work-area-phys to target.");
|
||||
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
|
||||
}
|
||||
} else
|
||||
{
|
||||
if (target->working_area_virt_spec)
|
||||
{
|
||||
LOG_DEBUG("MMU enabled, using virtual address for working memory 0x%08x", (unsigned)target->working_area_virt);
|
||||
} else {
|
||||
if (target->working_area_virt_spec) {
|
||||
LOG_DEBUG("MMU enabled, using virtual "
|
||||
"address for working memory 0x%08x",
|
||||
(unsigned)target->working_area_virt);
|
||||
target->working_area = target->working_area_virt;
|
||||
} else
|
||||
{
|
||||
LOG_ERROR("No working memory available. Specify -work-area-virt to target.");
|
||||
} else {
|
||||
LOG_ERROR("No working memory available. "
|
||||
"Specify -work-area-virt to target.");
|
||||
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user