From patchwork Mon Jun 21 15:21:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 464517 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2692810jao; Mon, 21 Jun 2021 08:25:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGSGBpvdDvJ8E893gjr9jYJ1ZbfIuDvysaC99ZtC5VyjrdT3XaWtYFiV0/Ly7sPTy4kTbD X-Received: by 2002:a2e:9790:: with SMTP id y16mr4028552lji.367.1624289139865; Mon, 21 Jun 2021 08:25:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624289139; cv=none; d=google.com; s=arc-20160816; b=HF4KNG2L9NdduVuqyc1VdCIyKoOiSEjb0iI2zDv/q+xAgE1a8x8P1Jtfgme66D/Bz+ 6Plgx1xRAS5RI6Qp44Z7zlMVMFNmmy74+GyyYUIei8en1YgQyB0RyBir5eX7hOqcCUz9 HJ2XmZNAKhFXtSZvGA7Qr2ENLvJO4xnWVASHJCoUg1hTcMKGCfsymDTOQMRVI/PWuYXP WNM6aDcQ0s9iylcICifITyXFS/rvQa5B/cxg6WoeuQlKQ1jKK5s+ZSGV5fSy7//3Vbke JI+chAhXjB/CwxgjGZ6ytjnoQaNNaaClOZbRFUmfRm7HD0csf74zZZZzFlqlMy55oX6j HMiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=bRXfzHb9Ja1eg0zoC+HYXEXnUyw677YmM0+TU1OM9Y4=; b=YQhXIQRxyLIEexFwN5jwWqGfWQ7ZCaYT2oESJ49dz+cZJwNIIFP0tLm++ynljdVQM+ QBgiEvv/zxUFmvZqln+uF8W2fYBQn+nMEfHAuHU5JSKuhh8w+n/9ZldfrUt/kAOpjCWp wi4B54lD+48RLIiaBTxuo6MBBl5NzrFQf9o02sIXu6f5hnqY2COn7qLuAgYuNB9YkTnG jjphWKCIhLrsGG/lG+5ugrG6wAc3gwU811Fup0iftIJujkyJvu4N0oGg0EMmMtCS+sw+ EmA02DEf+kQHZmgnPxpHqL6cKDtFxvMTfvnJmk8EB2eJ/m60XWDpBSmhU7knumWcJdPe nTCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=t8gNoqqV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k26si7185321lfe.336.2021.06.21.08.25.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jun 2021 08:25:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=t8gNoqqV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvLnu-0002LB-KE for patch@linaro.org; Mon, 21 Jun 2021 11:25:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvLjw-0006Bg-Fd for qemu-devel@nongnu.org; Mon, 21 Jun 2021 11:21:32 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvLjp-0000U4-Ag for qemu-devel@nongnu.org; Mon, 21 Jun 2021 11:21:32 -0400 Received: by mail-wm1-x332.google.com with SMTP id p10-20020a05600c430ab02901df57d735f7so2032789wme.3 for ; Mon, 21 Jun 2021 08:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bRXfzHb9Ja1eg0zoC+HYXEXnUyw677YmM0+TU1OM9Y4=; b=t8gNoqqVNOoHnicwAnKqDXNC5SQIxAubiS4fUAQJW/HKdAsA79YG9uSCSkU9aI37g3 C1ZBrZPsmSWkqrmWn3UWFzR3VlJX8bZGk4X2b1KMcsbnCFpp9sAwdoNp3XFeOP5lLuT8 P/W7avS1t6Q4auYa67utGTfwA1kU3LKm+yWQO/XT8BzvA0LLjgz8wrzvl4Pqo06thW41 WJC1aX5aaxEpiO4y12K0lkmoT8Jz5e8AvVj/tWGbkvIHSFsrofmYi3WcuefCYWHESEmj OWzW70gjtIPBZpa5brc6f7OIdKIcNqqSZcDyRN7WmdTyNPTa5F4N8+Vq1lbvgO1KUP9J 8TFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bRXfzHb9Ja1eg0zoC+HYXEXnUyw677YmM0+TU1OM9Y4=; b=EIwrPxqZ58/YxjAtsBb1SkQxeylw8VnsRzDZ6HbFfOOrYzr1YyYP608puxAJ8Zy5aX gwocCnbG7PbtqyhX7Y/IHb/s0EwfzIHgl0tGjwXIIRneyueJSZEO7lDQsGkGFxkZGeg4 xc5Wju6VanxxfRS6s6YRc2GR/lRONBalAJrPuLwdUU1YIVfZYeEUKzXFRKsGV5qNiBXZ VBmZv8PtNR60uEP9K6jBOwOhq4BIobLJweCEQQsGdg7Ivz5USjq59OVipSI1/uEKQsRu WGyPTigPfT6In2HKqL+HWuOX2HlMtUxPngpJkfmhItrgkxFpL7s+mqDmomLPes02kslY Pbow== X-Gm-Message-State: AOAM531sIfuwjo3HvHtfZcYooyCyMoJZ+tJIFLDmk1GEd+5CcOkdYooi kah4qNdvHb/CPLSzkorJEfzdrA== X-Received: by 2002:a7b:c099:: with SMTP id r25mr28087183wmh.144.1624288882929; Mon, 21 Jun 2021 08:21:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 197sm1773881wmb.20.2021.06.21.08.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 08:21:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 97AAC1FF87; Mon, 21 Jun 2021 16:21:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/5] meson: Introduce target-specific Kconfig Date: Mon, 21 Jun 2021 16:21:16 +0100 Message-Id: <20210621152120.4465-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210621152120.4465-1-alex.bennee@linaro.org> References: <20210621152120.4465-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Cornelia Huck , David Hildenbrand , Bin Meng , Mark Cave-Ayland , Aleksandar Rikalo , Laurent Vivier , Max Filippov , Alistair Francis , "Edgar E. Iglesias" , Marek Vasut , Yoshinori Sato , "open list:PowerPC TCG CPUs" , Artyom Tarasenko , thuth@redhat.com, Richard Henderson , Greg Kurz , "open list:S390 general arch..." , "open list:ARM TCG CPUs" , Michael Rolnik , Stafford Horne , =?utf-8?q?Ale?= =?utf-8?b?eCBCZW5uw6ll?= , David Gibson , "open list:RISC-V TCG CPUs" , Bastian Koppelmann , Chris Wulff , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Palmer Dabbelt , pbonzini@redhat.com, Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Add a target-specific Kconfig. We need the definitions in Kconfig so the minikconf tool can verify they exit. However CONFIG_FOO is only enabled for target foo via the meson.build rules. Two architecture have a particularity, ARM and MIPS: their 64-bit version include the 32-bit subset. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210131111316.232778-6-f4bug@amsat.org> Signed-off-by: Alex Bennée --- vajb: - removed targets that no longer exist - reword commit message to show why we need the Kconfigs --- meson.build | 3 ++- Kconfig | 1 + target/Kconfig | 19 +++++++++++++++++++ target/alpha/Kconfig | 2 ++ target/arm/Kconfig | 6 ++++++ target/avr/Kconfig | 2 ++ target/cris/Kconfig | 2 ++ target/hppa/Kconfig | 2 ++ target/i386/Kconfig | 5 +++++ target/m68k/Kconfig | 2 ++ target/microblaze/Kconfig | 2 ++ target/mips/Kconfig | 6 ++++++ target/nios2/Kconfig | 2 ++ target/openrisc/Kconfig | 2 ++ target/ppc/Kconfig | 5 +++++ target/riscv/Kconfig | 5 +++++ target/rx/Kconfig | 2 ++ target/s390x/Kconfig | 2 ++ target/sh4/Kconfig | 2 ++ target/sparc/Kconfig | 5 +++++ target/tricore/Kconfig | 2 ++ target/xtensa/Kconfig | 2 ++ 22 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 target/Kconfig create mode 100644 target/alpha/Kconfig create mode 100644 target/arm/Kconfig create mode 100644 target/avr/Kconfig create mode 100644 target/cris/Kconfig create mode 100644 target/hppa/Kconfig create mode 100644 target/i386/Kconfig create mode 100644 target/m68k/Kconfig create mode 100644 target/microblaze/Kconfig create mode 100644 target/mips/Kconfig create mode 100644 target/nios2/Kconfig create mode 100644 target/openrisc/Kconfig create mode 100644 target/ppc/Kconfig create mode 100644 target/riscv/Kconfig create mode 100644 target/rx/Kconfig create mode 100644 target/s390x/Kconfig create mode 100644 target/sh4/Kconfig create mode 100644 target/sparc/Kconfig create mode 100644 target/tricore/Kconfig create mode 100644 target/xtensa/Kconfig -- 2.20.1 Reviewed-by: Thomas Huth diff --git a/meson.build b/meson.build index d8a92666fb..3ddd22ab7a 100644 --- a/meson.build +++ b/meson.build @@ -1377,7 +1377,8 @@ foreach target : target_dirs command: [minikconf, get_option('default_devices') ? '--defconfig' : '--allnoconfig', config_devices_mak, '@DEPFILE@', '@INPUT@', - host_kconfig, accel_kconfig]) + host_kconfig, accel_kconfig, + 'CONFIG_' + config_target['TARGET_ARCH'].to_upper() + '=y']) config_devices_data = configuration_data() config_devices = keyval.load(config_devices_mak) diff --git a/Kconfig b/Kconfig index d52ebd839b..fb6a24a2de 100644 --- a/Kconfig +++ b/Kconfig @@ -1,5 +1,6 @@ source Kconfig.host source backends/Kconfig source accel/Kconfig +source target/Kconfig source hw/Kconfig source semihosting/Kconfig diff --git a/target/Kconfig b/target/Kconfig new file mode 100644 index 0000000000..ae7f24fc66 --- /dev/null +++ b/target/Kconfig @@ -0,0 +1,19 @@ +source alpha/Kconfig +source arm/Kconfig +source avr/Kconfig +source cris/Kconfig +source hppa/Kconfig +source i386/Kconfig +source m68k/Kconfig +source microblaze/Kconfig +source mips/Kconfig +source nios2/Kconfig +source openrisc/Kconfig +source ppc/Kconfig +source riscv/Kconfig +source rx/Kconfig +source s390x/Kconfig +source sh4/Kconfig +source sparc/Kconfig +source tricore/Kconfig +source xtensa/Kconfig diff --git a/target/alpha/Kconfig b/target/alpha/Kconfig new file mode 100644 index 0000000000..267222c05b --- /dev/null +++ b/target/alpha/Kconfig @@ -0,0 +1,2 @@ +config ALPHA + bool diff --git a/target/arm/Kconfig b/target/arm/Kconfig new file mode 100644 index 0000000000..3f3394a22b --- /dev/null +++ b/target/arm/Kconfig @@ -0,0 +1,6 @@ +config ARM + bool + +config AARCH64 + bool + select ARM diff --git a/target/avr/Kconfig b/target/avr/Kconfig new file mode 100644 index 0000000000..155592d353 --- /dev/null +++ b/target/avr/Kconfig @@ -0,0 +1,2 @@ +config AVR + bool diff --git a/target/cris/Kconfig b/target/cris/Kconfig new file mode 100644 index 0000000000..3fdc309fbb --- /dev/null +++ b/target/cris/Kconfig @@ -0,0 +1,2 @@ +config CRIS + bool diff --git a/target/hppa/Kconfig b/target/hppa/Kconfig new file mode 100644 index 0000000000..395a35d799 --- /dev/null +++ b/target/hppa/Kconfig @@ -0,0 +1,2 @@ +config HPPA + bool diff --git a/target/i386/Kconfig b/target/i386/Kconfig new file mode 100644 index 0000000000..ce6968906e --- /dev/null +++ b/target/i386/Kconfig @@ -0,0 +1,5 @@ +config I386 + bool + +config X86_64 + bool diff --git a/target/m68k/Kconfig b/target/m68k/Kconfig new file mode 100644 index 0000000000..23debad519 --- /dev/null +++ b/target/m68k/Kconfig @@ -0,0 +1,2 @@ +config M68K + bool diff --git a/target/microblaze/Kconfig b/target/microblaze/Kconfig new file mode 100644 index 0000000000..a5410d9218 --- /dev/null +++ b/target/microblaze/Kconfig @@ -0,0 +1,2 @@ +config MICROBLAZE + bool diff --git a/target/mips/Kconfig b/target/mips/Kconfig new file mode 100644 index 0000000000..6adf145354 --- /dev/null +++ b/target/mips/Kconfig @@ -0,0 +1,6 @@ +config MIPS + bool + +config MIPS64 + bool + select MIPS diff --git a/target/nios2/Kconfig b/target/nios2/Kconfig new file mode 100644 index 0000000000..1529ab8950 --- /dev/null +++ b/target/nios2/Kconfig @@ -0,0 +1,2 @@ +config NIOS2 + bool diff --git a/target/openrisc/Kconfig b/target/openrisc/Kconfig new file mode 100644 index 0000000000..e0da4ac1df --- /dev/null +++ b/target/openrisc/Kconfig @@ -0,0 +1,2 @@ +config OPENRISC + bool diff --git a/target/ppc/Kconfig b/target/ppc/Kconfig new file mode 100644 index 0000000000..3ff152051a --- /dev/null +++ b/target/ppc/Kconfig @@ -0,0 +1,5 @@ +config PPC + bool + +config PPC64 + bool diff --git a/target/riscv/Kconfig b/target/riscv/Kconfig new file mode 100644 index 0000000000..b9e5932f13 --- /dev/null +++ b/target/riscv/Kconfig @@ -0,0 +1,5 @@ +config RISCV32 + bool + +config RISCV64 + bool diff --git a/target/rx/Kconfig b/target/rx/Kconfig new file mode 100644 index 0000000000..aceb5ed28f --- /dev/null +++ b/target/rx/Kconfig @@ -0,0 +1,2 @@ +config RX + bool diff --git a/target/s390x/Kconfig b/target/s390x/Kconfig new file mode 100644 index 0000000000..72da48136c --- /dev/null +++ b/target/s390x/Kconfig @@ -0,0 +1,2 @@ +config S390X + bool diff --git a/target/sh4/Kconfig b/target/sh4/Kconfig new file mode 100644 index 0000000000..2397c86028 --- /dev/null +++ b/target/sh4/Kconfig @@ -0,0 +1,2 @@ +config SH4 + bool diff --git a/target/sparc/Kconfig b/target/sparc/Kconfig new file mode 100644 index 0000000000..70cc0f3a21 --- /dev/null +++ b/target/sparc/Kconfig @@ -0,0 +1,5 @@ +config SPARC + bool + +config SPARC64 + bool diff --git a/target/tricore/Kconfig b/target/tricore/Kconfig new file mode 100644 index 0000000000..9313409309 --- /dev/null +++ b/target/tricore/Kconfig @@ -0,0 +1,2 @@ +config TRICORE + bool diff --git a/target/xtensa/Kconfig b/target/xtensa/Kconfig new file mode 100644 index 0000000000..a3c8dc7f6d --- /dev/null +++ b/target/xtensa/Kconfig @@ -0,0 +1,2 @@ +config XTENSA + bool