From nobody Mon Feb 9 15:10:30 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 148702166445331.725797537730045; Mon, 13 Feb 2017 13:34:24 -0800 (PST) Received: from localhost ([::1]:59639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdOGM-0003me-Jl for importer@patchew.org; Mon, 13 Feb 2017 16:34:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdO8G-0004Um-C1 for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:26:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdO8D-0001BK-KK for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:26:00 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:32867) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdO8D-0001B9-Gf for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:25:57 -0500 Received: by mail-qt0-x244.google.com with SMTP id n13so15080555qtc.0 for ; Mon, 13 Feb 2017 13:25:57 -0800 (PST) Received: from bigtime.twiddle.net.com ([1.129.9.91]) by smtp.gmail.com with ESMTPSA id h40sm8311480qtb.6.2017.02.13.13.25.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Feb 2017 13:25:56 -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=C+b1PfnMkqcXnipkIn8kh+yxkVYMh6gdjJ9VM9pAS00b3soqgM5oSIEACEV/SG6FTV uBjsnM0TjkUCyvZ8BXMd4QPrt4vFFg4qE8/CwiiIKbN8URZBmnjAGOMRyL/IGtcMapsw 9Bh0hqeWMPQs7tJexg1DxHabdxAeUsO0bqPojierseJPaq/IA0QdMo0qT392Na2v0Se/ 3OBV4hLRRC+wOZiDd7n+lRBwyDryGrMlAoDIRdOI7MkeX9dVQRmE6NYr95qT9xWRc3PX WCTaQ+pCUnFxLmJM+npLRYaEuQUe7pj9yqsBiTn2uZa4bYUL/V2ceJ3EUd1HZuc17t2O bGzQ== 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=i2DlQrPJmUDvRoLsKyk75A1Fkhy3sCUT11DT1Ud9o0G7/vjSOU1tuKqa3YyTY4ox7p HQHMXqCcNn94GXkuq4QUc5lPeqpetZ5pULDEM05yKOxd+U6/X1LuAFpNSRJoWfB2Hmyh /InYlTRJ8PGwH+o2KA5uANL/E0veozDnE1FGp5pOQajtLF7IdDIWr/6YSwfxQm2HrHyz JvIl8AHiFj1qUSiXnqmX13FQ5Rt93rP123lKqIeCo/wKNex8Yu+ZclyTXBlh4+knv28w rGz3BJCRWT8zpMAPJwor/LotogPZTXFFtj2v9kNMLl34Oy7Zko0lrg/cIbEdNAvLK7SF RF8g== X-Gm-Message-State: AMke39nJTOwKtr2pq4Vmd8M1NYPs2NZzSegjNTRyXgTgUeLRK4MPOamIsrZcW5i8TGTdMg== X-Received: by 10.237.34.116 with SMTP id o49mr22433261qtc.122.1487021156742; Mon, 13 Feb 2017 13:25:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 14 Feb 2017 08:25:13 +1100 Message-Id: <20170213212536.31871-2-rth@twiddle.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170213212536.31871-1-rth@twiddle.net> References: <20170213212536.31871-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:400d:c0d::244 Subject: [Qemu-devel] [PULL 01/24] 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: peter.maydell@linaro.org 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