From nobody Tue Feb 10 19:23:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506095513839991.2278259301004; Fri, 22 Sep 2017 08:51:53 -0700 (PDT) Received: from localhost ([::1]:59629 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvQEw-0005Aa-ED for importer@patchew.org; Fri, 22 Sep 2017 11:51:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvQ56-000563-Hu for qemu-devel@nongnu.org; Fri, 22 Sep 2017 11:41:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvQ55-0003T7-Ja for qemu-devel@nongnu.org; Fri, 22 Sep 2017 11:41:32 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:38700) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvQ55-0003Sv-Fa; Fri, 22 Sep 2017 11:41:31 -0400 Received: by mail-qt0-x241.google.com with SMTP id o3so882268qte.5; Fri, 22 Sep 2017 08:41:31 -0700 (PDT) Received: from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id z75sm71742qkb.71.2017.09.22.08.41.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Sep 2017 08:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=giCF0bY5YniJgFPw2GzNEhwxxcZO6CxOYYAFIN4Zrbw=; b=QGzyRb/Z9Z1mi2kfG3ioSvOyOxHYAK3vvrE0iSBhCQmRzNRM1MSxnNPan3wkLzfSSz GzmFFUrg+kGXfs588otfyvP1n6HaqklYEXKRKI8QGh3Hm4Nq0ebbzKenpYV4jYnzhlYZ q2Qyw/nKUyGLsj2uSkZ3Ktp4U6EHVWxyQitQj7x52x3Yqra/58J08wAWSSlgQrr1zFMH 27eyVYc4w3wRQ3mBAC5jCE4E+RnlE/bRq+1Ncqafd6FtUzaLNbjEx/qCMHyavDrAxV1X 3cdZ2MJyEykQN7rX00PuRRB8Ln50VFdegh6OpGYzXexhk3OXC7dMOIZWEgVb0xEz4+2O I4eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=giCF0bY5YniJgFPw2GzNEhwxxcZO6CxOYYAFIN4Zrbw=; b=YXH7vwVSUZWPhiw/8FlWoyCQI5EXVbga2pwztgEFU8oqb9L55Zt2X7Z/a3d0nWWAzh 0O9Zj1UfOvY0AeHGhib6nHQaELEGOhOvnI3YQut9zEvo4e1CkXfmijuu1vjJhfOS1ffe nEYnk/jQUi6oM0GJIAjkPTM7ItRAW9mHxkrKiN50Zif3O/s5tH3QpxMQirdWfyuFoPuM SgAc1dHOGQQJUU7k08OcCKAfJhSrROdYCaA7AeDz2lG/OA6gakFI7uaLuiHKR7rIpfvB A76hBg2+adayZWqys9G4+zH6AqpFHgDGFdF8F7/eSMAjYXuZGDbgd7jmMvcEDskpAI6W vVqw== X-Gm-Message-State: AHPjjUgEFbsj3VRPSNR4ndRxV09+BF3t/xIw47Fbl990F1rBn4oZ1jpe vDqo5onQXJXLkV6VZH6ZJAI= X-Google-Smtp-Source: AOwi7QBA/o4UcFpUyCpxx5sNz1UZcoXfouGsIZV887lIwnjMPa13e1F4xMxg66yeFbrA2EnTpiGzhA== X-Received: by 10.200.9.61 with SMTP id t58mr8944612qth.337.1506094890981; Fri, 22 Sep 2017 08:41:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Paolo Bonzini , Guan Xuetao Date: Fri, 22 Sep 2017 12:39:58 -0300 Message-Id: <20170922154014.29350-19-f4bug@amsat.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922154014.29350-1-f4bug@amsat.org> References: <20170922154014.29350-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 18/34] hw/unicore32: restrict hw addr defines to source file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 and drop unused #includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/unicore32/puv3.h | 10 ---------- hw/unicore32/puv3.c | 16 ++++++++++------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/include/hw/unicore32/puv3.h b/include/hw/unicore32/puv3.h index 5a4839f8df..f587a1f622 100644 --- a/include/hw/unicore32/puv3.h +++ b/include/hw/unicore32/puv3.h @@ -14,16 +14,6 @@ =20 #define PUV3_REGS_OFFSET (0x1000) /* 4K is reasonable */ =20 -/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */ -#define PUV3_DMA_BASE (0xc0200000) /* AHB-4 */ - -/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */ -#define PUV3_GPIO_BASE (0xee500000) /* APB-5 */ -#define PUV3_INTC_BASE (0xee600000) /* APB-6 */ -#define PUV3_OST_BASE (0xee800000) /* APB-8 */ -#define PUV3_PM_BASE (0xeea00000) /* APB-10 */ -#define PUV3_PS2_BASE (0xeeb00000) /* APB-11 */ - /* Hardware interrupts */ #define PUV3_IRQS_NR (32) =20 diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 504ea46211..6849bac59c 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -11,16 +11,10 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "ui/console.h" -#include "elf.h" -#include "exec/address-spaces.h" -#include "hw/sysbus.h" #include "hw/boards.h" #include "hw/loader.h" -#include "hw/i386/pc.h" -#include "qemu/error-report.h" #include "sysemu/qtest.h" =20 #undef DEBUG_PUV3 @@ -29,6 +23,16 @@ #define KERNEL_LOAD_ADDR 0x03000000 #define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */ =20 +/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */ +#define PUV3_DMA_BASE (0xc0200000) /* AHB-4 */ + +/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */ +#define PUV3_GPIO_BASE (0xee500000) /* APB-5 */ +#define PUV3_INTC_BASE (0xee600000) /* APB-6 */ +#define PUV3_OST_BASE (0xee800000) /* APB-8 */ +#define PUV3_PM_BASE (0xeea00000) /* APB-10 */ +#define PUV3_PS2_BASE (0xeeb00000) /* APB-11 */ + static void puv3_intc_cpu_handler(void *opaque, int irq, int level) { UniCore32CPU *cpu =3D opaque; --=20 2.14.1