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 CBAE9C433EF for ; Fri, 7 Jan 2022 21:16:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7EFDA8309C; Fri, 7 Jan 2022 22:16:25 +0100 (CET) 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="h/3cPYe7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E41F683662; Fri, 7 Jan 2022 22:16:23 +0100 (CET) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (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 45F2983065 for ; Fri, 7 Jan 2022 22:16:21 +0100 (CET) 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-xd29.google.com with SMTP id i14so8671074ioj.12 for ; Fri, 07 Jan 2022 13:16:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VR8G/xIna30s35z2OTvdofIH9OHLk00iuq/D1B3IuMU=; b=h/3cPYe7AP2umGmFx0cmTgP4ccN86uHm0VG46UtkuIXzQ+Rk7SoeRb0jlmEo8WCgrt Fhpu8pjxgaGNvBo0Hk6+VVvRnhX1XVQwROOjT0OE1bcHkrfBIpEr6YJqk1iwhhyvXbNs 1xWA61FPQ0Dla7iaXgFuupRXq5e0yI1SE11O8N0j1+9KsCxgMOd5j4PO6FokQ1Gbruq5 XnZAZPg+0d31EAJMfFvSWenILTxhTl6+5guLG4U0VBpZwbyxU/R6Gij6nBMEpBA2XpOD WalRWYHC9HfhWUgoYeEGHm8V49i74j7Ij4Kob3vc1Wu0pgn8wLYcUdB5E8BWhsc1C+iv 1mEQ== 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:mime-version :content-transfer-encoding; bh=VR8G/xIna30s35z2OTvdofIH9OHLk00iuq/D1B3IuMU=; b=rTARW/FMukw7AuDQwJPkRSgiZWt3shsFCDcKJqTxvvDAUmMh+t3hbN0h8GuMgYBshw ZddVBtiq5XUT0qQrnIa9Dp9T8fuT37MJGZsSz9PFAT/40ALydR8kjXUbVW99iUmbtA/V 2xFxLmg1EjCxQe9e4TZ9IA1DjPhG3QS6H8eQl5bmCmq6xf05iu0CEeXiiqPlAmmS2IwO j6M5LkfFPJd6813bRId2MsG/eSvlP7mWk4+/R6u5AVtpfSkFTKIYTaNfCC3Gp7+QqI0g wlaUa/lEA+k7dZVsBDbD+4mXoJOVHU2ZKBbAhs07iU3O9c2XFbkGYMPRxWm920w9aOIt 2R6Q== X-Gm-Message-State: AOAM532ubxWyGF5o5BTm20QSBrGC70BSdifFQFWpeU+pZxPR0K+94IqF zuffnfor/Uzh15dmO6aq2zzuO77oHBU2NQ== X-Google-Smtp-Source: ABdhPJyldJ4f+5lekfCPi8MqrTfsQNpSM+LYEg00lLYfl4K0olVKFaWLKuV4j/riAjCr7+fNlvG7LA== X-Received: by 2002:a05:6638:1122:: with SMTP id f2mr31590697jar.33.1641590179574; Fri, 07 Jan 2022 13:16:19 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:5c9:d95d:7f32:33d0]) by smtp.gmail.com with ESMTPSA id r13sm3844614iov.11.2022.01.07.13.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 13:16:19 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Cc: frieder.schrempf@kontron.de, festevam@gmail.com, trini@konsulko.com, t.remmet@phytec.de, Adam Ford Subject: [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node Date: Fri, 7 Jan 2022 15:16:11 -0600 Message-Id: <20220107211612.374709-1-aford173@gmail.com> X-Mailer: git-send-email 2.32.0 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 The binman node is part of the imx8mm-u-boot.dtsi file which is duplicated in phycore-imx8mm-u-boot.dtsi and causes a build error. Remove the duplicate. Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration") Signed-off-by: Adam Ford diff --git a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi index f842e02c77..7c2dfb4a27 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.32.0