Skip to content

Commit

Permalink
hw/xtensa/xtfpga: fix FLASH mapping to boot region for KC705
Browse files Browse the repository at this point in the history
On KC705 bootloader area is located at FLASH offset 0x06000000, not 0 as
on older xtfpga boards.

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
  • Loading branch information
jcmvbkbc committed Jun 28, 2014
1 parent d4cba13 commit 37ed7c4
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions hw/xtensa/xtensa_lx60.c
Expand Up @@ -42,6 +42,7 @@
typedef struct LxBoardDesc {
hwaddr flash_base;
size_t flash_size;
size_t flash_boot_base;
size_t flash_sector_size;
size_t sram_size;
} LxBoardDesc;
Expand Down Expand Up @@ -266,9 +267,9 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine)
MemoryRegion *flash_io = g_malloc(sizeof(*flash_io));

memory_region_init_alias(flash_io, NULL, "lx60.flash",
flash_mr, 0,
board->flash_size < 0x02000000 ?
board->flash_size : 0x02000000);
flash_mr, board->flash_boot_base,
board->flash_size - board->flash_boot_base < 0x02000000 ?
board->flash_size - board->flash_boot_base : 0x02000000);
memory_region_add_subregion(system_memory, 0xfe000000,
flash_io);
}
Expand Down Expand Up @@ -313,6 +314,7 @@ static void xtensa_kc705_init(MachineState *machine)
static const LxBoardDesc kc705_board = {
.flash_base = 0xf0000000,
.flash_size = 0x08000000,
.flash_boot_base = 0x06000000,
.flash_sector_size = 0x20000,
.sram_size = 0x2000000,
};
Expand Down

0 comments on commit 37ed7c4

Please sign in to comment.