From patchwork Fri Oct 19 08:57:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 149243 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3039382lji; Fri, 19 Oct 2018 01:55:51 -0700 (PDT) X-Google-Smtp-Source: ACcGV62IXwPBsdkn9gi2RlNzt2mdeUjhmvoAJ7qce7c5EP0eehtncvwNp8+bQNhq8JnrDMmDMX+n X-Received: by 2002:a50:9665:: with SMTP id y92-v6mr5625515eda.175.1539939351735; Fri, 19 Oct 2018 01:55:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539939351; cv=none; d=google.com; s=arc-20160816; b=w9FRgJwSEbe0zFI1Ab8fWK5hVhG+10pfV5QIzoa6kx3LT9JgqyMRtbYe1I8q7HU6n+ DZku6Qy8YgJSuRtIZ1wXVxnBE6cRvnYKsKxlh8ttGAD4wl5H6SrynfO8AjJjhrzkMT+w BuYCnXZ5XiXzlk2Q2laPvO0fHL4yGUw88VIqqndH9YxhLZa01hHRmQ6zQjHa1H5Cwwvo 6RFXQopvrMiRl+AQ8n+0Uxfh6MSUhDv5t7MaAmciOOEhSiGqBbAfbZxOiZLigY9mWuXv h3Wc2fPUgRwIL1NGBoiVx1m7dBqtWAwqWKrHqiCa5xcZ8YcDeuz8ZGJqFEZOEGTyUF0+ A/vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:message-id:date:to:from:dkim-signature; bh=T1XikFAizptW/3vmTQnTNqPALC74c4DTbKbzke4IeMU=; b=w1iHw22KZB4y9ti0b9VWlRdC8nWH9gFYafjLyneLZB2Cm3gk/JgKgDVfnI4QPccbiU hrKg1ZaI17N+g/c3dMv8sgqFhic67Cuca8R5IWooC+LafNAg7wpHqUJNVgM02X6kNxH4 WRw3xXPlxMfQ1l9m1Gea6GgwJ1yZsi8sJ1PKwYx4YaK7gAwl9JPt2+Pu5wViiGMbD1lh M1IzXX72WrdO+dm/m3O90bo7/YPJaN2RgZDRD3yqMQdY9CI3+QcauCYyaGiw7NbdsOTM nArW/TGZ+SDSqwlRJ0ABWwE4B5k8Cb33ttb5DdUm2ldFjNJNTsvTDx5N1hCuv0cMq+Cy l3tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=i4qqMz7+; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id f6-v6si163691edm.355.2018.10.19.01.55.51; Fri, 19 Oct 2018 01:55:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=i4qqMz7+; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 48B2DC21D8E; Fri, 19 Oct 2018 08:55:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BCF2DC21C2C; Fri, 19 Oct 2018 08:55:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A9B8C21C2C; Fri, 19 Oct 2018 08:55:46 +0000 (UTC) Received: from mail-yw1-f68.google.com (mail-yw1-f68.google.com [209.85.161.68]) by lists.denx.de (Postfix) with ESMTPS id 3E592C21BE5 for ; Fri, 19 Oct 2018 08:55:44 +0000 (UTC) Received: by mail-yw1-f68.google.com with SMTP id z206-v6so1655257ywb.3 for ; Fri, 19 Oct 2018 01:55:44 -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:mime-version :content-transfer-encoding; bh=G2uAC7NSLik4tvM/M9pi/uOm3ZjK86Q2+1szf7eFOnA=; b=i4qqMz7+XyEDKj6yc5L+HiAJxYfWtsoL/S3nk23KUH0CTrdOithVfAvJOdzqppgPQM yj/WxqEhZnSJBilflyf+sxcPOLubXUk8cq2y9EfYOsPJRvrLNJn3USW/K9uF3zvLahw/ Da2ex4QPYr8NO6SSwkuB/RywxrCzMQBktQ0oQ= 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:mime-version :content-transfer-encoding; bh=G2uAC7NSLik4tvM/M9pi/uOm3ZjK86Q2+1szf7eFOnA=; b=NOQy/W2xHVpiyxCh8zD+KZGwpaGtDO5/yEFNG+n+oex2InRRFu58uhTkhS8g7+GNP7 AM+cqQJ26Wptp+GHtMg89pMqK5aQlTTWIc3XBXkZyElFv+uE0SOsJkQ4Ks5iusy252z3 XYVrsGr4q1zj7GdLB6FucHnFl2bvpW0BgI8GzOgJiPLvWy9+uewnvuKCEH+cm8u/l+F4 onFFrHORjfooJlvvD1LNvEfulh4MIAQVvLm8zKDfXb14SmJGc2MiZyjptgDZ+sB/pmxf Fya8yPP09QVcElARZo1+GdkhbhYpTgWfny1UM3AJKi1UGO7FBUW4SfLV/xsOUyZzUCXE bQDw== X-Gm-Message-State: ABuFfogVwyXFsmAb2A3rdCyUHi447pTePi6nFklvQfzqkmrNbP1iSYkS VN/Olgd/9nSCqJJDdaWiv5c5iw== X-Received: by 2002:a81:d88:: with SMTP id 130-v6mr21871251ywn.184.1539939342861; Fri, 19 Oct 2018 01:55:42 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id w22-v6sm5687889ywg.88.2018.10.19.01.55.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Oct 2018 01:55:41 -0700 (PDT) From: AKASHI Takahiro To: tuomas.tynkkynen@iki.fi Date: Fri, 19 Oct 2018 17:57:34 +0900 Message-Id: <20181019085734.18067-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Cc: u-boot@lists.denx.de, agraf@suse.de Subject: [U-Boot] [PATCH] arm: qemu: rework Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Define a missing CONFIG_SYS_SOC and move some CONFIG_SYS_* to a more canonical place (i.e. under board). Signed-off-by: AKASHI Takahiro --- arch/arm/Kconfig | 1 + arch/arm/mach-qemu/Kconfig | 18 ++++++++++-------- board/emulation/qemu-arm/Kconfig | 9 +++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 board/emulation/qemu-arm/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b39d08539aee..6dadf5a56f0c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1474,6 +1474,7 @@ source "board/broadcom/bcmns2/Kconfig" source "board/cavium/thunderx/Kconfig" source "board/cirrus/edb93xx/Kconfig" source "board/eets/pdu001/Kconfig" +source "board/emulation/qemu-arm/Kconfig" source "board/freescale/ls2080a/Kconfig" source "board/freescale/ls2080aqds/Kconfig" source "board/freescale/ls2080ardb/Kconfig" diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig index a2e4b98b8887..d75a95183a75 100644 --- a/arch/arm/mach-qemu/Kconfig +++ b/arch/arm/mach-qemu/Kconfig @@ -3,22 +3,24 @@ if ARCH_QEMU config SYS_VENDOR default "emulation" -config SYS_BOARD - default "qemu-arm" +config SYS_SOC + default "qemu" -config SYS_CONFIG_NAME - default "qemu-arm" - -endif +choice + prompt "QEMU cpu type" config TARGET_QEMU_ARM_32BIT - bool "Support qemu_arm" + bool "Arm" depends on ARCH_QEMU select ARCH_SUPPORT_PSCI select CPU_V7A select SYS_ARCH_TIMER config TARGET_QEMU_ARM_64BIT - bool "Support qemu_arm64" + bool "AArch64" depends on ARCH_QEMU select ARM64 + +endchoice + +endif diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig new file mode 100644 index 000000000000..db8b2a4dfae2 --- /dev/null +++ b/board/emulation/qemu-arm/Kconfig @@ -0,0 +1,9 @@ +if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT + +config SYS_BOARD + default "qemu-arm" + +config SYS_CONFIG_NAME + default "qemu-arm" + +endif