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 4FAD2C433FE for ; Sat, 22 Oct 2022 00:59:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 085D984FDD; Sat, 22 Oct 2022 02:59: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=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="c9iv3v2X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67CF184FED; Sat, 22 Oct 2022 02:58:56 +0200 (CEST) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 F401884FD9 for ; Sat, 22 Oct 2022 02:58:49 +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-qv1-xf29.google.com with SMTP id i12so2978583qvs.2 for ; Fri, 21 Oct 2022 17:58:49 -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:subject:date :message-id:reply-to; bh=RXEFTqnDJiNelYuyqePmDSba0GsoNlxJX1UFiCZ2TwY=; b=c9iv3v2XGWlAEdjcL7S2RyIGDzA8uLoEV22v/jBslVC2czKPQdi0K9kFCbzwj0AU1o 6ZKuBpjWy2PpG/NvaWaUe95ce45BWBokX1Hj/GY7rTn/cV4yB234yvu1FVdpsS1vkqSv xYT9ThS3qojgbmSFyApTEpRuoAD5/mJxYbK3kQNCpxYL1L25jiBUWlCWv4fSy6H2jlBt 612LNg6cN6R8aksi8iMG5PeUyIDBBCcdDgyVEKxCcrnk34v8acA1qEQHujYbgTteAgnX rItRLLhub1AhKDILqP/buLY3twwgVnlyC+WUZVTxHl5S3XYv3r7YbXAKHL+NUspqDBQc LN4Q== 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 :subject:date:message-id:reply-to; bh=RXEFTqnDJiNelYuyqePmDSba0GsoNlxJX1UFiCZ2TwY=; b=iYhOmiQ2qjrH0KpOmTHMK5vix46hoj1KhXal6PqHBV+I6sWxieKm9jz5gy02X2cBXR vFa+r1vlEnwNyfJ4Fnb/G77syzHkj6GNdczbT6fi3pogqysE79lSU3tTkFyedwPpd6Qr d6DpxR4HbHVHCcpVYtEhi2bZDjotX+A5AsoORDfLIROZrCHm8zUCT0iEmsERtfKfTcin nQLhIgnUTvuDtEpd8ujsLcx7c52ZW1BCVNHb+FgrloWGdJwrVpkNNzlTcuQs0tgVdUrr h5gMotm3e+2LGTpYloagUFy2Z1Pa9QAbSewAusSv9qLL0dgTe4TR+uvJ9/T7ayPVlt9x gVLA== X-Gm-Message-State: ACrzQf25eomMjE6F+SswAIXzCHh3LKsFLtxYjp8X8Mk4bW7+UxxOt6Ti t8mqGv8DTtl0YpZQpmOg5m0VYOJB7V0= X-Google-Smtp-Source: AMsMyM4oLtWrP4VpJwm7Ws5FlKGc9B7a+0v14tf1T/DjZO7HpKFopBt1Gl//WDZSQHPJ8pEo6lqiJg== X-Received: by 2002:a05:6214:d88:b0:4b4:10c0:6038 with SMTP id e8-20020a0562140d8800b004b410c06038mr18962756qve.102.1666400328402; Fri, 21 Oct 2022 17:58:48 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:447:d081:b229:10c8:126:4b77:a67d]) by smtp.gmail.com with ESMTPSA id b14-20020ac844ce000000b003434d3b5938sm8869620qto.2.2022.10.21.17.58.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 17:58:47 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: Adam Ford , Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , "Ariel D'Alessandro" , Michael Trimarchi , Tim Harvey Subject: [PATCH V2 2/7] arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot Date: Fri, 21 Oct 2022 19:58:32 -0500 Message-Id: <20221022005837.170357-3-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221022005837.170357-1-aford173@gmail.com> References: <20221022005837.170357-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-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi index 0efa6862eb..3180d57239 100644 --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi @@ -1,24 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2020 Compass Electronics Group, LLC + * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ -/ { - binman: binman { - multiple-images; - }; - - wdt-reboot { - compatible = "wdt-reboot"; - wdt = <&wdog1>; - u-boot,dm-spl; - }; -}; - -&{/soc@0} { - u-boot,dm-pre-reloc; - u-boot,dm-spl; -}; +#include "imx8mn-u-boot.dtsi" &{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} { u-boot,dm-spl; @@ -28,27 +13,6 @@ u-boot,dm-spl; }; -&aips1 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips2 { - u-boot,dm-spl; -}; - -&aips3 { - 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; -}; - &gpio1 { u-boot,dm-spl; }; @@ -61,15 +25,6 @@ u-boot,dm-spl; }; -&iomuxc { - u-boot,dm-spl; -}; - -&osc_24m { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - &pca6416_0 { compatible = "ti,tca6416"; }; @@ -106,10 +61,6 @@ u-boot,off-on-delay-us = <20000>; }; -&spba1 { - u-boot,dm-spl; -}; - &uart2 { u-boot,dm-spl; }; @@ -132,133 +83,6 @@ mmc-hs400-enhanced-strobe; }; -&wdog1 { - u-boot,dm-spl; -}; - &pinctrl_wdog { 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 = "lpddr4_pmu_train_1d_imem.bin"; - type = "blob-ext"; - align-end = <4>; - }; - - ddr-1d-dmem-fw { - filename = "lpddr4_pmu_train_1d_dmem.bin"; - type = "blob-ext"; - align-end = <4>; - }; - - ddr-2d-imem-fw { - filename = "lpddr4_pmu_train_2d_imem.bin"; - type = "blob-ext"; - align-end = <4>; - }; - - ddr-2d-dmem-fw { - filename = "lpddr4_pmu_train_2d_dmem.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