From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4A9DC432C0 for ; Sun, 24 Nov 2019 05:07:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9DDF02067D for ; Sun, 24 Nov 2019 05:07:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g1jZBSTl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DDF02067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYk7V-0000j5-E2 for qemu-devel@archiver.kernel.org; Sun, 24 Nov 2019 00:07:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60529) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYk3O-0003rK-J3 for qemu-devel@nongnu.org; Sun, 24 Nov 2019 00:03:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iYk3N-0007cu-Cv for qemu-devel@nongnu.org; Sun, 24 Nov 2019 00:03:22 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:37649) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iYk3N-0007cb-71 for qemu-devel@nongnu.org; Sun, 24 Nov 2019 00:03:21 -0500 Received: by mail-wr1-x443.google.com with SMTP id t1so13404060wrv.4 for ; Sat, 23 Nov 2019 21:03:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QzkggShKJxMML3S9AoJpwH/jsYAJf69kpBa7w1DUyrA=; b=g1jZBSTlwTq63lDHgZSDLF3xmUBnvvchOmLFf38Kanh4UxpemuqA35M5O41LXHvYJq RDyKaLttXhjgLPp9SgPgAWEdwK1vJmkh41cB2wxJpTJIhuf0rnygHNysKOTJ2CL3vVmq PNbpNPIq9gE84jgemYI2gOlkPX/doD3NDDsKB2qQrOjny+auadDQnuTtUbZTESxpYwbA 81mBpfrg8O5NDi9qrgpBEYR2r4ESRVwl6kp4le7BPp8SisFEooma+280L0/pPqza6RN4 ZGpV077Cfxg7IZVUJBDQHYPAlygCX8h9ku/SwSAK/kacRVPH4HA4q4cGlR0S9del1XJU UgYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QzkggShKJxMML3S9AoJpwH/jsYAJf69kpBa7w1DUyrA=; b=FIlvexQRZjadoRt73g9RTdkPlqhVTOak6rxBGRAobYafr3br1xPJvrbIrk/MrnsVY0 wxQVUjjqXT0OR/VzHAG7Lu9F3J/K5k+JU7f3Z7yrPaokp3xxd1DyqePMcPuKcrsGnjnk tM82+eGK7TRmS3vFaJY2umDlD5SSZEsf1Q7d+7WRTT5A52oTyRP4s2wK9pSS/hH6qwt6 nZCyNyz5+e5DiN2aw95nqXUjEhUVytKNOzzysd0BrhEVr2yIuk7D3OS4NeUKyUxjwIrF bCjOWHWMAFjhDQAfaa73YeiMauM86ggS+m7nYE3Mmk7XQFyyz6SKnK7YJ9vW6iYT2Ory OOVg== X-Gm-Message-State: APjAAAUxhwmlWsy22HaKrVwBPo8hsUO8I7G7V19bABho/vXlYU5xA6b3 Y3oOPvKxiMLFZmEmyme16m934fN7LzKiD1IH X-Google-Smtp-Source: APXvYqzqa6gyGkhywOshKCZ2PSNsaZHNmuzaNydmF97hjK6CxupUmSA7c365WcQLr8BfeYN/tnuZuA== X-Received: by 2002:adf:f5c6:: with SMTP id k6mr24189021wrp.245.1574571799944; Sat, 23 Nov 2019 21:03:19 -0800 (PST) Received: from 8c859074c0ff.ant.amazon.com.com (bzq-79-178-10-38.red.bezeqint.net. [79.178.10.38]) by smtp.gmail.com with ESMTPSA id t185sm4173976wmf.45.2019.11.23.21.03.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 23 Nov 2019 21:03:19 -0800 (PST) From: Michael Rolnik To: qemu-devel@nongnu.org Subject: [PATCH v36 13/17] target/avr: Register AVR support with the rest of QEMU Date: Sun, 24 Nov 2019 07:02:21 +0200 Message-Id: <20191124050225.30351-14-mrolnik@gmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20191124050225.30351-1-mrolnik@gmail.com> References: <20191124050225.30351-1-mrolnik@gmail.com> 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 recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, Michael Rolnik , richard.henderson@linaro.org, dovgaluk@ispras.ru, imammedo@redhat.com, philmd@redhat.com, aleksandar.m.mail@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add AVR related definitions into QEMU Signed-off-by: Michael Rolnik Tested-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- qapi/machine.json | 3 ++- include/disas/dis-asm.h | 6 ++++++ include/sysemu/arch_init.h | 1 + arch_init.c | 2 ++ tests/machine-none-test.c | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/qapi/machine.json b/qapi/machine.json index ca26779f1a..8c6df54921 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -21,11 +21,12 @@ # is true even for "qemu-system-x86_64". # # ppcemb: dropped in 3.1 +# avr: since 5.0 # # Since: 3.0 ## { 'enum' : 'SysEmuTarget', - 'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32', + 'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'cris', 'hppa', 'i386', 'lm32', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', 'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc', 'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4', diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h index e9c7dd8eb4..8bedce17ac 100644 --- a/include/disas/dis-asm.h +++ b/include/disas/dis-asm.h @@ -211,6 +211,12 @@ enum bfd_architecture #define bfd_mach_m32r 0 /* backwards compatibility */ bfd_arch_mn10200, /* Matsushita MN10200 */ bfd_arch_mn10300, /* Matsushita MN10300 */ + bfd_arch_avr, /* Atmel AVR microcontrollers. */ +#define bfd_mach_avr1 1 +#define bfd_mach_avr2 2 +#define bfd_mach_avr3 3 +#define bfd_mach_avr4 4 +#define bfd_mach_avr5 5 bfd_arch_cris, /* Axis CRIS */ #define bfd_mach_cris_v0_v10 255 #define bfd_mach_cris_v32 32 diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 62c6fe4cf1..893df26ce2 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -24,6 +24,7 @@ enum { QEMU_ARCH_NIOS2 = (1 << 17), QEMU_ARCH_HPPA = (1 << 18), QEMU_ARCH_RISCV = (1 << 19), + QEMU_ARCH_AVR = (1 << 20), }; extern const uint32_t arch_type; diff --git a/arch_init.c b/arch_init.c index 705d0b94ad..6a741165b2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -89,6 +89,8 @@ int graphic_depth = 32; #define QEMU_ARCH QEMU_ARCH_UNICORE32 #elif defined(TARGET_XTENSA) #define QEMU_ARCH QEMU_ARCH_XTENSA +#elif defined(TARGET_AVR) +#define QEMU_ARCH QEMU_ARCH_AVR #endif const uint32_t arch_type = QEMU_ARCH; diff --git a/tests/machine-none-test.c b/tests/machine-none-test.c index 5953d31755..3e5c74e73e 100644 --- a/tests/machine-none-test.c +++ b/tests/machine-none-test.c @@ -27,6 +27,7 @@ static struct arch2cpu cpus_map[] = { /* tested targets list */ { "arm", "cortex-a15" }, { "aarch64", "cortex-a57" }, + { "avr", "avr6-avr-cpu" }, { "x86_64", "qemu64,apic-id=0" }, { "i386", "qemu32,apic-id=0" }, { "alpha", "ev67" }, -- 2.17.2 (Apple Git-113)