From nobody Tue Nov 18 19:44:20 2025 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=1612091609; cv=none; d=zohomail.com; s=zohoarc; b=a6cg/I5c3N2pNLY2qT1blwLK+rxUwe5v3Pe1SbkWocKkE3ju3cPMU26n7N1dIcCjyOjGLrP6aITFzmGsM264DjPONr1tioIkobax4hueqeSgFFw4HyJPzVIgSRsYg5dJJOyNZA14vr1VGytHDGFa6NMFsm6H1wVtD+UH/vl4/vY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612091609; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tDvXzkWLMFL+IUxoP4BeNAznJqzRaOp5XiuRopnwJGs=; b=fQQrIlwzKOIG5bYZ61M3QKYAehAs3IfZyLmqd7K8e0qKxI/Kk+9wWgrbPKMDVqu6N7QBeZAvpGqQqTBZb8487A2qAtmHr/C3V/AreVmvsrq/jesCefN21skNrwHYQLSw46eTAIJO/IdyijIRTGtH5tRsMp9lqFRQv+T7jbro6oU= 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 1612091609010420.59243142966204; Sun, 31 Jan 2021 03:13:29 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id g10so13451683wrx.1 for ; Sun, 31 Jan 2021 03:13:28 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id b13sm21667614wrt.31.2021.01.31.03.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 03:13:26 -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=tDvXzkWLMFL+IUxoP4BeNAznJqzRaOp5XiuRopnwJGs=; b=RG9J4C21ulcBnb4iIf0uVpWt6zxp4h5tZBQGk6ttudggjuvc5rKyljqLRooHATvj+F Tin+5GAYqkQxUYw9EZCmA4jpVDlvUJUL/qhk5UYEZrWcjlo7mExMjnFxfypPa+jL1rxY V3hmqc37+kMAm9pDOnx8oW7o6JazRHiuC8MSGL7vJDLhDfFEXjGlakRvkHNDbtX0Lwic r02tOTqcndqQBDyGF/tuIgu8b9Ejny0K5jCi7XlpAjl1T/gH7ttxKgkemt2WD3TtpDNb 6UwPOn5Shf4y+xk2RHm7fhuw2wfCl8RTDeZmjdoC4F/82I5hesRlJUJxDvogNztJ01Wx Jt8Q== 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=tDvXzkWLMFL+IUxoP4BeNAznJqzRaOp5XiuRopnwJGs=; b=ZoU5vnmtciqCvU4P790DaL+k4szXoWio/RWHyucVhVgGlOQ15ywD0ORj8e+/bFYfzn YKeZY1JXs6GuDx/SdZCzI6d4cNPQVQZxHLK0s+Ded6LVd34c6cX+sEgnKy7jYAn8WQCD tKLg8fiZu19TMl75YIc7xS6cf9JeRIsCkcxbWP5bEjgUKc18R9GixNOoSzAp2dnFCo4d oW/o3WErQxHimum2DOIJmRpyWDCb9RGRnCelso6Jp+hdyBvTUsocfCrjUS6+5TP75SnX RDXmdGnGRtnYuCmSX22JWU2b54MPxXZqSQAnctzexPx+NjwMOVYOiDq3l7NpA1VwH7GY Hvdg== X-Gm-Message-State: AOAM5337V7FqdN+wC22SX26AnZDbe8XAdAdLZj13Yey+BrkZvbWYGBZ+ I/307NIEuAqf4Lbo4bubGmM= X-Google-Smtp-Source: ABdhPJwznvVVdPq4EYOauNSJGoo7Z+nlh8KGHlt6gDiDD/E4ojM4kgoWmoAglfTmwXFeXP0sQq8yGQ== X-Received: by 2002:a5d:4d0b:: with SMTP id z11mr13340402wrt.388.1612091607218; Sun, 31 Jan 2021 03:13:27 -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, Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Cc: Sarah Harris , Max Filippov , qemu-block@nongnu.org, "Michael S. Tsirkin" , Eduardo Habkost , Laurent Vivier , Yoshinori Sato , qemu-s390x@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Anthony Green , Kevin Wolf , Max Reitz , Chris Wulff , Guan Xuetao , qemu-riscv@nongnu.org, David Hildenbrand , qemu-arm@nongnu.org, Marcel Apfelbaum , Mark Cave-Ayland , Michael Walle , Greg Kurz , qemu-ppc@nongnu.org, Peter Maydell , Stafford Horne , Cornelia Huck , Marek Vasut , Aleksandar Rikalo , Sagar Karandikar , Bastian Koppelmann , Jiaxun Yang , "Edgar E. Iglesias" , Thomas Huth , Artyom Tarasenko , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Palmer Dabbelt , Michael Rolnik , Aurelien Jarno , Alistair Francis , David Gibson Subject: [PATCH 01/10] hw/sh4/Kconfig: Rename CONFIG_SH4 -> CONFIG_SH4_PERIPHERALS Date: Sun, 31 Jan 2021 12:13:07 +0100 Message-Id: <20210131111316.232778-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131111316.232778-1-f4bug@amsat.org> References: <20210131111316.232778-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. As CONFIG_SH4 is only used to select peripherals, rename it CONFIG_SH4_PERIPHERALS. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- hw/block/meson.build | 2 +- hw/char/meson.build | 2 +- hw/intc/meson.build | 2 +- hw/sh4/Kconfig | 6 +++--- hw/timer/meson.build | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/block/meson.build b/hw/block/meson.build index 602ca6c8541..7f24b42c283 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_SH4_PERIPHERALS', 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/char/meson.build b/hw/char/meson.build index 196ac91fa29..3b8cb6a2f5b 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_SH4_PERIPHERALS', 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/intc/meson.build b/hw/intc/meson.build index 53cba115690..b05bab2f4b6 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_SH4_PERIPHERALS', 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 4cbce3a0ed5..fbac8c09152 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -9,16 +9,16 @@ config R2D select USB_OHCI_PCI select PCI select SM501 - select SH4 + select SH4_PERIPHERALS =20 config SHIX bool select SH7750 - select SH4 + select SH4_PERIPHERALS =20 config SH7750 bool =20 -config SH4 +config SH4_PERIPHERALS bool select PTIMER diff --git a/hw/timer/meson.build b/hw/timer/meson.build index be343f68fed..d3f53dce400 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_SH4_PERIPHERALS', 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