Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63D75C4332F for ; Mon, 7 Nov 2022 21:23:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D770B85059; Mon, 7 Nov 2022 22:23:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 50A7E85020; Mon, 7 Nov 2022 22:23:12 +0100 (CET) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B150B85020 for ; Mon, 7 Nov 2022 22:23:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from localhost.localdomain ([194.191.232.38]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LptxZ-1pXEtd3vaJ-00fkm7; Mon, 07 Nov 2022 22:22:55 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Giulio Benetti , Fabio Estevam , Jesse Taube , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Stefano Babic Subject: [PATCH v5 2/8] imxrt1020: migrate to build system included -u-boot.dtsi Date: Mon, 7 Nov 2022 22:22:35 +0100 Message-Id: <20221107212241.25601-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221107212241.25601-1-marcel@ziswiler.com> References: <20221107212241.25601-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:gb2EPqi4if2Pwff3lBJ/NyqkJQpeUfv+cWtHNrxhlMxnSXLlJKk ddb6bT+XTNLAU9Kh7qEHqCrKHA5z8Il3gDt6dcnL5GmW2lyXbI5DS6B0/dOaKhTo1dMHQnB DW5LLZCpBL2mLt7ZGLDRUjpm2zj0vKWWiEWtWmigdKjiYl3QOUzHw53D/lTXgMJAvz/tOIj aEsqD9oe3MDyVpahsIoqg== X-UI-Out-Filterresults: notjunk:1;V03:K0:7Rgcy7Q8UTE=:8HGLQ3z4AOQZ2H7jv7vd2j xz7mi7MdjwXmw+t53+5Voh2yO0cU+ll49NJptpzV23OCUq+wkOD6qaJaJFprk+8QsaPvDtByl Gmx9Bs8R1dg0NisJ10xnfTU9vdUQ0WMitwB0MurFZnEDMAevQxxsFPOA7GphsG4Md6HlnqLC5 y8cT73F2H0YWHtC8QbJpjJGH74AFsaAif23nCTKeYw/HuUuyBXz5qQTicKUgV8TnYsd4bu0be hoFdSDJeWM3KkGKiYOeQnKVndig4s8272CGLUKteEchszWI6ZCMvWbcPMXQvBF8DZUag+6hlF An61AQDndWjuknjBh5udEHrvR/yZMxCs/POG67Rq3qugCvVs9+1xycXiYT2e10GQbRE6+aSKp 7gJ34lP1N6m6wDVxEP6rQ7QlE53nQJfckee+Cn7nZLNvJxEsz6Aq7xowUVt8+a6Kzcp+lDFTI ae/Qfvtp9P+RAtBi7UTr3mrFZ1c1cZiZA2AlQYYYHd3FGZMxhyujBF8hNU1jWYBP29dVJIlFe JQZCxXsEp8DorP5sZtMY9OwdLIZ8y3NRShmG4Eox80MAh36a8THC1ec7YeCWAEUu5iueXbEJm P0kKKFgA8s0xrd8NlX8oG1Uyof7Zy4KdtHYymlgjHtOVWca0Sz7ZSVk2RjoR+hJ6YKy5lGJE7 1D9qYlwSy2Q8FR5VnvLxZavaZyhGx2iIU2L0fRsDxIdLpqGoMrhAxO/Z8cF8KDPKAP8r/RycN ZLThpwm06bZTT/WtKhSaN0IPTPZOxKENX61ld9U5DyqAoEjd43PaXhA3oElvR0fpzefGvvCIG UqnxPj4h5kyXTxS1Wdbzufdy7Aqnw== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Migrate to using automatic build system included -u-boot.dtsi device tree include files. Signed-off-by: Marcel Ziswiler Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti --- Changes in v5: - Add Giulio's reviewed-by and tested-by. Thanks! Changes in v4: - Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out. arch/arm/dts/imxrt1020-evk-u-boot.dtsi | 7 ++++--- arch/arm/dts/imxrt1020-evk.dts | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/imxrt1020-evk-u-boot.dtsi b/arch/arm/dts/imxrt1020-evk-u-boot.dtsi index 9e1b074d2e..7cab486f5f 100644 --- a/arch/arm/dts/imxrt1020-evk-u-boot.dtsi +++ b/arch/arm/dts/imxrt1020-evk-u-boot.dtsi @@ -67,9 +67,6 @@ imxrt1020-evk { u-boot,dm-spl; - pinctrl_lpuart1: lpuart1grp { - u-boot,dm-spl; - }; pinctrl_semc: semcgrp { u-boot,dm-spl; @@ -81,6 +78,10 @@ }; }; +&pinctrl_lpuart1 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imxrt1020-evk.dts b/arch/arm/dts/imxrt1020-evk.dts index 22ae5ed735..d4d1de4ea8 100644 --- a/arch/arm/dts/imxrt1020-evk.dts +++ b/arch/arm/dts/imxrt1020-evk.dts @@ -6,7 +6,6 @@ /dts-v1/; #include "imxrt1020.dtsi" -#include "imxrt1020-evk-u-boot.dtsi" #include "imxrt1020-pinfunc.h" / { -- 2.35.1