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 39FFDC433F5 for ; Fri, 7 Oct 2022 13:14:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 748CF84E79; Fri, 7 Oct 2022 15:14:17 +0200 (CEST) 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="X9z8O1V6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8492584E81; Fri, 7 Oct 2022 15:14:15 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (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 B0C1C84E48 for ; Fri, 7 Oct 2022 15:14:12 +0200 (CEST) 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=DdNM/I/5QsWiDFzYuDHX+GkZxxv+2/5gYveHwcSYuwF3mqcg+qcJxCuv9wPcwu/Ci4dzJ6t3y2piBUXeiwDmLlrbFdGGQGcqg8HBUmEr0RbzICzwxWEpGqEUZT8tOP7jLHUFv5gwf+3qoTam34GX8JlNXHN32nmx+2Bpi3CaSIdjG5uhmbQMSlwcwETNhLGtRNi6BWbLsFMdGk4yXtBxXSN3xdytBa0Tw+uOsFYqQtbXs/yxwevy718LxfzhS9yifUOmXDD2qBqKttsFLGXeGWf4YolAMI0xP6V8uW5BXrFLaF5/4nLT17rg4yZqRXGMDvpqlLdjf5Nx0GUIrK1JUg== 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=4UxN5pQ4+I8N0R2O7Fy6RjlTrubOvYCo0P3+65nzlT4=; b=jCPQ/vLJaxSDLO11Nq4nayl8NHrWedTE7OMahPcNrgGo5YwesFbgyGhHKgfpPZ1zUlObKb6pnHFuvfo58ARxZ6jxTA586givWSQQ1IDJZYpMIv5WbLkO8VjRr2fzRxOqJZSIJ92XPsP6eCPn1mNgmgRfvguruky1i7JNlDndyoLQTaWYg83BEI+3ciUSOpYOYEq1Z5OLsHNoDLF2F37clDL4LyfTOf1jIL0dqlkJXnUlSCWgX45xVjHG9ZcbRM+y1Yo84d5GvfKK2IVtUaz1AgoCpeXDnzRaqm8wyL1Rh5l8MsR5/5YENkg1259uW5lLNsMiK/pIpJhQ0JPuJDehtw== 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=4UxN5pQ4+I8N0R2O7Fy6RjlTrubOvYCo0P3+65nzlT4=; b=X9z8O1V6MwmXPdl5nkNZnGiWf/kVmW+irjYdOGgnf8STOIdRi+A0STftx76tfObgTlLQUlrKukcwAbRBx06fMzp78p1zOMORxIzmr79+1XPjOzGYTDSzWQAsXvSPW/JhuLixyUN13EM43gJat7CKNtg69qwMbdwaD5AHWqJkJAE= 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 AM7PR09MB4054.eurprd09.prod.outlook.com (2603:10a6:20b:112::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.34; Fri, 7 Oct 2022 13:14:11 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::33a2:a128:9718:cf97]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::33a2:a128:9718:cf97%6]) with mapi id 15.20.5676.038; Fri, 7 Oct 2022 13:14:11 +0000 From: Oliver Graute To: trini@konsulko.com Cc: sbabic@denx.de, festevam@gmail.com, uboot-imx@nxp.com, peng.fan@nxp.com, oliver.graute@kococonnector.com, oliver.graute@gmail.com, u-boot@lists.denx.de, Marcel Ziswiler , Ye Li , Gaurav Jain , Denys Drozdov , =?UTF-8?q?Horia=20Geant=C4=83?= Subject: [PATCH v3] imx: imx8qm-rom7720: switch to binman Date: Fri, 7 Oct 2022 15:09:44 +0200 Message-Id: <20221007130945.12493-1-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: AS8PR07CA0017.eurprd07.prod.outlook.com (2603:10a6:20b:451::26) To AM9PR09MB4884.eurprd09.prod.outlook.com (2603:10a6:20b:281::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR09MB4884:EE_|AM7PR09MB4054:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c4a8bfa-65d5-48ed-27f4-08daa865d2f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iQH3EXurTZhLmg22zddp7Twx9b2V8HtvxZc6YwQDqIMebw9adHT5lmSA8gLZKmiWUPVMcDwfzeBqLsm4Y0aYlG4WhJK1TOUZ+9TKqh12JNrUveCLRSoS79O0f+/Nlf9rGTFl2t3G7nnTOdPQJv7j03FHW91NDcCRgGseXVs5QbTBMDiQlhAWW/5ZqofjX2mEU5zSJIWzi9hMNJdaxh/DnOBqNeqNnjJVpoL3dklfazqiWa7VKOgUiF/YG6tuOO+ODYmytzmQqbsCBFR5no70MfpeMvkT3UhtmD6FjO7sCz084hhHQS/OVc46rjkfLfh/7bFRT0AjdSVimxXzPpVHpc1N6ZqBj/FpI7nQ+fy8qpfYnIAu78SOQ1X4ZaE2znmH5nIRReJhA7SR+/M4LRgGlu/beWh0SHxLE7li78Jn4+t1RRvIL1T0aYU9Fbw8VrqDDGyaaCzELTG86rVpRi7KcqXOPM+sWgMwLKGq08KphULUY/vsQzFOFFQ7KVpZxqAGR75Tl1VI/DoIvDYdczjfAZmVXSmnrYIpSM+MQOsONOcw5klmNtBl1VMX0Zkt0uzRQjoX4kQ8KQJBv+oUbXQ35szL5UfPmK/+dFpjCwpd7v/h+TRfzPc/kV+i02M3MB6TalgrJNJ4fgq6d9lR/0qIoqrt2T5aD0uqRJ+NqiLKxcJuycAjsYnBbUY6rc4UYzys+2Arc3o44VZvW+BAgiS1QyDgDD3PZQJOeSs9zkqi0qX8tiUTNvyS/sd8o2gv1U1cfskcII8gU3+x+vRTiyZO5ZLBML/Kv+QmhW3IdQSz/1w= 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)(136003)(366004)(39830400003)(376002)(396003)(451199015)(4326008)(26005)(6666004)(6512007)(7416002)(44832011)(66556008)(66946007)(66476007)(8936002)(8676002)(5660300002)(36756003)(6506007)(41300700001)(86362001)(38100700002)(38350700002)(52116002)(2906002)(186003)(1076003)(316002)(2616005)(6916009)(6486002)(478600001)(83380400001)(54906003)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hv4IbOZ8hUsy1VOlVkNaTm1aKWRPiTZ8wM4RrxuZMOb/aJ+0SBKfuT3xlb/R?= =?us-ascii?Q?V2W3T/3/eMPvYZSemzg2zpEeNlV7kl4jv/wWTPaEUtZs8U9dcAtsq4qS5o/Q?= =?us-ascii?Q?EgVNMLfh9UtHelXBEDAb2bQ2xJzBWJR814xYu45qqKVApDvkqtR3deVZ+dMw?= =?us-ascii?Q?n4BdoTGSRYiwe1Xe1EzQo7oWFffOgLt8zCwaqqV8SMl4xd92cQoVjxC7pyM8?= =?us-ascii?Q?lf6R6Ef0U01jUdqPpU/hdoI+iOUX8qf3GxUFKA/t2Tg9mR75f3bsRyq6VTbF?= =?us-ascii?Q?BxIsxCm4Dyx9CfN0NYSQGYH6IY1HVf2d0b8jOtafoM7rbuj9O2vADthUg4eL?= =?us-ascii?Q?Bv4KDbrrhmRsOvEZkUYgWPCLoPnfWxoQRnq409+yfFQaQl2Dm+ppkwh3B5Vt?= =?us-ascii?Q?eVseZKi/z4idwpqi10wdwGewAVQYhTHl/Z7lBmIYYaCJvIgB2P5vRaZU6WdE?= =?us-ascii?Q?MGsRs/EnmqqvbAoYq+ZekFwLR5l9ZUJm6PCoxrvg8wBsuEQfbfCD/qCvbVXm?= =?us-ascii?Q?E2czFli9t9qzMi3gKZHzqlMyMgMqLPiNb+8G/NoQxubOmmZIlL0lcuMJ2WE6?= =?us-ascii?Q?ap6SPkFaJLgdu192DktV1bTq6IEHr5K4gAcyULJNxKh0FCNDSwA2BktBEuPz?= =?us-ascii?Q?DG4q1B4WzQfvAyBtkTjC25n6anAIE/gpNCD8dPNkFvQAImululGDYvtUJypw?= =?us-ascii?Q?GO7szBlI2xhbmJ60ORaYoMPKfOH6w9R+PHVOUK364MvZ227z+zzNvRRPCB16?= =?us-ascii?Q?wPxYIfFZZoCkFA/ex+ofmztlQLRDYEOh1jxobUadyuguSaPjZnFcHdleyC9p?= =?us-ascii?Q?ZE3flOLGZFfruIkh5d98wB4OfdLHZoQ1ydI5wt7XokXk+l2DAl1kQN3dYTKA?= =?us-ascii?Q?G1DHhQeIwKhqo7ytx3XZT4jds36Mvl4SK5EX9zYxEeSoxFQmcDOU5WgacUdV?= =?us-ascii?Q?/vcQ7Qtzn/ukmYgZcxwCUNSIpcChDmmelHf8T13uFLCnwdDTpGRnd0Ya2viW?= =?us-ascii?Q?enUXSNPfa++Op8cW55DPX5CksG/psxveAClESnSznPeB8UnpFkGmy49i1D7Z?= =?us-ascii?Q?qlzROBvTjSmiUNlEJSYtrhZqclwiuDFHjzHoNIbL5fHFUdFGR6588JOxfwLd?= =?us-ascii?Q?uydHGZAFRsIja2ATxzmpFkCqGe/RO3Ihlx0sC0mTyFQk7TmNuhSJWj62magx?= =?us-ascii?Q?pWEsFp5S6NHqF/hOzzirHuEBwEdXDK9to7Q2hFl78MzSGYf1qlMXcuifbEzi?= =?us-ascii?Q?xMNJJ1Cm6+kV4WiYTbw7AjneKkGn+t1jDh9kUYMDqzW5qOrAgKhLp/cBIrSg?= =?us-ascii?Q?s63/N8AqYSbYvLZnbBQVRBp/7439tguEYsxin1THZgMB62+8D76IGM2CELK5?= =?us-ascii?Q?PXB+2Q4SDZqnTUv72sEISfnVlVu7T5MSxfZcxMmXNq4QIGZJ0se4wAujD7iK?= =?us-ascii?Q?o3yvoe7Xy/hqt9kummo1ZGp/mUj8aTWl7Vwk/B49Xq2Eho97tbpVSUTDjntL?= =?us-ascii?Q?sPJd/FEcNsXdeJqB6FKpMJSiCOFYWJvChAMQw7/gkexpwIW1/01I/k/xuG/G?= =?us-ascii?Q?EGbiZih2+d8wlH83bZEJVeU2fcrDm6ZLb/Lx2mk4bZlIv5e0UinaDUMZ6Dbh?= =?us-ascii?Q?qoUt7/6yojZkX81Yc0kN3Tc=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c4a8bfa-65d5-48ed-27f4-08daa865d2f5 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 13:14:11.5492 (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: O0aUj/DqN14ETcCLjGaow5xcGAjbF4Zr0y54YYzSST7uFsnT4Nul3O7fQs/8S3HRumXpHKweuisa3y51OxYjMfww50sBuJjnmfNxwdfRvXE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR09MB4054 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 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 | 2 +- doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +- 6 files changed, 139 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..5da420ece6 --- /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 = "blob-ext"; + }; + }; + + 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 { + filename = "imx8qm-rom7720-a1"; + type = "flat_dt"; + compression = "none"; + + uboot_fdt_blob { + filename = "u-boot.dtb"; + type = "blob-ext"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + filename = "imx8qm-rom7720-a1"; + fdt = "fdt"; + 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..ed79cb732f 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -21,7 +21,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y CONFIG_FIT=y 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