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 7FBEFC38A2D for ; Tue, 25 Oct 2022 15:21:29 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 81E8C84D8A; Tue, 25 Oct 2022 17:21:26 +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="MUEAUKaP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8AC6E84E3C; Tue, 25 Oct 2022 17:21:22 +0200 (CEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2044.outbound.protection.outlook.com [40.107.21.44]) (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 1A5EA84B39 for ; Tue, 25 Oct 2022 17:21:17 +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=Ssvd0SGQZAx9tlPiMhSERJIY2tLkwX3YV1NGwto+PggAm6X+IMiuCzu1uZWCpFT0IYDrBPxVWpJqFaJHx/E9dusxivs9qCU2zGEPk72qNv76iZGShONr1+4IFBGiPUPJFQVgqBe1EKVEA+Z3q/Cj7DhcBhLrs16zSS1XXeY2lZiz6LfM68uaXoAiu83PaXAxs8D3QPGGtAItHB5bxQNZcTLsF3ZooLJe2QXL8EdzIiRd+pBmcSOaYDWXgqkngLJg8kEiYdDnrAlVaLBdTUdck7DAE+4UDBdRvOzpvnmm/isdYm+vSQ9rwiBCJW+6GZ9nlXaZwOBPVFnVDqwUiS9J2A== 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=xmXS4Jz3SQuWBr7Gw6zM+v8SOc9ZSCpWhI6e5PIWYtQ=; b=ecmPw7RC37EWxBhkIrx66z6PgA6zxjXwnvQMmcoCTGXNlaSZRkOo0XmBzeaSWKD4KCwlKnvHGNXXvlontntRku3FuTXTCh0MA2IlI+Au7JZIKMe5jPAiKtSCUo/TkZyITdvCjBuC9eCloKuE+gY/dVoffune6Q/mKplOA1q+2poPbgGbmgRNfZ25Dm+hxIFpit5mYleOi3htfO+/8ZZwqOnFA5oZ3ByiSY7qKCCikUout8C/zOfSwtOdSgNeQFZVFRBCdGZtB7lEUeMJUksBnXu2KmLhAhX8GDZrQkJwlAqzbhhcWV+RN65kz3I34nX21e5N5630Gx21si9nspcjLg== 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=xmXS4Jz3SQuWBr7Gw6zM+v8SOc9ZSCpWhI6e5PIWYtQ=; b=MUEAUKaPjkFG8UIc5MOVoVxr0o92DoXZ8Z1BXhjL22K7C7m6YEdPgbZZtQYXR62mmRhkfvswgoyFPYBEGWyHYHEdxKnxV3LiFILERCRr4iAXm0QUuV9gvgLxIirU0ekQkQ4S1HPyj9Q2CKc1XA5AqSEsSqaWT53OlGwBTMiRuI8= 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 AS8PR09MB4741.eurprd09.prod.outlook.com (2603:10a6:20b:298::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Tue, 25 Oct 2022 15:21:15 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::7b16:e671:48c1:9ee7]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::7b16:e671:48c1:9ee7%9]) with mapi id 15.20.5746.028; Tue, 25 Oct 2022 15:21:15 +0000 From: Oliver Graute To: sbabic@denx.de Cc: festevam@denx.de, oliver.graute@kococonnector.com, Fabio Estevam , "NXP i.MX U-Boot Team" , Ye Li , Marcel Ziswiler , Denys Drozdov , Gaurav Jain , =?UTF-8?q?Horia=20Geant=C4=83?= , u-boot@lists.denx.de Subject: [PATCH v4] imx: imx8qm-rom7720: switch to binman Date: Tue, 25 Oct 2022 17:20:56 +0200 Message-Id: <20221025152058.17944-1-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: AM3PR05CA0135.eurprd05.prod.outlook.com (2603:10a6:207:3::13) To AM9PR09MB4884.eurprd09.prod.outlook.com (2603:10a6:20b:281::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR09MB4884:EE_|AS8PR09MB4741:EE_ X-MS-Office365-Filtering-Correlation-Id: 7704a75f-3e51-4f38-bba4-08dab69c8ed8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VXgeShy1XBL51/LJ5BVv07l0qih/GEae0glTGbXl9JsIjesbxBGNJSb7ZSKU+0B1+EPCSZA4XNLBGC85pSiUKeeWT4YDJ49hqZftJDLb4dWMDg0drCPMEqR/m9CQm/ywpLou9/dGEJsLtoLb28x3M+NAp9cXgbSEiv4acnOxHsZjaNT0l5AUbf3s/dXu0Sh6MXy5dHKiLjHRa8nJ9AsyI0uYp1VrGE7Va/hqF3Fl4EWbX+imKT3sspay5uZGCZoBEoofCLLRcalQzzKUrAaUTLBiK4wOwqgxAxv1NvklcwND1uMVfJzVNq9Z4ekkSxde/T+w3Mc/RkDgr52IR4lSA+njpKW+aeiA3Z+8an8eKRJUX2sx/+tf0T8oYS4Ey0rEu2++jZapP0vJcNN4tg3+oAmLdh14mqg9sRQo5R0PqQD2OaHOVSljIXq8VXDam2FcB4Bci24EyEE12+UBQ0YJAznXgt4d7oDdnNDB5MU3jq/marvv4U9i8Qy5qeYL11Xie2mkvy8oc6B0l4YZkV1lNuUZ3p/fyx2ujVTvMq6WXyCNeHj1zqF1id/4U5FDrW58nUBR0bzu3iRsE7yQqIpgAhaElYQvvtXuTfsMwO6ZW39xOJi1vKiNsBnJIKQSSdDn6NpDNtaP6ZZM40EnUp3teNgHJHvMLEgI+r3sXgx/Zs8NrdS4y9wX8mXucpEbUQULtB2mag3FLWm8Oyf8o1opONmI9AP/CfafR6HJeEJIv3Kfagsiqtb9Qsr2vcgOqeQcRk/iMuH/qFBX4Jy2IlkmhZIxlPNkHNGsUwW+u4K3WKc= 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)(396003)(346002)(376002)(136003)(366004)(39830400003)(451199015)(66556008)(66476007)(4326008)(6486002)(66946007)(8676002)(36756003)(86362001)(6916009)(54906003)(316002)(478600001)(38350700002)(38100700002)(83380400001)(26005)(6512007)(6506007)(1076003)(186003)(52116002)(6666004)(2616005)(41300700001)(8936002)(44832011)(5660300002)(7416002)(2906002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4CaWWayYX6H879jhtDBWjilkKO7YR6RRSV2aPTP0YJeb/tEE0GDkIS4wL7Y9?= =?us-ascii?Q?CnXOYewClzkl6cDo40xXbuyuln5hChT3zFM0tT443ScXGb9xFIwgu2d5DrOa?= =?us-ascii?Q?k6MdOisfR3orvbCjpuQMBvwY0RfuA2TTNHk73+EzfsqBohZLBA1jzQXf0k2X?= =?us-ascii?Q?MYE+w3GLvKNExZn/iEBfUKL34JiBjmMiQr4yizeGfOKe+K3qeskkDESAKptq?= =?us-ascii?Q?xXmq+V5L/J9JEXt4+40ErEFfbSOJkBna+J3ZHX1FtKE0d5Yel//hKBq6qcL/?= =?us-ascii?Q?lRTUtRhFj6rzNnRDyMkB+SUqQHy/akpOypXhdHNUNlUaWRinMkf+3Svpzz/K?= =?us-ascii?Q?bdHuwZ8lZTR4vgSNGByr7QcSGSHojAMibqosNh4WltHWqxQzIaq+Qb+oqQdE?= =?us-ascii?Q?QEe/k9RMawGfQIscNKA0EBJovOqjB8OLBqQRNcN8ZVGwaEg4u7/UDZgY9uYj?= =?us-ascii?Q?PAGyNSsRvjShnIuPGCtGN60SQ2FUPBmPJdU9yAX9i9TrXcdbLfsCvqGWwzly?= =?us-ascii?Q?UP3vyKp/FJj17dtmeskNwXNssTKkMKWL0Sg55q6uDZR0YiFOQk8l0jtM1uML?= =?us-ascii?Q?QePAJJGrIQ61rBAVlKi6LBWG8MMHku3J3Bx8g01V2FC/E9OeVft3En/1+bWU?= =?us-ascii?Q?1rEELZdKTZmYkG0EizBPqgb6VYGKWqEGq34t4OiyrSfollQam+7+PZelSaXP?= =?us-ascii?Q?lDn5GKzDyf2IE8sl8g/z4d7Q1ugUObwScGQs7DleksHJ7PocNlr8XGFjSsFY?= =?us-ascii?Q?5d8/bcRMO+FG9hZmvYvCdmDP9S2cw4VBvqcrswM4nGc/K669X3bGBfORP6o5?= =?us-ascii?Q?dDqT2w73cDIdVCn5eAwE7XcP9XYtOCPJmQOfbabM0WKzQjlaIQ5CKpPO8vpe?= =?us-ascii?Q?sXB0NtOllbh2RFQr7YMMzGCir/umyH1vF+0sdItuRQ9xYnmTzsmbTx0ZBKtz?= =?us-ascii?Q?il3sHsjUfhkcoRlaBFIrrmDnTgnqiE7j/Ba89X6+FNMX1teudsXRz0eY/zR0?= =?us-ascii?Q?2cDhqHvNZBhqaBsKCZwfgQXZneM3xI5xmvUPxIujYDtBjoxDUgkM3+6XsdB8?= =?us-ascii?Q?vPzJSO8E1/kCNbHacnzVICJIJvF77lQtVmHzqR16+juREtuCVVYs1rPleSk7?= =?us-ascii?Q?NFR1UqICxJiw0P7QijyqAFUyneP7aOJdtmtuyuhDGpEq4dGsHi/3m29QaOWN?= =?us-ascii?Q?rPEj84QpuTS88A5fkOdSg6eyUyzoaOrh5NceJ17J8np3gHz0FGIs1FrX0eA1?= =?us-ascii?Q?mZ6LCk1qS+zBtba3MpfCnmmoD5MmitKMuw/JdhfMICUVhIcCatKPQmmo6UQ5?= =?us-ascii?Q?7DRrsQUaSMHK6WFNHXOkUpsnu8Crrq/JpDMSNQKFrdOPcjbTzXZ99mXJJXzr?= =?us-ascii?Q?HFfArpFYH1E16aRF51A83YBQAs/uson9lQkS3MZMB8LJpMWU/4jUo4Fgt6z2?= =?us-ascii?Q?hNUhaylkZkvbgRw5Ta4UYjTPKfo4boNK1cCf7+84RhQDbpvdacH6shqFtsA5?= =?us-ascii?Q?WQr2po+ugcbQL4F2E/Z1CTBvaXCnep4uqt1+jdHEpl8Bt6zeXrA2JJtyKhVr?= =?us-ascii?Q?z+1NxQ+OQplCtnUQ/ifNhSPK9VMPX+KS6LGgeoN1jvMOWiCkHEEUcKNKgGlA?= =?us-ascii?Q?8ECYNKbXsNq6qOERqdz02Ek=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7704a75f-3e51-4f38-bba4-08dab69c8ed8 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 15:21:15.5474 (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: 3OtxK6F0/nLA1xJW2M74htrgCx47CV+hF3HzaLbX6ogRP63CQfC1vKXdwJJCkaW1nMQAiLZrXpGHLE3o7hkDEMISLMXReCD/gaA2a1BG+EY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR09MB4741 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 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 | 131 ++++++++++++++++++ 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, 138 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,131 @@ +// 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 { + type = "flat_dt"; + compression = "none"; + + uboot-fdt-blob { + filename = "u-boot.dtb"; + type = "blob-ext"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + 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..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