From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHUPm-0000EB-P8 for qemu-devel@nongnu.org; Thu, 05 Sep 2013 03:55:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHUPb-0000ms-N3 for qemu-devel@nongnu.org; Thu, 05 Sep 2013 03:55:42 -0400 Received: from mail-la0-x229.google.com ([2a00:1450:4010:c03::229]:52585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHUPb-0000mW-E3 for qemu-devel@nongnu.org; Thu, 05 Sep 2013 03:55:31 -0400 Received: by mail-la0-f41.google.com with SMTP id ec20so1284426lab.0 for ; Thu, 05 Sep 2013 00:55:30 -0700 (PDT) From: Antony Pavlov Date: Thu, 5 Sep 2013 11:52:56 +0400 Message-Id: <1378367579-1099-3-git-send-email-antonynpavlov@gmail.com> In-Reply-To: <1378367579-1099-1-git-send-email-antonynpavlov@gmail.com> References: <1378367579-1099-1-git-send-email-antonynpavlov@gmail.com> Subject: [Qemu-devel] [RFC v4 2/5] hw/arm/digic: prepare DIGIC-based boards support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alex Dumitrache , Peter Crosthwaite , Giovanni Condello , g3gg0 , Peter Maydell , Paul Brook , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Antony Pavlov Also this patch adds initial support for Canon PowerShot A1100 IS compact camera. Signed-off-by: Antony Pavlov --- hw/arm/Makefile.objs | 2 +- hw/arm/digic_boards.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 hw/arm/digic_boards.c diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index e140485..f6e9533 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,4 +1,4 @@ -obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o +obj-y += boot.o collie.o digic_boards.o exynos4_boards.o gumstix.o highbank.o obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c new file mode 100644 index 0000000..0b99227 --- /dev/null +++ b/hw/arm/digic_boards.c @@ -0,0 +1,63 @@ +#include "hw/boards.h" +#include "exec/address-spaces.h" +#include "hw/arm/digic.h" + +typedef struct DigicBoardState { + DigicState *digic; + MemoryRegion ram; +} DigicBoardState; + +typedef struct DigicBoard { + hwaddr ram_size; + hwaddr start_addr; +} DigicBoard; + +static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size) +{ + memory_region_init_ram(&s->ram, NULL, "ram", ram_size); + memory_region_add_subregion(get_system_memory(), 0, &s->ram); + vmstate_register_ram_global(&s->ram); +} + +static void digic4_board_init(DigicBoard *board) +{ + Error *err = NULL; + + DigicBoardState *s = g_new(DigicBoardState, 1); + + s->digic = DIGIC(object_new(TYPE_DIGIC)); + object_property_set_bool(OBJECT(s->digic), true, "realized", &err); + if (err != NULL) { + fprintf(stderr, "Couldn't realize DIGIC SoC: %s\n", + error_get_pretty(err)); + exit(1); + } + + digic4_board_setup_ram(s, board->ram_size); + + s->digic->cpu.env.regs[15] = board->start_addr; +} + +static DigicBoard digic4_board_canon_a1100 = { + .ram_size = 64 * 1024 * 1024, + /* CHDK recommends this address for ROM disassembly */ + .start_addr = 0xffc00000, +}; + +static void canon_a1100_init(QEMUMachineInitArgs *args) +{ + digic4_board_init(&digic4_board_canon_a1100); +} + +static QEMUMachine canon_a1100 = { + .name = "canon-a1100", + .desc = "Canon PowerShot A1100 IS", + .init = &canon_a1100_init, +}; + +static void digic_register_machines(void) +{ + qemu_register_machine(&canon_a1100); +} + +machine_init(digic_register_machines) -- 1.8.4.rc3