diff --git a/hw/adsp/dsp/common.c b/hw/adsp/dsp/common.c
index 19b2279cb84ab..2d628fe24b551 100644
--- a/hw/adsp/dsp/common.c
+++ b/hw/adsp/dsp/common.c
@@ -175,7 +175,7 @@ static int sof_module_memcpy(struct adsp_dev *adsp,
 
 			mem = adsp_get_mem_space(adsp, board->iram_base + block->offset - board->host_iram_offset);
 			if (!mem)
-				continue;
+				goto next;
 			memcpy(mem->ptr + block->offset - board->host_iram_offset,
 				(void *)block + sizeof(*block), block->size);
 			break;
@@ -186,7 +186,7 @@ static int sof_module_memcpy(struct adsp_dev *adsp,
 
 			mem = adsp_get_mem_space(adsp, board->dram_base + block->offset - board->host_dram_offset);
 			if (!mem)
-				continue;
+				goto next;
 			memcpy(mem->ptr + block->offset - board->host_dram_offset,
 				(void *)block + sizeof(*block), block->size);
 			break;
@@ -200,7 +200,7 @@ static int sof_module_memcpy(struct adsp_dev *adsp,
 			"block %d type 0x%x size 0x%x ==>  offset 0x%x\n",
 			count, block->type, block->size, block->offset);
 
-
+next:
 		/* next block */
 		block = (void *)block + sizeof(*block) + block->size;
 	}
diff --git a/hw/adsp/dsp/hikey.c b/hw/adsp/dsp/hikey.c
index bc6cadb6a1b21..6d42d353a1172 100644
--- a/hw/adsp/dsp/hikey.c
+++ b/hw/adsp/dsp/hikey.c
@@ -387,6 +387,9 @@ static const struct adsp_desc hikey_dsp_desc = {
 
     .num_io = ARRAY_SIZE(hikey_io),
     .io_dev = hikey_io,
+
+    .iram_base = ADSP_HIKEY_HOST_RUN_ITCM_BASE,
+    .dram_base = ADSP_HIKEY_HOST_RUN_DTCM_BASE,
 };
 
 static void hikey_adsp_init(MachineState *machine)