From patchwork Wed Oct 26 14:00:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Graute X-Patchwork-Id: 1694976 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=KoCoConnector.onmicrosoft.com header.i=@KoCoConnector.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-KoCoConnector-onmicrosoft-com header.b=bRUHCxoA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4My9Vd3DYXz20KC for ; Thu, 27 Oct 2022 01:02:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0F66C85066; Wed, 26 Oct 2022 16:02:28 +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="bRUHCxoA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9080D85070; Wed, 26 Oct 2022 16:02:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2050.outbound.protection.outlook.com [40.107.22.50]) (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 9FB9185065 for ; Wed, 26 Oct 2022 16:02:22 +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=Gz89jfTSD49e+nxluVUsC1tyGlur2ZJ+wOyfekcSyvhQ4FcNfBT3cjskVP2W956Wf+knYobapz+3FX7BcEW14zaKwOMOUQ9Cmk8HLRtIaIcsfkBkG10HlQ2INJYXiuv7qltWy4Kd8dID0WMIoOhF+95txhq/XTo1JkOT9N+5IT9hJhfApKqbqEWPqz7mgZm+CGBYagEAY/ltey6QOuWDFGbcdBOa4LiQOmQn+lFO4lenRddxUrAsUhtEbhcpJrw+ouBYC6Gz0jP7IPyFXcsIC4fdXqqGP9biRpNPReAj7hJ1S2Rc1Xx9dDWiOFBa5BMEcaN9mqIK7fktjQ5OeCIabQ== 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=BGVn/rY4Gx0cheYpA36UAcfIxCdVebEV7js1hs5SnIOqsEvWUJhMIlrya6yheeexGSBI+yFrSW/1aLfqtGYMyn3ibB5oGA/ThM14hSnnHhuObC4C5u3XE8Msnpih7ATLH43ubCJFwjOOXVt/zZWA4rY0Qabp7RH3XZBKkmgnDo/WXFc7uI7fIIZr1amF2IBAiFkdqCvUaUntZK87PHm2WW+mNp/8ssPTEncEOXElaFMb2hCrXt+zDFCEUbsZBvc0pzaVQXdU+50lhtubKQ+nZMIsZD3gM15BDIQBlTY2kfduG9pd5fcC+jB5tgen9AV2jhzXi4/JJfJvXBjsCL1lsA== 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=bRUHCxoAE+6dNLyzDnxJSbg4/hxz3LHbBAQjMK+TYC6zMmHlcb5bgOgyaHRdB69PUD22igMZbD2uq/NLHkZ5SWRK3cy7uoIv+UGFtx13/0U67JCN/OVt6E0u+CBUvb6BeHv1SHuO/EHdMT9oK4ETHI7LmhIF/5TagKF5qzurfnI= 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 DB8PR09MB4263.eurprd09.prod.outlook.com (2603:10a6:10:147::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Wed, 26 Oct 2022 14:02:21 +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; Wed, 26 Oct 2022 14:02:21 +0000 From: Oliver Graute To: sbabic@denx.de Cc: festevam@gmail.com, peng.fan@nxp.com, oliver.graute@kococonnector.com, uboot-imx@nxp.com, agust@denx.de, u-boot@lists.denx.de, Denys Drozdov , Marcel Ziswiler , =?utf-8?q?Horia_Geant=C4=83?= , Gaurav Jain , Ye Li Subject: [PATCH v5] imx: imx8qm-rom7720: switch to binman Date: Wed, 26 Oct 2022 16:00:55 +0200 Message-Id: <20221026140057.13207-1-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: AM0PR02CA0161.eurprd02.prod.outlook.com (2603:10a6:20b:28d::28) To AM9PR09MB4884.eurprd09.prod.outlook.com (2603:10a6:20b:281::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR09MB4884:EE_|DB8PR09MB4263:EE_ X-MS-Office365-Filtering-Correlation-Id: 7169558a-3f27-47ec-dbc7-08dab75ab36e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nyG3wS3msGUuXR0mAAAUcaoYkdWYz0+0Xuai57BiR8fhNA736JCW7174oPhkjKzT41ywfn2FskoTuWoEJqAsIcgwn7sWS7IKUiWh5jpgjaQfP5kwLYC6Lf9JAULV8p1KPkViTbvYtV3ULMAqa0OKqV9QlHVbCBSgvJd6YvJgduy/74eFFP1kxOc3fncUJ99FPhD1jU1sD50k0GlA4aRhpX376C3TQwMklDhu9fRqOjx2imKr7TgHMnIUxKc99mPS2buzAzxLE57pE1ZkX8gOOnFbFLSnAAenA4/VzgZ8kqKn6OS+LzNJkpJaTzItxJdye5Tgu4aMmhrXXGZ179RP47QA11WSNS2wSrm4O3Y0GPNx9g81U8QGGKh8WPzFZckdxFlHEHIv2BvdlScR8Xh7F74ohka1R7QYi79FMp+Qrw34hnPpM627jJPgwOJq47SYV+SiXC1rVrf/cI6bF/nDHokkkzlhl/Z8tTwqfY0bvROzC2CXf2EKqvA6iNt/Pel3gr4Wdw+7t38YdutQA+31oa1dNRilbgNS+rMLCTnDY663tP7YDJTy6K8sK40jKNweh+lKsY8CxCV6hNBsim9qkP/tjJD7oAcAECJbc071MBgdTfEKFM/vNEYXyd3rf40fAoLmQnt4X/Xq7+IEqL0EP4CRraEGjs/yRm51ZnWRV+OBOjGUPTnOzL0+SsjvK7HUsxgmWqvp+YWHxsiCK9sjFWW43Rt9QR6cwpheJCle3cBNZc96opSYUHEr5algXVbyZlKs4rls1euU64aIqTEoA1mYsdGtuVsSzaMS9vOWzFo= 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)(39830400003)(366004)(376002)(396003)(451199015)(478600001)(6666004)(52116002)(26005)(6506007)(6512007)(6486002)(8676002)(66556008)(4326008)(38100700002)(38350700002)(66946007)(5660300002)(7416002)(8936002)(66476007)(41300700001)(2616005)(186003)(36756003)(83380400001)(44832011)(1076003)(54906003)(86362001)(316002)(2906002)(6916009)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Rk6sOgbRC7Ze1Fvzcz5zBRPz/9qEb+P7QWsbG9TF5/40YOFIl6a459jgP+zof22ERK127L99jse6CZyB2iGcH52MUfRD1u+HYh76myNxYbtey03bI204OmZZOQzmQyLEhIpSp6CWjuuL4G5C8ZLh3KX2rrnHJJG2qyjqOgA5a+W7IMYUqi1ZVeJmIIG/9blexeJP/ar3JVilTlezsXUBSK/s7/hOU0X2Q0LkHRNiml4lWAijRo1izipMje7BussLFBtmOWsraMohVS6HQgaMBXslm5ZZAjgXHKAuCItVD1pr4ZqJ+w3NHKg6ZduYRel4EWPSWVYa3BJ3buj5Lz4kULqEoN2bf+7PUtm2+kFVJ2kxoc+8WVs7Glz9fuYv8lmydBF11CdZtu7vAKw9I4PZ10RYt12LweOP3yseljCgcXd7u4PVmBWzhqc093bQnA818Yb9xEiXilur7fEbiGiRp+EerAGyWpBqc4RPE0Q3A8PP7fsaIG2CfO8qLyE5YATSyCMzUkG1Efqa9bMcy3P0Gb2rQGAKkkkYqdsBSYiBqrh9nL91YfH8AUCvKTPxRR7RCphWkuQAs65d1z8BeB3bSKCjvBCzvLJNASCBf2VIeoeURkf8CEcLTwXBN/WNXOUWrLSPmpj/ggvq4iPHCn5cNtYAbNWierbZPEj1Xm8E7V6QdRr5gpce72nNVY6EDxKxP8dt1ccnl9n3YMPW19H6GdnAZNRD+Si46k99i3Onc7BPIWm71+GAdVeGlK6dEcX0cvGwC82xLKM6lM2/IikVouU94hrL3GfLaDnM/WwYMmRl7NOm70oCyDkLC6dw15Ojs+POChNWemRExzc+ZKQewXMANPvVVVqh64G2F/YcQSm+pDhKeoHgnKBlAfS192bRxZaPkmObZ4DKNqaLzbeFJYEbnW5qLOrexQ+dhLddTpomSeTO0XvX16qzFMKR3kAylcOTy0nS/7W/lQIh+PgXk9FvcvrismpL+3oDMIBQZ3emBw2Fm90u+lp3nWSg8QF7hl0w1JMk4SmtamBhR0d80PtU9Hc1w397LkmsYYQ2msECQRi9TtW/EB9NA/OeiRwvD0Hwg73IFkav2or98yBRaFzpaYCfKuuowYclqlrA3Spe5C9di7emDGQEKGFQYgn1PB88UIx4AWhOsnrJ0qWdSrrLSLqyYKRQedxjAH/Zk70noyw6sItOYKwq1fR6DUjc+VPzmD1R15NQaFeC0vNjaAStSwX7qnQ6VwldxtVCt3FbXiA+Orwe6QQOvw2kBXHnQpVE8/O/zsByLph7LOKVgAsPXSBrnpRmaPRA7A2LkZGJ2XjohuHPM+Z5MTrb5APoFyTbTtsxPb+zcuHaFbLt7IrlQdUdUcSQr02KUjiMScN8MIvdSkoSAxsLG5xKo8dsDR8XHfvFanDLbjnj83qmwVPzSjXaJtKRsJPiiuWOapmHGw4FW8vh45Bx4ywtxNVVle1/88MOpJAWuZOwoqg64cAD8IZXq5Uhy2LstfyfA0ninE49TjJJtw69nTxf9jg2mV5jNbgwR2Uer5cwTIKxtqRYg9T32Y+YuJjwNLIKMOxFrqIcNv0TjeA9Jrd/zSOWusbS/RYUPr1GwfyoACDB6aQvIDen1sRwl3xnMuIdW1k= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7169558a-3f27-47ec-dbc7-08dab75ab36e X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 14:02:21.3391 (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: Rg8q0lrSvJt8h8jo7b5z3yK+d9JdMDvGupHdXVSb0Eov69YyvfDSTbbSIHCb3lssJRwYReqlNQ1IliX9kQFgNz3SpnYuP8pifwkg46kelOs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR09MB4263 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 ---------------------------------