From nobody Thu Jan 23 05:47:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1737475007; cv=none; d=zohomail.com; s=zohoarc; b=N4yK148TFeil9pxIRElyT4rzdhFUCruyXVcLuCXCVmATSTBnSZgxX8LmYTaPbiBARc8WVrAI2XWCAuKj6RkCzCbIJSHGGl8mxOEkY1C6p0NjnNEdzNv4JlZIE+BYHo6Ggw9L0t60AvGaCRm0hprWoRJGQYfr5aJDSAikj81JtgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737475007; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xQw8hecSqNH6i5kzCWTZhqTCpjqpw+LPVTLqVJJZAzs=; b=Fkh74wvOaS29GudGkvuOcClSlX2g1joSWyglBDyRJyEoayEtOconFtZALE4NWDBC1aVAr01s+dwaeMAXXqTVfKYOvdukEopAQMdMmQGr/zBfWiUdxtp+O4mMg+zYGSGnKeOyxJ8EkzVLAlQ1DYeTWHi3Prs3ZB4JYBBAHKxjcsM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1737475007101624.4462564690515; Tue, 21 Jan 2025 07:56:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taGbq-0004Gk-Pj; Tue, 21 Jan 2025 10:56:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1taGbO-0003qS-OM for qemu-devel@nongnu.org; Tue, 21 Jan 2025 10:55:43 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1taGbL-0001wd-AI for qemu-devel@nongnu.org; Tue, 21 Jan 2025 10:55:41 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-435f8f29f8aso42003205e9.2 for ; Tue, 21 Jan 2025 07:55:38 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c7499942sm242499335e9.6.2025.01.21.07.55.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jan 2025 07:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737474937; x=1738079737; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xQw8hecSqNH6i5kzCWTZhqTCpjqpw+LPVTLqVJJZAzs=; b=ftWKLLBXMCQTRtU77TxaFPAAJn2HuyfQKt8Yy9U9P0ToBxzW1ahHVRQfqZ/BCBGebS OkRypaH28qSQTj4qz+Nsq1zqvGwzrQMC3DZVi2/I2IHVbC3SAkYfLJJ/ZmERH0fwltGc ygw1dpG92RjFyXeDbaULPLW+nJw16dRoiDabt8toL3a9iSHIP0hnBi13tdZVGfud/uhc /ZySR1lWoKCV5+cYLTOdLKiwze/sj4i7/YbL7PPyGq8ZNY6Ie2vLJ6R4qmo5TbVuHBkI 72iAb42C50/WTBilqJgeyAzmdnBEpD/TT57kXRlrcmq951VdBVHK/h6s82hLiHJCY32C DKTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737474937; x=1738079737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xQw8hecSqNH6i5kzCWTZhqTCpjqpw+LPVTLqVJJZAzs=; b=stKngfJhErVYJnJf71pldow9ltFIBv/tMPzgV61dxUkteKbtafIByokia82GMykyZQ ZkD6tUOkoMNbmAaZ7qitcaDbuuXrCnDTOtFCl8UCkUzNf9Rkm6teDDZ2CEBVWjkjCXh5 KxnhRrQyTGSO6E8MfZJ++f0UdSK8xfiGLT7TT+3ufBC0VNeS5brWcU0eK7VO+ffni10P jYjEGyukKI5k8cJFuJFwkv6fTir1T5xvSp9lfyqK8V8fKLK3yEbMgwkfLyB5qtavotDM 4UBqMQ13UoHmprooqAXvHjgy4NaA702fPF9MUUZsDiIGrdFnLB5w33syeo6kmaMwBbE/ VJjw== X-Gm-Message-State: AOJu0YwR6EzbRrUggExrr+MAkj0CmV9XuDPh2dBVYCJBOXzX/j1eRGTX Hnm4gmGo+9F9Bk/3gQfAVOCKQVWzGBYcH/M1alsrHaya2MOOGst1d3SgYUBZ5Ro2yVbDUGe0U8C UFvA= X-Gm-Gg: ASbGncuGQCqv3hvxVzaIWE5JAlLnhUut4ZM+WaG7d9BJZuMFUzuWf9kFIfbSlP/l0sQ qqrMKqlOcuGc8I8U1HRql1D0doW12MCjBFz9qaA9ssYIRl4px/ifu/hEdoYAQMfwZXMeYkX+pTl D80GPOruRlAh585axaxoB/xfgoI28WYXlK6vklQXhhuo6/kt5RzWl1hEOMh1WHowy4FrQXrTwxs /RypW2nr///4wvCUZiS/OoEUMYu1+egGSh2y1i0rXNEWXEu84HyG184Qna+k5IAnVpgfxAQYCgD qM0/xsFAAbGCd31+jsgtnhcZqdz1y/e6UMm44DoAe0oW X-Google-Smtp-Source: AGHT+IE+GvUdCD/OJPAi//CfCtFZVnP2Beu4mc4H7j0kk22NtG3llLHtdWEcws7MnOuRNn7ucAeaCA== X-Received: by 2002:a05:600c:54e4:b0:434:f131:1e64 with SMTP id 5b1f17b1804b1-438913cb735mr163475285e9.9.1737474937218; Tue, 21 Jan 2025 07:55:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alberto Garcia , Bernhard Beschow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/3] hw/ipack: Clarify KConfig symbols Date: Tue, 21 Jan 2025 16:55:25 +0100 Message-ID: <20250121155526.29982-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250121155526.29982-1-philmd@linaro.org> References: <20250121155526.29982-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1737475009445019000 Split IPACK Kconfig key as {IPACK, TPCI200, IP_OCTAL_232} - IPack is a bus - TPCI200 is a PCI device providing an IPack bus - IP-Octal232 is an IPack device plugged on an IPack bus Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Fabiano Rosas --- hw/char/Kconfig | 5 +++++ hw/char/meson.build | 2 +- hw/ipack/Kconfig | 4 ++++ hw/ipack/meson.build | 3 ++- tests/qtest/libqos/meson.build | 4 +++- tests/qtest/meson.build | 4 +++- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 4b73a803bf3..1dc20ee4c2c 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -78,3 +78,8 @@ config GOLDFISH_TTY =20 config SHAKTI_UART bool + +config IP_OCTAL_232 + bool + default y + depends on IPACK diff --git a/hw/char/meson.build b/hw/char/meson.build index 1750834385a..ed3529cbbb7 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -4,7 +4,7 @@ system_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c')) system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c')) system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c')) system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c')) -system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c')) +system_ss.add(when: 'CONFIG_IP_OCTAL_232', if_true: files('ipoctal232.c')) system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c')) system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c')) system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c')) diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig index f8da24a62be..28d668727c8 100644 --- a/hw/ipack/Kconfig +++ b/hw/ipack/Kconfig @@ -1,4 +1,8 @@ config IPACK bool + +config TPCI200 + bool + select IPACK default y if PCI_DEVICES depends on PCI diff --git a/hw/ipack/meson.build b/hw/ipack/meson.build index 26567f1068e..e4805228926 100644 --- a/hw/ipack/meson.build +++ b/hw/ipack/meson.build @@ -1 +1,2 @@ -system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c')) +system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c')) +system_ss.add(when: 'CONFIG_TPCI200', if_true: files('tpci200.c')) diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build index 46f130ccfdb..1ddaf7b095b 100644 --- a/tests/qtest/libqos/meson.build +++ b/tests/qtest/libqos/meson.build @@ -32,7 +32,6 @@ libqos_srcs =3D files( 'i2c-omap.c', 'igb.c', 'sdhci.c', - 'tpci200.c', 'virtio.c', 'virtio-balloon.c', 'virtio-blk.c', @@ -70,6 +69,9 @@ endif if config_all_devices.has_key('CONFIG_RISCV_IOMMU') libqos_srcs +=3D files('riscv-iommu.c') endif +if config_all_devices.has_key('CONFIG_TPCI200') + libqos_srcs +=3D files('tpci200.c') +endif =20 libqos =3D static_library('qos', libqos_srcs + genh, build_by_default: false) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 94b28e5a534..e60e92fe9de 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -286,7 +286,6 @@ qos_test_ss.add( 'e1000-test.c', 'eepro100-test.c', 'es1370-test.c', - 'ipoctal232-test.c', 'lsm303dlhc-mag-test.c', 'isl_pmbus_vr-test.c', 'max34451-test.c', @@ -317,6 +316,9 @@ qos_test_ss.add( if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL') qos_test_ss.add(files('virtio-serial-test.c')) endif +if config_all_devices.has_key('CONFIG_IP_OCTAL_232') + qos_test_ss.add(files('ipoctal232-test.c')) +endif =20 if host_os !=3D 'windows' qos_test_ss.add(files('e1000e-test.c')) --=20 2.47.1