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 0C501C433EF for ; Tue, 3 May 2022 08:09:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F720839DF; Tue, 3 May 2022 10:09:15 +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="gFcJLK8W"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B93F2837EF; Tue, 3 May 2022 10:09:12 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0630.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::630]) (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 176478390C for ; Tue, 3 May 2022 10:09:07 +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=mz6IIdqPuz1NhwgzR4FyppdMz18sO70FntCixoa3MgM611s4RSQ1kAmndgA9bFoa30NQFGp5CGBUJ0E+o6z5dahHSyRdJH/ohn4MQqwPwS0d4B4Lemjb1pjm/Ztm46Eexq1N/mkjvXSYoe/w7kpxCjgsJDD0QMVV7GuoatDPqXb8eCGKYSrbhEaEAqwC+xISop5nwySc8fUl+FAtQJlqpsBaWMyOlLJUfGJiE+3M+DyQMorg0png4oAAJJYt1jQQJxU+RpZbfsUv3Sc9PRlYnF/GcYUI44luKYY/ShFh/VKrQ8Re+bP3f/OXfxyrn/ZXum1NFKHiG5+mPks3dDVWXg== 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=2uUFaBDaiPyek6lYG5PhfGZH24FMrvLq+BQu2iXVybw=; b=QlZoX1ulG+vVMjzkDCa/ec1ckFHD64pdxi54ITqIxHQpGqrsg6lNfjouRxbCBZDlid9V7cVK3OoRlyvSoQo9qCdVRAhWw8NF5ZlAKfDkOMBLyCy7Jw1HHtZGY2lXrqb45DA33rYpNiZ0BgWsh+4Qx6QCAko7otQXg1woutglgyIx9sUs8Cjh0ufpoUvVzA21WAIsfRSc0YyKjuzMvjdmQdyL5BB3aMxwHtbQsGDEyY1LagCXmoSJNThGCv8t7x94dUWdh20QcfEKPb2qLEW6cKYXWzorcz0xh+3jRg23C5xP1sse7kDV9Z9xb9UKMGdUfWKyPSlkyhJ/p4SX6H7BLA== 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=2uUFaBDaiPyek6lYG5PhfGZH24FMrvLq+BQu2iXVybw=; b=gFcJLK8WRYw+eBcje9iT8Kp2E3nmBkMicQGq13XvIKTSV3ScKE1s7SGLj70DdbkxYTLUc5IpI2krfooEh9wGzEa+njr1VCn4HSzFB4sZIyQeLnnTOYFda8XZxJm28niy90GXuM7roxr9c3GRCruLiq5ZiS7LTUdtHQPig9J2YFU= 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 VI1PR09MB3789.eurprd09.prod.outlook.com (2603:10a6:803:13b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 08:09:05 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::581b:1a8b:c5c3:294]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::581b:1a8b:c5c3:294%4]) with mapi id 15.20.5206.024; Tue, 3 May 2022 08:09:05 +0000 From: Oliver Graute To: trini@konsulko.com Cc: oliver.graute@kococonnector.com, Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Peng Fan , u-boot@lists.denx.de Subject: [PATCH v2] imx: imx8qm-rom7720: switch to binman Date: Tue, 3 May 2022 10:08:54 +0200 Message-Id: <20220503080854.32631-1-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: AM0PR06CA0135.eurprd06.prod.outlook.com (2603:10a6:208:ab::40) To AM9PR09MB4884.eurprd09.prod.outlook.com (2603:10a6:20b:281::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9b53611e-27fd-4c68-282e-08da2cdc30cb X-MS-TrafficTypeDiagnostic: VI1PR09MB3789:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I24xXTe8yvuSM716Zh/RaWKHkfZhGr8guUfRcwsbFmfTIkLBN+Lt16z1eElfLh55j5s8HzW9iEXk4YN87lIpGEL6ckecWzrZHPrQwiTW/9DOgXVO66YeYF5+dLOhbw0VhZshMw0Ur6QLWfbfZSlCgxMnr9yoH+3sbLPJMuFeAoHOGb6k2saM+VBgtHwDwHDokQ9ddRWjvWPiPk4Fb0PIH0zP0d6Wb2MJcYxK9lmmTx9qXEya2NAbEHYN38u1zyU/ktRc2VKhJ056KXbqeYb4s2xjkTgnhkIdpE+/xoC66gKk2XqveqaVG4Yd3VSO+iPq2YWGK/qPH1RNu92WtQuaTNFyHAtt7zjFsppirQmSWoRzXOn3Iztf/DmQfaA/LgOEFzCYVjrOHb14ZZIF5dagyj33XTy5gqXFc+UF97gUzORNYtzg0Fe7XuBpCmyI5xnKOmJM55j7HTSI0LsAFhHi7skXssLMP2Phwn6OViddK3IQZNN36PWRsimBSbg4R+VlqXBPLLGkN8KmfDJK8R0I1oD5VbXpW/eS0ir9YFzIKoI5NngsWwxNNRTJMtom78XSZlhixkIhk6kHpTDyJmTWGcuYMJPVBlZKXYGdwzw192Q1kH9FVTxImGUmbIksMLaGnTFOJIY+kuXRKABGSUyXXoxAckdIXZQwXeD0H1n/UPmXPMU0RM2OAAlg5LvpDqlthc3Um6gte67mbFBnkJtBt0IlPZEhKoq4BJjyYt1m27E= 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:(13230001)(136003)(376002)(366004)(396003)(346002)(39830400003)(1076003)(8936002)(4326008)(36756003)(6486002)(2616005)(5660300002)(6666004)(6916009)(8676002)(66476007)(508600001)(54906003)(66946007)(66556008)(2906002)(6512007)(52116002)(26005)(38350700002)(83380400001)(6506007)(38100700002)(186003)(44832011)(86362001)(316002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tYLHFM18bcZ8WSfTEGn16D4AAaiNzv9+7HtTOBv9RSEKTKVQxBW2vnxdcT7y?= =?us-ascii?Q?G+4ZcnOpMNyIfDf+2Xg3CFqxF2c6Gpr0rndwqJQZ4lR49onbNpUvHukvyc8x?= =?us-ascii?Q?JQCwXfoIMXSq2y+Jz2af9IP6L/N3z1GsCZqRTMZVRFBvnAZn+IIYidibnYzP?= =?us-ascii?Q?HtJVjFr5yqj8EMk4GBZ7N8aJpDBIfWEqDcRKhcA69vEjLdtVJCHHQNg0mEsy?= =?us-ascii?Q?4l8jQsRjFdAQAuDJItULffEmjFALOibjXtDVLGjsr6PtW83yuAWM203bxyPO?= =?us-ascii?Q?ZfpGqg1GOppywP0tqFobxM+5VdR/4d7ceClIEwSRN2pZ77XMW/mSGQDFsgti?= =?us-ascii?Q?Z6NKqEKk8GKBNGqoz2u+g4T+dlUvcuZoHl7Hk8PK9H8crJ8ZdcrfSZW7SmCZ?= =?us-ascii?Q?PitENBcNrffzJFHiFWEdFmSSwyePokStsDTso6NJ94fnIiV2ExjvOhSqshm/?= =?us-ascii?Q?+mzyxoA//gRow7IuEmxB4h8vH2t4rrJH2NQMjmJuQ+YUDDVjNWLS6Dux7pEI?= =?us-ascii?Q?8Hrmms/K2MsHeu1rTPB5A5lfJyZU7cvXGJ/Lm2pczKcm5cyi8bjrpPooXpxU?= =?us-ascii?Q?OZ+yFGV/VYP+QT7bxrOm9K6aYGfxg9nHzpsGnzyudNJUHkuKivtqBmr/BoG3?= =?us-ascii?Q?KuIG7p+2K/SwXYGafR/stxp1liXXrsyFduKBv8D6ZDYLbjJ+YX9Ko5I+ZoyX?= =?us-ascii?Q?U0rgoXs8Lq2+9GHr3wD72oakWXbEW7V0vy4MUHKsMul4S1Z0BDKxsAdZITu7?= =?us-ascii?Q?IAQtHOU3xKXqW6/j6mncM+v2Ho3OVMvzCfOroP9qAPWppIP0MkwaDIYRlitt?= =?us-ascii?Q?5ieTkIqkAu8Is2jVwxLeYCf6dBawFOfZuRu5eN4BKS3CwKezlU12w9Y7v8WD?= =?us-ascii?Q?F9aqXmb4QqMHXFHJ+s0atobdNn7UzEp9uos6HQhFYR9XdLZW94D6FlgREehc?= =?us-ascii?Q?eWvuSC5ptd9SkRnYMQjzB5i0dbyWtoyw891wZjwB2udNoSd4a1Jg4KDeICCg?= =?us-ascii?Q?a1gcXl4rCGvANnS1VqqTVjWFJI/vQfqrOVozfPLCFr0Hs6LqeCezKZhXY6qb?= =?us-ascii?Q?TQ0q1gnGCOhyxiQlzR+r4xPL7GRwUOMp3NUHg6xK4XfvDRR8o7W0W7EDKnCl?= =?us-ascii?Q?ChS07Z85sBotOerQC+3ND5T23wliU7BRG8weZrVCspjmz5w/QnCHFxXkgUnb?= =?us-ascii?Q?2Lb/UY3o/n0BquCkfWLwm9L3S1MtkM9NBcOOqF9CN0G5d54cn0JpIhJVyq38?= =?us-ascii?Q?A2r2D8E8HzvygDEFRygfVZ0Sx3VHFM1de6jPMXKFALLDIxDqLNqbxuEoZZzP?= =?us-ascii?Q?knVfgtmFYa8F6ULlzm+2Vw8nTYoAKRyZJZcNtGkdg3DDU0bwm95R4c9EtR0+?= =?us-ascii?Q?4iX7pUjDXfVKv5l6EQhX3mdJ4ckpUJCcyJrvF264z7d4amJKpc6IypYRjvHz?= =?us-ascii?Q?1/acoGxVz9VuZlu6IyQ56kCtNeaVXrIU5rwNG+kyVqY1OB43+ZAXRXL/Hl9r?= =?us-ascii?Q?BKfBqufQjKYNRGhwdDeDRjbzgDybOwtaxMczGjoVmiEviqqyIawmcLVHhPFy?= =?us-ascii?Q?dYJmTLAGXir4PS8ZoqFzbPF4oxEi2X7UaVKnaU5e02x8O2VaUxyg9aZaXYQs?= =?us-ascii?Q?DGfcleFSAY9JfMiZkp1XnB0lv/XJhgctgdo4UsPeW5DxApiadT2jfzeGaLHS?= =?us-ascii?Q?7LNLqyP/STypzdg7xLlpt5NVSng7+9+dubXtlA95G01XljoNTvCXaZPOllCW?= =?us-ascii?Q?Ni42aD5XO9b2bd9Cq6oaCUrNHHMWB/0DgD3IfatvA6Gw8WO0bBAY?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b53611e-27fd-4c68-282e-08da2cdc30cb X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 08:09:05.0643 (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: VBClLdSRFspSIMEh/4HHhqAAWvNvU1xNBUJEHYirngzxsM30OmcZxZ2EV1qRPM3jscovAKcQSfAKmoJ4jEzgHcPLRoSv67gwZVOuACK4++4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR09MB3789 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.5 at phobos.denx.de X-Virus-Status: Clean Switch to use binman to pack images Signed-off-by: Oliver Graute --- 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 b43739e5c6..b42b985cdf 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -81,6 +81,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 e324c7ca37..58eeef54f6 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -5,8 +5,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 fb43fa1962..26afa4f8d7 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL=y 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