{"id":817602,"url":"http://patchwork.ozlabs.org/api/patches/817602/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922154014.29350-19-f4bug@amsat.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170922154014.29350-19-f4bug@amsat.org>","list_archive_url":null,"date":"2017-09-22T15:39:58","name":"[18/34] hw/unicore32: restrict hw addr defines to source file","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"234a6743e9b570a54c2d7655aa5686fcd96c29d9","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/people/70924/?format=json","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922154014.29350-19-f4bug@amsat.org/mbox/","series":[{"id":4657,"url":"http://patchwork.ozlabs.org/api/series/4657/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4657","date":"2017-09-22T15:39:40","name":"remove i386/pc dependency from non-PC world (part 1)","version":1,"mbox":"http://patchwork.ozlabs.org/series/4657/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817602/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817602/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"QGzyRb/Z\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xzHxS3DzTz9s83\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 23 Sep 2017 01:50:20 +1000 (AEST)","from localhost ([::1]:59618 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dvQDa-0003wk-Hq\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 11:50:18 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41843)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQ56-000563-Hu\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 11:41:35 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQ55-0003T7-Ja\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 11:41:32 -0400","from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:38700)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQ55-0003Sv-Fa; Fri, 22 Sep 2017 11:41:31 -0400","by mail-qt0-x241.google.com with SMTP id o3so882268qte.5;\n\tFri, 22 Sep 2017 08:41:31 -0700 (PDT)","from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id\n\tz75sm71742qkb.71.2017.09.22.08.41.28\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 22 Sep 2017 08:41:30 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=giCF0bY5YniJgFPw2GzNEhwxxcZO6CxOYYAFIN4Zrbw=;\n\tb=QGzyRb/Z9Z1mi2kfG3ioSvOyOxHYAK3vvrE0iSBhCQmRzNRM1MSxnNPan3wkLzfSSz\n\tGzmFFUrg+kGXfs588otfyvP1n6HaqklYEXKRKI8QGh3Hm4Nq0ebbzKenpYV4jYnzhlYZ\n\tq2Qyw/nKUyGLsj2uSkZ3Ktp4U6EHVWxyQitQj7x52x3Yqra/58J08wAWSSlgQrr1zFMH\n\t27eyVYc4w3wRQ3mBAC5jCE4E+RnlE/bRq+1Ncqafd6FtUzaLNbjEx/qCMHyavDrAxV1X\n\t3cdZ2MJyEykQN7rX00PuRRB8Ln50VFdegh6OpGYzXexhk3OXC7dMOIZWEgVb0xEz4+2O\n\tI4eA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:mime-version:content-transfer-encoding;\n\tbh=giCF0bY5YniJgFPw2GzNEhwxxcZO6CxOYYAFIN4Zrbw=;\n\tb=YXH7vwVSUZWPhiw/8FlWoyCQI5EXVbga2pwztgEFU8oqb9L55Zt2X7Z/a3d0nWWAzh\n\t0O9Zj1UfOvY0AeHGhib6nHQaELEGOhOvnI3YQut9zEvo4e1CkXfmijuu1vjJhfOS1ffe\n\tnEYnk/jQUi6oM0GJIAjkPTM7ItRAW9mHxkrKiN50Zif3O/s5tH3QpxMQirdWfyuFoPuM\n\tSgAc1dHOGQQJUU7k08OcCKAfJhSrROdYCaA7AeDz2lG/OA6gakFI7uaLuiHKR7rIpfvB\n\tA76hBg2+adayZWqys9G4+zH6AqpFHgDGFdF8F7/eSMAjYXuZGDbgd7jmMvcEDskpAI6W\n\tvVqw==","X-Gm-Message-State":"AHPjjUgEFbsj3VRPSNR4ndRxV09+BF3t/xIw47Fbl990F1rBn4oZ1jpe\n\tvDqo5onQXJXLkV6VZH6ZJAI=","X-Google-Smtp-Source":"AOwi7QBA/o4UcFpUyCpxx5sNz1UZcoXfouGsIZV887lIwnjMPa13e1F4xMxg66yeFbrA2EnTpiGzhA==","X-Received":"by 10.200.9.61 with SMTP id t58mr8944612qth.337.1506094890981;\n\tFri, 22 Sep 2017 08:41:30 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>","To":"Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>,\n\tPaolo Bonzini <pbonzini@redhat.com>, Guan Xuetao <gxt@mprc.pku.edu.cn>","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":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400d:c0d::241","Subject":"[Qemu-devel] [PATCH 18/34] hw/unicore32: restrict hw addr defines\n\tto source file","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=\n\t<f4bug@amsat.org>, \tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"and drop unused #includes\n\nSigned-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n include/hw/unicore32/puv3.h | 10 ----------\n hw/unicore32/puv3.c         | 16 ++++++++++------\n 2 files changed, 10 insertions(+), 16 deletions(-)","diff":"diff --git a/include/hw/unicore32/puv3.h b/include/hw/unicore32/puv3.h\nindex 5a4839f8df..f587a1f622 100644\n--- a/include/hw/unicore32/puv3.h\n+++ b/include/hw/unicore32/puv3.h\n@@ -14,16 +14,6 @@\n \n #define PUV3_REGS_OFFSET        (0x1000) /* 4K is reasonable */\n \n-/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */\n-#define PUV3_DMA_BASE           (0xc0200000) /* AHB-4 */\n-\n-/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */\n-#define PUV3_GPIO_BASE          (0xee500000) /* APB-5 */\n-#define PUV3_INTC_BASE          (0xee600000) /* APB-6 */\n-#define PUV3_OST_BASE           (0xee800000) /* APB-8 */\n-#define PUV3_PM_BASE            (0xeea00000) /* APB-10 */\n-#define PUV3_PS2_BASE           (0xeeb00000) /* APB-11 */\n-\n /* Hardware interrupts */\n #define PUV3_IRQS_NR            (32)\n \ndiff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c\nindex 504ea46211..6849bac59c 100644\n--- a/hw/unicore32/puv3.c\n+++ b/hw/unicore32/puv3.c\n@@ -11,16 +11,10 @@\n \n #include \"qemu/osdep.h\"\n #include \"qapi/error.h\"\n-#include \"qemu-common.h\"\n #include \"cpu.h\"\n #include \"ui/console.h\"\n-#include \"elf.h\"\n-#include \"exec/address-spaces.h\"\n-#include \"hw/sysbus.h\"\n #include \"hw/boards.h\"\n #include \"hw/loader.h\"\n-#include \"hw/i386/pc.h\"\n-#include \"qemu/error-report.h\"\n #include \"sysemu/qtest.h\"\n \n #undef DEBUG_PUV3\n@@ -29,6 +23,16 @@\n #define KERNEL_LOAD_ADDR        0x03000000\n #define KERNEL_MAX_SIZE         0x00800000 /* Just a guess */\n \n+/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */\n+#define PUV3_DMA_BASE           (0xc0200000) /* AHB-4 */\n+\n+/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */\n+#define PUV3_GPIO_BASE          (0xee500000) /* APB-5 */\n+#define PUV3_INTC_BASE          (0xee600000) /* APB-6 */\n+#define PUV3_OST_BASE           (0xee800000) /* APB-8 */\n+#define PUV3_PM_BASE            (0xeea00000) /* APB-10 */\n+#define PUV3_PS2_BASE           (0xeeb00000) /* APB-11 */\n+\n static void puv3_intc_cpu_handler(void *opaque, int irq, int level)\n {\n     UniCore32CPU *cpu = opaque;\n","prefixes":["18/34"]}