Skip to content

hikey #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 2 commits into from
Apr 26, 2019
Merged

hikey #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c37f1ff
hikey: fix IRAM/DRAM base addresses
jgunn0262 Apr 25, 2019
aba7897
adsp: common: simple file parser needs to increment block on error.
jgunn0262 Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hw/adsp/dsp/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}
Expand Down
3 changes: 3 additions & 0 deletions hw/adsp/dsp/hikey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down