From patchwork Sun Sep 1 21:22:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antony Pavlov X-Patchwork-Id: 271651 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C5DD32C0084 for ; Mon, 2 Sep 2013 07:28:34 +1000 (EST) Received: from localhost ([::1]:35820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGFCD-0001WV-0L for incoming@patchwork.ozlabs.org; Sun, 01 Sep 2013 17:28:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGF9F-0005m6-OY for qemu-devel@nongnu.org; Sun, 01 Sep 2013 17:25:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGF97-0005GL-4l for qemu-devel@nongnu.org; Sun, 01 Sep 2013 17:25:29 -0400 Received: from mail-lb0-x22e.google.com ([2a00:1450:4010:c04::22e]:59326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGF96-0005GD-Tb for qemu-devel@nongnu.org; Sun, 01 Sep 2013 17:25:21 -0400 Received: by mail-lb0-f174.google.com with SMTP id w6so3334572lbh.33 for ; Sun, 01 Sep 2013 14:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IcS65b8dex/KkaSmMvwf7fTMsdooL1ScyoopmoM8bjY=; b=ZMkoMKLJNPmvU0QvomsxqGRyvwdSh6VHzPv9cZBUzKIY0eECKy6Wx9TwGuiPi27dAR Et7feeLcVa2K5lwajthT4pD3PBDWWtjZi+ub6d7EizV7ezBZoxu50j6H1krApsLgtDAH 9zqdZEr4nkEsXZ2sQn1Aa38yDxYXBJoIpnLFkVIpo1LsQLIcyoI2zUHvsnZ+PjQlWoJO Lls30HuECOjVl1Q2nRc5M13pveC2txOCUVi4/OtgZ7h0PU5ucmurVH3QDPbo6gcFWEZp zDH+J0RooRP5qcxiweTFrJxCW6XyzEeRuo7b+Jy1Msx0dCcM9MAHS3Vf7CvYpAbZIVjD P5hw== X-Received: by 10.152.116.7 with SMTP id js7mr18492025lab.11.1378070719905; Sun, 01 Sep 2013 14:25:19 -0700 (PDT) Received: from localhost.localdomain (ppp37-190-57-26.pppoe.spdop.ru. [37.190.57.26]) by mx.google.com with ESMTPSA id u20sm4348379lbh.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 01 Sep 2013 14:25:18 -0700 (PDT) From: Antony Pavlov To: qemu-devel@nongnu.org Date: Mon, 2 Sep 2013 01:22:42 +0400 Message-Id: <1378070562-14777-6-git-send-email-antonynpavlov@gmail.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1378070562-14777-1-git-send-email-antonynpavlov@gmail.com> References: <1378070562-14777-1-git-send-email-antonynpavlov@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22e Cc: Alex Dumitrache , Peter Crosthwaite , Giovanni Condello , g3gg0 , Peter Maydell , Paul Brook , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Antony Pavlov Subject: [Qemu-devel] [RFC v2 5/5] hw/arm/digic: add NOR ROM support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Antony Pavlov --- hw/arm/digic_boards.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 0b99227..7b7dc1c 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -1,6 +1,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; @@ -9,6 +16,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; @@ -35,11 +46,67 @@ 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 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) + + target_long rom_size; + const char *filename; + + /* + * Samsung K8P3215UQB: + * * AMD command set; + * * multiple sector size: some sectors are 8K the other ones are 64K. + * Alas! The pflash_cfi02_register() function creates a flash + * device with unified sector size. + */ + 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); + + 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, FLASH_K8P3215UQB_SIZE); + if (rom_size < 0 || rom_size > FLASH_K8P3215UQB_SIZE) { + fprintf(stderr, "Couldn't load rom image '%s'\n", filename); + exit(1); + } + } +} + 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, };