From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612792258; cv=none; d=zohomail.com; s=zohoarc; b=JaznN8uuPbNTLiXTc74dGXgt2wRDhCionJiIf2u1Ofq3G8IHYCDyWnCLPMqr4J/DxeqsSbu1vV8in88aCQET41Fu+fbs+gT6fOr8cwvpJ6YPNDEU2y2cGkJy30L2C57U0z2GSPTba/zrRRurGh4Dq0BnvUEbljrqTq+LRUWS6BE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612792258; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ymgca9dXIBWh4OYOFB4RihA4VVSB+doofzMZFtWgb/M=; b=N3hOMk7B283pYrMc7Z6qXf9VbovSjwDFDPN0+zG00tUzoUOGE7TY1nUTmljIYxJkeSnob+TXuneyavFB9hyJ12pMu2DAOfmNxeu5yqHUbGVuRlzM0c33h88eS6zfctrKgUB7jA3ObmCRz4Ldsos/eTGU8YMzYc6iPPbK3jVtj4s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1612792257986101.8660095225373; Mon, 8 Feb 2021 05:50:57 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id m1so13313460wml.2 for ; Mon, 08 Feb 2021 05:50:56 -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 b2sm9058955wrv.73.2021.02.08.05.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:50:54 -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=Ymgca9dXIBWh4OYOFB4RihA4VVSB+doofzMZFtWgb/M=; b=XEcEW2QEsqIK/urB0eT6rjCAhu/ZzOOusqghDDaRGvWe1tx6o3XfF+e84xUu9mY5zs 0Nkgbcm2GFUnj016QtOoKNug2K/hyb4o1o1WhrbakZY2MjT6nN3plfxfhx4bo6gFOIwt Hx8xJLtA++dQ+rulzuAUmSgXJ23fxk4ZA5mgcK+mplT/i1sbUX6iIp1t3uHeTpvTMf42 /AarRFo3wTqgQnJgyJoXejc1VCq0Dk/zzIp22vtZGyIKzam+ukA7zciPO6FacUgQGztL 59hGXPJTiXFoOUF5pJtnXryOkufY3X8g3fN7GJl9uYpWXeAVodNv1MsSz7zcrOyUCWb+ WZaQ== 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=Ymgca9dXIBWh4OYOFB4RihA4VVSB+doofzMZFtWgb/M=; b=m/MZmr30FmrhR9W3W9CpZkbFIcju/RGiTM2QIY0NnzUzhXrJCkGUjUE63PmFo2JLxK pHVmYCdL7oeXaURWWzf1EElW6ykhpShM5W13SG5EJ2lgfs6DnTYBjZ4aW73wQSo+ougn zHwGEjjiQA1edNYcOl132POIpoYDp+F+7WwIyw+HQr4smwH1IbgmvKCjWFofUXx2S1bA NjEPxdsNW2xcSu4OhPtn1b79Qgk8KFgOLWcUeASUTYRu2oL5RkBFdhHPc9ZnL9bAdRQy /0Lqog3XJpxsVnSJA3PCKXlcHDsJrvt7imOFbk2ECFQ7M3D+WEQrKUE7DIHDTPfog3Ge exJg== X-Gm-Message-State: AOAM532bY/mLM50ownzTAwf7v2ry404nBJdMzsY7a3FKm8oY8pr8ExEG 40PzFrWtP2fZ+yPsJsSs5Bw= X-Google-Smtp-Source: ABdhPJxhOxbbJ7dYS/BC6/g5z8li9GPE4mohlkGa9ZmlIjo8sIKV/LleANEokU8p9LP9sSzOXhQRSg== X-Received: by 2002:a1c:9dcd:: with SMTP id g196mr13268465wme.30.1612792255257; Mon, 08 Feb 2021 05:50:55 -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 , Michael Walle , Yoshinori Sato , BALATON Zoltan , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , qemu-block@nongnu.org (open list:Block layer core) Subject: [PATCH 1/4] hw/sh4/Kconfig: Rename CONFIG_SH4 -> CONFIG_SH4_DEVICES Date: Mon, 8 Feb 2021 14:50:45 +0100 Message-Id: <20210208135048.2601693-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208135048.2601693-1-f4bug@amsat.org> References: <20210208135048.2601693-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_DEVICES. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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..f1deee2d648 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_DEVICES', 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..370f5d5ad17 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_DEVICES', 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..7f2a0fed2e3 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_DEVICES', 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..c20b86e3fde 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_DEVICES =20 config SHIX bool select SH7750 - select SH4 + select SH4_DEVICES =20 config SH7750 bool =20 -config SH4 +config SH4_DEVICES bool select PTIMER diff --git a/hw/timer/meson.build b/hw/timer/meson.build index be343f68fed..a0fa3845d80 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_DEVICES', 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 Fri May 17 09:01:29 2024 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=1612792262; cv=none; d=zohomail.com; s=zohoarc; b=fnOBw31aoMkbwMFhk4kpFbCE21HXYqz9Lpx5gFap+mEUbyIwVI1mITzWthx//+oGgyqrkeW6mh2dsT3issPQwzkVKVZ7ydDH2z78moet3CiWhJ8k1JxRs5kJv2o7D2kF3KD1P8BzLsTdQJvo196UQy/X+G+85gA8vAZIwcXpkKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612792262; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FxFFuRHhcoSHA/Qg7nBmJ5yFviRbeYpeHFIYqJuSlbI=; b=aTGHyDDem3QbLxYpdx/JISRop9FM8TtuAUBB6/n9bE8ID3CnyBwu026Qsa6M0jUd/bnWa83pWjLmPApGjB8KL4JpkKriydJBBAkWdCOA32tZ53wVTPRM+y8wv+BpC2GjKuegbAE8MZvfhV8O2eyy6eWMy5pMNU0ugV0bT6mO4SE= 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 1612792262047845.2419947606571; Mon, 8 Feb 2021 05:51:02 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id y134so4971405wmd.3 for ; Mon, 08 Feb 2021 05:51:01 -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 y83sm21220331wmc.12.2021.02.08.05.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:50:59 -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=FxFFuRHhcoSHA/Qg7nBmJ5yFviRbeYpeHFIYqJuSlbI=; b=h9VcQuX2tIbBVDG7swh/lo9z93HzUWBzNPJFIj63xLolWjbFprYwFGBRJvkZkO1XS5 YqJt3cX6g4m4DY2Tua5x/UMfO6+5mqfkYENa0oVDvq/YHJ9051c2cg6zo6F58cscRZ0w w/swr+zwz2PSV8JpRYPXff78YPwWUzQNZE0ZOqN/EsXCWysiuLFNAM2bPABsz+RHs4II 8dBDVbwL14yf0Tn40xll9R+8ruBKj7CpsxD6Mr4DBt/B+66QBFCEfNMeOBRMaPUnigHc 2W5CLtqhDF3OgUeiX7sup3FbokxurogmGYGrESTqzm90xKP832tdmwB8B6BZIufKurdf /+HA== 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=FxFFuRHhcoSHA/Qg7nBmJ5yFviRbeYpeHFIYqJuSlbI=; b=H1FUtnc2Q0UACgqHvt3gzG9qzlbTjZ6vJ/5uPuAOaaAuiGjO1W/Le22mBC+EgNF6Cs CwkX2RgB60IYj57AAR4TP2wPBlACV/VLtDhraN94P/1o1f1NANPCrgNdGIeMKSyxDuvQ EtiYffkGOcY1sG0cJyNIAIRqDZkKAoLOW/NroU9ZtvUFWko8vMx9YGx1mcBf+vjycPKs /0M+f8rAb51UikU2D2+oHrTVB6yTLPIXxfpz7C9CKy6MJTJLhekXe7wV6q7uRHYaID4N z/CfNGS3c9Ph6lmTDJeHg0IK8xmoGSljPYPodBw+tKUXESnnboVZOT8kn1H23spCGbOc tvDQ== X-Gm-Message-State: AOAM533+IAm9qdV8FJHNkEwE8nnnpFwQUK+pGDrHbTgm26cchsnjzro8 1jV/69urnpJP9j+WmvF3TRQ= X-Google-Smtp-Source: ABdhPJxxlrxSBX4Masaf2RgQneEBe/n/C1uVOaK2iEjPvVTCi2QAnhSmZlEfZQAue3H2Ib0PSY7fdg== X-Received: by 2002:a7b:c4c1:: with SMTP id g1mr14589895wmk.145.1612792260140; Mon, 08 Feb 2021 05:51:00 -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 , Michael Walle , Yoshinori Sato , BALATON Zoltan , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 2/4] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards Date: Mon, 8 Feb 2021 14:50:46 +0100 Message-Id: <20210208135048.2601693-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208135048.2601693-1-f4bug@amsat.org> References: <20210208135048.2601693-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 'LM32' config for architecture specific features. Introduce CONFIG_LM32_EVR to select the lm32-evr / lm32-uclinux boards. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/devices/lm32-softmmu.mak | 2 +- hw/lm32/Kconfig | 6 +++++- hw/lm32/meson.build | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/default-configs/devices/lm32-softmmu.mak b/default-configs/dev= ices/lm32-softmmu.mak index 115b3e34c98..1bce3f6e8b6 100644 --- a/default-configs/devices/lm32-softmmu.mak +++ b/default-configs/devices/lm32-softmmu.mak @@ -8,5 +8,5 @@ CONFIG_SEMIHOSTING=3Dy =20 # Boards: # -CONFIG_LM32=3Dy +CONFIG_LM32_EVR=3Dy CONFIG_MILKYMIST=3Dy diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index ed2e3060b04..20c36edc402 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,7 +1,6 @@ config LM32 bool select PTIMER - select PFLASH_CFI02 =20 config MILKYMIST bool @@ -12,3 +11,8 @@ config MILKYMIST select FRAMEBUFFER select SD select USB_OHCI + +config LM32_EVR + bool + select LM32 + select PFLASH_CFI02 diff --git a/hw/lm32/meson.build b/hw/lm32/meson.build index 8caf0a727ff..42d6f8db3d9 100644 --- a/hw/lm32/meson.build +++ b/hw/lm32/meson.build @@ -1,6 +1,6 @@ lm32_ss =3D ss.source_set() # LM32 boards -lm32_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_boards.c')) +lm32_ss.add(when: 'CONFIG_LM32_EVR', if_true: files('lm32_boards.c')) lm32_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist.c')) =20 hw_arch +=3D {'lm32': lm32_ss} --=20 2.26.2 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1612792267; cv=none; d=zohomail.com; s=zohoarc; b=FBKstbfF0G2RTpLRPOlnG6qYYQo3xOVIup+TuLEDu43iHuBBKrOl/T7/A64HWjqzcbkDvB8ytmBx77/mw4kRj0bx/4uvXQzBh+6qQEWiyucnp/aVS4Y380PuIetK7iko2naVmz+l/sbKpBXMl9AC7gUv03/PVFcknhuwsejNWP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612792267; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wECdu+wn/qig5FGpmkX3tVwNWLo0wfkHUfYY3YKcApI=; b=RponUCcNekQwQFWA0ZvbeLhU7I5VCLwt+8zxrIqtz36CITSmKRugyHbf9/IK8dNqL2YYfrwJ2OI+grSeEDmQZYjtD6SmX7ykhaI7s1/8Z0Xh+IhVacS9LO631rH3Ew5wbIhKSrSjtwv2xXRbNiN230fzBYQTUh6YOPYpmJjk3uo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1612792267024871.8351155255572; Mon, 8 Feb 2021 05:51:07 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id v14so1639380wro.7 for ; Mon, 08 Feb 2021 05:51:06 -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 o13sm17613705wmh.2.2021.02.08.05.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:51:04 -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=wECdu+wn/qig5FGpmkX3tVwNWLo0wfkHUfYY3YKcApI=; b=R/Xvz3D4nganBT/0wxmbzJlofCE7eIvF7dohmgVKAjfQZE5ZKT7u/aiBK/OEGw0Cpl anIH9rgUDGbdgTY+0Xc1WOAuzGaiHxMHxSfvrKzRPNAZoGdpB4zvuR6SJVxvb87kWysI d75lE2mnXdt9+XLPaiXm8T3yolQnAUCy6YXkIAtomFlfh+GydcSBDIy9fIpO9Iolqjqc PM//HCFx6y+IBktSAMXjMaf+50dLvX4f0aVOUp4Rol+LQviOi3eawXahfhjbijU7GhFo +O4EC3jGfAYpDwQuCJe9pawy7UwWdZZxEySOz/7x9w0PNUDfPKGVF3T2pa6XpKMdqvhb w8tw== 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=wECdu+wn/qig5FGpmkX3tVwNWLo0wfkHUfYY3YKcApI=; b=p+hlDhi5/beGibRc5VYENhiBtjrFcaZBdbeBZJOd4vVnj1AR2OGnaSWjRfdBbC0h92 paxbdwx2s75KIlBIp4+OvvKb8ja4sYMePMqB541AGogZk7RwYf28xm4ShCeB2VgRZLd4 UFG3e79zRDWnh5fLdgEgfnmZ2iRzCjxwOFbwzscYc1dJwtg50nke898/DJiA8R1tFrF+ 5j9vsWShwwxW5jP4VH8ON/ZUbKGqoRZC0XSeHx466GRBLBKrU3zWbw7IwRw+IkdcxXWB 4SCekKYjWfSo0bOXkOFK6itG4+qL+g6xsF2mklVZMFQhFc2xCVuSb9YZQX5UaGlN72M6 v+GA== X-Gm-Message-State: AOAM530JBh1780jk1rn3GdFqQ0gbm+unim2YOzmCvsuKePcoIiPZFNBK gDE4bGTis3YN+nUpOr1IAls= X-Google-Smtp-Source: ABdhPJxrAJItC2Oi/Kl/IKR4KiNL2zgt41g19t0vwWLD45JFFIf8q1PnWk25w5c1JzU+PU4YTDQw1g== X-Received: by 2002:adf:f112:: with SMTP id r18mr8459629wro.241.1612792265229; Mon, 08 Feb 2021 05:51:05 -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 , Michael Walle , Yoshinori Sato , BALATON Zoltan , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH 3/4] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES Date: Mon, 8 Feb 2021 14:50:47 +0100 Message-Id: <20210208135048.2601693-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208135048.2601693-1-f4bug@amsat.org> References: <20210208135048.2601693-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 'LM32' config for architecture specific features. As CONFIG_LM32 is only used to select peripherals, rename it CONFIG_LM32_DEVICES. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/meson.build | 4 ++-- hw/intc/meson.build | 2 +- hw/lm32/Kconfig | 4 ++-- hw/timer/meson.build | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/char/meson.build b/hw/char/meson.build index 370f5d5ad17..6ab90e68568 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -8,8 +8,8 @@ softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c')) softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c')) softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c')) -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_juart.c')) -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_uart.c')) +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_juart.c')) +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_uart.c')) softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-uart.c'= )) softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c')) softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c')) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 7f2a0fed2e3..2b975b235f2 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -14,7 +14,7 @@ softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i82= 59.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2= .c')) softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c')) -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_pic.c')) +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_pic.c')) softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c')) softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c')) softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_intc.c')) diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 20c36edc402..518c84ed508 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,4 +1,4 @@ -config LM32 +config LM32_DEVICES bool select PTIMER =20 @@ -14,5 +14,5 @@ config MILKYMIST =20 config LM32_EVR bool - select LM32 + select LM32_DEVICES select PFLASH_CFI02 diff --git a/hw/timer/meson.build b/hw/timer/meson.build index a0fa3845d80..809a8988b9f 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -19,7 +19,7 @@ softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i82= 54.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c')) -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_timer.c')) +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_timer.c')) softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.= c')) softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c')) softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c')) --=20 2.26.2 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612792271; cv=none; d=zohomail.com; s=zohoarc; b=TaxXaZAt2yHgBCt7EuemvEPqVk+o7Pe8Df0BYl435XChnCRi6yM3yJkv6KvdGMFylUUczvkTzpynDUx1vkok7XiESQl5ozeUgNYOoX92CjqHCCY+a+RVfSDZTB/w6/NK7X93guNl0bTv03dlqXPKjsiwCisp3Y152kN0I3ce/v4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612792271; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=na17oWuPKTj+SU6c6Dkqcg8IZxkfU6eQT/pu9RwQ//c=; b=DYsVJVHX4vfbKYujCe5YwoewqAIVmTRH5EcTttXbL4tle5Rbsx1HLmQSZ3HrUC+hAs7/04jVfhWjzGgQ33kb/8rtEkJlAtqduA2WPiwqnPH30TNFlhzoOBAlm637ucNhR6K9mjLN8uDfnZLyW4UH90DPB+8xxfq76Ys1zgKon5U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1612792271909456.7428849468897; Mon, 8 Feb 2021 05:51:11 -0800 (PST) Received: by mail-wr1-f54.google.com with SMTP id r21so980369wrr.9 for ; Mon, 08 Feb 2021 05:51:11 -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 l38sm4384680wmp.19.2021.02.08.05.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 05:51:09 -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=na17oWuPKTj+SU6c6Dkqcg8IZxkfU6eQT/pu9RwQ//c=; b=dSedH1SxplSrJIo17nt4Yjv0otJr09g7f7pDzGmziC5RxvP+vmlQEJKncGy3q+BUyY jCQlXX2Dm9eoQvJegJYDlWOuWOmvGlwLaRj+bRUNnygDCU2pnoDK9VjuoYhXVqMGwGbF GQg+FZXmj5LC4dUWpWC9BnH16L3jRz+RD+jZA36Bxv5AbBSI5ab4ko2ThLSnpLoIzmvE SQc1i2OjRC5m+QnjPGEP4uq2uFHIuxMvdw5PZaszfdIcfsPw8CTyGfYTaF1qe3eYZDrO ttzu9/TI9XIfcJILv0be74ybXgJ6MtPOKAx5WLUcGBZ4fCu166P6ZIamCwjchoJA+yYh /RMg== 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=na17oWuPKTj+SU6c6Dkqcg8IZxkfU6eQT/pu9RwQ//c=; b=KuXvbWF9pCXdrFc9crjBBRbTYDjBEmr6JkPdkZbdwy22uGwA2hxWJIsP4u4MkgK/NH 3oNVEGyQI4/roXAj7RsR3ZsvnYI9lw/hsCXFzBZwhp7thBz3Lk/ON48iP22ER3pHEr49 qXPWfYgpUSp4SlWhKzkhT1ONEtx0R/CgT3Ayr0VbOmSIONAtMbez5smjXOC0rPGuuqTx Pb/qj71ZP+Qqz5h6C/afs0eUyIy/bgLlM7vfY7UYwC5TSROwDUrvwKBFyQLq3uX0lo4l QXCqQoBmymi4qW6uAhuz+RrphBBdWflzDhehIfdtXMdLjqWRO70jz8QyyQ6odtbVTg5C xIVA== X-Gm-Message-State: AOAM532RTcQ8uDUVkai+bNaaYHCeRVP4AxSk8NUCJNXUNZF1+a1yQAqX +KWBKACTcd69AIDFzwiwAvM= X-Google-Smtp-Source: ABdhPJxOrrCsrJsNXlrOHytBJpUcWhTuAG8que3wTHno94u1TGkhMhVtjswH2PAX93477SX1KhswZg== X-Received: by 2002:adf:e805:: with SMTP id o5mr3091832wrm.227.1612792270221; Mon, 08 Feb 2021 05:51:10 -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 , Michael Walle , Yoshinori Sato , BALATON Zoltan , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 4/4] hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES Date: Mon, 8 Feb 2021 14:50:48 +0100 Message-Id: <20210208135048.2601693-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210208135048.2601693-1-f4bug@amsat.org> References: <20210208135048.2601693-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) The Milkymist board requires more than the PTIMER. Directly select the LM32_DEVICES. This fixes: /usr/bin/ld: libqemu-lm32-softmmu.fa.p/target_lm32_gdbstub.c.o: in function `lm32_cpu_= gdb_read_register': target/lm32/gdbstub.c:46: undefined reference to `lm32_pic_get_im' target/lm32/gdbstub.c:48: undefined reference to `lm32_pic_get_ip' libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_= wcsr_im': target/lm32/op_helper.c:107: undefined reference to `lm32_pic_set_im' libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_= wcsr_ip': target/lm32/op_helper.c:114: undefined reference to `lm32_pic_set_ip' libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_= wcsr_jtx': target/lm32/op_helper.c:120: undefined reference to `lm32_juart_set_jtx' libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_= wcsr_jrx': target/lm32/op_helper.c:125: undefined reference to `lm32_juart_set_jrx' libqemu-lm32-softmmu.fa.p/target_lm32_translate.c.o: in function `lm32_cp= u_dump_state': target/lm32/translate.c:1161: undefined reference to `lm32_pic_get_ip' target/lm32/translate.c:1161: undefined reference to `lm32_pic_get_im' Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/lm32/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 518c84ed508..8ac94205d71 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -6,11 +6,11 @@ config MILKYMIST bool # FIXME: disabling it results in compile-time errors select MILKYMIST_TMU2 if OPENGL && X11 - select PTIMER select PFLASH_CFI01 select FRAMEBUFFER select SD select USB_OHCI + select LM32_DEVICES =20 config LM32_EVR bool --=20 2.26.2