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 1B158C433F5 for ; Fri, 7 Jan 2022 21:16:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0951D836CB; Fri, 7 Jan 2022 22:16:28 +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="dIAjcYGY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0D2E083065; Fri, 7 Jan 2022 22:16:25 +0100 (CET) Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 3B910830B3 for ; Fri, 7 Jan 2022 22:16:22 +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-il1-x12c.google.com with SMTP id e8so5552441ilm.13 for ; Fri, 07 Jan 2022 13:16:22 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=/dymYeyaIBGzbjOZ3nHRj3xo1GKiJRGpe7/rwaPTeW4=; b=dIAjcYGYKAXvsaXZW+Y8jSPQJCX4lUaM9EpHbGAG2icRY/isFmzVyFhseYDLM/y8AM 9JcGwJH7pXKpdNGqkKzBPLVQaCnieNZM8rr4HbRsJsDa7kSt7vjao36ZlOuAY3CJAOf9 9te4iCBmy4P0o1pFtpgMwvITKZmsh9HQVMNojFMiQnmO5sxHHL6WlYEWtkOPYXKJTmv3 XjM0T68magSJ8+Cwixof4V+LyncZPh9YWnV+mU7wJ1LkSzHBeX86PGkdjgP0rOBfbzvv ln3kkzxNbmf9yiWnVAC/CFHDmax1bP8Yx09zlW3WIGXpQ5uKTHQwwmxFsoClCoiYfb18 skXA== 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=/dymYeyaIBGzbjOZ3nHRj3xo1GKiJRGpe7/rwaPTeW4=; b=Fyb/Kdmhbvf7ZRtz3HNdr+ZKLAvU0+PR7oU+o7V3Ei8p6U6tODBWtrU9cIm4sDo8Ca QOM/rTYI/Qj25MXfE7Ir8N7mBWSfpEEyBeKYWDb5OJ5R+LdcErK1rlkF+S5kZUY3kHdF ND1GSIIqpJC7S5obfF08LajdNjV/YRE6AoS6fLKOCH6IzIsYjWLmAlZvxizTdy4X9yD1 tNxjS8kPOJ+SX8P+/Qvw9nhkVqXb2w4XCOhAW8YKn/c/mrQ4EKeXzcKVGRIbuUxjWjKr +l4Bg3BGDorSlguPeaXG8n6srPFGjUZgcrdlOUk8KKp9aD8f35Go8LRhZzBmDL84tptT GASw== X-Gm-Message-State: AOAM530DXdMHaQpCsF1HDNz3ST76OLSp/d6VQgbaQmod3tk+h3hy/ATX 5O60SUXqAxOTkqOfCuZlWP1IWKcQQ7PlLQ== X-Google-Smtp-Source: ABdhPJzUL6xE33W9II/m+/JZQFWsUrQUyxKSZuM2QKbXjNpc7m+UwoBmpiSgudYJ4I3ZVnKzEn3lSQ== X-Received: by 2002:a05:6e02:19cc:: with SMTP id r12mr31050687ill.15.1641590180488; Fri, 07 Jan 2022 13:16:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 13:16:20 -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 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error Date: Fri, 7 Jan 2022 15:16:12 -0600 Message-Id: <20220107211612.374709-2-aford173@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220107211612.374709-1-aford173@gmail.com> References: <20220107211612.374709-1-aford173@gmail.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 The binman node is part of the imx8mm-u-boot.dtsi file which is duplicated in imx8mm-kontron-n801x-s-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/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi index 5e368a61bc..22d18e6f1c 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi @@ -11,10 +11,6 @@ usb1 = &usbotg2; }; - binman: binman { - multiple-images; - }; - wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; @@ -130,145 +126,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 { - offset = <0x0>; - filename = "spl.bin"; - }; - - uboot: blob-ext@2 { - offset = <0x57c00>; - filename = "u-boot.itb"; - }; - }; - - u-boot-update { - filename = "firmware-update.itb"; - - fit { - description = "Configuration for firmware update file"; - - images { - flash-bin { - description = "U-Boot flash image"; - type = "firmware"; - os = "u-boot"; - arch = "arm"; - compress = "none"; - load = <0>; /* unused */ - - blob { - filename = "flash.bin"; - }; - - }; - }; - }; - }; -}; -- 2.32.0