Received: from list by lists.gnu.org with archive (Exim 4.86_2) id 1hwiso-0005iC-7K for mharc-qemu-riscv@gnu.org; Sun, 11 Aug 2019 04:07:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60086) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwisl-0005Yt-Hb for qemu-riscv@nongnu.org; Sun, 11 Aug 2019 04:07:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hwisk-0003rv-A7 for qemu-riscv@nongnu.org; Sun, 11 Aug 2019 04:07:15 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:42134) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hwish-0003pV-8w; Sun, 11 Aug 2019 04:07:11 -0400 Received: by mail-pg1-x543.google.com with SMTP id t132so47976275pgb.9; Sun, 11 Aug 2019 01:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=l7CKiSlXuEdauID4CyC/VWGhUA8EAksPM7wH/OCK8/M=; b=u7IlNh5CwOPOAVYqMxcMUzi6npwOErzMgT3+lq/QaDdOD0Z9DmTEHqNbpw5hwIB40V k5qKXbrRlbubSuwMcNCsBC4FSCiTAnssK7MDp8la1VsNQhBsQuQLYyOc/L2NPxr700Na eOI0XNOW4qYNyOowGID5YNL2aemy1dosxUSDpd2CUOUhvsqU8OLbNA5hGGtgUJn4hhzk 5kmlxsSlh5LSGS0Jh0pTKM2miua4srGWn40TVn1keCKzRKfFYy/rwcNa4oJ5zRX+nDxW oDplXnz1zW53R+s5abSICX+evlYxMo4o69cxHW2hlXT9Zc8x4Z8YOTbTABbCgcVE2xLY /aIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l7CKiSlXuEdauID4CyC/VWGhUA8EAksPM7wH/OCK8/M=; b=FkJyqblEPXKtCT13BngdEDyWnxHpf5dkjj3TTfwUfbV1ZgOgfVuJ1hEMsARIZw1TbM TpjOywH2MlPIMgv3JkkOygRMvx/1fVy49XenAHDKf6HkDNG1fj+0Aq/Q4UgiTaF581II ZrY3COIj86tyWspSHWSDZr43r8ICE/p6A8AsJ8gTHK8zviO7TDUCK6t72aNPOfR3z5Iz 3uK3QQBUpT4uO+z+8UPjEaP7L7swmBORMGagGgJ0/oCf+9PidUt1L4UiYijdJ2z/pLUQ BkpK7hPC2c4HVI8DVhjCGWA/RL3bwoo0VWgARoqHeQ8c5s15Zj8NEStcUP3kRzVgzt2H LzQg== X-Gm-Message-State: APjAAAUsgi/v0kHA9bokOnFuWE8uTi/bWBQAoEZcuGpJsF2WGvV5UftY 0NqPGNjIWosvV8dJ4DpIpLk= X-Google-Smtp-Source: APXvYqy9dRGJk+/7/pfHKykEDIYDCe/DoAXMb3g1YiLdE+IV2kRZB+Ct0A6Z+dCuI+0STKHGip/nQQ== X-Received: by 2002:a63:6f81:: with SMTP id k123mr25735304pgc.12.1565510830340; Sun, 11 Aug 2019 01:07:10 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id v8sm87339107pgs.82.2019.08.11.01.07.09 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 11 Aug 2019 01:07:09 -0700 (PDT) From: Bin Meng To: Alistair Francis , Palmer Dabbelt , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Sun, 11 Aug 2019 01:06:36 -0700 Message-Id: <1565510821-3927-4-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1565510821-3927-1-git-send-email-bmeng.cn@gmail.com> References: <1565510821-3927-1-git-send-email-bmeng.cn@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: 2607:f8b0:4864:20::543 Subject: [Qemu-riscv] [PATCH v3 03/28] riscv: Add a sifive_cpu.h to include both E and U cpu type defines X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Aug 2019 08:07:17 -0000 Group SiFive E and U cpu type defines into one header file. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé --- Changes in v3: None Changes in v2: None include/hw/riscv/sifive_cpu.h | 31 +++++++++++++++++++++++++++++++ include/hw/riscv/sifive_e.h | 7 +------ include/hw/riscv/sifive_u.h | 7 +------ 3 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 include/hw/riscv/sifive_cpu.h diff --git a/include/hw/riscv/sifive_cpu.h b/include/hw/riscv/sifive_cpu.h new file mode 100644 index 0000000..1367996 --- /dev/null +++ b/include/hw/riscv/sifive_cpu.h @@ -0,0 +1,31 @@ +/* + * SiFive CPU types + * + * Copyright (c) 2017 SiFive, Inc. + * Copyright (c) 2019 Bin Meng + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#ifndef HW_SIFIVE_CPU_H +#define HW_SIFIVE_CPU_H + +#if defined(TARGET_RISCV32) +#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E31 +#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U34 +#elif defined(TARGET_RISCV64) +#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E51 +#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U54 +#endif + +#endif /* HW_SIFIVE_CPU_H */ diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index d175b24..e17cdfd 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -19,6 +19,7 @@ #ifndef HW_SIFIVE_E_H #define HW_SIFIVE_E_H +#include "hw/riscv/sifive_cpu.h" #include "hw/riscv/sifive_gpio.h" #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc" @@ -83,10 +84,4 @@ enum { #define SIFIVE_E_PLIC_CONTEXT_BASE 0x200000 #define SIFIVE_E_PLIC_CONTEXT_STRIDE 0x1000 -#if defined(TARGET_RISCV32) -#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E31 -#elif defined(TARGET_RISCV64) -#define SIFIVE_E_CPU TYPE_RISCV_CPU_SIFIVE_E51 -#endif - #endif diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 892f0ee..4abc621 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -20,6 +20,7 @@ #define HW_SIFIVE_U_H #include "hw/net/cadence_gem.h" +#include "hw/riscv/sifive_cpu.h" #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc" #define RISCV_U_SOC(obj) \ @@ -77,10 +78,4 @@ enum { #define SIFIVE_U_PLIC_CONTEXT_BASE 0x200000 #define SIFIVE_U_PLIC_CONTEXT_STRIDE 0x1000 -#if defined(TARGET_RISCV32) -#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U34 -#elif defined(TARGET_RISCV64) -#define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U54 -#endif - #endif -- 2.7.4