From patchwork Sat Feb 12 00:15:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 82881 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D4889B7101 for ; Sat, 12 Feb 2011 11:29:08 +1100 (EST) Received: from localhost ([127.0.0.1]:52290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Po3CY-00048a-51 for incoming@patchwork.ozlabs.org; Fri, 11 Feb 2011 19:19:02 -0500 Received: from [140.186.70.92] (port=50658 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Po39V-0002sc-MC for qemu-devel@nongnu.org; Fri, 11 Feb 2011 19:15:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Po39T-0003sL-Lv for qemu-devel@nongnu.org; Fri, 11 Feb 2011 19:15:53 -0500 Received: from mail-ey0-f173.google.com ([209.85.215.173]:61114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Po39T-0003rs-G1 for qemu-devel@nongnu.org; Fri, 11 Feb 2011 19:15:51 -0500 Received: by mail-ey0-f173.google.com with SMTP id 7so1642429eyg.4 for ; Fri, 11 Feb 2011 16:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=CJjPlydmOqmAjSDxx39Pu9MHsYXYSrozIDA7wpkTDM4=; b=mmh6WGhAVizLb1dBgJQaj5jk2bHIj7gxf9cGQ4WvEg0yRxUnFjR7iNxscHWlQFMBfP GmszNoYQHEojbw4ZuJuGbduEWpuTOnqIEyjwkMABuF1T+vKvhOPRyulcH4n0t4mdV0RT 6536NnCH70zMhms4whaW/034TcXwTOkeDmWK0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=sKu15o1DUH3tG0TzdE4hz8Bf3wVl2hU0VYfe5YSuo84OVuKKJgyy2oT6vWYnFlscN8 68wH2/r7tuNgU9dSqeRVR+eux+xSVYVnqt7zqk4nQ29wOdoikcInOiAbrDQVKqc0PU8z 1yqJf6ATT2DtTDb3ctDQ85b7psB9fYKrJy+8M= Received: by 10.213.16.79 with SMTP id n15mr1103993eba.69.1297469751037; Fri, 11 Feb 2011 16:15:51 -0800 (PST) Received: from doriath.ww600.siemens.net (ppp89-110-8-230.pppoe.avangarddsl.ru [89.110.8.230]) by mx.google.com with ESMTPS id t5sm1202197eeh.20.2011.02.11.16.15.49 (version=SSLv3 cipher=OTHER); Fri, 11 Feb 2011 16:15:50 -0800 (PST) From: Dmitry Eremin-Solenikov To: qemu-devel@nongnu.org Date: Sat, 12 Feb 2011 03:15:25 +0300 Message-Id: <1297469725-31730-3-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1297469725-31730-1-git-send-email-dbaryshkov@gmail.com> References: <1297469725-31730-1-git-send-email-dbaryshkov@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.173 Subject: [Qemu-devel] [PATCH 3/3] Merge mainstone.h header into mainstone.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now the only user of mainstone.h is mainstone.c file. Merge header into board file. Signed-off-by: Dmitry Eremin-Solenikov --- hw/mainstone.c | 23 ++++++++++++++++++++++- hw/mainstone.h | 35 ----------------------------------- 2 files changed, 22 insertions(+), 36 deletions(-) delete mode 100644 hw/mainstone.h diff --git a/hw/mainstone.c b/hw/mainstone.c index 9c8bc15..41c1433 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -14,12 +14,33 @@ #include "net.h" #include "devices.h" #include "boards.h" -#include "mainstone.h" #include "sysemu.h" #include "flash.h" #include "blockdev.h" #include "sysbus.h" +/* Device addresses */ +#define MST_FPGA_PHYS 0x08000000 +#define MST_ETH_PHYS 0x10000300 +#define MST_FLASH_0 0x00000000 +#define MST_FLASH_1 0x04000000 + +/* IRQ definitions */ +#define MMC_IRQ 0 +#define USIM_IRQ 1 +#define USBC_IRQ 2 +#define ETHERNET_IRQ 3 +#define AC97_IRQ 4 +#define PEN_IRQ 5 +#define MSINS_IRQ 6 +#define EXBRD_IRQ 7 +#define S0_CD_IRQ 9 +#define S0_STSCHG_IRQ 10 +#define S0_IRQ 11 +#define S1_CD_IRQ 13 +#define S1_STSCHG_IRQ 14 +#define S1_IRQ 15 + static struct keymap map[0xE0] = { [0 ... 0xDF] = { -1, -1 }, [0x1e] = {0,0}, /* a */ diff --git a/hw/mainstone.h b/hw/mainstone.h deleted file mode 100644 index e6a2b67..0000000 --- a/hw/mainstone.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * PXA270-based Intel Mainstone platforms. - * - * Copyright (c) 2007 by Armin Kuster or - * - * - * This code is licensed under the GNU GPL v2. - */ - -#ifndef __MAINSTONE_H__ -#define __MAINSTONE_H__ - -/* Device addresses */ -#define MST_FPGA_PHYS 0x08000000 -#define MST_ETH_PHYS 0x10000300 -#define MST_FLASH_0 0x00000000 -#define MST_FLASH_1 0x04000000 - -/* IRQ definitions */ -#define MMC_IRQ 0 -#define USIM_IRQ 1 -#define USBC_IRQ 2 -#define ETHERNET_IRQ 3 -#define AC97_IRQ 4 -#define PEN_IRQ 5 -#define MSINS_IRQ 6 -#define EXBRD_IRQ 7 -#define S0_CD_IRQ 9 -#define S0_STSCHG_IRQ 10 -#define S0_IRQ 11 -#define S1_CD_IRQ 13 -#define S1_STSCHG_IRQ 14 -#define S1_IRQ 15 - -#endif /* __MAINSTONE_H__ */