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 B1DADC433EF for ; Fri, 7 Jan 2022 21:21:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B0AC8376C; Fri, 7 Jan 2022 22:21:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 2DC05836CB; Fri, 7 Jan 2022 22:21:22 +0100 (CET) Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (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 290FE83753 for ; Fri, 7 Jan 2022 22:21:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f52.google.com with SMTP id a9so6652916qvd.12 for ; Fri, 07 Jan 2022 13:21:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kJI/LD5ygsCvExlMbmsHJU5kCsfaD/nsV8KAu1NJvzQ=; b=6/qHta9wg8GT3HJtKXwe8vjQT6HCP8pmqJp+q3rho9+47593LHYZm/qNEE93U2SbyR O6VIgh5nD7Ec86y1s6VBxDl6ta/5CPuod0dZ1L49celXyP1DbU1I3JfuQDQAHflFNiEt WX3DozHAsWcdSOXy0LI+Eb30UMCL3GC5QOQCil52QAH5o3jQJNHyLJg4cqV+xmmTgagt e7cblWTcNGrJwFxJK3LHVZmCvTo2JSwJiX62UfKIwmD28CZ7XXsQE80Jlz7f2Hhkqs26 q4S0fqXPANq40n5vkXiSTCcSEc78CxZlPJnAvRdy84SbeE+as5dfPw0b1ujs/vz/Ghg+ m+OQ== X-Gm-Message-State: AOAM531kffQUA0a6vZYeR/fR1WuOLQC7FWZs2zOxcVhN8s/fZIt/S2iK 6o1I7Gcvw9ZucwpIE6AmXAVyGGVB9g== X-Google-Smtp-Source: ABdhPJyF562VF5u+XvVsQ2x35p6cqz/K+xkObvR3U2NnBVo4xrE6oz4PuwL7q0jWy8vPtOaeUAaZlA== X-Received: by 2002:ad4:5d4e:: with SMTP id jk14mr58776814qvb.12.1641590477813; Fri, 07 Jan 2022 13:21:17 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-f174-9b83-85b8-612f.res6.spectrum.com. [2603:6081:7b01:cbda:f174:9b83:85b8:612f]) by smtp.gmail.com with ESMTPSA id o21sm4531262qta.89.2022.01.07.13.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 13:21:17 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Teresa Remmet Subject: [PATCH 2/2] phycore-imx8mm-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi Date: Fri, 7 Jan 2022 16:21:14 -0500 Message-Id: <20220107212114.227319-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220107212114.227319-1-trini@konsulko.com> References: <20220107212114.227319-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean Now that we have the common binman section information included in mx8mm-u-boot.dtsi we must exclude them from the board dts files. Update this to remove the now duplicate information. Cc: Teresa Remmet Signed-off-by: Tom Rini --- This is based on having all of https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/ applied which includes https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the common imx8mm-u-boot.dtsi file in question. --- arch/arm/dts/phycore-imx8mm-u-boot.dtsi | 122 ------------------------ 1 file changed, 122 deletions(-) diff --git a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi index f842e02c771b..7c2dfb4a273c 100644 --- a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi +++ b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi @@ -7,10 +7,6 @@ #include "imx8mm-u-boot.dtsi" / { - binman: binman { - multiple-images; - }; - wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; @@ -73,121 +69,3 @@ &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>; - }; - - blob_1: blob-ext@1 { - filename = "lpddr4_pmu_train_1d_imem.bin"; - size = <0x8000>; - }; - - blob_2: blob-ext@2 { - filename = "lpddr4_pmu_train_1d_dmem.bin"; - size = <0x4000>; - }; - - blob_3: blob-ext@3 { - filename = "lpddr4_pmu_train_2d_imem.bin"; - size = <0x8000>; - }; - - blob_4: blob-ext@4 { - filename = "lpddr4_pmu_train_2d_dmem.bin"; - size = <0x4000>; - }; - }; - - spl { - filename = "spl.bin"; - - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000"; - - 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 = <0x920000>; - entry = <0x920000>; - - 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 { - filename = "spl.bin"; - offset = <0x0>; - }; - - uboot: blob-ext@2 { - filename = "u-boot.itb"; - offset = <0x57c00>; - }; - }; -}; -- 2.25.1