From patchwork Tue Jan 14 06:13:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1222465 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=ezB2MT7t; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xgBk0hLZz9sP6 for ; Tue, 14 Jan 2020 17:13:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9FD181835; Tue, 14 Jan 2020 07:13:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1578982425; bh=EDJNWUSFmc6RlN6Gc4peXGLYQ7yokElb+raAklN1g34=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=ezB2MT7tzipxFFgYLDZL3PPmiAyf1+0VelUagGwXNGoC6g/YwdpEbq/Ypml13u9Dc BFVBnkJ9NBTWuyGXfpdyUOGzo7uWH7E5BsNQXbdRggtV+8RParMQ4AW+QSNSQveEtM GqVkYDQFZaFNS/oiBlBWk02OWajWGLzyges6yxauQnsSKq4eYq+Onrp5AVm2EEoGD3 mL0kk8X2l58eTRZPywQGd37yg3QvWx55Jpif7Qlpdtnje6OWKwt8duWSHR9t0TjAYm We2J208KnEk2kQJ5n83OWdN4k6CjEmx6H2SjpIvfI9CM29wyPKimUTP/Xb+IxvDbuC IdGaG99POVH4A== Received: by phobos.denx.de (Postfix, from userid 109) id 6D1FF81836; Tue, 14 Jan 2020 07:13:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 06E5481830 for ; Tue, 14 Jan 2020 07:13:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=hs@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47xgBX5sCCz1rqv3; Tue, 14 Jan 2020 07:13:40 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47xgBX5fjGz1qqkw; Tue, 14 Jan 2020 07:13:40 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id OysIntvsLMPx; Tue, 14 Jan 2020 07:13:40 +0100 (CET) X-Auth-Info: lIhI/TgbZrg9GzN5vsUfFYSyYy06ZtJz58G9E1q4NRY= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 14 Jan 2020 07:13:39 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id CD95418381C; Tue, 14 Jan 2020 07:13:16 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id CB1D71A0085; Tue, 14 Jan 2020 07:13:16 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Subject: [RFC WIP PATCH v1 1/7] wandboard: Import the dts files for the other revd1 variants Date: Tue, 14 Jan 2020 07:13:08 +0100 Message-Id: <20200114061314.148491-2-hs@denx.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114061314.148491-1-hs@denx.de> References: <20200114061314.148491-1-hs@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Roese , Michal Simek , "NXP i.MX U-Boot Team" Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam Import the imx6dl-wandboard-revd1.dts and imx6q-wandboard-revd1.dts from kernel 5.4.8 so that these variants can also be supported. Signed-off-by: Fabio Estevam Signed-off-by: Heiko Schocher --- arch/arm/dts/Makefile | 2 ++ arch/arm/dts/imx6dl-wandboard-revd1.dts | 19 +++++++++++++++++++ arch/arm/dts/imx6q-wandboard-revd1.dts | 23 +++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 arch/arm/dts/imx6dl-wandboard-revd1.dts create mode 100644 arch/arm/dts/imx6q-wandboard-revd1.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 983e235f442..a60e23242fe 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -609,6 +609,7 @@ dtb-y += \ imx6dl-sabreauto.dtb \ imx6dl-sabresd.dtb \ imx6dl-wandboard-revb1.dtb \ + imx6dl-wandboard-revd1.dtb \ endif @@ -641,6 +642,7 @@ dtb-y += \ imx6q-sabresd.dtb \ imx6q-tbs2910.dtb \ imx6q-wandboard-revb1.dtb \ + imx6q-wandboard-revd1.dtb \ imx6qp-sabreauto.dtb \ imx6qp-sabresd.dtb \ imx6qp-wandboard-revd1.dtb \ diff --git a/arch/arm/dts/imx6dl-wandboard-revd1.dts b/arch/arm/dts/imx6dl-wandboard-revd1.dts new file mode 100644 index 00000000000..6d1d863c2e3 --- /dev/null +++ b/arch/arm/dts/imx6dl-wandboard-revd1.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2013 Freescale Semiconductor, Inc. + * + * Author: Fabio Estevam + */ +/dts-v1/; +#include "imx6dl.dtsi" +#include "imx6qdl-wandboard-revd1.dtsi" + +/ { + model = "Wandboard i.MX6 Dual Lite Board revD1"; + compatible = "wand,imx6dl-wandboard", "fsl,imx6dl"; + + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0x40000000>; + }; +}; diff --git a/arch/arm/dts/imx6q-wandboard-revd1.dts b/arch/arm/dts/imx6q-wandboard-revd1.dts new file mode 100644 index 00000000000..55331021d80 --- /dev/null +++ b/arch/arm/dts/imx6q-wandboard-revd1.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2013 Freescale Semiconductor, Inc. + * + * Author: Fabio Estevam + */ +/dts-v1/; +#include "imx6q.dtsi" +#include "imx6qdl-wandboard-revd1.dtsi" + +/ { + model = "Wandboard i.MX6 Quad Board revD1"; + compatible = "wand,imx6q-wandboard", "fsl,imx6q"; + + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0x80000000>; + }; +}; + +&sata { + status = "okay"; +}; From patchwork Tue Jan 14 06:13:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1222466 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=sdApihdi; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xgBz0fHyz9sP6 for ; Tue, 14 Jan 2020 17:14:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E94C81744; Tue, 14 Jan 2020 07:14:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1578982440; bh=p8rxfd+zuyQQQIAgj/d8XZLooYLCUAUteJS2FTXNpm8=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=sdApihdicFqpbE4Sc0O/ldDOQ849bYFvzGxD2+4OV+EYMwyqmjZW54mCgv96l6yOw deSs4j3OzzpSbphIvXlBGgSc1nniz3p5vgSDUu6gKGi/P9/CQvNtJh7EvlydacAYVU 7HKK9TYYJnjc/Ia7xt6DTHVkogUeOc+wgUrbnjRdD2QbMTOYSCFrcxfK2cE2JhAUVj tH1pF11MAtkWB3wQmESZIHAHJyWY/X5LE6WvTtFBUdansJRp/2SJ8w34QDRGWTNWrW H1W50UEHytM4aixAteORhZDKAXZ63gP+CF2Wa5iuJB6OvEv375KuxV/GdmO00eunp2 OzxWL4UJ69DGg== Received: by phobos.denx.de (Postfix, from userid 109) id DDDC181824; Tue, 14 Jan 2020 07:13:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [IPv6:2001:a60:0:28:0:1:25:1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8575B8172D for ; Tue, 14 Jan 2020 07:13:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=hs@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47xgBr0kTsz1rfc8; Tue, 14 Jan 2020 07:13:56 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47xgBr0VhWz1qqkw; Tue, 14 Jan 2020 07:13:56 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id HjmfnBTPRRGr; Tue, 14 Jan 2020 07:13:55 +0100 (CET) X-Auth-Info: EswJg2pXN/e7Po0LTd1ibXepLY9q1RVID0EXwlwT9pk= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 14 Jan 2020 07:13:55 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id 79E491860A0; Tue, 14 Jan 2020 07:13:17 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id 77E291A0085; Tue, 14 Jan 2020 07:13:17 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Subject: [RFC WIP PATCH v1 2/7] wandboard: Handle the imx6dl and imx6q revd1 boards Date: Tue, 14 Jan 2020 07:13:09 +0100 Message-Id: <20200114061314.148491-3-hs@denx.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114061314.148491-1-hs@denx.de> References: <20200114061314.148491-1-hs@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam Currently the only supported revd1 variant is imx6qp. Add logic for supporting imx6dl and imx6q revd1 boards as well. Reported-by: Heiko Schocher Signed-off-by: Fabio Estevam Signed-off-by: Heiko Schocher --- board/wandboard/wandboard.c | 16 +++++++++++++--- configs/wandboard_defconfig | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index f4534dd3dc6..05f36b7f5d5 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -483,12 +483,22 @@ int checkboard(void) #ifdef CONFIG_SPL_LOAD_FIT int board_fit_config_name_match(const char *name) { + /* imx6qp wandboard only comes in revd1 flavor */ + if (is_mx6dqp()) { + if (!strcmp(name, "imx6qp-wandboard-revd1")) + return 0; + } + + if (is_mx6dq() && is_revd1()) { + if (!strcmp(name, "imx6q-wandboard-revd1")) + return 0; + } else if ((is_mx6dl() || is_mx6solo()) && is_revd1()) { + if (!strcmp(name, "imx6dl-wandboard-revd1")) + return 0; + } if (is_mx6dq()) { if (!strcmp(name, "imx6q-wandboard-revb1")) return 0; - } else if (is_mx6dqp()) { - if (!strcmp(name, "imx6qp-wandboard-revd1")) - return 0; } else if (is_mx6dl() || is_mx6solo()) { if (!strcmp(name, "imx6dl-wandboard-revb1")) return 0; diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index ca564c59b80..d6bde4bf28b 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -43,7 +43,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1" -CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1" +CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1" CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y From patchwork Tue Jan 14 06:13:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1222467 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=kPkr9q3p; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xgC86fBdz9sP6 for ; Tue, 14 Jan 2020 17:14:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 239CD8183C; Tue, 14 Jan 2020 07:14:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1578982448; bh=o5b/lEsmKvjNhwULt53o9NHBfD7S0gtNncYaLk7HKcg=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=kPkr9q3pMM7EYgpgE+pNcNSwg1HNSkfoBNVQ9pOpXxqGNQSNI4BpW6r2dqbj19THG 1Lc3bNxDWMQ4SpnYMJykf1HgwC4jmPhI86cMMnMGw2ovzENX3BSfSw1DpTQe9M0eQl 99R5lTR9ituSy0R55nqxaXQAGX8y3Yi6Dns+7suLa/GFRdm1I7s/BceJRPQfVAUAFv korIQtfeoA0YiKYgH9RNp75fv5XSckJL24HaxcPZV3ZARZHiR2itsltw6nvwEq3weu r9KzJ+JafBZJA9rk87Xqt5Ft4ex5PDWg4Na9didZXFh7kBkxMwOSg8T/iJ4MGZETs3 s/EdoyCuLD0dw== Received: by phobos.denx.de (Postfix, from userid 109) id A92A88183C; Tue, 14 Jan 2020 07:14:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 891A18183C for ; Tue, 14 Jan 2020 07:14:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=hs@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47xgBy10Zhz1qrJJ; Tue, 14 Jan 2020 07:14:02 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47xgBy0lwMz1qqkw; Tue, 14 Jan 2020 07:14:02 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id xtNgld7Vl0Zp; Tue, 14 Jan 2020 07:14:01 +0100 (CET) X-Auth-Info: L/TNwdfkix/ih7mXDYHJbsVehvVRPZBXx5PAoRZfOWs= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 14 Jan 2020 07:14:01 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id 1ACB91860A5; Tue, 14 Jan 2020 07:13:18 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id 18C5E1A0085; Tue, 14 Jan 2020 07:13:18 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Subject: [RFC WIP PATCH v1 3/7] wandboard: reorder board_fit_config_name_match Date: Tue, 14 Jan 2020 07:13:10 +0100 Message-Id: <20200114061314.148491-4-hs@denx.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114061314.148491-1-hs@denx.de> References: <20200114061314.148491-1-hs@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean handle different board revisions in one if path. Without this change if "imx6dl-wandboard-revb1" is passed before "imx6dl-wandboard-revd1" to this function, "imx6dl-wandboard-revb1" is detected as the correct version, on revd1 boards, as "imx6dl-wandboard-revb1" is not dependend on is_revd1(). Signed-off-by: Heiko Schocher --- board/wandboard/wandboard.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 05f36b7f5d5..4cb9bf6f8c2 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -489,19 +489,22 @@ int board_fit_config_name_match(const char *name) return 0; } - if (is_mx6dq() && is_revd1()) { - if (!strcmp(name, "imx6q-wandboard-revd1")) - return 0; - } else if ((is_mx6dl() || is_mx6solo()) && is_revd1()) { - if (!strcmp(name, "imx6dl-wandboard-revd1")) - return 0; - } - if (is_mx6dq()) { - if (!strcmp(name, "imx6q-wandboard-revb1")) - return 0; - } else if (is_mx6dl() || is_mx6solo()) { - if (!strcmp(name, "imx6dl-wandboard-revb1")) - return 0; + if (is_revd1()) { + if (is_mx6dq()) { + if (!strcmp(name, "imx6q-wandboard-revd1")) + return 0; + } else if (is_mx6dl() || is_mx6solo()) { + if (!strcmp(name, "imx6dl-wandboard-revd1")) + return 0; + } + } else { + if (is_mx6dq()) { + if (!strcmp(name, "imx6q-wandboard-revb1")) + return 0; + } else if (is_mx6dl() || is_mx6solo()) { + if (!strcmp(name, "imx6dl-wandboard-revb1")) + return 0; + } } return -EINVAL; From patchwork Tue Jan 14 06:13:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1222468 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=HoaqyID+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xgCM3yxhz9sP6 for ; Tue, 14 Jan 2020 17:14:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 764D281840; Tue, 14 Jan 2020 07:14:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1578982451; bh=Hdmx+sTmgf7H3ssuVAcKH+ekH0ApjNcesoOxVtX0jFc=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=HoaqyID+XGT3Hrw0PutNKmPU7uKttTNBY3gHiBKWlIQzyxlw2yCxeix3a42O33M7i 4ciryyGwvB2FH9zw5UPXK88bTjnX0+nAcoextgO4imPEPj1jQdAv6OoKqP+q1QdDmP zujxFeb7El0CEt0wF7TBcbE7vdIsJxzxmSrU4RnUJ67tnb1a/cp5Olz7ci08i/m39+ NqbDO2hwtNUfB+CWyI3e4UZ8bOUwopf+LlSXzVmsEnkzezj4XuZB4sHoqUtK98J3yH InQdIIPotf2gSNn0ggEWSrjA6DiT8ObE1X8iLvJ/O+0/VmtuBWgI2p72cGxwvz22/z XsxAZECCSdG2g== Received: by phobos.denx.de (Postfix, from userid 109) id A40A981843; Tue, 14 Jan 2020 07:14:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4AEF881840 for ; Tue, 14 Jan 2020 07:14:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=hs@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47xgC40r1Wz1qrJS; Tue, 14 Jan 2020 07:14:08 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47xgC40k9Zz1qql3; Tue, 14 Jan 2020 07:14:08 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ZTGo5Re04hHg; Tue, 14 Jan 2020 07:14:07 +0100 (CET) X-Auth-Info: QMJOuyV22aBY8U+zk7GBgAgs8dcKOj0jnZvKDU4EMt0= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 14 Jan 2020 07:14:07 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id B64971860B0; Tue, 14 Jan 2020 07:13:18 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id B44E51A0085; Tue, 14 Jan 2020 07:13:18 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Subject: [RFC WIP PATCH v1 4/7] wandboard: enable CONFIG_DTB_RESELECT Date: Tue, 14 Jan 2020 07:13:11 +0100 Message-Id: <20200114061314.148491-5-hs@denx.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114061314.148491-1-hs@denx.de> References: <20200114061314.148491-1-hs@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean we have to reselect the DTB, as we need to start with DTB for revision D1 boards, as there is a PMIC which is not on other board revisions. If we do not find the PMIC, we are not on D1 revision board. Signed-off-by: Heiko Schocher --- board/wandboard/wandboard.c | 21 +++++++++++++++++++++ configs/wandboard_defconfig | 1 + 2 files changed, 22 insertions(+) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 4cb9bf6f8c2..ae4ad765a83 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -510,3 +510,24 @@ int board_fit_config_name_match(const char *name) return -EINVAL; } #endif + +#if !defined(CONFIG_SPL_BUILD) +#ifdef CONFIG_DTB_RESELECT +/* + * we have to reselect the DTB, as we need to start + * with DTB for revision D1 boards, as there is + * a PMIC which is not on other board revisions. + * If we do not find the PMIC, we are not on D1 + * revision board. + */ +int embedded_dtb_select(void) +{ + int rescan; + + power_init_board(); + fdtdec_resetup(&rescan); + + return 0; +} +#endif +#endif diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index d6bde4bf28b..b8ed143ee99 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -44,6 +44,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1" CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1" +CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y From patchwork Tue Jan 14 06:13:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1222469 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=uT7un0qn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xgCZ2M44z9sP6 for ; Tue, 14 Jan 2020 17:14:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 41EAC81845; Tue, 14 Jan 2020 07:14:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1578982458; bh=cUx+L9A3AV97YfWSYgnLvkI0S8EIyct2rm/VfhYx4gE=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=uT7un0qnWMD/qxLKDR+xEs1idmFDCmGLMpniTch7kjeyKrEofBpoGkRVS0bFnoz9e FJOBy6CyDfNcQGIq1E8WbsvxWicxUK3r9AkNmXw32oMv0rrWbe2dWD1vSm0cChdpPn eg2c298IUWUyU6y/MFBSK4pFpaplMPABDZdVe+4mGN2GdNDaE7L8yjwQJ/bR0/Xxyc tEjqQe+rYuJNTkafOKFTvFrqELcVHypCB7fSawXwFP6YIsgxIj5xFpisvyfusf+sKd 9Oj9pk/ISgDKgwEhIYS1HwNThjX+liMAS2KCv+R8taNqLTqfwMX4cPcg85IYw4RLsh /j+8Owm10OWJw== Received: by phobos.denx.de (Postfix, from userid 109) id 679AB81845; Tue, 14 Jan 2020 07:14:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1693A8184A for ; Tue, 14 Jan 2020 07:14:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=hs@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47xgC96QqWz1qrJJ; Tue, 14 Jan 2020 07:14:13 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47xgC96F9Jz1qqkw; Tue, 14 Jan 2020 07:14:13 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id m_m1HZT-7213; Tue, 14 Jan 2020 07:14:13 +0100 (CET) X-Auth-Info: bbaAtlRXMAPLaeZhKb3Czusf5K/5Xxx1Ni6nJ9uNcJQ= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 14 Jan 2020 07:14:13 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id 601481860B4; Tue, 14 Jan 2020 07:13:19 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id 5E1701A0085; Tue, 14 Jan 2020 07:13:19 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Subject: [RFC WIP PATCH v1 5/7] wandboard: use imx6dl-wandboard-revd1 as default DTB Date: Tue, 14 Jan 2020 07:13:12 +0100 Message-Id: <20200114061314.148491-6-hs@denx.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114061314.148491-1-hs@denx.de> References: <20200114061314.148491-1-hs@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean we detect revision D1 board by searching for pmic, as revision D1 only has a pmic on board. For this we need to have pmic in DTB, so use imx6dl-wandboard-revd1 as default device tree, not imx6dl-wandboard-revb1 Signed-off-by: Heiko Schocher --- configs/wandboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index b8ed143ee99..6f3d413f66a 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -42,7 +42,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1" +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revd1" CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1" CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y From patchwork Tue Jan 14 06:13:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1222470 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=TKMWLXYY; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xgCm6PLgz9sP6 for ; Tue, 14 Jan 2020 17:14:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78EF38184F; Tue, 14 Jan 2020 07:14:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1578982466; bh=Puuio6Xo6XcutBmBeIUqKWdo/KfF0BfnkVdUjxZuUOo=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=TKMWLXYYRAizE05KWxcKOSvHNf/fVbXYrJW46ag2y9rmOQeWz3NXZRVHVFUBL/PiN 4DKe9IAs48uigrMNuTq/4lwUoPDMjWlvpFUp4g4Z5QzMlQvqbObZuvBZbHFO1p9gMT USnD5Aou9jLICJZ9VPd35fsPO7gbho/XC3STOF4rs82L8AnWcQTtBq8OclXVTjT1RN 8848Jyt1BNEwHdzKGNl/b3uMvNpaX9M3lqNwPcq5mCUoNHkyY13udqHqFf4XrGfC1K KRHY6ygORQkCle798THphg7j506xSb2Bs6nq7QmVcHH2dFGHHf+OITmAbURtqZxAgc Ze5pyH+d6XIrw== Received: by phobos.denx.de (Postfix, from userid 109) id 2EED981853; Tue, 14 Jan 2020 07:14:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DFF0F81852 for ; Tue, 14 Jan 2020 07:14:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=hs@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47xgCL4sztz1qrJJ for ; Tue, 14 Jan 2020 07:14:22 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47xgCL4nLjz1qql3 for ; Tue, 14 Jan 2020 07:14:22 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id doTu83eHIMn2 for ; Tue, 14 Jan 2020 07:14:21 +0100 (CET) X-Auth-Info: 2oRLrsaZos4b7Bg2DtWN1tbPzSkHojk5URzjKfDHIiw= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Tue, 14 Jan 2020 07:14:21 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id 212BF1860C7; Tue, 14 Jan 2020 07:13:20 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id 1F35C1A0085; Tue, 14 Jan 2020 07:13:20 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Subject: [RFC WIP PATCH v1 6/7] wandboard: add u-boot specific *wandboard-revd1-u-boot.dtsi Date: Tue, 14 Jan 2020 07:13:13 +0100 Message-Id: <20200114061314.148491-7-hs@denx.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114061314.148491-1-hs@denx.de> References: <20200114061314.148491-1-hs@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "NXP i.MX U-Boot Team" Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean we want to access PMIC before relocation, so we need to add u-boot specific "u-boot,dm-pre-reloc" properties. Signed-off-by: Heiko Schocher --- arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi diff --git a/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi new file mode 100644 index 00000000000..93e88fa1148 --- /dev/null +++ b/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2020 Heiko Schocher + +&i2c3 { + u-boot,dm-pre-reloc; +}; + +&pmic { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi new file mode 100644 index 00000000000..93e88fa1148 --- /dev/null +++ b/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2020 Heiko Schocher + +&i2c3 { + u-boot,dm-pre-reloc; +}; + +&pmic { + u-boot,dm-pre-reloc; +}; From patchwork Tue Jan 14 06:13:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1222471 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=Rcc7cScx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xgCz0823z9sP6 for ; Tue, 14 Jan 2020 17:14:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1163D81850; Tue, 14 Jan 2020 07:14:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1578982472; bh=jm6YzAtxzj4wdCM8b15mREJSwbmoNb6985kLhaObjQs=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=Rcc7cScxeSWySdxJkVMN8EuaQY1bYxd/YilnAZQYOGn7qy/FgReBCf7pgCPzMqT1h /fn6lP4/Pc+dZ2n8L8n9kLAgwzg2+BmP7pv2SJjJ/undGQbPncvk31jKvsB3OEydNw KMUEh5jf5GQbCGNsdZqHsfRlkKQfHX9g/mBefXG/iPHwDHoQIJw9bgpQBAHxou8U0/ /oAghenqbdKNFgUwsGnzadDdxDeDHBNqR1wcKktHFxT7BtmTlK0H5chsI6HwyEVqAW 0C2wPw1nxD137xcmnn+eXvyCxLBSyFf6izTFyJ5AP5qgmtJgotnvhppsHBMfHlVV7d tmEng29APO9zQ== Received: by phobos.denx.de (Postfix, from userid 109) id DCEEC81852; Tue, 14 Jan 2020 07:14:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B354581850 for ; Tue, 14 Jan 2020 07:14:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=hs@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47xgCS3nK9z1qrJQ; Tue, 14 Jan 2020 07:14:28 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47xgCS3dxLz1qql3; Tue, 14 Jan 2020 07:14:28 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id nrYRGg1c86UE; Tue, 14 Jan 2020 07:14:27 +0100 (CET) X-Auth-Info: B8wjUWKELPGj2Evs+Ci0B5tOj66fZan0/pEt9eTuEF4= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 14 Jan 2020 07:14:27 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id D06871860CB; Tue, 14 Jan 2020 07:13:20 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id CE62F1A0085; Tue, 14 Jan 2020 07:13:20 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Subject: [RFC WIP PATCH v1 7/7] wandboard: in SPL use only D1 DTB Date: Tue, 14 Jan 2020 07:13:14 +0100 Message-Id: <20200114061314.148491-8-hs@denx.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114061314.148491-1-hs@denx.de> References: <20200114061314.148491-1-hs@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Heiko Schocher --- board/wandboard/wandboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index ae4ad765a83..6b7210c0992 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -489,7 +489,12 @@ int board_fit_config_name_match(const char *name) return 0; } +#if defined(CONFIG_SPL_BUILD) + /* in SPL we use only revision D1 DTB */ + if (1) { +#else if (is_revd1()) { +#endif if (is_mx6dq()) { if (!strcmp(name, "imx6q-wandboard-revd1")) return 0;