From nobody Tue Feb 10 12:14:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) client-ip=209.85.218.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614003345; cv=none; d=zohomail.com; s=zohoarc; b=jGc8GROjMtdVovvPit6wZGjnfhLgR05OwEZAq4YtSZwPnCoeBfo4m9LO2gkYnX8M5d7Arw+BIpesym9wHLkr2H+o+U34hKHapbRpBDXGFneokHHyP3ulb7eT1WQiEGqj6KjDa2BvQRNIunK04rN90TGyugkRFqCZrVRy6d6c56c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614003345; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8NQxzvw/rLDcJlmgmZNjYJ+dqWkqgHbVTMWeNA+d6sI=; b=LRSVURevNDqavHlz+TKz4tX/txMVkuAbBNfnDHbVaqwLWZUvEsEMdrYz5P4wtTLJt1sLHQnu1IF9uoWbUPm0tj1h4bbv49oOLuJRNmQnhzGLQLDxY56zmWnHx4bCt08EkQ8haIUBJCm70bDClw/9Cq/IOhUunSUke0jPjCmXQHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.zohomail.com with SMTPS id 1614003345378428.628878475173; Mon, 22 Feb 2021 06:15:45 -0800 (PST) Received: by mail-ej1-f44.google.com with SMTP id d8so29626510ejc.4 for ; Mon, 22 Feb 2021 06:15:44 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id w24sm11633219edu.2.2021.02.22.06.15.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 06:15:43 -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=8NQxzvw/rLDcJlmgmZNjYJ+dqWkqgHbVTMWeNA+d6sI=; b=LV5fuJFbP0bzckaxjC0Y4PKvN3Z2pJmy5CUQCxrZbTyoAneTWb2X93H2GjYeHSYXek NXlCzh30aBHki9hI43X+nQ561ga7DXo54YVPFY612woox24E/smzfwdPRXpplx4uS5/G cuqwSxTEMnTBxudiuMnKSxhO7Vpr7LAfFT842qzQjPn6rbiDc7jCOVXLryT8Xh82Jpak Amm8EYjm0sIK3yV2YS+tbYo2Np8bRYx4k1SlgH1yCD9vTeuNkMFAtTPXFh2jyNXsGNEE n1sMrFeZPmqoHXPBD5zZ1qbX79MDEnBHaCwstC2fUY6FcJDJH10UhgiEiNJxcn5wibAK rXtg== 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=8NQxzvw/rLDcJlmgmZNjYJ+dqWkqgHbVTMWeNA+d6sI=; b=Z7bIaFUKWvhdvJyniXSvJGXg5Ek6gTKnjy/loeqehsZHi18l45HZIGGisy3DaUFqqY aZ5k3mVysOBTos+w/AmoSd+qiogNazs71X2fHn3t2XIgWfTskoC803VUcP8WXYA/ZT3i haOFUcBh3gbYso+f1+w0w+/I+4K+ILZJ3qoQlInhP4eSlh0F5fmd1T6SOCDYJI+m6qJH j47S1t8rZ8FD1zlUaslGZvizNfMwc7ConQsGJ4m4DJIMl9Khtyizq8Wnl/ihvoilx58k mNf0R8yJhM9CzbcbWivj990C3UBBhosKqcO8XUkwfwP+XGaamcrAIB9zrmmO5RpiWF/n X7Qg== X-Gm-Message-State: AOAM5337tnizMQ6RhzEBBbeHZA0Hha1hmkJu2SAJEvrBrti6NId7S1dj g5sU8L6hHmGh5yAYRWEkXNA= X-Google-Smtp-Source: ABdhPJyFeeRMdSjLmSCuX2+pw2XUoR+EWcgA9uqO2//Sw1DC+CyIoBwp8FPTccGWALLyMECJ1H1tHw== X-Received: by 2002:a17:906:43d7:: with SMTP id j23mr20924571ejn.519.1614003343694; Mon, 22 Feb 2021 06:15:43 -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: Max Reitz , Paolo Bonzini , Kevin Wolf , Yoshinori Sato , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, Magnus Damm , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 5/8] hw/timer: Introduce SH_TIMER Kconfig entry Date: Mon, 22 Feb 2021 15:15:11 +0100 Message-Id: <20210222141514.2646278-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210222141514.2646278-1-f4bug@amsat.org> References: <20210222141514.2646278-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 Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 b53a937714a..a03557f4f7c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1391,6 +1391,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 @@ -1400,6 +1401,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