From patchwork Sun Oct 30 18:03:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 122654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B8B71B6F75 for ; Mon, 31 Oct 2011 05:04:21 +1100 (EST) Received: from localhost ([::1]:49231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKZjw-0002h4-Lm for incoming@patchwork.ozlabs.org; Sun, 30 Oct 2011 14:04:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKZjk-0002Vk-Kw for qemu-devel@nongnu.org; Sun, 30 Oct 2011 14:04:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKZji-0003SZ-Vh for qemu-devel@nongnu.org; Sun, 30 Oct 2011 14:04:00 -0400 Received: from [188.134.19.124] (port=46220 helo=octofox.metropolis) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKZji-0003S9-IB for qemu-devel@nongnu.org; Sun, 30 Oct 2011 14:03:58 -0400 Received: from octofox.metropolis (localhost [127.0.0.1]) by octofox.metropolis (8.14.5/8.14.5) with ESMTP id p9UI3uqa010897; Sun, 30 Oct 2011 22:03:56 +0400 Received: (from jcmvbkbc@localhost) by octofox.metropolis (8.14.5/8.14.5/Submit) id p9UI3tH1010896; Sun, 30 Oct 2011 22:03:55 +0400 From: Max Filippov To: qemu-devel@nongnu.org Date: Sun, 30 Oct 2011 22:03:14 +0400 Message-Id: <1319997794-10542-4-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1319997794-10542-1-git-send-email-jcmvbkbc@gmail.com> References: <1319997794-10542-1-git-send-email-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 188.134.19.124 Cc: jcmvbkbc@gmail.com Subject: [Qemu-devel] [PATCH 3/3] xtensa_lx60: fix build date code and change memory region names 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 Fix date code to uses MMDDYYYY notation. Change memory region names to reflect specification that defines them. Signed-off-by: Max Filippov --- hw/xtensa_lx60.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 069b21c..8947157 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -63,7 +63,7 @@ static uint64_t lx60_fpga_read(void *opaque, target_phys_addr_t addr, switch (addr) { case 0x0: /*build date code*/ - return 0x27092011; + return 0x09272011; case 0x4: /*processor clock frequency, Hz*/ return 10000000; @@ -107,7 +107,7 @@ static Lx60FpgaState *lx60_fpga_init(MemoryRegion *address_space, Lx60FpgaState *s = g_malloc(sizeof(Lx60FpgaState)); memory_region_init_io(&s->iomem, &lx60_fpga_ops, s, - "lx60-fpga", 0x10000); + "lx60.fpga", 0x10000); memory_region_add_subregion(address_space, base, &s->iomem); lx60_fpga_reset(s); qemu_register_reset(lx60_fpga_reset, s); @@ -186,11 +186,11 @@ static void lx_init(const LxBoardDesc *board, } ram = g_malloc(sizeof(*ram)); - memory_region_init_ram(ram, NULL, "xtensa.sram", ram_size); + memory_region_init_ram(ram, NULL, "lx60.dram", ram_size); memory_region_add_subregion(system_memory, 0, ram); system_io = g_malloc(sizeof(*system_io)); - memory_region_init(system_io, "system.io", 224 * 1024 * 1024); + memory_region_init(system_io, "lx60.io", 224 * 1024 * 1024); memory_region_add_subregion(system_memory, 0xf0000000, system_io); lx60_fpga_init(system_io, 0x0d020000); if (nd_table[0].vlan) {