From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613937781; cv=none; d=zohomail.com; s=zohoarc; b=PSUVmd1nFUNSGpku+pcNA+ncU5jREpNICmsoe3JzQ7h24OvIf8PLcSANRMqvb1S8FBh7ArEyFeKvzQj97+5Wy0KfFQLe5YRp2ChCMtk9FXBWOjoL86O9GULfZ6SDDNdtvsDTBUMA0P9JkqAUBuSaLMvEiHyypiCDGwMAowC+5Q0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613937781; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1wIIiqxyo9qU4hDfl/CUSouFCDD9ilWz0hTE1uhI3Xc=; b=e7nud+Td7t6RnmOVqOg+r1H9/Hp1UiscF9nvfxTKkwEwEe0a0Hht1fuNy2oLyT9Jy6gwiNx64AQKBI6UsMOL4sA9YX0CNglT8phM8jSW12uBi4o8AcJy/Nng7RSBG9pyyvZ8BC7QgfwyQl/2K9Oq98gLxCeyviXbquVSWdsHS1k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1613937780906744.3840976469464; Sun, 21 Feb 2021 12:03:00 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id t15so16855199wrx.13 for ; Sun, 21 Feb 2021 12:03:00 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id h13sm25961771wrv.20.2021.02.21.12.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 12:02:58 -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 :mime-version:content-transfer-encoding; bh=1wIIiqxyo9qU4hDfl/CUSouFCDD9ilWz0hTE1uhI3Xc=; b=UL89WnRY1mUaPrpRBnVEWxAnf4DdXhiiWLyE5PiuM540+sIxYUoPK70p4bn5AyciSz gmBxTngftTCfWB4OIGF47ZlKo3BqyL7H0Y1IBeZxJ7aQFcWgHX6XkoQo76wU31NwX4Ae w0z64GO4lLcjYp4/Pd/EPAD9pcw/evTA7nROHxm0265mDyttXPbp0b1tXb0pnkrbhL4P H0KXupOtxkKIXnLREZz40n2/0uw38DSRlThWHXrK+S49aE26EQ7TaGjz2h9BYyOZlHKJ vmKRpV64OAbdare6poiLt4ULkjym3rmBJ2ULAsWLJiZOq1U2Ze+4wr79qLSSSwzg/drR nKnQ== 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:mime-version:content-transfer-encoding; bh=1wIIiqxyo9qU4hDfl/CUSouFCDD9ilWz0hTE1uhI3Xc=; b=pMV9oWBXLrOiBQxwvwF4O3YcF/+TLn3Yi6ZHh8MvY5wl4aZpfjPfz5hXVc7HxUv0kl +V5tWSz6DIdwkI4lufqDUZH0TyTndwRKcijsOreraiZilKQKdnl2xWtVTOW+5VTWO2jF gIgRYD1TEBOcr1zwopRmwZjB8Eep1fkQiwbMBAV++/Nm20xtHhNOATIkkUp+Cs+S5w1d QZNG+MrU+Nbvi1p2jF+W1AvBo+5OmoQjo6Rqrs/jSxW1lrujiyJJBwoFYNY3mb8soFz3 kTvTq2qejsZ1uL+FvHlIrh1XWtTSnVTgG7ewG2axT9fwbPO4skGqCcWrOmmzlYnlU+/o e0Sg== X-Gm-Message-State: AOAM532YQBWpOtxyTDEUs8OVuZyjNuqllLhl+EDMlQZBWPUTz//aVKYO L3D7cmVrkXmrIKiEjIM4Fvk= X-Google-Smtp-Source: ABdhPJx+DK7L8XXqmY+theD52Odt3JKpO29iyu85Sx/Nu/ldCCZ+EbQxsZxlcH8gY3EUmwMy+VfFWQ== X-Received: by 2002:adf:8bd2:: with SMTP id w18mr18633661wra.204.1613937779256; Sun, 21 Feb 2021 12:02:59 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Max Reitz , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Samuel Tardieu Subject: [PATCH v2 1/8] hw/sh4: Add missing license Date: Sun, 21 Feb 2021 21:02:42 +0100 Message-Id: <20210221200249.2536247-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221200249.2536247-1-f4bug@amsat.org> References: <20210221200249.2536247-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This code was introduced in commit 27c7ca7e775, ("SHIX board emulation (Samuel Tardieu)"). Use the same license. Cc: Samuel Tardieu Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/sh4/sh.h | 12 +++++++++--- hw/block/tc58128.c | 7 +++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h index 93f464bf4cd..33dde7a56dd 100644 --- a/include/hw/sh4/sh.h +++ b/include/hw/sh4/sh.h @@ -1,6 +1,12 @@ -#ifndef QEMU_SH_H -#define QEMU_SH_H -/* Definitions for SH board emulation. */ +/* + * Definitions for SH board emulation + * + * Copyright (c) 2005 Samuel Tardieu + * + * SPDX-License-Identifier: MIT + */ +#ifndef QEMU_HW_SH_H +#define QEMU_HW_SH_H =20 #include "hw/sh4/sh_intc.h" #include "target/sh4/cpu-qom.h" diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index 9888f01ac60..1a0fa86d8ea 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -1,3 +1,10 @@ +/* + * TC58128 NAND EEPROM emulation + * + * Copyright (c) 2005 Samuel Tardieu + * + * SPDX-License-Identifier: MIT + */ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/sh4/sh.h" --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613937786; cv=none; d=zohomail.com; s=zohoarc; b=m5gI3BfNhWL01W974O8KXddEe7Hh83q5YRm3/0J52qvoSAzH57pWK8ImbUGAub3zI6aeK0uKtUQZo18oZSS38jZ63irEiluFM9jJWOh/f7Qy85f2WoK3X28UykaywMy+B1reAELUG08Qz2+lx0kLsoqAb10mCEBkZEp458n2sI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613937786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AIxQp5jGuiI1O3G9klEp4e9wkZDTM64R+LqmaT3yKjo=; b=QQ85ZfsPsGL210Wu+BE7ZOLWehknjoW4IAtawTJYWYIgsNwnK7tNt6iUZGTKU0GTO/hvUZlxByvCRdqfkZChRgngdEzRayt2uM4Yfoh+AstNdf8A8eb3P4fkHOhBdeAgpswDPP7eeJSrUMrfkMB60lTC2htTMA7sq5Or1urH2hk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1613937785834355.08907153119424; Sun, 21 Feb 2021 12:03:05 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id l30so1231486wrb.12 for ; Sun, 21 Feb 2021 12:03:05 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y12sm13987764wrm.33.2021.02.21.12.03.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 12:03:03 -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 :mime-version:content-transfer-encoding; bh=AIxQp5jGuiI1O3G9klEp4e9wkZDTM64R+LqmaT3yKjo=; b=jlYyckfKrOKoHGrvr4BBESf8rDqr8VIL6+gx1c/GUAZpDuhGzuINsLaDm+p1ZuPGio esCC5oJxKQWere1BlQRY3utt2yfSMylBkigUKG4vYF5K2DlePKWcMyD0G/UB5LcQPwdV VMsp4Wnk753Rs2VgPc7o3yuTRkawb9QGg5df3a9V/2s7wkzsXva3NBCOXfG6oPYv4wkm 94uEEgtybAWTetpCBaTZDYsCRNt0cFI5a0tOSkt5QkLJlgYmhehL4Ck+TK0iWUAeEs2z 7+Zv5VB+4+I9nkYLb+1nuicY0bcgkqwEaDyjvvZ9eMReGkb63ndNIVxpgTU87YNwT0xZ wO9g== 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:mime-version:content-transfer-encoding; bh=AIxQp5jGuiI1O3G9klEp4e9wkZDTM64R+LqmaT3yKjo=; b=DWYWFOoVz1rOXtEj9QU8ahwrEIstwexrKuhLc3soaaZgJxv3oZM58JbZ02mQZXR/HI ygYLdmQJZ+hD6q1PaxCn8iwwRDKgBDQrQTC0E2bAkVGYxerl1cT4m06XJAGeUkCtF2Ri Qa94S4GtBKgRWOsZ1Z1SmoGzt29OznZxVK4cK5qhTDTpTNaCC9jY5k9DJG8t1nKX8tE/ +i9vbpoNLUoXsqV71vmppNDoHfasr65OT5d1NO5MPk4xhAcyvozELUDRzImQcmlzzsd6 To2EhnIiiu5vGrhLzAgYv6Sa8HRhiXNxyVBaHQZySMEN+j7WPomR+TENR4sTQkeqMwMA KBkQ== X-Gm-Message-State: AOAM533NwWomwaYHvYo0Ppd7VOC0NXsziSsIWZv3SJ+UsN04ENWTW2pj G/O8/LCerxv7Wy5MEGhNJFcW863p8mg= X-Google-Smtp-Source: ABdhPJw7MT83vn5DHuTOmpqqZqnZkbfv4VKJHXanO8lg5Fmjv92ItHZn7+pm9hh7As17udah0ChGHw== X-Received: by 2002:adf:fbce:: with SMTP id d14mr17612863wrs.44.1613937784111; Sun, 21 Feb 2021 12:03:04 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Max Reitz , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/8] hw/sh4: Add missing Kconfig dependency on SH7750 for the R2D board Date: Sun, 21 Feb 2021 21:02:43 +0100 Message-Id: <20210221200249.2536247-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221200249.2536247-1-f4bug@amsat.org> References: <20210221200249.2536247-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) r2d_init() calls sh7750_init() so depends on SH7750.Harmless at the moment because nothing actually uses CONFIG_SH7750 (hw/sh4/meson.build always compiles sh7750.c and sh7750_regnames.c unconditionally). Fixes: 7ab58d4c841 ("sh4-softmmu.mak: express dependencies with Kconfig") Reported-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sh4/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 4cbce3a0ed5..0452b4624ae 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -10,6 +10,7 @@ config R2D select PCI select SM501 select SH4 + select SH7750 =20 config SHIX bool --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613937791; cv=none; d=zohomail.com; s=zohoarc; b=ee8ZhHSSkM8vPDEiCdd5vp9Wk7yMqoBY7/H/fOLjX+/hPd+JxJdreD6CRHMKoaug3YjHiplhAA3peq7W5OUYtkGG5SLliEnWHKkpn4NFWuxw6fgLmSCcVvr3H+KzM/GEFSkGYYFvV15g49gUrOQM5Ro41CRJeoVEXZpL+G+ZUs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613937791; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OIyWkXIHvI4kNUqxYnAR61a/CdM/+9iu9ZaZAZRb9T8=; b=i1tJb8IKrBwROv6cF0uyS6FGyJ++Io6uDqVTVCNN2iBraQWF42H+jzUuZhRnbT+pW8Bei9zJNjjeiOEoJyUf5S8BIeV/vyt3MzHSwH17v+/EOLBOJddLgkHefr3sEyiGefy4oMRS61OITtKI/Q+2opgvvtUuAKnNJFFnfOqq5PA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1613937790936179.10594308639384; Sun, 21 Feb 2021 12:03:10 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id a132so11690489wmc.0 for ; Sun, 21 Feb 2021 12:03:10 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id e1sm26013513wrd.44.2021.02.21.12.03.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 12:03:08 -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 :mime-version:content-transfer-encoding; bh=OIyWkXIHvI4kNUqxYnAR61a/CdM/+9iu9ZaZAZRb9T8=; b=tsPoBIl5w4G0KXze/RMiERgDPDjTeMj2qZTo1VDmRGrxQPPD1mQ444vcqVOhkggAFV PBd6agyQxNY0tXhjdmB/SbWX0yNRHZWpUdFJEHLfWHrNJGozb6AqJ9MwiCztI/1jahCA xyEyWHn8Jjr1YjAmCOWBXRNhRkkd3afjmQ/sEav9swtaJauXZQwxQBjTkPA7Pe7ZZIV8 onLfuXXwnbjveBlHNYogudfwip/w9B4/eFeawB5IVMOKUDDyBWoYMqHs+Ov+29cPgfWG NavFNeHKVCiyD+tbwt5VSusEbSggdVUpSzGbog9g02cc5V2HWB963knZcXnUVoW6COea mezA== 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:mime-version:content-transfer-encoding; bh=OIyWkXIHvI4kNUqxYnAR61a/CdM/+9iu9ZaZAZRb9T8=; b=Ip6/ON6RQgiH+yzKL9Uma0mEfCz9qvZlkZztNbNGWQOsars/NK11FD6OQwF6ZrlOVV mkA2tmjTM8VDT+QOCd2aBLGRjVhk36XqzBxkoXFTT4E1XB6IWv8djwA89dlxC1vCWZ7o 6YKDIiAnwnwkggq7EEdqY7DiILPJIYMaYUSgv4BCIDOKbrMd7spiXqk0I+teZ2oRgE/X kQTfZLjgTz2pqO7FAglb+H+fUho9+LNI4aMFoPwWYszBoiOLdBHGNJEGe8XW57SExGU2 UxOQWWx2Lbq5mPeyGV7r/hxw1gkp8kVizmpVL9h3t7pTavPS83B0Eyk7M2pvGX+u+neV QvqA== X-Gm-Message-State: AOAM53152izZgko4nI65RFW3mQzZFnLfc0XHmDgOmzeyNuREhHIcrA13 lDyIYvB1jJCFmBOu2HIHz7s= X-Google-Smtp-Source: ABdhPJy09m+hcc4cBmilGpcZ5SSeMSp4i5gJWFEqtuicCCWegfxyuRi8s8FON5+4Qs09+XrlmppFgw== X-Received: by 2002:a7b:cc0c:: with SMTP id f12mr17508289wmh.111.1613937789245; Sun, 21 Feb 2021 12:03:09 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Max Reitz , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/8] hw/intc: Introduce SH_INTC Kconfig entry Date: Sun, 21 Feb 2021 21:02:44 +0100 Message-Id: <20210221200249.2536247-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221200249.2536247-1-f4bug@amsat.org> References: <20210221200249.2536247-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_INTC selector for the SH4 interrupt controller. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/intc/Kconfig | 3 +++ hw/intc/meson.build | 2 +- hw/sh4/Kconfig | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index c18d11142a8..66bf0b90b47 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -53,6 +53,9 @@ config OMPIC config PPC_UIC bool =20 +config SH_INTC + bool + config RX_ICU bool =20 diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 53cba115690..b3d9345a0d2 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -47,7 +47,7 @@ specific_ss.add(when: 'CONFIG_RX_ICU', if_true: files('rx_icu.c')) specific_ss.add(when: 'CONFIG_S390_FLIC', if_true: files('s390_flic.c')) specific_ss.add(when: 'CONFIG_S390_FLIC_KVM', if_true: files('s390_flic_kv= m.c')) -specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_intc.c')) +specific_ss.add(when: 'CONFIG_SH_INTC', if_true: files('sh_intc.c')) specific_ss.add(when: 'CONFIG_SIFIVE_CLINT', if_true: files('sifive_clint.= c')) specific_ss.add(when: 'CONFIG_SIFIVE_PLIC', if_true: files('sifive_plic.c'= )) specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 0452b4624ae..c2008c6a0d2 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -19,6 +19,7 @@ config SHIX =20 config SH7750 bool + select SH_INTC =20 config SH4 bool --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613937796; cv=none; d=zohomail.com; s=zohoarc; b=fBauB4IwOb4nHaFOVq0WAxdPDNf48ydLjEmmT6mWwEem/weMyCn6lEKeQ/dTAvztSj+vXGWCuOFz5Kwwh9giQA9+Btrko1glkNN9j8OySV6RZ1B989JvHt1Cx5eB1ohThGG7PhA1logutGaB4O85n6J/PjGPRzzicy/I1i3Vko8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613937796; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+e2u3tqEz47yl0Tpv1FDkuej/YTyk4vXNRGouHyGkiY=; b=LzbzdJPE/Y2RQQz6UqzrVe3jYHPIBMh2C7WA5qrOOyjeqltwvCcxPmHS6SG66xCjWO2FFuUAFnqv4GKIGX7xQBwFsX50yRE8aAOo9eFD5WLIyW0ZML9VQ/W+H4HR/FGVRvKYFw3oGDgHagniuiFWLUtsGWIY1Pk42cXzgb1Kwyg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1613937796057932.4929290109056; Sun, 21 Feb 2021 12:03:16 -0800 (PST) Received: by mail-wr1-f42.google.com with SMTP id l30so1231763wrb.12 for ; Sun, 21 Feb 2021 12:03:15 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id l1sm22971851wmi.48.2021.02.21.12.03.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 12:03:13 -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 :mime-version:content-transfer-encoding; bh=+e2u3tqEz47yl0Tpv1FDkuej/YTyk4vXNRGouHyGkiY=; b=A6Jb5LOF2kMWFt54kbWlU5W+CmV+9YDSO8HooN54IR5HV63Nvveubt0Ktwfyja5NZQ AYIwF4VMpH10wB78z7f1vgKXbDdfxSLq6agixjoC87KwsO0v6iiQ1NdMMCa03/tKnMzM xinAnMncI8yaNEjewSkLDlPD/EC5Li9M15QMAzPJkZP9fnRKl1y4s2tEwlYX+zwny3Bo jjWL3ksJXWCdZXZ2AcCjJR6wOEZKRApgvobMciCIwyKN5ZLL2i1RnVTcnxuQ7cFA/Tqx eSmSwjfDM1nvvLRf14GrQEyjbJuDYzsIq2LiFOk5hbgAzkQTOIffE2481uSb6saI8VVS JRLg== 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:mime-version:content-transfer-encoding; bh=+e2u3tqEz47yl0Tpv1FDkuej/YTyk4vXNRGouHyGkiY=; b=GrOxXB1p7GG28MCQ+H0lVAhno05GPCUpffjjvVezihOPJWgcLhbNLxd8mnWc5NJF9N mXgXluE1KbeOtfr7nbqtDsijOKDUDt++IPNBPVVfhGNau4Qz0BN/St/U/bS37LlIz0aC lKH3eBoxbhZ3D5zyruF0cr26eu/ZOC3EjZia4iHo9EkXgL/ohvR7rhgAiM+Gh0DKdbYB 1WpIe+I/X6LRzgMckXdlgjq4SzqxaspSZJ5o+BBebXD5zXnrY6JNbGGmzEeyesuOzSW2 RzCXN1FHkOf4QkYcpIKgEfq4htpRiFGxQXmPlBhrV57apkynj0/Vdt+Talk+TJnnue1U W2oA== X-Gm-Message-State: AOAM532LEbr+PfsIWhVU+3AMdEctFVcoSBOaZt/OvpNx24zlMruxjw5T qLq9deSMt0veVqoiX6J5Bgg= X-Google-Smtp-Source: ABdhPJyG0lieoNJUUhuVYthhxzdlCzRhRbDWxlYuRealSuHwrx8viGC7pryoVa6M2h9RqnlXQk0BqA== X-Received: by 2002:adf:f80e:: with SMTP id s14mr18927038wrp.363.1613937794278; Sun, 21 Feb 2021 12:03:14 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Max Reitz , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/8] hw/char: Introduce SH_SCI Kconfig entry Date: Sun, 21 Feb 2021 21:02:45 +0100 Message-Id: <20210221200249.2536247-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221200249.2536247-1-f4bug@amsat.org> References: <20210221200249.2536247-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_SCI selector for the SH4 serial controller. Add the missing MAINTAINERS entries. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- MAINTAINERS | 2 ++ hw/char/Kconfig | 3 +++ hw/char/meson.build | 2 +- hw/sh4/Kconfig | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index da10756abf7..34587d90637 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1387,6 +1387,7 @@ R2D M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c F: include/hw/sh4/sh_intc.h @@ -1395,6 +1396,7 @@ Shix M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c F: include/hw/sh4/sh_intc.h diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 939bc447588..f6f4fffd1b7 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -50,6 +50,9 @@ config SCLPCONSOLE config TERMINAL3270 bool =20 +config SH_SCI + bool + config RENESAS_SCI bool =20 diff --git a/hw/char/meson.build b/hw/char/meson.build index 196ac91fa29..afe9a0af88c 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -31,7 +31,7 @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c')) softmmu_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c')) softmmu_ss.add(when: 'CONFIG_SIFIVE_UART', if_true: files('sifive_uart.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_serial.c')) +softmmu_ss.add(when: 'CONFIG_SH_SCI', if_true: files('sh_serial.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_u= sart.c')) softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfso= c_mmuart.c')) =20 diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index c2008c6a0d2..47240aa97b7 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -20,6 +20,7 @@ config SHIX config SH7750 bool select SH_INTC + select SH_SCI =20 config SH4 bool --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613937801; cv=none; d=zohomail.com; s=zohoarc; b=mFCkVFiEByd5E6iFDA1p/icLDjF5Ri10NpsU9dJrrMoGNN0eQLN5Jg9mOzoDFHKQqxFif1pl9XY98AE9HOE4kUFobRf5yZG619AexA/SsqvZqy1tmO7PGeL2XIGKIC0s1y1mSJKh6k6eWlv1SsGz9k0RQAmpe2hT99ZEVo4mAUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613937801; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SscAxapg73VCziLIrtZXdLeUi08cdYrQoTkeiIFn0cs=; b=Ev/2JA14ydu6/fqebYtgjK2VuWXf0hcpKJG796WrO8e1O+RE3XLhkeiDGjimOB4Di6U42B5abtb1JkFfPTIIrdOvKR8jx+oG0Xk5B2uPR/ls39Wtqn3UE13QUz3cKN2jvDPKA90/Vt84Krgtd94NOOA7+2A/OJD6bxOKsUsQsUk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1613937800902406.4815366602545; Sun, 21 Feb 2021 12:03:20 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id w4so11620920wmi.4 for ; Sun, 21 Feb 2021 12:03:20 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z11sm5670270wrm.72.2021.02.21.12.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 12:03:18 -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 :mime-version:content-transfer-encoding; bh=SscAxapg73VCziLIrtZXdLeUi08cdYrQoTkeiIFn0cs=; b=AjRv+y6w3TVGocmwyhr+wYQPEnYJq2SsWxBqOly0MY68WCnw7oD1c8vzCOjBVXbpkv AKy2P16ZPGivpGwWUKbfM16/ZkFsm2C+YYrDhnD8NAE5C2GWJooNsIvbkkP/H74GFjM9 Jm3yCYhw0XJtknED+8cmYugtWTEXUOEh8hA7QKTBdqb6AaTKSX3nZYfVWhdig9/S4b4O QYi4t860A9X4xqTpFOFiR47I7cBaMou2iA3TIm8EZ05QW5xB61AAd08uewrqjMIZJsCJ Y3WmonovASrwYUDV3QZD1li7A2FpcqE5ciR9lQJiJUr+ofMKtXg57EDZXV/HYYOJZpzx ACDQ== 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:mime-version:content-transfer-encoding; bh=SscAxapg73VCziLIrtZXdLeUi08cdYrQoTkeiIFn0cs=; b=j8XbiPDP0JxHuZbGDM43IGF44uiu28YoI66krASY+CiDz0OljeM3/KvOrZv1nVWrd1 vnWsxjpbDlsOLfmDCJyB7u0ZHD7BlCyqoy4NykHtgy0EgryblH1ejBH7nb43zAWmQxl6 e+El6sbXqEpPnD6l3RFJHOLqe9HsEzUS8cuMTk4X7dwan8CUn/aQ4w5dpuhnF9aMx4x4 XUou3/s6K5MEUFFnwmGjUwvHGo9j2LqsHSmKxUYcV5uNLkHvAezhjaek8ZsB1OOteRkK w5Qj7dx+mUp5IGv65gwXEkosuVu1pp+OJNgfKoV309AM3yZtxrDvOjZLKwkBzijU0YYt LgrA== X-Gm-Message-State: AOAM530XWLovrIAlP+kU97iRlBw6F/M1H4N2noscrc9r7X7E+jphrF4e VaRazHuA+fNxJ0SpF1aJjMI= X-Google-Smtp-Source: ABdhPJz6sh0GBSaxwPhRzfixpEbxg+f6z8SCaSrtE/km8OKFl7gFCkA7OH/KFtXumBcX8WNsBHD3Cw== X-Received: by 2002:a1c:1982:: with SMTP id 124mr17569272wmz.84.1613937799216; Sun, 21 Feb 2021 12:03:19 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Max Reitz , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/8] hw/timer: Introduce SH_TIMER Kconfig entry Date: Sun, 21 Feb 2021 21:02:46 +0100 Message-Id: <20210221200249.2536247-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221200249.2536247-1-f4bug@amsat.org> References: <20210221200249.2536247-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_TIMER selector for the SH4 timer control unit. Add the missing MAINTAINERS entries. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- MAINTAINERS | 2 ++ hw/sh4/Kconfig | 2 +- hw/timer/Kconfig | 4 ++++ hw/timer/meson.build | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 34587d90637..cacb5d125ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1390,6 +1390,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c +F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h =20 Shix @@ -1399,6 +1400,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c +F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h =20 SPARC Machines diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 47240aa97b7..e569470a614 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -21,7 +21,7 @@ config SH7750 bool select SH_INTC select SH_SCI + select SH_TIMER =20 config SH4 bool - select PTIMER diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 8749edfb6a5..18936ef55bf 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -36,6 +36,10 @@ config CMSDK_APB_DUALTIMER bool select PTIMER =20 +config SH_TIMER + bool + select PTIMER + config RENESAS_TMR bool =20 diff --git a/hw/timer/meson.build b/hw/timer/meson.build index be343f68fed..26c2701fd78 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -30,7 +30,7 @@ softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_ost.c')) softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c')) softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_timer.c')) +softmmu_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c')) softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_t= imer.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613937806; cv=none; d=zohomail.com; s=zohoarc; b=VXlPUG61vrAHI6J7xH7ImQ+vg3keo934+TuEHkIDhBcaaTmHC9PhbOaAvewzdyvhAtvn7ZxKXjQXfLqH3359W58R+Tn8HRu7gDAcktiWrvgNI7/UyBi1uqdCwzvDBj33hXFICrXGNY2Yy3iHohYcFZqxReImefP9ak8V/ZInAr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613937806; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DggX1m2mxe8Ghm6QtFBVtBRStF24z4AQO4nQOdJ8O1M=; b=Gi8QCaCLE1lDydDd0K6Y3i9K0BdmDIL9897lAc/ONy96pZTiahA+TOHJ0zKKWpeKJ2i4tQjp174aMEMMIvzZrs1rpFM36WdyDcSFIeNUHlcqmoGxGNGqJv2rOsSYU/gBK+xYfE4nurb5VzT4RbtcMH1+i8iO+P19SilEUPtI8kk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 161393780605215.003808163441818; Sun, 21 Feb 2021 12:03:26 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id n4so16952090wrx.1 for ; Sun, 21 Feb 2021 12:03:25 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id m2sm22074858wml.34.2021.02.21.12.03.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 12:03:23 -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 :mime-version:content-transfer-encoding; bh=DggX1m2mxe8Ghm6QtFBVtBRStF24z4AQO4nQOdJ8O1M=; b=ME1tbfFA+GeMbwIcO5XlEqyxdL901SsKzG+y9Y0eaeIkNdGC0I7OCZ1QbYfn+Dd/s1 JcMabj2b7dKJvOb5ekSMAdJYG4NTPKtbefUeXlfvHxNmzPAkPfj3fi6eEqQJsIGFMIiH MRQoBS9SlhDMu/pJzttwSiVNoF1IafOs0FrEJ2oB+4i0bMySTbCqbgl69boScmR/I7H0 rulfOHKOUNPUFr+2bzaDOwl9aWhqXUlImuvgznlI/GI+MhczC6ymF0EDZR6mbgHg8+Kc SaBu/hhoBXKgFXFjMEXuxzTPViaiWGGayoz0xNh0oybQBJoWvY69SnpTXXBA+P0H3MeJ UWHA== 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:mime-version:content-transfer-encoding; bh=DggX1m2mxe8Ghm6QtFBVtBRStF24z4AQO4nQOdJ8O1M=; b=B8ls/ORQcGlMuGW8kwQv5tnbdaN6Q6QkUpEzuzr2Ot+uBRkaMZJifv99mAc5OYOo0X 5NnSULUSMc/m3L/ZSvEnFGSRI62coAN2CCQvWlmQkVsAE9Ybyg23NTRQrVKgSlMJvP7o Cq/wVUwU3+R4OvH3jzmjXhxM/0MFIHQAqEHsXHBrtfc4BGo15yfwP0aRwWLRV9PKwSdp HFcbHXBObG610RtNCQuCc3Phbsk5W2FyVZRO6f+vMBpJ3Puv0suJ3YbxahKYnKw2M1/K ZGmqGc/gITQLZyGuIHl5eN/+RxE6Nk8GifmnLcpVe62sQSUySdXyHEHH7+qXWhNX63h+ Gk4Q== X-Gm-Message-State: AOAM530xb5ylVxkCP8BbU1aK29Nrx45fQ1g8jRtNDB61brdI8oUSdqNV E5Ea6FxUyGpQxntKytlCxKA= X-Google-Smtp-Source: ABdhPJxfdfshbSla1A3QUVtbOUToVmcjnu4v2jLsHNIb+bh8YNSd83iXf5/yAEfq/MGnJGekzXCD4g== X-Received: by 2002:a5d:4ec6:: with SMTP id s6mr1628279wrv.416.1613937804328; Sun, 21 Feb 2021 12:03:24 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Max Reitz , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/8] hw/block: Introduce TC58128 eeprom Kconfig entry Date: Sun, 21 Feb 2021 21:02:47 +0100 Message-Id: <20210221200249.2536247-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221200249.2536247-1-f4bug@amsat.org> References: <20210221200249.2536247-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Add more fine-grained selection by adding a CONFIG_TC58128 selector for the TC58128 eeprom. As this device is only used by the Shix machine, add an entry to the proper section in MAINTAINERS. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- MAINTAINERS | 1 + hw/block/meson.build | 2 +- hw/sh4/Kconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index cacb5d125ab..6117ad414a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1397,6 +1397,7 @@ Shix M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/block/tc58128.c F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c diff --git a/hw/block/meson.build b/hw/block/meson.build index 602ca6c8541..4bf994c64ff 100644 --- a/hw/block/meson.build +++ b/hw/block/meson.build @@ -12,7 +12,7 @@ softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c')) softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c')) softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) +softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c')) softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.= c')) =20 specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index e569470a614..34c01dadde9 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -16,6 +16,7 @@ config SHIX bool select SH7750 select SH4 + select TC58128 =20 config SH7750 bool --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613937812; cv=none; d=zohomail.com; s=zohoarc; b=bLnQ25vneHLgC3rTQtj9bHGE89sqwPXomI/KluYtRZYScUtkgEwJEjgi0uOzuua0oPYheN1od9KFh7mDT8i1RtWXi4jJ2iQzunYQY8cRC/G6u6SpgDzSAGkYRiyetNBjJUAieQRWbsNeJWb3Nkt5nbvXAZ0lTZMK7/72l3adPQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613937812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tuW/bZqhOYUsUa8HZIutmrxZFzUxuZRNcKFfymRQrfU=; b=OmT0v7PgNdvcyUSNIP57n8JFemQiGCNb0AF6l3gVSjonoOYR3NBNObW+hEDd13sC4iTj22ioMz2L7OKbFpfVew+E6Ml7cNaIbXNChLvtssa+SnCL8rkC4BIRCYvwTlOhl7L9HUKWzht3PgB1x/4QIbOsSaRSm7NsNeG9Bv7EqBY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1613937811595299.36776990082024; Sun, 21 Feb 2021 12:03:31 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id t15so16856028wrx.13 for ; Sun, 21 Feb 2021 12:03:30 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id h12sm31429397wru.18.2021.02.21.12.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 12:03:29 -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 :mime-version:content-transfer-encoding; bh=tuW/bZqhOYUsUa8HZIutmrxZFzUxuZRNcKFfymRQrfU=; b=LlWXUOeD9e7COvfdu70Y228yhgm+WUhqWxbtK8oSoX2Rj0uev6AK9inPTqfD3pejFS dk+eRaVkGj14zELlQWLDm6FkxFwVQqP8mjOcaGAIfaYTkCcZOxJSpa4balToqoSHO7w+ 4vWNlOajFGr5h92peCFkUuS65a+P6m14W9cLKRYOTvMQ8DuGN8JjK8Q3oIYieKatGlIr 8K0mlBRP05tq4BAalS/87FaM1DoQreIPShqgQAoMBs5z1/JRNwbOKWqvtqEOaBG7SX8O U2/FPaP8FDPiA8m72S/PyoqdCne3SZdWIvEEo5ZkZws+Pfmned6fNT0O6xrAN+OzsXm9 U76Q== 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:mime-version:content-transfer-encoding; bh=tuW/bZqhOYUsUa8HZIutmrxZFzUxuZRNcKFfymRQrfU=; b=XtfAfvPlTctdAYsmhzedkGT1rZSm81FskAEe/9ugStVe00N5HTyrxB+StpHJhhtWJo JFF3yo/I4ls+TmorgAJ8Dkcq9r3sindGcgjqdojhqxcuDPYPqrCO0T10Apr/1k7cytkP x1iX2qIC0xp5ZkT3KtV6Rqg08hhrd3ZucDLeSRYur2S2lx4r68b5A8mViNtzQrwMpd/5 5mTsGzRnaqy5FBnTLLSej4ZvHdOuQ06KZa7Pu3awtaQKtwUfxRrPzb7ZzB7AyVvvmVjH pz+xDzvdXVyeLtM0u0xe5HOQr9IX+i6cyCDwkK91PTm66TqMn/KYYZ+4wRloaWDKsxnz mMdQ== X-Gm-Message-State: AOAM531X/04r2WCLQW8xt3JdwfSD8NoqElgs24sOtt1Btny2oYRXqeZr E489yQ2bPX2fhy/p3BxdSEc= X-Google-Smtp-Source: ABdhPJxarupXBZfEX/DKUyJl1AMb7JcB4vv2euT2smh5XgoNrnbRpZQmuJKtRBl456TcwmWqBRLOHw== X-Received: by 2002:adf:e90e:: with SMTP id f14mr17742203wrm.324.1613937809888; Sun, 21 Feb 2021 12:03:29 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Max Reitz , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 7/8] hw/pci-host: Introduce SH_PCI Kconfig entry Date: Sun, 21 Feb 2021 21:02:48 +0100 Message-Id: <20210221200249.2536247-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221200249.2536247-1-f4bug@amsat.org> References: <20210221200249.2536247-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_PCI selector for the SH4 PCI controller. Move the file with the other PCI host devices in hw/pci-host and add its missing MAINTAINERS entries. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/{sh4 =3D> pci-host}/sh_pci.c | 0 MAINTAINERS | 1 + hw/pci-host/meson.build | 1 + hw/sh4/Kconfig | 1 + hw/sh4/meson.build | 1 - 5 files changed, 3 insertions(+), 1 deletion(-) rename hw/{sh4 =3D> pci-host}/sh_pci.c (100%) diff --git a/hw/sh4/sh_pci.c b/hw/pci-host/sh_pci.c similarity index 100% rename from hw/sh4/sh_pci.c rename to hw/pci-host/sh_pci.c diff --git a/MAINTAINERS b/MAINTAINERS index 6117ad414a4..7698a69e621 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1390,6 +1390,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c +F: hw/pci-host/sh_pci.c F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h =20 diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build index 1847c69905c..87a896973e7 100644 --- a/hw/pci-host/meson.build +++ b/hw/pci-host/meson.build @@ -10,6 +10,7 @@ pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c')) pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.= c')) pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files('remote.c')) +pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c')) =20 # PPC devices pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 34c01dadde9..b9f0538d57f 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -11,6 +11,7 @@ config R2D select SM501 select SH4 select SH7750 + select SH_PCI =20 config SHIX bool diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build index 303c0f42879..424d5674dea 100644 --- a/hw/sh4/meson.build +++ b/hw/sh4/meson.build @@ -2,7 +2,6 @@ sh4_ss.add(files( 'sh7750.c', 'sh7750_regnames.c', - 'sh_pci.c' )) sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c')) sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c')) --=20 2.26.2 From nobody Mon Feb 9 10:38:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613937817; cv=none; d=zohomail.com; s=zohoarc; b=BiLqQ9xrVToSvOg5hi1tEPpWnEheHCyyv45nElDqAhkpljTQCA39hAMlnVv/Ue2MnFVZcqSfm5fvUJtG6ENaW7Usr1iuez07tJkvlHQxzU+hK6ni5BpqJrQscJguW2gtoF5KqRxa0aCRiRYw7fMUgka9exwMwq+LFsjY7hyxjQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613937817; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5dFD5muUoIl7eho1/C8LkdWekpYEZwtQ05983iGULtA=; b=Y4uZ4I1K2xTQ0yja5/w4hH4M1bFV5i/N29EGRqoYUlvmLO9JpfZZgd4JmWa8E5c7HNCV7zc3J/+5jusX5FYZCChnqQkDyggmVoe5nada0flzdqq9LQQ/GX1hpx58J1DZt2bJwtJhUBOGKf8HkcAgLT6NxOYQHVVk7o5vM4aaUJg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1613937816890481.0434217978308; Sun, 21 Feb 2021 12:03:36 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id v14so16908538wro.7 for ; Sun, 21 Feb 2021 12:03:36 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id l15sm23208876wmh.21.2021.02.21.12.03.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 12:03:34 -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 :mime-version:content-transfer-encoding; bh=5dFD5muUoIl7eho1/C8LkdWekpYEZwtQ05983iGULtA=; b=mVmbhbr1xYur0nIwUcE0Vbawb/QHEBZvwvm4IkWQZKmSOlGYGmC1GgUbf6/HZ8mkTW Vq5ABewHUNrVGZr9dYkhrwALYVIww7LtcEoZhjNw69rho2Ip3/I6NmNGkHfGVtxrGD+K 6t/cNBMqyQEGWOa2ObMnB619tk2HH79zdrCk5rRcCLWR6iasCemZY0ruMBQYT4GwoE8k yN2boEKGs82Ja2Q3iE1f2adxpLvpowHworfj1PuS3KBfsnPp+o96GtiMp6Nn6h6Qasza 3j86buJV6e6UtC+Ny0ohvzqKO2Oojst+eAFqONUW+7hGk6xFEB2aMBkOipy9p0IADx1u jASA== 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:mime-version:content-transfer-encoding; bh=5dFD5muUoIl7eho1/C8LkdWekpYEZwtQ05983iGULtA=; b=FdF42FCYK8VdHpUTj2kzAl8OqlbpEE/6JFU3vadvumMVGkkv7vlMmWqKzJIMD+KVmE aoVew+d8MTFAifGA1MFRCFWGcFiWYfghv4LDvjDEklsENKHqo1vTPSDyIZahCUFt+qik nn34sUyyZMsOYkMaNELNmDFAcOVMROJrxFn0zrgaJg08/QPqh2EZdAiLG+xtupaGYjTN /80ObEH/XgIunFinkKlQP4U8Vtxl6DPHuj6HpLgzYFEbPrG2jq3sa0PEfQE6nMYlBzKN m3vG+1NvjaVc4JxO8Zwm3wwt2p2n1jzFyj7jGdz0WRJf6sNHyqmn1a2bU4Tr7T7kK5F3 mxXw== X-Gm-Message-State: AOAM533ez9g01Ds/6VvVI7H3i+bB25gVu2tpdYIgTeBSjstRX5WwBeN6 k0wBrhENVLNoEikDGTGojHs= X-Google-Smtp-Source: ABdhPJwUtCk/8mtIvHS2idP3GiYox9bcHsu+Rxuc5gcW4Hy6k3iQvHJT4o/46uyTk4BE7jfsQScHDQ== X-Received: by 2002:a5d:4d85:: with SMTP id b5mr16408182wru.192.1613937815217; Sun, 21 Feb 2021 12:03:35 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Max Reitz , Yoshinori Sato , Magnus Damm , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 8/8] hw/sh4: Remove now unused CONFIG_SH4 from Kconfig Date: Sun, 21 Feb 2021 21:02:49 +0100 Message-Id: <20210221200249.2536247-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221200249.2536247-1-f4bug@amsat.org> References: <20210221200249.2536247-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) As replaced the generic CONFIG_SH4 by more fine-grained selectors, we can remove this now unused config variable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sh4/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index b9f0538d57f..ab733a3f760 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -9,14 +9,12 @@ config R2D select USB_OHCI_PCI select PCI select SM501 - select SH4 select SH7750 select SH_PCI =20 config SHIX bool select SH7750 - select SH4 select TC58128 =20 config SH7750 @@ -24,6 +22,3 @@ config SH7750 select SH_INTC select SH_SCI select SH_TIMER - -config SH4 - bool --=20 2.26.2