From patchwork Mon Jul 18 18:15:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 649717 X-Patchwork-Delegate: twarren@nvidia.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3rtWYy4mY9z9s9Y for ; Tue, 19 Jul 2016 04:15:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6CA09A7549; Mon, 18 Jul 2016 20:15:30 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JcjPW0C1lFXy; Mon, 18 Jul 2016 20:15:30 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 82799A75CC; Mon, 18 Jul 2016 20:15:23 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AEE2FA74D6 for ; Mon, 18 Jul 2016 20:15:19 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xkKiQZbOFX9P for ; Mon, 18 Jul 2016 20:15:19 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from avon.wwwdotorg.org (avon.wwwdotorg.org [70.85.31.133]) by theia.denx.de (Postfix) with ESMTPS id 229E4A7528 for ; Mon, 18 Jul 2016 20:15:15 +0200 (CEST) Received: from swarren-lx1.nvidia.com (thunderhill.nvidia.com [216.228.112.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPSA id 269A01C044C; Mon, 18 Jul 2016 12:15:14 -0600 (MDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.99 at avon.wwwdotorg.org From: Stephen Warren To: Simon Glass Date: Mon, 18 Jul 2016 12:15:04 -0600 Message-Id: <20160718181505.22483-2-swarren@wwwdotorg.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160718181505.22483-1-swarren@wwwdotorg.org> References: <20160718181505.22483-1-swarren@wwwdotorg.org> X-NVConfidentiality: public Cc: u-boot@lists.denx.de, Stephen Warren Subject: [U-Boot] [PATCH 2/3] ARM: tegra: split p2771-0000 build X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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: Stephen Warren There are multiple versions of p2771-0000 board. There are SW visible incompatible differences between the versions, and they are relevant to U-Boot. Create separate "A02" and "B00" defconfigs (named after the first and/or only board rev they defconfig supports) so that users can select which build they want. With the minimal set of HW currently enabled in U-Boot, the differences are irrelevant, hence the DT files aren't different. However, that will change in a future patch. Signed-off-by: Stephen Warren --- arch/arm/dts/Makefile | 3 ++- arch/arm/dts/tegra186-p2771-0000-a02.dts | 8 ++++++++ arch/arm/dts/tegra186-p2771-0000-b00.dts | 8 ++++++++ .../arm/dts/{tegra186-p2771-0000.dts => tegra186-p2771-0000.dtsi} | 2 -- configs/{p2771-0000_defconfig => p2771-0000-a02_defconfig} | 4 ++-- configs/{p2771-0000_defconfig => p2771-0000-b00_defconfig} | 4 ++-- 6 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 arch/arm/dts/tegra186-p2771-0000-a02.dts create mode 100644 arch/arm/dts/tegra186-p2771-0000-b00.dts rename arch/arm/dts/{tegra186-p2771-0000.dts => tegra186-p2771-0000.dtsi} (96%) copy configs/{p2771-0000_defconfig => p2771-0000-a02_defconfig} (85%) rename configs/{p2771-0000_defconfig => p2771-0000-b00_defconfig} (85%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index ef573ec68515..d41183c917fe 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -53,7 +53,8 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra124-jetson-tk1.dtb \ tegra124-nyan-big.dtb \ tegra124-venice2.dtb \ - tegra186-p2771-0000.dtb \ + tegra186-p2771-0000-a02.dtb \ + tegra186-p2771-0000-b00.dtb \ tegra210-e2220-1170.dtb \ tegra210-p2371-0000.dtb \ tegra210-p2371-2180.dtb \ diff --git a/arch/arm/dts/tegra186-p2771-0000-a02.dts b/arch/arm/dts/tegra186-p2771-0000-a02.dts new file mode 100644 index 000000000000..70f4326c0913 --- /dev/null +++ b/arch/arm/dts/tegra186-p2771-0000-a02.dts @@ -0,0 +1,8 @@ +/dts-v1/; + +#include "tegra186-p2771-0000.dtsi" + +/ { + model = "NVIDIA P2771-0000 A02"; + compatible = "nvidia,p2771-0000-a02", "nvidia,p2771-0000", "nvidia,tegra186"; +}; diff --git a/arch/arm/dts/tegra186-p2771-0000-b00.dts b/arch/arm/dts/tegra186-p2771-0000-b00.dts new file mode 100644 index 000000000000..2384a65e870a --- /dev/null +++ b/arch/arm/dts/tegra186-p2771-0000-b00.dts @@ -0,0 +1,8 @@ +/dts-v1/; + +#include "tegra186-p2771-0000.dtsi" + +/ { + model = "NVIDIA P2771-0000 B00"; + compatible = "nvidia,p2771-0000-b00", "nvidia,p2771-0000", "nvidia,tegra186"; +}; diff --git a/arch/arm/dts/tegra186-p2771-0000.dts b/arch/arm/dts/tegra186-p2771-0000.dtsi similarity index 96% rename from arch/arm/dts/tegra186-p2771-0000.dts rename to arch/arm/dts/tegra186-p2771-0000.dtsi index 5f29ee450194..87f0427e80c1 100644 --- a/arch/arm/dts/tegra186-p2771-0000.dts +++ b/arch/arm/dts/tegra186-p2771-0000.dtsi @@ -1,5 +1,3 @@ -/dts-v1/; - #include "tegra186.dtsi" / { diff --git a/configs/p2771-0000_defconfig b/configs/p2771-0000-a02_defconfig similarity index 85% copy from configs/p2771-0000_defconfig copy to configs/p2771-0000-a02_defconfig index 9f2c418f9fe1..1fe25f58f199 100644 --- a/configs/p2771-0000_defconfig +++ b/configs/p2771-0000-a02_defconfig @@ -2,10 +2,10 @@ CONFIG_ARM=y CONFIG_TEGRA=y CONFIG_TEGRA186=y CONFIG_TARGET_P2771_0000=y -CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000" +CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-a02" CONFIG_OF_SYSTEM_SETUP=y CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="Tegra186 (P2771-0000) # " +CONFIG_SYS_PROMPT="Tegra186 (P2771-0000 A02) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/p2771-0000_defconfig b/configs/p2771-0000-b00_defconfig similarity index 85% rename from configs/p2771-0000_defconfig rename to configs/p2771-0000-b00_defconfig index 9f2c418f9fe1..552fb6cec78b 100644 --- a/configs/p2771-0000_defconfig +++ b/configs/p2771-0000-b00_defconfig @@ -2,10 +2,10 @@ CONFIG_ARM=y CONFIG_TEGRA=y CONFIG_TEGRA186=y CONFIG_TARGET_P2771_0000=y -CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000" +CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-b00" CONFIG_OF_SYSTEM_SETUP=y CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="Tegra186 (P2771-0000) # " +CONFIG_SYS_PROMPT="Tegra186 (P2771-0000 B00) # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set