Received: from eggs.gnu.org ([2001:4830:134:3::10]:46156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vo77a-0002AI-8h for qemu-devel@nongnu.org; Wed, 04 Dec 2013 02:43:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vo77R-0001pj-Nh for qemu-devel@nongnu.org; Wed, 04 Dec 2013 02:43:46 -0500 Received: from mail-lb0-x236.google.com ([2a00:1450:4010:c04::236]:33142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vo77R-0001pa-DU for qemu-devel@nongnu.org; Wed, 04 Dec 2013 02:43:37 -0500 Received: by mail-lb0-f182.google.com with SMTP id u14so9099482lbd.41 for ; Tue, 03 Dec 2013 23:43:36 -0800 (PST) From: Antony Pavlov Date: Wed, 4 Dec 2013 11:50:43 +0400 Message-Id: <1386143443-5999-6-git-send-email-antonynpavlov@gmail.com> In-Reply-To: <1386143443-5999-1-git-send-email-antonynpavlov@gmail.com> References: <1386143443-5999-1-git-send-email-antonynpavlov@gmail.com> Subject: [Qemu-devel] [PATCH v6 RESEND 5/5] hw/arm/digic: add NOR ROM support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , Giovanni Condello , g3gg0 , Alex Dumitrache , Paul Brook , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Antony Pavlov Signed-off-by: Antony Pavlov --- hw/arm/digic_boards.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 77cfc81..bf6e015 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -26,6 +26,13 @@ #include "hw/boards.h" #include "exec/address-spaces.h" #include "hw/arm/digic.h" +#include "hw/block/flash.h" +#include "hw/loader.h" +#include "sysemu/sysemu.h" + +#define DIGIC4_ROM0_BASE 0xf0000000 +#define DIGIC4_ROM1_BASE 0xf8000000 +#define DIGIC4_ROM_MAX_SIZE 0x08000000 typedef struct DigicBoardState { DigicState *digic; @@ -34,6 +41,10 @@ typedef struct DigicBoardState { typedef struct DigicBoard { hwaddr ram_size; + void (*add_rom0)(DigicBoardState *, hwaddr, const char *); + const char *rom0_def_filename; + void (*add_rom1)(DigicBoardState *, hwaddr, const char *); + const char *rom1_def_filename; hwaddr start_addr; } DigicBoard; @@ -60,11 +71,71 @@ static void digic4_board_init(DigicBoard *board) digic4_board_setup_ram(s, board->ram_size); + if (board->add_rom0) { + board->add_rom0(s, DIGIC4_ROM0_BASE, board->rom0_def_filename); + } + + if (board->add_rom1) { + board->add_rom1(s, DIGIC4_ROM1_BASE, board->rom1_def_filename); + } + s->digic->cpu.env.regs[15] = board->start_addr; } +static void digic_load_rom(DigicBoardState *s, hwaddr addr, + hwaddr max_size, const char *def_filename) +{ + + target_long rom_size; + const char *filename; + + if (bios_name) { + filename = bios_name; + } else { + filename = def_filename; + } + + if (filename) { + char *fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, filename); + + if (!fn) { + fprintf(stderr, "Couldn't find rom image '%s'.\n", filename); + exit(1); + } + + rom_size = load_image_targphys(fn, addr, max_size); + if (rom_size < 0 || rom_size > max_size) { + fprintf(stderr, "Couldn't load rom image '%s'\n", filename); + exit(1); + } + } +} + +/* + * Samsung K8P3215UQB + * 64M Bit (4Mx16) Page Mode / Multi-Bank NOR Flash Memory + */ +static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr, + const char *def_filename) +{ +#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024) +#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024) + + pflash_cfi02_register(addr, NULL, "pflash", FLASH_K8P3215UQB_SIZE, + NULL, FLASH_K8P3215UQB_SECTOR_SIZE, + FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE, + DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE, + 4, + 0x00EC, 0x007E, 0x0003, 0x0001, + 0x0555, 0x2aa, 0); + + digic_load_rom(s, addr, FLASH_K8P3215UQB_SIZE, def_filename); +} + static DigicBoard digic4_board_canon_a1100 = { .ram_size = 64 * 1024 * 1024, + .add_rom1 = digic4_add_k8p3215uqb_rom, + .rom1_def_filename = "canon-a1100-rom1.bin", /* CHDK recommends this address for ROM disassembly */ .start_addr = 0xffc00000, }; -- 1.8.4.4