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: 995600 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="l71qEMu7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42s3tp0hHnz9s1x for ; Sat, 10 Nov 2018 02:27:45 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 93778C22540; Fri, 9 Nov 2018 15:27:37 +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_DNSWL_BLOCKED, 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 1018DC22562; Fri, 9 Nov 2018 15:27:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 73ED1C220F8; Fri, 9 Nov 2018 15:27:03 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id 1B310C22095 for ; Fri, 9 Nov 2018 15:27:03 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id k15-v6so2288720wre.12 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=SIStgT7rg10jIORGyCYA2QvHoHBTfYhNIXqIe68E3NkWdDF2cD8NrPXhrAwPN8fimo WRCWv48nS8zSZzBaS+mO+fIrtB/IJkGBty73zFEthRrRgUndC/2bf5mut3uAOLmBoryy Aa4dpCwV99/LMMdGkS/eVLg9/CKl7pftxo58peK1tunclTWr8Z4lXHshbgU/xhZaKCHT 3oTORRFw/5O9Xq5a7qlN19gH458GKDK3zY41Y2QAxKRcQfka7pLTjGGqge3fRFUIRbNx ksW53+6WCC8NMsCSujtAqGBCLwG4ei/qoWJ3CnMQAPNRA7BCxIm17p50Tog+LkA42pKW vb7A== X-Gm-Message-State: AGRZ1gI06brwXXDWUInqvVOLposXC2i51wnaE2Qwqoe0br+aiRjLi1po hUxE3oCWiuJY+VS4mqb7eIiNagffUcY= 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 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> Cc: linux-amlogic@lists.infradead.org, trini@konsulko.com, Jerome Brunet Subject: [U-Boot] [PATCH u-boot 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: , MIME-Version: 1.0 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 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"