From patchwork Sun Jul 31 23:45:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1662337 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=J12uvnRy; 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 4LwyZc4kLGz9sGP for ; Mon, 1 Aug 2022 09:46:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 925AF842E4; Mon, 1 Aug 2022 01:46:17 +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="J12uvnRy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C52E084212; Mon, 1 Aug 2022 01:46:15 +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=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 0890084212 for ; Mon, 1 Aug 2022 01:46:12 +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-xd33.google.com with SMTP id z132so7341091iof.0 for ; Sun, 31 Jul 2022 16:46:11 -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=yZ3KtLQhj2/MA85NO1RR57fBFfrNyie68rmzYJygtKQ=; b=J12uvnRyBJKuwvjsyDrxEA9jaDB+S824QtYWbJVNU09FyEr18VgavKL3MCOWVOp3Kk LmumbtM3tA0AQiNjV3BfrvJr6sSODwHU/2aYpOHHFs45FAjyjEZu+awsV4MgINrIB7h9 1uQ3213ZWtO6E854+xNvB5Qru5EBiX5LYT2Ttbj+t5qrBlEMJYvvI4f0WJdAOHbSmFWJ UkGpaMty+AV/c4Nr3EGAxPcqtZWXriCvzKiEVMnAkFGEhipdFK4ZySE1GYM94RtruQ4J 9vJqn/mA/fWpHxsCFMYYrBzeL8vkSJMiPnxzgEmTi+I13HMQRQCQ8dqEAdXGm8hQ6W7X VJWQ== 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=yZ3KtLQhj2/MA85NO1RR57fBFfrNyie68rmzYJygtKQ=; b=Fhl3AHwtFOfZa2yCKTsrWwUbtNSaUXHi6zvM5gc1qgH79PNNBIRmF5FFqd/tuHG+mT aUuGztNPYAA5Xk7a5eHvC8Pdq3k4rTg5458Cv+lLXmJWN50B4R23EkWi+2JCcYb1uP7H 6nGx2S/O9/hgRN9VX0wz/hSvUCebTpJbNBRfWB+X/1TeLzvXDDyOS2ncs/Iil2F3kdMl ibgE1YqM+PxFQKdQ385iN48jlNyP1T9vzr+V+H3noZA85HH+j9T7VNh55JndYGztDmjI mqnITJC+x91f3QHNNEX3wIpYYI6x8Q5azdyTDtdVWs1ciRAnB6rKtt06qEuAZmditO/s zJ3w== X-Gm-Message-State: AJIora8ZLKcUHNSBXY84X8GMWeZLqx6CD9xPWkTs1zaHh6tQaavgRQua EPU2IpFY86DpxZho//WFxFg9jxkmWF8= X-Google-Smtp-Source: AGRyM1tsvyXHTXy0+A01whnXfHa8Wd2GS5EdUH3es97DSlBGt2NEOZTW63oHDjKJC5W+OFffqfZVWw== X-Received: by 2002:a05:6638:3806:b0:341:4b48:e1d1 with SMTP id i6-20020a056638380600b003414b48e1d1mr5157868jav.302.1659311169989; Sun, 31 Jul 2022 16:46:09 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jul 2022 16:46:09 -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 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi Date: Sun, 31 Jul 2022 18:45:51 -0500 Message-Id: <20220731234557.602391-2-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 Multiple boards create duplicate entries in their respective -u-boot.dtsi files which all basically do the same thing. To consolidate these and make it easier to make improvements going forward, consolidate them all into one place. This file creates a flash.bin image using binman, and supports LPDDR4, DDR4 and DDR3. Since individual boards use different peripherals and different UART ports, those entries were kept in their respective board files, but the spba1 node was addded which contains all UART1-3 to help facilitate SPL_DM_SERIAL. Individual users will still need to include their respective UART and pinctrl nodes for those UARTS. This consolidated file also supports generating a flash.bin file which can boot from flexSPI if CONFIG_FSPI_CONF_HEADER is enabled. Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam --- Patches on top of [1] [1] - https://patchwork.ozlabs.org/project/uboot/patch/20220731171610.487086-1-aford173@gmail.com/ diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi new file mode 100644 index 0000000000..327d4070fc --- /dev/null +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -0,0 +1,248 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2022 Logic PD, Inc dba Beacon EmbeddedWorks + */ + +/ { + binman: binman { + multiple-images; + }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + u-boot,dm-spl; + }; +}; + +&{/soc@0} { + u-boot,dm-pre-reloc; + u-boot,dm-spl; +}; + +&aips1 { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&aips2 { + u-boot,dm-spl; +}; + +&aips3 { + u-boot,dm-spl; +}; + +&aips4 { + 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; +}; + +&iomuxc { + u-boot,dm-spl; +}; + +&osc_24m { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&spba1 { + u-boot,dm-spl; +}; + +&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>; + filename = "u-boot-spl.bin"; + }; + + ddr-1d-imem-fw { +#ifdef CONFIG_IMX8M_LPDDR4 + filename = "lpddr4_pmu_train_1d_imem.bin"; +#elif CONFIG_IMX8M_DDR4 + filename = "ddr4_imem_1d.bin"; +#else + filename = "ddr3_imem_1d.bin"; +#endif + type = "blob-ext"; + align-end = <4>; + }; + + ddr-1d-dmem-fw { +#ifdef CONFIG_IMX8M_LPDDR4 + filename = "lpddr4_pmu_train_1d_dmem.bin"; +#elif CONFIG_IMX8M_DDR4 + filename = "ddr4_dmem_1d.bin"; +#else + filename = "ddr3_dmem_1d.bin"; +#endif + type = "blob-ext"; + align-end = <4>; + }; + + ddr-2d-imem-fw { +#ifdef CONFIG_IMX8M_LPDDR4 + filename = "lpddr4_pmu_train_2d_imem.bin"; +#elif CONFIG_IMX8M_DDR4 + filename = "ddr4_imem_2d.bin"; +#endif + type = "blob-ext"; + align-end = <4>; + }; + + ddr-2d-dmem-fw { +#ifdef CONFIG_IMX8M_LPDDR4 + filename = "lpddr4_pmu_train_2d_dmem.bin"; +#elif CONFIG_IMX8M_DDR4 + filename = "ddr4_dmem_2d.bin"; +#endif + 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"; + 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>; + +#ifdef CONFIG_FSPI_CONF_HEADER + fspi_conf_block { + filename = CONFIG_FSPI_CONF_FILE; + type = "blob-ext"; + offset = <0x400>; + }; + + spl { + filename = "spl.bin"; + offset = <0x1000>; + type = "blob-ext"; + }; + + binman_uboot: uboot { + filename = "u-boot.itb"; + offset = <0x59000>; + type = "blob-ext"; + }; +#else + + spl { + offset = <0x0>; + filename = "spl.bin"; + type = "blob-ext"; + }; + + binman_uboot: uboot { + offset = <0x58000>; + filename = "u-boot.itb"; + type = "blob-ext"; + }; +#endif + }; +}; From patchwork Sun Jul 31 23:45:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1662338 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=PRmIQO/0; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LwyZx4hYRz9sGP for ; Mon, 1 Aug 2022 09:46:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5A72C84409; Mon, 1 Aug 2022 01:46:19 +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="PRmIQO/0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C6698420C; Mon, 1 Aug 2022 01:46:16 +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-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) (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 468DF84137 for ; Mon, 1 Aug 2022 01:46:13 +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-xd2d.google.com with SMTP id p81so7318578iod.2 for ; Sun, 31 Jul 2022 16:46:13 -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=RXEFTqnDJiNelYuyqePmDSba0GsoNlxJX1UFiCZ2TwY=; b=PRmIQO/00caWsjUvdgTge2GMwz0BrTJO+Z4HCtD8kkXrzSnEXCHTtDcQGca/PINKrk GTxjtDjP6N1d0hxAfDVe3YmJu3tVh8/S4FNd6dYE2Qmf8tmQZHg+DeT/tQSiYSGRIpmr Mficb08VqGV60n2iywLAvsjcdAAfvfrTRNnMmWE5Ww5CuPCDEQAjGZGmdvarGCY87QcR Ni5MyyqsfJUIa2IUfsnAfN1Jyx+OeYjIL06YgYSkOwFs5l20/fobbLyLzd5N7go2bXw4 8jhKh8U7Ezay1H6RzGRSNwa/BNh5W7dDG0YtENCKVvkXfp5It+9zopOk0NaRxr4EiK4+ qFgw== 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=RXEFTqnDJiNelYuyqePmDSba0GsoNlxJX1UFiCZ2TwY=; b=65oo0k8Nvg227RPyRVrYDYNNG9qc5/4w3lAI36C4sC7S4eKbOoic2bO05FW68GMaGb j0KmaW9iy54MvxTuUo0UFgADuP+RwZdQhlxF/YAG/EHXCDRZrDPhR+TQPylLS8HJ++3j c0oWsGMsjtyvIqNnb6kPGR4Bqfx1DKwKTDxQF4t+QVryG1/nUVZ5XZTLNoHxeMpft6Cl HnBdCq/H/DQm6u2YFY63yLayBkMmRpMiQBOl3NS1uRBgNm4JEZa1vfH5/FZ4aoZtq4Sj uOFbgsgzmiys47WR1lGVjiizyYHesRXHoYuGipAtWwsjtk5yi4+aCZbH/jgWoKGScXGU Hdiw== X-Gm-Message-State: ACgBeo0gC3d7gn06CbF01mp3st0E3CadA38vU7ZFibLTJJ50a4LZXDiX bYrzs/vWcdX8qNVfGWbhYI8kOdNNfko= X-Google-Smtp-Source: AA6agR62gZyoSingh3RoWbCKTtljYAyGidvCFshfoWlZBS/8ONWX6tDsCgy6vbCACy43pCWZrJKtdA== X-Received: by 2002:a05:6602:2e09:b0:67f:a29a:6617 with SMTP id o9-20020a0566022e0900b0067fa29a6617mr337866iow.200.1659311171371; Sun, 31 Jul 2022 16:46:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jul 2022 16:46:10 -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 2/7] arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot Date: Sun, 31 Jul 2022 18:45:52 -0500 Message-Id: <20220731234557.602391-3-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-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"; - }; - }; -}; From patchwork Sun Jul 31 23:45:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1662339 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=UY+2CJw/; 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 4Lwyb34ZqYz9sGP for ; Mon, 1 Aug 2022 09:46:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1478A8438D; Mon, 1 Aug 2022 01:46:21 +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="UY+2CJw/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C7C7D843FB; Mon, 1 Aug 2022 01:46:17 +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-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 879DE8420A for ; Mon, 1 Aug 2022 01:46:14 +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-xd33.google.com with SMTP id l24so7279030ion.13 for ; Sun, 31 Jul 2022 16:46:14 -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=/suYxhRqOYYAJjOudA2ELCC+fm2yAAJMc51BKXVk7fM=; b=UY+2CJw/uA4Y8vAYTB9mU3XNyxyOEkMk9DDWMTcj8tKmcUUlZie5uz71D1+xt5F3Nb YLkUwcGFWpLuH5eP1ezAlkmRpxsGpZDsejOmnOHtN0qCV5oU95t7tzActxM5kk0uCaxP qy8Jj7VFnHnUQKnlh50SaDycZo7hV3WEJXpuE2bqfh9a28wYboJuay7F1WkMxRDZsOi/ z40mAbgle67MinU02oJaoO3t22ZIruk/IA+Q60OsuT6NBjOyeONlOyef9SgDk6czcXMl BfjQsmFroIt/Y6aOlktZ/3oMK14Jmr4dbq+j1bu0YOEzWDan/dJFDKSISgPl3wday1Nw 9xrQ== 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=/suYxhRqOYYAJjOudA2ELCC+fm2yAAJMc51BKXVk7fM=; b=R/g+UvsL/u6bQlfMNN2ULCdNMKkdeolicJW2Oug517IMcqoNM4BtRJMjrp1ARvzGxT BFKTpNuofVm7M0kNxieGpwp6v33kQ1abNwzpkELtvN4IdTFNcmdhrfioS2Tmx28s8zJ0 KoVHDCT+k+0dEUVdhuRkaSdxlHPxgF3TbiIZUAZBkUdE5OBgjWgXBRWRg7YdmEXCZDBu BRMXFDmJRlFdXHntPXp8aLqDtYx4yuwg1lzl2f7OU/wa160XrQCD5iAtUvplmz64+2lH sl1nT0qw5fxXjNZYW7BWgs+so29D19LGCPMK+0jVa1bO2GgRsCcndJIyWeFjQ5TCIgAn sRSg== X-Gm-Message-State: AJIora/CeyOusdLUqsLQyS//Gtgla0C3MuzPnU1O4hnnKlaWMdkr72vE ydCtTrfIB294qUozOABmRqMt7TP4LTw= X-Google-Smtp-Source: AGRyM1s+8SboPEXUBl9YKiq4dnxB0aulFAEhYCUia2qqSFZ4RVt1NSqZ8cfTYO/kT4Xvk7rxuEymmQ== X-Received: by 2002:a05:6602:1cf:b0:5e9:74e7:6b01 with SMTP id w15-20020a05660201cf00b005e974e76b01mr4200254iot.127.1659311172729; Sun, 31 Jul 2022 16:46:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jul 2022 16:46:12 -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 3/7] arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot Date: Sun, 31 Jul 2022 18:45:53 -0500 Message-Id: <20220731234557.602391-4-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-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi index c4ae7ca4f3..3967e0bd15 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi +++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi @@ -4,22 +4,7 @@ * Copyright 2021 BSH Hausgeraete GmbH */ -/ { - 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; @@ -29,27 +14,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; }; @@ -66,15 +30,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; }; @@ -98,128 +53,3 @@ &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 = "ddr3_imem_1d.bin"; - align-end = <4>; - type = "blob-ext"; - }; - - ddr-1d-dmem-fw { - filename = "ddr3_dmem_1d.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"; - }; - }; -}; From patchwork Sun Jul 31 23:45:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1662340 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=VDyw06Vw; 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 4LwybH0wfYz9sGP for ; Mon, 1 Aug 2022 09:47:07 +1000 (AEST) 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) 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-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 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"; - }; - }; -}; From patchwork Sun Jul 31 23:45:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1662341 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=kO6EbEYb; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4LwybV57H5z9sGP for ; Mon, 1 Aug 2022 09:47:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B66638440C; Mon, 1 Aug 2022 01:46:23 +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="kO6EbEYb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC7E184206; Mon, 1 Aug 2022 01:46:19 +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-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) (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 4E65884206 for ; Mon, 1 Aug 2022 01:46:17 +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-xd2b.google.com with SMTP id c185so7299035iof.7 for ; Sun, 31 Jul 2022 16:46:17 -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=CYndbs4lRj7lRyivBNM3tUyYivPdSVLISMRfw84qmhw=; b=kO6EbEYbiYRjeInox0s8FQTvZeI87v2oUYC+m5Le9znEKnb5bJVhaTt8RgJoy3Uh2k RmDSV+iYxnM54h1GlvHmonHFMlaxaBim8QCkhz0oi+cFnlRkQ49iX7BxvueFRGv7xZGX YaRuuX1l5kqia7cBIEuXrkZ2u+mrkKTe6HBwnviqNMVb6Mg4nP4xkhBa5TTAxDs3pxXl xtLeNGbAS73viqkUtrRHJR05D+OKMSgrZC1/sXuKaBrRbe1WKHfBmkI7cNppurXzFqzo JlLNb+tEwASSZ87Apl8/Ec0bzz+GO4gzSCQJQ1Cj5+eHnwM60GV3IBNuWozvKnpKidGr frIA== 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=CYndbs4lRj7lRyivBNM3tUyYivPdSVLISMRfw84qmhw=; b=MpYLWf695KYVlj+SDnDCPka09EXIl3FLTHJQCoVOmT6HiwflPLOr+G289EtlP7a59s I5RKFeFtTXMZ27tf6IvEKEj7UEhpYXXYCPYuCR7Txw4SitWCc7HZckCc+Gu8Ws4GpL5N BfFcZoYRLixSI3/+85IHEDH8I4YaKsXcNzOPER68hQni8pQjgE8d0rPam23lZu9mL7+P ncJE9BWeLU7ENNUaWW8Lh/0mspEdyf6veJhTRFpQ5nAQpwTAWJAESLK+F5jcft7XfVVb Yz7Gd/T72dG8ZSosiunFlouJ9IRNLBbzyXFis1beJUpqwOkP3s+ZnmYYB7HC8FkMB8h1 9Cjg== X-Gm-Message-State: AJIora9zCyPTUjU5wPPPwFvH5H5wZyGZ34GyUo/B3Zls0poLeiHcLOLW jmj8ZHsOVmCkvtD5Pmh3D9hwb5gO8lI= X-Google-Smtp-Source: AGRyM1t2FThc4OYhBuqrCDZxrYylEMJgw9SJi6Tz5+Sl3TGVGSR2dfgHrXUozl8lmu0uHR2PFGTinA== X-Received: by 2002:a6b:670b:0:b0:67b:ef4e:4225 with SMTP id b11-20020a6b670b000000b0067bef4e4225mr4637705ioc.189.1659311175443; Sun, 31 Jul 2022 16:46:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jul 2022 16:46:15 -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 5/7] arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot Date: Sun, 31 Jul 2022 18:45:55 -0500 Message-Id: <20220731234557.602391-6-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-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi index c4b83d3f7e..6c6c949f43 100644 --- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi @@ -24,111 +24,3 @@ &pinctrl_pmic { 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"; - }; - }; - }; - }; -}; From patchwork Sun Jul 31 23:45:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1662342 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=gH1Y1zwH; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4Lwybj0XRdz9sGP for ; Mon, 1 Aug 2022 09:47:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8685B844A4; Mon, 1 Aug 2022 01:46:25 +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="gH1Y1zwH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 985F1842FA; Mon, 1 Aug 2022 01:46:21 +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-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 A7FEB84335 for ; Mon, 1 Aug 2022 01:46:18 +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-x12e.google.com with SMTP id s16so1169539ilp.3 for ; Sun, 31 Jul 2022 16:46:18 -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=qJBW+7GsjKdu2XzdJNqYe8j3OtuEMgCNyxSXhG5Pfjg=; b=gH1Y1zwH54jwF+KW47fCFOsN3LDG11jXxgvKVhfbMmu9dPGo3VxK4ocv9f9IAc8wyd pB8qdKFV7divuLo8JBl36oWtmzLegjTh6Gtyy24+Lg7wKNUvV+ltCVNaNMD9kRYfCk1I 98/kHSm9dhW/T43e7viPnSoT7LC4mmTlIrT82fzd/ijNHp2DQxywenUjl947688LxTh7 cPm73bCZmKaZ2F1kPuWSkMJNNI8CkmK4thxU5vYoN0SG0piH9KfgT54wKJILKllC3H1T dDQkU3zrvsfGIpmX3VfKnKJ6N7sFybKi23nkBa+jvJneOAkJU8DQx2Ddm/LXIGkWTIOW mNeg== 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=qJBW+7GsjKdu2XzdJNqYe8j3OtuEMgCNyxSXhG5Pfjg=; b=yhlaKO6+EMWbEpSdo5Yv0914EcCDFjoM2p6upoki6U7V2aG3HkdaTWkOJeCLABcfeZ U+KYP7hzV5SoMfSq8ybI0DhI3BxQj0WBB2NAFIJ+4cKHS0IzKLiAw2JJ0QaHk9Gw6IJe HraxXy67GvClqRnAM8TaoNWooDnsCodZyNIpNnrN6sHk+rKm0DWrEXHTKAXD/9v1ZMVz Btm4cXHyd89faj9U0k0RuP9TdL5Q6T01PloaPeprzzMbqao9DOnPnk8tdpwMxClGGOF/ ULaqesLLYWdR+a7qsIn6SmS5lbXg4q1Vfd0US2yxqQKHFKYwrHhRi84zPcLZAfrAhivH WG3Q== X-Gm-Message-State: AJIora9CENPu7j1p8iULlTZJ4YHngvrB25MLzrSU5WgMefwLUSV0gDow QenfFX6JDKiXO9Q5d7GQ7RaBy1wXBoI= X-Google-Smtp-Source: AGRyM1uXXyNA7VMBtQpyBK04Jbi4g/TmNr0rIC1mtK8/WG8ReHlyaqu4BR95YomNd/uCB2HSS6WU5g== X-Received: by 2002:a05:6e02:19cc:b0:2dd:ad68:7443 with SMTP id r12-20020a056e0219cc00b002ddad687443mr5185557ill.141.1659311176868; Sun, 31 Jul 2022 16:46:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jul 2022 16:46:16 -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 6/7] arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot Date: Sun, 31 Jul 2022 18:45:56 -0500 Message-Id: <20220731234557.602391-7-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-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"; - }; - }; -}; 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"; - }; - }; -};