From nobody Mon Feb 9 16:51:01 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.zoho.com; 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 1486616051495710.6918787815017; Wed, 8 Feb 2017 20:54:11 -0800 (PST) Received: from localhost ([::1]:35508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbgkD-0002yG-GN for importer@patchew.org; Wed, 08 Feb 2017 23:54:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbgiI-0001v4-MN for qemu-devel@nongnu.org; Wed, 08 Feb 2017 23:52:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cbgiF-0007hN-Nu for qemu-devel@nongnu.org; Wed, 08 Feb 2017 23:52:10 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:34149) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cbgiF-0007hD-I3 for qemu-devel@nongnu.org; Wed, 08 Feb 2017 23:52:07 -0500 Received: by mail-pg0-x241.google.com with SMTP id v184so16783086pgv.1 for ; Wed, 08 Feb 2017 20:52:07 -0800 (PST) Received: from bigtime.home ([1.128.80.123]) by smtp.gmail.com with ESMTPSA id b75sm24202832pfb.90.2017.02.08.20.52.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Feb 2017 20:52:06 -0800 (PST) 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; bh=o37/nbrpdNh/aOdfjnLzRpElkUoIA//Q+0EwZAl9kws=; b=MwOOaQAcZyaJsy5furnOATOuJ3+f2CMy0HICDQuPAxsbVFlE93jgn3nhvkfvo4yO58 5OS9uzeLJCisDvEenLj+tI6lcn0era3Hjt0EMWWmV9HxL25TWVyT6+OyAKo3LZBmPyWE Hee7ojtimWKB+Upa/WKDfLP2JHekSrbCJU8IQTBg6rpGmVB+FIN+ixYYTZ8wKmegb73x GkWA+OspP0/46OjfKN1HuA/uTHEUdoAGGDSbNfY+7Irab0UQxhxenF7x4x99byuc5sa8 gfSa1geNbc5DR32SUxVzAsi7OLNFYU3yOo8KYua1kARZV9uvAF79pWi7f0SXDpYJpl83 tggA== 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; bh=o37/nbrpdNh/aOdfjnLzRpElkUoIA//Q+0EwZAl9kws=; b=KERtjbot8iuBUor3cyBfzUu3s7sWv4gDFjCLhDbam5BOOb+pruRcduP90CE7c9ve8u RsMOykjpUFsXYpFQhR6I90S5c96TNS+6Fv+1zGaWAK9xC7Qcl4OOx6ytu5A49y2z7iVE dqtG6PVrYqEHWOj7t2Rl4/dJmRZ7yC+zeGUZL41OzitQGheff9ugnMYL73nhH1HuGmaS 5QyFR6GxZhLzJrrQ+LXx+JR8jDJP4wNR6hMQYfwuSnTk89n8P2V31pIa8divZXzUqps+ mfaWsfhglcjM7MoPGEjwB/u6UJadVqWyByWcWZCLMjVSnsJyDrOuQCZ/I5nubHQEdYsO rTZQ== X-Gm-Message-State: AMke39lwemTWyOQSn+YuFbfJ2kz4JTygB6ll0HEtpG5NoZbfWHKfafVHCYb6fA4OZJL/4w== X-Received: by 10.99.142.65 with SMTP id k62mr1548230pge.157.1486615926579; Wed, 08 Feb 2017 20:52:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 8 Feb 2017 20:51:33 -0800 Message-Id: <20170209045154.16868-2-rth@twiddle.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170209045154.16868-1-rth@twiddle.net> References: <20170209045154.16868-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH 01/22] target/openrisc: Rename the cpu from or32 to or1k 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: shorne@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is in keeping with the toolchain and or1ksim. Signed-off-by: Richard Henderson --- configure | 6 +++--- default-configs/or1k-linux-user.mak | 1 + default-configs/or1k-softmmu.mak | 4 ++++ default-configs/or32-linux-user.mak | 1 - default-configs/or32-softmmu.mak | 4 ---- hw/openrisc/openrisc_sim.c | 4 ++-- target/openrisc/cpu.h | 2 +- tests/tcg/openrisc/Makefile | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 default-configs/or1k-linux-user.mak create mode 100644 default-configs/or1k-softmmu.mak delete mode 100644 default-configs/or32-linux-user.mak delete mode 100644 default-configs/or32-softmmu.mak diff --git a/configure b/configure index 6325339..1c9655e 100755 --- a/configure +++ b/configure @@ -5843,7 +5843,7 @@ target_name=3D$(echo $target | cut -d '-' -f 1) target_bigendian=3D"no" =20 case "$target_name" in - armeb|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or32|ppc|ppcem= b|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) + armeb|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcem= b|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) target_bigendian=3Dyes ;; esac @@ -5937,7 +5937,7 @@ case "$target_name" in ;; nios2) ;; - or32) + or1k) TARGET_ARCH=3Dopenrisc TARGET_BASE_ARCH=3Dopenrisc ;; @@ -6145,7 +6145,7 @@ for i in $ARCH $TARGET_BASE_ARCH ; do nios2) disas_config "NIOS2" ;; - or32) + or1k) disas_config "OPENRISC" ;; ppc*) diff --git a/default-configs/or1k-linux-user.mak b/default-configs/or1k-lin= ux-user.mak new file mode 100644 index 0000000..20e03c1 --- /dev/null +++ b/default-configs/or1k-linux-user.mak @@ -0,0 +1 @@ +# Default configuration for or1k-linux-user diff --git a/default-configs/or1k-softmmu.mak b/default-configs/or1k-softmm= u.mak new file mode 100644 index 0000000..10bfa7a --- /dev/null +++ b/default-configs/or1k-softmmu.mak @@ -0,0 +1,4 @@ +# Default configuration for or1k-softmmu + +CONFIG_SERIAL=3Dy +CONFIG_OPENCORES_ETH=3Dy diff --git a/default-configs/or32-linux-user.mak b/default-configs/or32-lin= ux-user.mak deleted file mode 100644 index 808c1f9..0000000 --- a/default-configs/or32-linux-user.mak +++ /dev/null @@ -1 +0,0 @@ -# Default configuration for or32-linux-user diff --git a/default-configs/or32-softmmu.mak b/default-configs/or32-softmm= u.mak deleted file mode 100644 index cce4746..0000000 --- a/default-configs/or32-softmmu.mak +++ /dev/null @@ -1,4 +0,0 @@ -# Default configuration for or32-softmmu - -CONFIG_SERIAL=3Dy -CONFIG_OPENCORES_ETH=3Dy diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 6d06d5b..fc0d096 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -139,10 +139,10 @@ static void openrisc_sim_init(MachineState *machine) =20 static void openrisc_sim_machine_init(MachineClass *mc) { - mc->desc =3D "or32 simulation"; + mc->desc =3D "or1k simulation"; mc->init =3D openrisc_sim_init; mc->max_cpus =3D 1; mc->is_default =3D 1; } =20 -DEFINE_MACHINE("or32-sim", openrisc_sim_machine_init) +DEFINE_MACHINE("or1k-sim", openrisc_sim_machine_init) diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index 508ef56..231c163 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -32,7 +32,7 @@ struct OpenRISCCPU; #include "fpu/softfloat.h" #include "qom/cpu.h" =20 -#define TYPE_OPENRISC_CPU "or32-cpu" +#define TYPE_OPENRISC_CPU "or1k-cpu" =20 #define OPENRISC_CPU_CLASS(klass) \ OBJECT_CLASS_CHECK(OpenRISCCPUClass, (klass), TYPE_OPENRISC_CPU) diff --git a/tests/tcg/openrisc/Makefile b/tests/tcg/openrisc/Makefile index 7e65888..fb5ceda 100644 --- a/tests/tcg/openrisc/Makefile +++ b/tests/tcg/openrisc/Makefile @@ -1,8 +1,8 @@ -include ../../config-host.mak =20 -CROSS =3D or32-linux- +CROSS =3D or1k-linux- =20 -SIM =3D qemu-or32 +SIM =3D qemu-or1k =20 CC =3D $(CROSS)gcc =20 --=20 2.9.3