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 35ECBC433FE for ; Wed, 2 Nov 2022 15:57:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EC2E7850A3; Wed, 2 Nov 2022 16:57:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=kococonnector.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=KoCoConnector.onmicrosoft.com header.i=@KoCoConnector.onmicrosoft.com header.b="hMtWQe63"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 81B48850A6; Wed, 2 Nov 2022 16:57:40 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20088.outbound.protection.outlook.com [40.107.2.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3AE6A850A4 for ; Wed, 2 Nov 2022 16:57:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kococonnector.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=oliver.graute@kococonnector.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lQ5DJOVF0liI2PLRYHrc7Cqhss/JgHyb7+2T45DLnPYIsTj0qbk71HVU46PvBJkO1zSH9jJpJ+G2n1UL2hC50m5d3J258y3NFI8wFw4ZVBs0EdFJ2LJud0O3n7M8pj7YTV3PushU05ypMHCXWOMZdjtsoI1K3gZ93dIWwCWjH4hT3uKLDZr03bJjaf3P+eynm+/wi/29Pj9bcT74JFWSNg95vMTBDa/hr+GGVTGWO/2hKUwWFT7y0laxFrPm4dPQOXuhjCHJtnFeZ/2buXsyhm57dp8rMJvLvlBOKLYDrTnNAa6YM4TUfa42aTXCrpBrTXwbk/CuJhZ9nIQIJxLqMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Pm6LyY2y1i9uDZtLNRURq8AFGAAI0C2qHN9yu39zCG0=; b=d1SBE0YwKin/fFR1k7MviTtuBp/ACgZVQ5c60H+IybzgzesWsb7NMhnTuIdi0IDJHYA0wxqBgan87BD30TVERYmjDr791/3gpu7uS3ayQMkaJtPPF3SssXy28biuuPg+M+NUOOFcbL3IfOq+0lyun0Jw+n5nqwD/tjQErSFfjR09NDnyaWZ3aTXVAIequYCMU2tGe9l8oV7xptdsuwDzju+U5zPa/CiXzziilk/xBsXGxL1JvGGakkviOakeYC8pJ562QDkrFJEEsD+rScAsx0t53r4l7deBx8+5cG9DvSt18uiiNBUulPvZLng1pcOMCHdsbF0N2bDejBj09jhR9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kococonnector.com; dmarc=pass action=none header.from=kococonnector.com; dkim=pass header.d=kococonnector.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=KoCoConnector.onmicrosoft.com; s=selector2-KoCoConnector-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Pm6LyY2y1i9uDZtLNRURq8AFGAAI0C2qHN9yu39zCG0=; b=hMtWQe63bC3RjpbxKshO5DpBMYqGn6XwIrQCgM4xdp0KR1l1Ln75VULcSA4Px9r8o78i+kPD/Wc3OhteNby6t3aZzjL2tWn4pjGbwDEQa4HMLsMOSD8yfQYLkftmBxEF4/o0dwu+pTNQL/lFUG7rA9XgIG8D50sD/CMdzWKVRXs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kococonnector.com; Received: from AM9PR09MB4884.eurprd09.prod.outlook.com (2603:10a6:20b:281::9) by DU0PR09MB6300.eurprd09.prod.outlook.com (2603:10a6:10:417::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20; Wed, 2 Nov 2022 15:57:36 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::82f6:540b:bc00:80b5]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::82f6:540b:bc00:80b5%7]) with mapi id 15.20.5791.020; Wed, 2 Nov 2022 15:57:36 +0000 From: Oliver Graute To: sbabic@denx.de Cc: oliver.graute@kococonnector.com, oliver.graute@gmail.com, festevam@gmail.com, peng.fan@nxp.com, uboot-imx@nxp.com, Gaurav Jain , Ye Li , Marcel Ziswiler , Denys Drozdov , =?UTF-8?q?Horia=20Geant=C4=83?= , u-boot@lists.denx.de Subject: [PATCH v5] imx: imx8qm-rom7720: switch to binman Date: Wed, 2 Nov 2022 16:56:48 +0100 Message-Id: <20221102155655.5296-2-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221102155655.5296-1-oliver.graute@kococonnector.com> References: <20221102155655.5296-1-oliver.graute@kococonnector.com> Content-Type: text/plain X-ClientProxiedBy: AS8PR04CA0121.eurprd04.prod.outlook.com (2603:10a6:20b:127::6) To AM9PR09MB4884.eurprd09.prod.outlook.com (2603:10a6:20b:281::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR09MB4884:EE_|DU0PR09MB6300:EE_ X-MS-Office365-Filtering-Correlation-Id: cdfb5de9-0a87-45e1-c819-08dabceaf5cf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l0ZSuv0FpoA/NZ6Mma+yx/Je7Fp1zu4pwC4NUp/ZjiK9BvuzNTN+YYO3ObwiCBBYEswg2JTxXmccnGfnIXqwDVMlDJjOHwTcxkMZb/0cRZwS4b+x80YK1TwgTiTvaABSSsMAjFzgZdIzkIzuWx6d2FmiCwMz105JrusatNuC6D//Kv4yiGxUf8p1ii4rzXJd7bhr3SAeUUffmNw/v3mHeFTQ3YWlIyH5Pnvsi6Z7ScTdy38Xpx5KBddt3vuVg8fBEsdSmiz/pJqRQ2RFm7gPpihCX3tvtsUL5oY7tzmk5H1VqNaXQad8ze29/NWjXEDCXBWLpIUmeYZU/6g7bvDIboXDw7b9fBgBkPv5l2XdYEGwDaiIWssxXDMiuscWlrIW+XQGZT1v5qouoW00lYbziKctH4fMqUfq8dsHgZVjSUJxHsONfXNn80THtWN8aeZp/jf3ZnF28JBLrmpRxKIavQpc4shjyd2X08YF63agn7c4hXJrE33VcfAr9m3i9ujcLr25/S9npqdZDniMeE0k2h8abTxfMBn16glPaO4rBq5I9cKTAIYzN8xP0URV24qsiEoNVb/mD01LuOcA+DH/OKEPoewhIaf6JLKu4o3/HGNffkG0e1oWFXcIt//9er5hiP6+Z1HVaXavmGQ4slp+hSbunAeRCteR0H8phl/xe/O9hDzSDfeJv+ETNhR9C+u29N2bqR+JAqR8QVQMO3hCmB94Cu777LYHimhEzNpbAEfVEZGQ5xOslDh8/JTWLdA76/xhkjLYuxT71Z1GN+hH51hYG2dA3E89QcUEcZlhoOI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR09MB4884.eurprd09.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(39830400003)(366004)(396003)(376002)(136003)(451199015)(86362001)(36756003)(38100700002)(6666004)(38350700002)(316002)(52116002)(66556008)(66946007)(6506007)(478600001)(54906003)(6916009)(8936002)(44832011)(2616005)(6486002)(1076003)(186003)(7416002)(5660300002)(83380400001)(6512007)(2906002)(41300700001)(66476007)(26005)(8676002)(4326008)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?c14kSSlGBf6jAeiDJ6dhgSD+P64DsBpx6Ag7zngUgY+zDnoVLVcPJ2J4I/6Y?= =?us-ascii?Q?FquJ7zHtwHzAmPFsG48f0UcUgWZDeJNia2sr1iNa29RG/upGm2zX9naBSI+z?= =?us-ascii?Q?yb9rWPJ207SoEI98hHER48W3hp/zYKMbH3LAddwgM/mVS8JeI6irweXigQYG?= =?us-ascii?Q?fMFaxH5A3CO4u1N1oBo6PFkB6xYaabotAD+GNY2aTNvEe9cxFBLT1RpMG57H?= =?us-ascii?Q?hgEXt18tdQgH5/ulnjH4kaSO82qYkfVyr6QbaIok+ShPs8T8zfXxfxqInXW8?= =?us-ascii?Q?Og/UrmAgicvzyZX4MsYTAXE9IxiEEIuCXmReagfGd6n/HmjSJ2lDLf1KrPF3?= =?us-ascii?Q?taCFE0lLSam6zX2iCqtBSKaGjz9ddB8GW/085Y7IsXBz0FjFNpaHvnaL6/dQ?= =?us-ascii?Q?45tNqoZSeZCc8rc4i1A2ziqfFw0JJxP90P1TT4sZYRf/cBjcxhEobqHnjV8/?= =?us-ascii?Q?amj2Oc02VgEV+HmnE53FQwZB2wTmBnFP3Z2Qz1F5nPv0mRYs8NuKq5LZEze8?= =?us-ascii?Q?Cp7iLnrNOv+80X40wS/2FOHsECcZNdEmSt5plAWnFQun2ny5Iz5R6jHS+0vo?= =?us-ascii?Q?bDwgprfeUH7zOBmuv/5SyFZIGBC6BIMQJCtNQMeMKF0li1Sb1Q+2xWbsbNSw?= =?us-ascii?Q?33SVA4EXBWM5M3dyN8z6JGwoaRgcAzfq4mLY8yWfloZWJ7OpOud3MxB27q7p?= =?us-ascii?Q?Zm+LoUrkX1MwZEtU/OJgWfxBSwFg7CcZnQ1QQkLlDXmB/68M6LcT9A+e2rhc?= =?us-ascii?Q?vzAo+8zD/la95mniAJ2V0ZlLkpanTIHSXyoakJMfkFBLqbMj2RpXwr/zBtAv?= =?us-ascii?Q?9QzlKhMYruyZeZIbU0Mr5w2c4xcVplMfKmwoieMUdBAcJQszd+BRgudVpRDt?= =?us-ascii?Q?KQvLMmS/Rb3eOva+3D24U+VR4WCYMTuI+jR7BtOR4gex4SE1JQo+0gt9UG4K?= =?us-ascii?Q?ZsF36XfYmDfYCJA9HixTCN5ffQW4A4aWkdcr0P47oQ32PAwp0doIBf7Z3jgn?= =?us-ascii?Q?wRr+EYcYb033z3T0KKALrmIPJKbdlHXmIo/KuJc5NXuJJYr7vPWjILsHZZHZ?= =?us-ascii?Q?Z8YBdjxuHNp3In54C2UI+gHE7mJLjl40fAHQ6gAl3ZLWc3ptpywWiU5CCBYM?= =?us-ascii?Q?/Cu6x+ngnuO8Sh0DhBn5gZbVNrkUqOmeEZM/Ao98PH8JP/OfTzV4BuO3u1Is?= =?us-ascii?Q?1rKcG08qxzHinaJAa4q+QgLErAymMkncrMtslLpHWYA/mnlGyfY0Vu2uOMMU?= =?us-ascii?Q?OxmcnPvk15KHH6B4oGdezPzSrBLewuBkiEgDHXuBsMEYEtSsfcumtxM3davh?= =?us-ascii?Q?9B8253K57JDMKFamxb7iGs9QqGcxOPFrO+xRBosfigzIHw1EFVFwHUmJJFC7?= =?us-ascii?Q?aL/+LtRvQdQcbBK7N1LLS5NA/8zF0aF8uFvoTXZHKlsGpFjJ2c0ovl/W9mEa?= =?us-ascii?Q?mWXpCvINgBzLTvDAHKHBuID9/UbQul9pUP7PA205Cn8Lu6DKT6NN20l2hCPH?= =?us-ascii?Q?w53QcT8E4ITIHkgvUozawAN57fEq1ce22vExw0o6YRdri4VxsmsDeB9rePgO?= =?us-ascii?Q?43WW7PQ8ZnsZcdNP/OVR1fdUqBxUIvIu/JdD0KoQcGsq1NbF7w9PQeNNljPA?= =?us-ascii?Q?L3gMFnJDwlJGCUvnOUgjzF0=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdfb5de9-0a87-45e1-c819-08dabceaf5cf X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2022 15:57:36.0937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 59845429-0644-4099-bd7e-17fba65a2f2b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4sHZ1UIXiwC2DDlu80SZ0li8wJp8U++LI5fqafyMXDUak5CVOxkjGO1+8S4PjF5WsmyUYcS0tUb57j78XUHjIxZFG0JScitf6T7y3JhegpE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR09MB6300 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 Switch to use binman to pack images Signed-off-by: Oliver Graute --- Changes for v5: - renamed ftd to @fdt-SEQ Changes for v4 - remove hardcoded dtb filename - added CONFIG_FIT_EXTERNAL_OFFSET Changes for v3 - just rebased to master Changes for v2 - just rebased to master arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 133 ++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 4 +- configs/imx8qm_rom7720_a1_4G_defconfig | 3 +- doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +- 6 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi diff --git a/arch/arm/dts/imx8qm-rom7720-a1.dts b/arch/arm/dts/imx8qm-rom7720-a1.dts index d1f2fff869..332d441c6d 100644 --- a/arch/arm/dts/imx8qm-rom7720-a1.dts +++ b/arch/arm/dts/imx8qm-rom7720-a1.dts @@ -10,6 +10,7 @@ /memreserve/ 0x80000000 0x00020000; #include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi" / { model = "Advantech iMX8QM Qseven series"; diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi new file mode 100644 index 0000000000..9b382f4d11 --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021 NXP + */ + +/ { + binman: binman { + multiple-images; + }; +}; + +&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"; + }; + }; + + spl { + filename = "spl.bin"; + + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x100000"; + + 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 = <0x00910000>; + load = <0x00091000>; + type = "firmware"; + + atf-blob { + filename = "bl31.bin"; + type = "atf-bl31"; + }; + }; + + scfw { + arch = "arm64"; + compression = "none"; + description = "System Controler Firmware"; + type = "firmware"; + + scfw_blob { + filename = "mx8qm-val-scfw-tcm.bin"; + type = "blob-ext"; + }; + }; + + seco { + arch = "arm64"; + compression = "none"; + description = "Seco Firmware"; + type = "firmware"; + + seco_blob { + filename = "mx8qm-ahab-container.img"; + type = "blob-ext"; + }; + }; + + @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"; + }; + }; +}; diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index abb03340d8..71abbb33ea 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -82,6 +82,7 @@ config TARGET_CONGA_QMX8 config TARGET_IMX8QM_ROM7720_A1 bool "Support i.MX8QM ROM-7720-A1" + select BINMAN select BOARD_LATE_INIT select SUPPORT_SPL select IMX8QM diff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg index 5ecde0c530..43035088e3 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -4,8 +4,8 @@ */ -/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 +BOOT_FROM sd + /* SoC type IMX8QM */ SOC_TYPE IMX8QM /* Append seco container image */ diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index 3b099761a9..4b7ed6df01 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -20,8 +20,9 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else booti ${loadaddr} - ${fdt_addr}; fi" diff --git a/doc/board/advantech/imx8qm-rom7720-a1.rst b/doc/board/advantech/imx8qm-rom7720-a1.rst index bd4be1dbeb..953cf01fde 100644 --- a/doc/board/advantech/imx8qm-rom7720-a1.rst +++ b/doc/board/advantech/imx8qm-rom7720-a1.rst @@ -57,8 +57,7 @@ Build U-Boot $ export ATF_LOAD_ADDR=0x80000000 $ export BL33_LOAD_ADDR=0x80020000 $ make imx8qm_rom7720_a1_4G_defconfig - $ make u-boot.bin - $ make flash.bin + $ make Flash the binary into the SD card --------------------------------- -- 2.17.1