From patchwork Thu Nov 22 09:07:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 151732 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp483290ljp; Thu, 22 Nov 2018 01:08:41 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ub6eTn7zjVuksmoUaOXhKELSqu+BhrtSzSmltWoIAma2OkiADG9c54Ita/A6odNg/CgWTI X-Received: by 2002:a50:a166:: with SMTP id 93-v6mr4633379edj.146.1542877721032; Thu, 22 Nov 2018 01:08:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542877721; cv=none; d=google.com; s=arc-20160816; b=l0K+Ca3EnHdDnfxC/Fkh66K9QEASJdZKtwODTYJqT7SoJzlm3barhxx+dfxE1COvL0 WteEZbrhc301XIFh0RZBZdBUy196RYHAuLrFZarD/dYLBHqikDPg1WatO4Ms4IcpB4xE eeZTwFb9j8BY2Nr2ET4uaHCBVinkg/A27iVN/qBbb6iezxB4VeOTOfIZ0UY349J0yAnv xP9BDPFjyZcZzFRo45VdShr/AicYgvkA+3uVgBW8j2asV3Zs4p8ASx7zWWy2r2yVyWut lzkV1UeHPObUjhaAE6XjnRnH5RSfqvGiObqPyIHzDMjIYdMqWPU7jPT1m6iNuXsYLWPA 2fLQ== 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:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=SaFWLscLXXAJaXPxfqw7mZo6tP4AOkcM1z4m7PfdD14=; b=QpzAdKdW07mRTBgI81trWTp/WrD8VyNgyLLDnYbXL7ZlntCLBVv0xd5Sxl12wCHNse 7iQx76EqHP+ftgS+4/4ihdCb4ARfhEtDAXFrk3oKwCtiwK3RbQ+v+xzvQ8oJIEqFBoRE D7UOkhfgTTDk/1+lu9hsJuTmA4KfETZCYgKoE2G+W9I1F/F6Np5JM5t8+xu61BZcSLXr DSfc+bT0pVl3a31ssi+Bck55bREemPTTuvpNShLpbk0alsss1QsGBmRSaBjsrcbMFtXI F10EEKIGY4HVMyLd1HXtm5zU7QOmggOtGDGnJYYZsJPOzJMM7v3S3KBfWCm7Z1X+tXrD jWog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=rMPYIO+0; 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 Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id gr7-v6si2880438ejb.241.2018.11.22.01.08.40; Thu, 22 Nov 2018 01:08:41 -0800 (PST) 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=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=rMPYIO+0; 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 Received: by lists.denx.de (Postfix, from userid 105) id A6AF4C2204A; Thu, 22 Nov 2018 09:08:33 +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_H2, 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 1D418C21F19; Thu, 22 Nov 2018 09:07:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8E4F2C21EC5; Thu, 22 Nov 2018 09:07:46 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id 408D9C21EC2 for ; Thu, 22 Nov 2018 09:07:46 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id y139so8078461wmc.5 for ; Thu, 22 Nov 2018 01:07:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h6Km6GkkNuw5cScI1O/4xnXguq55R6xizvrdwdSxvDs=; b=rMPYIO+0XkIlIZMjJvkWnZdBVzx8Ezye2w+4scWf1/AxigBiFtvIJi7edF6t6S+TN4 FhYZLXV+83XjaX7eoxFeqfhWA+1yxwvK20mti245dhnaILeJiRE8EtJswbofrTqNDpvy wIt3yYAwpWcNrePAvki4v9MQb5xCapTicvh837vTSoZn+3njqdodux7GqOmCWiVaCk4m 5psPffQZjkV3rlphEB7sW+TbcjwdT3M9rIVufvSNQ4DVgPLuCMcGMVySdTpQ/XtEjoLq 03ACL2qGmVrSTnp8QLJzwdCb37npfucWoHQ4qLtYxYa8AKFyZn8VX1ctlyNmvQ2nnVsK 1M2g== 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=h6Km6GkkNuw5cScI1O/4xnXguq55R6xizvrdwdSxvDs=; b=XSHTQlMbYpwZ8Xgmu6VHhFhOkSgO33Ue7V7z/iUXO2wKmdu11Y/FJTrB3CunjznME8 6HqPTccpui7g6kDefHkQQyfMrcp+OFCCSi5dYZZYj5DM8NBszXSytUv1tfSodduLr7o6 vqIPeXyv0+7KjkCe4erPIPZwJBp6c0VMrUcRDVQjCO/lstkbCpbyCCPmWdwSRjzW7uvu PppQeuJN+varSXLABRxAXnajmvc132hj/9N5XgsKZBvB44b4f/Hrf/ZGcWFeCJYcX3pH 3xv6XjEpzieEPZo0dLmTH5PDrgAYpLGvBBXSOSiBgNjPxyD0xb244obtgPOy09JL7dGP 8kjQ== X-Gm-Message-State: AA+aEWbSouwH+hXQAW/R2SMTBINs/AbGwVBBMNutIjbi9ntmx/4caVUu m42iuV+5F7kkh7WlrhTsByGUx084X9jcqQ== X-Received: by 2002:a1c:860d:: with SMTP id i13mr8488297wmd.49.1542877665284; Thu, 22 Nov 2018 01:07:45 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id y9sm13856434wrq.55.2018.11.22.01.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Nov 2018 01:07:44 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Date: Thu, 22 Nov 2018 10:07:22 +0100 Message-Id: <20181122090740.29739-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181122090740.29739-1-narmstrong@baylibre.com> References: <20181122090740.29739-1-narmstrong@baylibre.com> MIME-Version: 1.0 Cc: linux-amlogic@lists.infradead.org, trini@konsulko.com Subject: [U-Boot] [PATCH u-boot v2 01/19] ARM: meson: clean-up platform selection 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" From: Jerome Brunet Even if multiple board are selected through Kconfig, u-boot will only compile one. This makes sense since compiling these targets will export global symbols, such as board_init() The change rework amlogic Kconfig so only one board may be selected at a time Signed-off-by: Jerome Brunet Signed-off-by: Neil Armstrong --- arch/arm/mach-meson/Kconfig | 51 +++++++++++++++---------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index cc943443b3..bc0f6a169b 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -1,41 +1,32 @@ if ARCH_MESON -config MESON_GXBB - bool "Support Meson GXBaby" +config MESON64_COMMON + bool select ARM64 select CLK select DM select DM_SERIAL imply CMD_DM - help - The Amlogic Meson GXBaby (S905) is an ARM SoC with a - quad-core Cortex-A53 CPU and a Mali-450 GPU. + +config MESON_GXBB + bool + select MESON64_COMMON config MESON_GXL - bool "Support Meson GXL" - select ARM64 - select CLK - select DM - select DM_SERIAL - imply CMD_DM - help - The Amlogic Meson GXL (S905X and S905D) is an ARM SoC with a - quad-core Cortex-A53 CPU and a Mali-450 GPU. + bool + select MESON64_COMMON config MESON_GXM - bool "Support Meson GXM" - select ARM64 - select CLK - select DM - select DM_SERIAL - help - The Amlogic Meson GXM (S912) is an ARM SoC with an - octo-core Cortex-A53 CPU and a Mali-T860 GPU. + bool + select MESON64_COMMON -if MESON_GXBB +choice + prompt "Platform select" + default TARGET_ODROID_C2 config TARGET_ODROID_C2 bool "ODROID-C2" + select MESON_GXBB help ODROID-C2 is a single board computer based on Meson GXBaby with 2 GiB of RAM, Gigabit Ethernet, HDMI, 4 USB, micro-SD @@ -43,16 +34,15 @@ config TARGET_ODROID_C2 config TARGET_NANOPI_K2 bool "NANOPI_K2" + select MESON_GXBB help NANOPI_K2 is a single board computer based on Meson GXBaby with 2 GiB of RAM, Gigabit Ethernet,AP6212 Wifi, HDMI, 4 USB, micro-SD slot, eMMC, IR receiver and a 40-pin GPIO header. -endif - -if MESON_GXL config TARGET_P212 bool "P212" + select MESON_GXL help P212 is a reference dessign board based on Meson GXL S905X SoC with 2 GiB of RAM, Ethernet, HDMI, 2 USB, micro-SD slot, @@ -60,6 +50,7 @@ config TARGET_P212 config TARGET_LIBRETECH_CC bool "LIBRETECH-CC" + select MESON_GXL help LibreTech CC is a single board computer based on Meson GXL with 2 GiB of RAM, Ethernet, HDMI, 4 USB, micro-SD slot, @@ -67,23 +58,21 @@ config TARGET_LIBRETECH_CC config TARGET_KHADAS_VIM bool "KHADAS-VIM" + select MESON_GXL help Khadas VIM is a single board computer based on Meson GXL with 2 GiB of RAM, Ethernet, HDMI, 4 USB, micro-SD slot, eMMC, IR receiver and a 40-pin GPIO header. -endif - -if MESON_GXM - config TARGET_KHADAS_VIM2 bool "KHADAS-VIM2" + select MESON_GXM help Khadas VIM2 is a single board computer based on Meson GXM with 2/3 GiB of RAM, Ethernet, HDMI, 4 USB, micro-SD slot, eMMC, IR receiver and a 40-pin GPIO header. -endif +endchoice config SYS_SOC default "meson"