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 F3F6CC433FE for ; Sat, 22 Oct 2022 01:00:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5104984FDF; Sat, 22 Oct 2022 02:59:50 +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="m6m1dFej"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 93FCB84FD3; Sat, 22 Oct 2022 02:59:13 +0200 (CEST) Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (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 ED29B84FCA for ; Sat, 22 Oct 2022 02:58:56 +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-xf33.google.com with SMTP id f14so2976658qvo.3 for ; Fri, 21 Oct 2022 17:58:56 -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=qJBW+7GsjKdu2XzdJNqYe8j3OtuEMgCNyxSXhG5Pfjg=; b=m6m1dFejtFTOu95RrdPw0RW9QjRuSRrHktyknCELAygaFwHGaTjayvp7a1OkAQZ722 bjWmQCtoqz+CktP+3php2keHhs/Tg/3hSZnMv5vgjGZA/xQMdqLq1H/yHUIaLn+PfRCW tfoWrUfVaCVn9LyfjiJP/YlBYsMUQ5qNikWEGJy03lOTui+zF/C5maq2dXO0d+CziHRz NnlTjbIqa0PXjXvaAZqO7iYdWrra9aEwNYMRgpn4o7J9sgRmVaiSixt9n/aO/+5Y9lkb g0TJbWKi9ue/6Xv90x2TXn0oxo2pDYYUeNbubqHWLRXhxPN3/omnSBsNMwj3c5mmnog3 QUug== 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=qJBW+7GsjKdu2XzdJNqYe8j3OtuEMgCNyxSXhG5Pfjg=; b=AwXdWdrXe0LTChJDlGcMqiVdgQVJhdX74sd0fivD3gtNJ0Ro8m5Y7RYrdbyRObZb55 kJgagCGNxryXkGGVZP+efcY8OejY2YrZq9VOdRvbzRD00Hwh7UqAjhELXEC+JirtJXd7 sYdviq/85Qi2Sz/4oPuhT1vW8jG4YFmyuBwU2jipC30iYESuU11lVzku4g3i6FeNZGLM 5XObMnk0ICcm6VfA/OuA2vSzENJjFaangyo3PFfrAwaeJwcQf87Lg5yVjeGNdRJpMO1h Q34SjtTGBmtg93296scJGj2oMMfGFFF3f0UL4+HTvW8I8AHisStnf/n5yhZovttJV33R 0f6A== X-Gm-Message-State: ACrzQf0CYM4oOm1BzuJb2pWysZuaIakN4ZonDFfbFGBRAkYvE4X3RWKc cbQIibDDfeUVQLQmGYB3wyz8uZz6KK0= X-Google-Smtp-Source: AMsMyM6xY3ACleONrDPpuBPPT/cPd/qcb/QUyDwi/LIHuStW5psyfqHao8Cdcdc2wfDO37JHt8PFvQ== X-Received: by 2002:a05:6214:e6f:b0:4b3:f41c:a59 with SMTP id jz15-20020a0562140e6f00b004b3f41c0a59mr18625493qvb.59.1666400335315; Fri, 21 Oct 2022 17:58:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 17:58:54 -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 6/7] arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot Date: Fri, 21 Oct 2022 19:58:36 -0500 Message-Id: <20221022005837.170357-7-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-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi index ed1ab10ded..a20683155c 100644 --- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi @@ -3,22 +3,7 @@ * Copyright 2021 Collabora Ltd. */ -/ { - 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-pre-reloc; - u-boot,dm-spl; -}; - -&aips3 { - u-boot,dm-spl; -}; - -&aips4 { - u-boot,dm-spl; -}; - -&clk { - u-boot,dm-pre-reloc; - u-boot,dm-spl; - /delete-property/ assigned-clocks; - /delete-property/ assigned-clock-parents; - /delete-property/ assigned-clock-rates; -}; - &gpio1 { u-boot,dm-spl; }; @@ -65,15 +29,6 @@ u-boot,dm-spl; }; -&iomuxc { - u-boot,dm-spl; -}; - -&osc_24m { - u-boot,dm-pre-reloc; - u-boot,dm-spl; -}; - &pinctrl_i2c1 { u-boot,dm-spl; }; @@ -113,144 +68,3 @@ &usdhc3 { u-boot,dm-spl; }; - -&wdog1 { - u-boot,dm-spl; -}; - -&binman { - u-boot-spl-ddr { - align = <4>; - align-size = <4>; - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - - u-boot-spl { - align-end = <4>; - filename = "u-boot-spl.bin"; - }; - - ddr-1d-imem-fw { - filename = "ddr4_imem_1d.bin"; - align-end = <4>; - type = "blob-ext"; - }; - - ddr-1d-dmem-fw { - filename = "ddr4_dmem_1d.bin"; - align-end = <4>; - type = "blob-ext"; - }; - - ddr-2d-imem-fw { - filename = "ddr4_imem_2d.bin"; - align-end = <4>; - type = "blob-ext"; - }; - - ddr-2d-dmem-fw { - filename = "ddr4_dmem_2d.bin"; - align-end = <4>; - type = "blob-ext"; - }; - }; - - 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"; - fit,external-offset = ; - fit,fdt-list = "of-list"; - #address-cells = <1>; - - images { - uboot { - arch = "arm64"; - compression = "none"; - description = "U-Boot (64-bit)"; - load = ; - type = "standalone"; - - uboot_blob { - filename = "u-boot-nodtb.bin"; - type = "blob-ext"; - }; - }; - - atf { - arch = "arm64"; - compression = "none"; - description = "ARM Trusted Firmware"; - entry = <0x960000>; - load = <0x960000>; - type = "firmware"; - - atf_blob { - filename = "bl31.bin"; - type = "atf-bl31"; - }; - }; - - binman_fip: fip { - arch = "arm64"; - compression = "none"; - description = "Trusted Firmware FIP"; - load = <0x40310000>; - type = "firmware"; - }; - - @fdt-SEQ { - compression = "none"; - description = "NAME"; - type = "flat_dt"; - - uboot_fdt_blob { - filename = "u-boot.dtb"; - type = "blob-ext"; - }; - }; - }; - - configurations { - default = "@config-DEFAULT-SEQ"; - - binman_configuration: @config-SEQ { - description = "NAME"; - fdt = "fdt-SEQ"; - firmware = "uboot"; - loadables = "atf"; - }; - }; - }; - }; - - imx-boot { - filename = "flash.bin"; - pad-byte = <0x00>; - - spl { - filename = "spl.bin"; - offset = <0x0>; - type = "blob-ext"; - }; - - binman_uboot: uboot { - filename = "u-boot.itb"; - offset = <0x58000>; - type = "blob-ext"; - }; - }; -}; -- 2.34.1