From patchwork Mon Feb 8 13:50:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12076425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53674C433E6 for ; Mon, 8 Feb 2021 20:02:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 824CE64EB6 for ; Mon, 8 Feb 2021 20:02:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 824CE64EB6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Cjc-0007W2-Vi for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 15:02:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l96wo-0004jL-JY; Mon, 08 Feb 2021 08:51:30 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:35505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l96wY-0008L9-Qf; Mon, 08 Feb 2021 08:51:18 -0500 Received: by mail-wm1-x32e.google.com with SMTP id j21so10610483wmj.0; Mon, 08 Feb 2021 05:50:56 -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=tObTYhQ+zus1AvtZTsC2+O32j1QKeXfs5+MsjvyMcl7S/jaCMqPVS6lfqcPYgFKE0n GIngG0I0+lUijOjUe1IOKVExP1JZ1S2kBbGXCx7vFMxmc2t6zp3xq07fbjnXZ5MbrcD/ PLdnvRFQ9nL7MnrgOjIUpxCvbvWKx2uFHujI05Rsr3Yk1iwNCgE+aSdCXNZK83TgZxp5 Sm2pkTJP0DW0FNkgZNRL0HqnfTuW2Fy1ENDz/FZwNPLgFbjSpXT2JE7YZC4CfTZptMBH dDnPcrDQhwbohb/nxsy9EOUALnPRbZJGLu6iWJe87B39SPfwGtrFmk/4pKwgUkh/Epmi +ldg== X-Gm-Message-State: AOAM532ZwclrU21Nmx4UYV/uFcfs3hNd9LIBI69CADzxbJK+LpgQXor2 jChLi3MD9zl7qGBWD5+4ioTRBNXINnA= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "open list:Block layer core" , Yoshinori Sato , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Walle , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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ée Signed-off-by: Philippe Mathieu-Daudé --- 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')) 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_usart.c')) softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfsoc_mmuart.c')) 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_kvm.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 config SHIX bool select SH7750 - select SH4 + select SH4_DEVICES config SH7750 bool -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_timer.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) From patchwork Mon Feb 8 13:50:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12076419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB745C433DB for ; Mon, 8 Feb 2021 19:58:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5AB2B64E66 for ; Mon, 8 Feb 2021 19:58:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5AB2B64E66 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Cfs-0003ls-7q for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 14:58:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l96wn-0004jK-NG; Mon, 08 Feb 2021 08:51:28 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:40330) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l96wS-0008LS-NN; Mon, 08 Feb 2021 08:51:14 -0500 Received: by mail-wm1-x32d.google.com with SMTP id o24so5605167wmh.5; Mon, 08 Feb 2021 05:51:01 -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=o1PjaijOInOKAF05KO/i0IqrfO/AXG+HXivHc25PbUuAD2gzUv2jwWcxLnBA4Uw0fZ j5VFaX2Y459LumTjZULdMEVA+/cwOvq7QhUHFR5EENGaY2YE0Ykb7Aye24vqjmHa45hS 9/pOvHgGCQG/T3kWYOQef6XcNdcO4DIMbqyxiEyKdBWSV0p40SCMqdJT10EWM/gVjNvD bV7jVv7Y27aGtOV8QUoJPpBEYpdIsLKECQAptWNquTb3E6CKpT1RVMg314pnTm5oX4Nm Y7OFUbI9u67Dkr32AsHwesv0bv+D6lnwAfg1S6kDfUpDjqpQupTqG/+a7nT9tpZnINo/ h1HQ== X-Gm-Message-State: AOAM533v8t9VEFP8IKvvJ0ja/ffr3f7xKO0k5mST2nqjBCTxO9bhIbbu KMWF8bl9he0YlBIeJhEK0+cpeXJFWEM= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yoshinori Sato , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Walle , Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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ée Signed-off-by: Philippe Mathieu-Daudé --- 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/devices/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=y # Boards: # -CONFIG_LM32=y +CONFIG_LM32_EVR=y CONFIG_MILKYMIST=y 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 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 = 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')) hw_arch += {'lm32': lm32_ss} From patchwork Mon Feb 8 13:50:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12076441 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01F12C433E6 for ; Mon, 8 Feb 2021 20:12:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 670BA64E66 for ; Mon, 8 Feb 2021 20:12:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 670BA64E66 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Cts-00006O-GH for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 15:12:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l96wn-0004jJ-Mm; Mon, 08 Feb 2021 08:51:28 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l96wY-0008NL-QH; Mon, 08 Feb 2021 08:51:18 -0500 Received: by mail-wr1-x42b.google.com with SMTP id g10so17256543wrx.1; Mon, 08 Feb 2021 05:51:06 -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=ZlvKDSXjD2iset7L2o7L4rOWq8GoWIHrT6e8JovAzVCJhZBpqiabAQpvl4u0e5rQ9B 5QaUGbUsiSDqfhmWsqLq6k3lr08tKTgSJC8unQNh7+brONf5AErL4gER1pSL2RL0i9XV HfGVD9tTqtE/LCxuOOmm5UEeTOPgywbynEIfRVlOl+HfeSphKnIPYbSqB1+LfuzHfKQX F+wGoNC77VU+TQwJrhEpR53Sjkz3Na9tOUQ2k1KtpqEOukuuAopDVzBhkZURbioQc3L2 lg7QX2yLwtaFiW6A1HyiLrd7+qkCZmMFB1FuD9oCeTg7QIiLWjmh/rkwE+jh5TjosChG HnrQ== X-Gm-Message-State: AOAM533WFREEB4Kbb2KPbzp5Y0c4LIFsAdOMkikr54DfYxnAiyRBPlbC 0q2DeM5wEXChE/KO2MCHF0WiTWt0e6I= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yoshinori Sato , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Walle , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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ée Signed-off-by: Philippe Mathieu-Daudé --- 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', 'i8259.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 @@ -14,5 +14,5 @@ config MILKYMIST 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', 'i8254.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')) From patchwork Mon Feb 8 13:50:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12076461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBCBEC433E0 for ; Mon, 8 Feb 2021 20:19:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E8A264E66 for ; Mon, 8 Feb 2021 20:19:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E8A264E66 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9D0n-0007Ah-7K for qemu-devel@archiver.kernel.org; Mon, 08 Feb 2021 15:19:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l96wy-0004ji-PW; Mon, 08 Feb 2021 08:51:41 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l96wh-0008Nn-Ul; Mon, 08 Feb 2021 08:51:26 -0500 Received: by mail-wr1-x42f.google.com with SMTP id g6so4219347wrs.11; Mon, 08 Feb 2021 05:51:11 -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=bCQLco5GIiePlK9udzWAM2M+sueZW5+kLPQlZg3/pLyRi5uBXbKEcViWB8AyM8vppq Ow+coRG6i7euId2UI5mlnn7lT01JP0zMS1VZwPWiHExqwBRrHySH56Hmsr7lb0WBxVqw 4VBMvph0+hUOKG0l7WqA2C9TD9nBUY/QIl73F22z9vOFLGqE6IoFWp8egAYZfOhi7t/K InIqUqYKD+RCeQ/F/TpYhmHhPT29zeWspuDJAyd1Bpj6VAGSmNRWbRiYI+WLZATAxjR1 AvoaUYdmfN0LmW6OX078DGjqlhe7qorrsloFLx/SuUgPeSQWZpInZb7MG40cSe/n2OIN I7Yw== X-Gm-Message-State: AOAM532f3XjLWqmVxp/m9Cpblc//Bn1q/x7JI5QUWZZQi0iCmBBjwqQc t6+MD72HglzwQ4KLYsUBb6AetWDarF0= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yoshinori Sato , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Walle , Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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_cpu_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ée Signed-off-by: Philippe Mathieu-Daudé --- 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 config LM32_EVR bool