From patchwork Fri Nov 9 15:26:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10676167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8C525A4 for ; Fri, 9 Nov 2018 15:27:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A564E28305 for ; Fri, 9 Nov 2018 15:27:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 998132ED55; Fri, 9 Nov 2018 15:27:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2D8C628305 for ; Fri, 9 Nov 2018 15:27:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=c64wbsC76iIejsk4Hw6p74hLGQkA8neqAgYp1FNS2vU=; b=Dg0CFmsJCtSueaDu5bFVwLKi4z c0P2oIIGZoOipNQ04qPpIPGX+8IWF7ETVvEWJ6NjWzCS5F8JIBzf1Zpy9kQf6YU/h/P1vcMPwJhIh r9o9EPmR36Q6A5/tFlV3CQZ5JptPc+zcxEprbnFX2tRHpZwwcNPXvckm8wRVDnWK+Z9va11yZ4kmu AvnujTV27gkVu4MJczW+4pIEXPzcP64pqKrYa7nMkPkG8BSxajRIMxTXuILwPvmShXjtc/ih/rAHR PrQgidZK72V55wndpDEq+SdoaKymwky5HOmEBtvdCLPiGTW4eGEM8e3McSlDEkXnfDXccw3pa6miY mWJwmwwQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL8gq-0002bx-Cs; Fri, 09 Nov 2018 15:27:20 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL8gl-0002YH-RD for linux-amlogic@lists.infradead.org; Fri, 09 Nov 2018 15:27:17 +0000 Received: by mail-wr1-x444.google.com with SMTP id 74-v6so2287714wrb.13 for ; Fri, 09 Nov 2018 07:27:03 -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; bh=h2Hydaclqn1+H055g2T0kMJIIEjTiqGSUCEaf3IN7gc=; b=l71qEMu7nOiuUU1y+1jC+QttqO2Rz6QiIBRZL1a5t8F2ZYEilUCSnTfYlrLz+EwTcP YV6/WvHzvGN476tEbv8/l9sfu+tr7Jzlb70ATMPud3yPylOT85Y72QIbzShFJibj83m7 ummhP5FXEFLOsxz5AWm3iFUxuN1Lx9ahZ/L3dXdUvVpIINngqLOlC1vUEDP2NUEjO5Va a2tnDbAlRWbiB3YiwGM3SuGOSOBPnqiprvItFMCJDxwVyqT5UQMnD5Qi9glimg8cibRH DOBb4pC8kNvSitQVexZE/hYxf6UkvuVF0vJZOKPBprFoiTo37B16Jit9/J+5Gz1Ao5RJ neog== 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; bh=h2Hydaclqn1+H055g2T0kMJIIEjTiqGSUCEaf3IN7gc=; b=gW0kFG/qUiWUnha4hiQPBUO2ihaSKY2GqV/pLa8i0sskvHVBPtAs/BqIHWsWTD8xOc b4+VXvDutmNRlQ/t7tLSsfSqwc7P4T4+4FfrxSlOSsvIthL6LeUqK806Wvu9Jh5+KxCC oaXyn3rQGtYzh/mqdotwpX9Sxa507JFil1HTq/Idl24nvD0amdoNWM1qNkYK2SyuSQ2o t4MrxjGfC5b2WKz49eoVAcQ92fi1Q0yuC1kQWoDq1HpRRud1YDunnawuoXJu/eYqHREV Q+wVEBmWIYu62Y+I5ISI2C4LlqjgHeil6Irny8nnZbSCqfTX6n0PrRdY8AD/ioKeNkAa PqOw== X-Gm-Message-State: AGRZ1gJmS4iIR/rGBVp7feSCtgk6vbWZ2CBfVlHdWMCyQre5d7RJTLJv +YpOXzyF7z+Tl/61DaOH7sWmrYcC2zE= X-Google-Smtp-Source: AJdET5dPjp6xKBU0ewzdC35kfSOS9Mw6tNERU5+OIFtjFk6IxPsAeOrMXZQkHD/a/ukJT5BCsK5TMw== X-Received: by 2002:a5d:4b8b:: with SMTP id b11-v6mr8815000wrt.72.1541777222007; Fri, 09 Nov 2018 07:27:02 -0800 (PST) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id a127-v6sm1748545wmh.24.2018.11.09.07.27.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Nov 2018 07:27:01 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Subject: [PATCH u-boot 01/19] ARM: meson: clean-up platform selection Date: Fri, 9 Nov 2018 16:26:40 +0100 Message-Id: <1541777218-472-2-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541777218-472-1-git-send-email-narmstrong@baylibre.com> References: <1541777218-472-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181109_072715_950863_202FED2C X-CRM114-Status: UNSURE ( 9.70 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, Neil Armstrong , trini@konsulko.com, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 cc94344..bc0f6a1 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"