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 4FFAAC433EF for ; Fri, 7 Jan 2022 21:21:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E6C798374E; Fri, 7 Jan 2022 22:21:22 +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 B95D8836CB; Fri, 7 Jan 2022 22:21:21 +0100 (CET) Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (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 CCB37836CB for ; Fri, 7 Jan 2022 22:21:18 +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-f54.google.com with SMTP id kk22so6723157qvb.0 for ; Fri, 07 Jan 2022 13:21:18 -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:mime-version :content-transfer-encoding; bh=Wd6tHNSxMI3Fuh/1KO2GSqBzjRAJeWRpqOpVDexg9Zg=; b=XF5UN1zjahDy8V/EX1Ie70I3VcJXflsIYbUNSLbAiSqQVZ8W8oojzG26qfS4yklh9r +1l55re2cckHuWQ/cHJTh9Vkz7ViYHU2943ywD7x3eXkgNP94YxQk/AtY8PKBa3ystzi h2i88vGbmDYkfsXC9KxOO9eMqRBPkbYctmUOnEro294mocCJ8id4CzHJPB95Sj0j+3+P sgTXvFjvwR06oPl3kOcWILjqkguwCb4Znp3wTMVi/6SP9h7KhDrsDAFuKTTW7MfxyK6V 9tagOor2cL9QC5TCyVuYzvOcNhoy3Tg8UB6ObAGjqwSEA+v8E7ffRhc+7tXMgc75t45B H7MQ== X-Gm-Message-State: AOAM531mNZfaSuMGb1eB2SZW2ZWK7/wyXIX7pbp5/fbvGTltRYFgmrUe y+yhZxId3eL0PSj7vlZdONiNporKiA== X-Google-Smtp-Source: ABdhPJwyi8KYZIiVQdq4kEcbVdYarVa3J7FvGtcw4jLlZUr5ng1ENUht/S/OA11BgUfWwxRKGKKybg== X-Received: by 2002:a05:6214:518b:: with SMTP id kl11mr60081066qvb.51.1641590477362; 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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 13:21:16 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Frieder Schrempf Subject: [PATCH 1/2] imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi Date: Fri, 7 Jan 2022 16:21:13 -0500 Message-Id: <20220107212114.227319-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 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: Frieder Schrempf 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. --- .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 120 ------------------ 1 file changed, 120 deletions(-) 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 5e368a61bc9f..cf7212748cf6 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>; @@ -132,122 +128,6 @@ }; &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"; -- 2.25.1