From mboxrd@z Thu Jan 1 00:00:00 1970 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 8E870C00140 for ; Sun, 31 Jul 2022 23:47:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3500A841F8; Mon, 1 Aug 2022 01:46:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VDyw06Vw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E8FD5843FB; Mon, 1 Aug 2022 01:46:18 +0200 (CEST) Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F032784220 for ; Mon, 1 Aug 2022 01:46:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-io1-xd2c.google.com with SMTP id v185so7280965ioe.11 for ; Sun, 31 Jul 2022 16:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=w3MvF/VfgguxLJigRWhK4WSUC3wogzptjNDrQgGovhM=; b=VDyw06Vwthfu2UijmGTXBlI7FsmVV8v0CfvBCcrCPfOu8EgxZe/PGx3Xh60YQE1vFh fBAKQLmVRTIGxKocSVZZ6u/yD3h/uuJMUNDT7G0vxi8g34sohIYU7huiKHgN1MMAnozo HM4kxXy2PJ/Su1biFMo6YKf0uBYmCJcM4kXqVAZfDdE3Ri+oC46ft7mXyifgXBX2RABP Ogmm/I61Rru+qOtVlYPdPtjfD7Rzm/LzeYViB710X3rQMirkVPPb5zSKASersnwWhkce NFb/u6R/MXaE6H7XRremQjyyrdGwgnfkvcVqS4BLJqsQC8qfVbQGcS/4qRC1a6YCaxqp 0cXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=w3MvF/VfgguxLJigRWhK4WSUC3wogzptjNDrQgGovhM=; b=3RtH46aV+E0KcitBmrqt102PxlRu4SShaZ1pvADe5uLE2193b8tDbLaOIOFnq3gW+P sEqtFCg8NWB+YUdfsoqKtXrfa27qMe6y9qCTEQsslqukjiLy4iVlNSJoa11QVfGsitkY qpLg0Dujw8OS3wagvfLi8tQPATrqpChD+mGVg82UJhUawblEENyD+lHGkG84Asj6htcx TI0NZ32H9+Sa2Es9FFpfYhxEfyf4GU1x8tn3hZLG2wWciki/Pxm6gU6a97+zzK6KE/DD NVr+WCJW1xEfect/zd1loOhMV7rrYSeK9t96jV2gLKHXDNRujAg7A8jcWpbD82YvGjcT DBQA== X-Gm-Message-State: AJIora8kNrg6Jm2JdN4l3RvEF+iSgCEHVSuTJQ5dKBixMmsbLpmxkOVb PoXpGlNr2z3MkwktGw+l1vmSd8e7LbI= X-Google-Smtp-Source: AGRyM1uWzMNIZgY8GHekFb89zDCkcJVjtHeWRqHm5wylbUjeboC/KuG9V/FGROqX4yA1rRMAN8QPzw== X-Received: by 2002:a05:6602:25d7:b0:67c:9c30:49e0 with SMTP id d23-20020a05660225d700b0067c9c3049e0mr4237432iop.25.1659311174103; Sun, 31 Jul 2022 16:46:14 -0700 (PDT) Received: from AIO.lan ([2601:448:8400:9e8:b376:d337:106c:b8cb]) by smtp.gmail.com with ESMTPSA id e17-20020a0566380cd100b0034278df66c3sm196957jak.149.2022.07.31.16.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jul 2022 16:46:13 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: aford@beaconembedded.com, Adam Ford , Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , "Ariel D'Alessandro" , Michael Trimarchi , Tim Harvey Subject: [PATCH 4/7] arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot Date: Sun, 31 Jul 2022 18:45:54 -0500 Message-Id: <20220731234557.602391-5-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220731234557.602391-1-aford173@gmail.com> References: <20220731234557.602391-1-aford173@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Now that a unified imx8mn-u-boot is available, remove duplicated code for generating flash.bin and other common imx8mn peripherals. Signed-off-by: Adam Ford diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 78773c198e..54f3ebe88b 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -3,58 +3,7 @@ * Copyright 2019, 2021 NXP */ -/ { - binman: binman { - multiple-images; - }; - - wdt-reboot { - compatible = "wdt-reboot"; - wdt = <&wdog1>; - u-boot,dm-spl; - }; - firmware { - optee { - compatible = "linaro,optee-tz"; - method = "smc"; - }; - }; -}; - -&{/soc@0} { - u-boot,dm-pre-reloc; - u-boot,dm-spl; -}; - -&clk { - u-boot,dm-spl; - u-boot,dm-pre-reloc; - /delete-property/ assigned-clocks; - /delete-property/ assigned-clock-parents; - /delete-property/ assigned-clock-rates; -}; - -&osc_24m { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips1 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips2 { - u-boot,dm-spl; -}; - -&aips3 { - u-boot,dm-spl; -}; - -&iomuxc { - u-boot,dm-spl; -}; +#include "imx8mn-u-boot.dtsi" &pinctrl_reg_usdhc2_vmmc { u-boot,dm-spl; @@ -139,130 +88,3 @@ mmc-hs400-1_8v; mmc-hs400-enhanced-strobe; }; - -&wdog1 { - u-boot,dm-spl; -}; - -&binman { - u-boot-spl-ddr { - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - align-size = <4>; - align = <4>; - - u-boot-spl { - align-end = <4>; - }; - - ddr-1d-imem-fw { - filename = "ddr4_imem_1d_201810.bin"; - type = "blob-ext"; - align-end = <4>; - }; - - ddr-1d-dmem-fw { - filename = "ddr4_dmem_1d_201810.bin"; - type = "blob-ext"; - align-end = <4>; - }; - - ddr-2d-imem-fw { - filename = "ddr4_imem_2d_201810.bin"; - type = "blob-ext"; - align-end = <4>; - }; - - ddr-2d-dmem-fw { - filename = "ddr4_dmem_2d_201810.bin"; - type = "blob-ext"; - align-end = <4>; - }; - }; - - - spl { - filename = "spl.bin"; - - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000"; - - blob { - filename = "u-boot-spl-ddr.bin"; - }; - }; - }; - - itb { - filename = "u-boot.itb"; - - fit { - description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; - fit,external-offset = ; - - images { - uboot { - description = "U-Boot (64-bit)"; - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = ; - - uboot_blob: blob-ext { - filename = "u-boot-nodtb.bin"; - }; - }; - - atf { - description = "ARM Trusted Firmware"; - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <0x960000>; - entry = <0x960000>; - - atf_blob: blob-ext { - filename = "bl31.bin"; - }; - }; - - fdt { - description = "NAME"; - type = "flat_dt"; - compression = "none"; - - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; - }; - }; - }; - - configurations { - default = "conf"; - - conf { - description = "NAME"; - firmware = "uboot"; - loadables = "atf"; - fdt = "fdt"; - }; - }; - }; - }; - - imx-boot { - filename = "flash.bin"; - pad-byte = <0x00>; - - spl: blob-ext@1 { - offset = <0x0>; - filename = "spl.bin"; - }; - - uboot: blob-ext@2 { - offset = <0x58000>; - filename = "u-boot.itb"; - }; - }; -}; -- 2.34.1