From patchwork Fri Dec 9 12:17:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 9468121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F2D0607D8 for ; Fri, 9 Dec 2016 12:37:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 822FB283EF for ; Fri, 9 Dec 2016 12:37:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 757FC28624; Fri, 9 Dec 2016 12:37:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3741E283EF for ; Fri, 9 Dec 2016 12:37:23 +0000 (UTC) Received: from localhost ([::1]:46266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFKQU-00005C-8y for patchwork-qemu-devel@patchwork.kernel.org; Fri, 09 Dec 2016 07:37:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFK9G-0002sV-Ne for qemu-devel@nongnu.org; Fri, 09 Dec 2016 07:19:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFK9F-0003e0-2b for qemu-devel@nongnu.org; Fri, 09 Dec 2016 07:19:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33204) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cFK9E-0003dg-Pv for qemu-devel@nongnu.org; Fri, 09 Dec 2016 07:19:32 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0E064E4D9; Fri, 9 Dec 2016 12:19:31 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-17.ams2.redhat.com [10.36.116.17]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB9CHpb6031224; Fri, 9 Dec 2016 07:19:26 -0500 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini , Peter Crosthwaite , Richard Henderson , Aurelien Jarno , Peter Maydell Date: Fri, 9 Dec 2016 13:17:46 +0100 Message-Id: <1481285870-3396-17-git-send-email-thuth@redhat.com> In-Reply-To: <1481285870-3396-1-git-send-email-thuth@redhat.com> References: <1481285870-3396-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 09 Dec 2016 12:19:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 16/20] sh4: Move CPU files to target/ folder 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: Cornelia Huck , James Hogan , Jia Liu , Christian Borntraeger , Bastian Koppelmann , Anthony Green , Marcelo Tosatti , Mark Cave-Ayland , Laurent Vivier , Eduardo Habkost , Alexander Graf , Max Filippov , Michael Walle , Yongbok Kim , "Edgar E. Iglesias" , Guan Xuetao , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- hw/sh4/shix.c | 2 +- include/hw/sh4/sh.h | 2 +- {target-sh4 => target/sh4}/Makefile.objs | 0 {target-sh4 => target/sh4}/README.sh4 | 2 +- {target-sh4 => target/sh4}/cpu-qom.h | 0 {target-sh4 => target/sh4}/cpu.c | 0 {target-sh4 => target/sh4}/cpu.h | 0 {target-sh4 => target/sh4}/gdbstub.c | 0 {target-sh4 => target/sh4}/helper.c | 0 {target-sh4 => target/sh4}/helper.h | 0 {target-sh4 => target/sh4}/monitor.c | 0 {target-sh4 => target/sh4}/op_helper.c | 0 {target-sh4 => target/sh4}/translate.c | 0 14 files changed, 4 insertions(+), 4 deletions(-) rename {target-sh4 => target/sh4}/Makefile.objs (100%) rename {target-sh4 => target/sh4}/README.sh4 (98%) rename {target-sh4 => target/sh4}/cpu-qom.h (100%) rename {target-sh4 => target/sh4}/cpu.c (100%) rename {target-sh4 => target/sh4}/cpu.h (100%) rename {target-sh4 => target/sh4}/gdbstub.c (100%) rename {target-sh4 => target/sh4}/helper.c (100%) rename {target-sh4 => target/sh4}/helper.h (100%) rename {target-sh4 => target/sh4}/monitor.c (100%) rename {target-sh4 => target/sh4}/op_helper.c (100%) rename {target-sh4 => target/sh4}/translate.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index d4d5605..31597bc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -209,7 +209,7 @@ F: disas/s390.c SH4 M: Aurelien Jarno S: Odd Fixes -F: target-sh4/ +F: target/sh4/ F: hw/sh4/ F: disas/sh4.c F: include/hw/sh4/ diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index 14d4007..fd00cc5 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -25,7 +25,7 @@ Shix 2.0 board by Alexis Polti, described at https://web.archive.org/web/20070917001736/perso.enst.fr/~polti/realisations/shix20 - More information in target-sh4/README.sh4 + More information in target/sh4/README.sh4 */ #include "qemu/osdep.h" #include "qapi/error.h" diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h index 070312d..e50651a 100644 --- a/include/hw/sh4/sh.h +++ b/include/hw/sh4/sh.h @@ -3,7 +3,7 @@ /* Definitions for SH board emulation. */ #include "hw/sh4/sh_intc.h" -#include "target-sh4/cpu-qom.h" +#include "cpu-qom.h" #define A7ADDR(x) ((x) & 0x1fffffff) #define P4ADDR(x) ((x) | 0xe0000000) diff --git a/target-sh4/Makefile.objs b/target/sh4/Makefile.objs similarity index 100% rename from target-sh4/Makefile.objs rename to target/sh4/Makefile.objs diff --git a/target-sh4/README.sh4 b/target/sh4/README.sh4 similarity index 98% rename from target-sh4/README.sh4 rename to target/sh4/README.sh4 index ece0464..a192ca7 100644 --- a/target-sh4/README.sh4 +++ b/target/sh4/README.sh4 @@ -8,7 +8,7 @@ file describes the current state of implementation. Most places requiring attention and/or modification can be detected by looking for "XXXXX" or "abort()". -The sh4 core is located in target-sh4/*, while the 7750 peripheral +The sh4 core is located in target/sh4/*, while the 7750 peripheral features (IO ports for example) are located in hw/sh7750.[ch]. The main board description is in hw/shix.c, and the NAND flash in hw/tc58128.[ch]. diff --git a/target-sh4/cpu-qom.h b/target/sh4/cpu-qom.h similarity index 100% rename from target-sh4/cpu-qom.h rename to target/sh4/cpu-qom.h diff --git a/target-sh4/cpu.c b/target/sh4/cpu.c similarity index 100% rename from target-sh4/cpu.c rename to target/sh4/cpu.c diff --git a/target-sh4/cpu.h b/target/sh4/cpu.h similarity index 100% rename from target-sh4/cpu.h rename to target/sh4/cpu.h diff --git a/target-sh4/gdbstub.c b/target/sh4/gdbstub.c similarity index 100% rename from target-sh4/gdbstub.c rename to target/sh4/gdbstub.c diff --git a/target-sh4/helper.c b/target/sh4/helper.c similarity index 100% rename from target-sh4/helper.c rename to target/sh4/helper.c diff --git a/target-sh4/helper.h b/target/sh4/helper.h similarity index 100% rename from target-sh4/helper.h rename to target/sh4/helper.h diff --git a/target-sh4/monitor.c b/target/sh4/monitor.c similarity index 100% rename from target-sh4/monitor.c rename to target/sh4/monitor.c diff --git a/target-sh4/op_helper.c b/target/sh4/op_helper.c similarity index 100% rename from target-sh4/op_helper.c rename to target/sh4/op_helper.c diff --git a/target-sh4/translate.c b/target/sh4/translate.c similarity index 100% rename from target-sh4/translate.c rename to target/sh4/translate.c