From patchwork Sun Jul 31 23:45:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1662343 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=HID+C2K7; dkim-atps=neutral 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=) 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lwybv63rbz9sGP for ; Mon, 1 Aug 2022 09:47:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 601C784488; Mon, 1 Aug 2022 01:46:27 +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="HID+C2K7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C2C1E84206; Mon, 1 Aug 2022 01:46:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 3DDE284417 for ; Mon, 1 Aug 2022 01:46:20 +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-il1-x12b.google.com with SMTP id y13so4835239ilv.5 for ; Sun, 31 Jul 2022 16:46:20 -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=JEN+Cv8enDIV3njjgVIiNj02QiKo1+kyoro4INNT638=; b=HID+C2K7uSzirMhGoWoUlXVpvV6WTOm9vZlTKEWb4c8vWlfi2uZNrXJlJdIL1WNDSH H8CeyZoL0EydHkDZbt4RiqVGY88uf1/8zirdgPvis5WTPuJ9CVsSeEWEPlzZcPqxuZc3 LNVN12O5njh/fcgoOmDdndcMyj+LdJMfVojXcDnj0Lg53vRc8EtWaLFFo1EKI1G/ZwnM BxbSNGxvQlzjyHthXh5kTbUL5HjWbNO/pSMzwjQ6m03yzlJWrJevKlRElAtlNusRhCrH 9OIyyRtAY8ZVrNC+aOUg0BD1jO0JjY4f0cP0rbsybSs6GHZ4+IKGDjnVbp7KdXeJV99Z u2Ow== 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=JEN+Cv8enDIV3njjgVIiNj02QiKo1+kyoro4INNT638=; b=DCD4MUkJuxuNTLY/Io4NarYQW40szTu7u+KlqQySImPAuon3UqRY9qNH4PKjbMvj+/ 3PdBY6qgdxTxP8zFWS1MYIvxvNlvHU9/ZLfrZlsccT3M4ULp1xtdsJ/obhl2h9EiUoi4 9s0lQGXSKhOZxtFJBBwN3bp74ppGVnoUbvuXjzKaFW+tR7c7RiZJbCLM2eoGV2699h4O /2zE9wEP5vWQlWk/06I8QrESw+Ey8yOgKWX+JT1CUN289QoFSkk78OocUCNFqyMzDmd2 mlgYQ6Mbr/TxUkaxN3qO0xcZrl1BQ+4VKKDPe/Pu2GVslIpkqkl0JvZy6W2Xac9LVSTC N4QQ== X-Gm-Message-State: AJIora+rDOvTRhJlbiE1wc/hIlcpkwNIIdD8xL7fLmEGko/l6ETGw1Ga y+tCrkVcTXyNEiutHgyTN1+DwJdfpd4= X-Google-Smtp-Source: AGRyM1vnHxZlONQmb7rqG3SxJOAIULDXm2Bb4tIU8JreL1WiWLpl4Stko9b9cnHPemzZ+qY+cPyu8A== X-Received: by 2002:a05:6e02:20ca:b0:2dc:90fa:af35 with SMTP id 10-20020a056e0220ca00b002dc90faaf35mr5067018ilq.302.1659311178372; Sun, 31 Jul 2022 16:46:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jul 2022 16:46:17 -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 7/7] arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot Date: Sun, 31 Jul 2022 18:45:57 -0500 Message-Id: <20220731234557.602391-8-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 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-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi index 9fb3871452..aea48f2d79 100644 --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi @@ -3,52 +3,7 @@ * Copyright 2022 Gateworks Corporation */ -/ { - 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; -}; - -&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" &gpio1 { u-boot,dm-spl; @@ -106,147 +61,6 @@ u-boot,dm-spl; }; -&wdog1 { - u-boot,dm-spl; -}; - &pinctrl_wdog { 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 = "lpddr4_pmu_train_1d_imem.bin"; - align-end = <4>; - type = "blob-ext"; - }; - - ddr-1d-dmem-fw { - filename = "lpddr4_pmu_train_1d_dmem.bin"; - align-end = <4>; - type = "blob-ext"; - }; - - ddr-2d-imem-fw { - filename = "lpddr4_pmu_train_2d_imem.bin"; - align-end = <4>; - type = "blob-ext"; - }; - - ddr-2d-dmem-fw { - filename = "lpddr4_pmu_train_2d_dmem.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 = "blob-ext"; - }; - }; - - 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"; - }; - }; -};