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 94449C4332F for ; Fri, 4 Nov 2022 15:19:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F16685253; Fri, 4 Nov 2022 16:19:43 +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="XG+LWHx4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1672A85256; Fri, 4 Nov 2022 16:19:40 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130089.outbound.protection.outlook.com [40.107.13.89]) (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 85FB285255 for ; Fri, 4 Nov 2022 16:19:30 +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=F+NAtRuiOPg5LNtsnoR8BfBpdmi6yXNbzINhUx+Q1TbBi9Kn1NFksXWdPn5/2mXdwazj84m7EgJ4uLOnsGm2uJwhE8LTgDOGbqKEywhs0D1tKFRkFA/9fnyTPZ+b5TnTwAIzqx2Z3kF3uLT40Q294FfIF0xCOssxQGNpgv6NNozZ7SrzmaUKu/5OidWYb0ekTzzcFy5KsrdB1K/s3nHAzufdDyG4rdZAc/DyoZ37Y1uFTbubn7YZv1u7CjRC3FJDKw9CmUhO6IMuC8+pVMQgOhrVT2cjVrTuNwMLwwNxNCpoLXkeccraTWDetagDXv0gPcXJveHZV5xaYv1IuXjzpQ== 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=RKxRlsX/HVS7O+shadhkH9cGWo7OiLjA/RKiZ3JwRP6I6r8u0dMW6XLkdBtHlYBO4W3iHiCujWlRLb3zr+BiZRH9oY8S4Ziaykb024B4lONVf7N/vHoxrhGdmH6pyP7vkeiSKIwMEZ7TbZ7DW1iTivaExaPN+a6X9AO77+5ZtniBd+gIi/FPvyqsfd2e4dogFr25hMnkrW11FHNz5NrqEPIN9QPejXo3R0oqIng7iN1TDE4ZhKbC5NoMD7eVXSwdmAz1aK/CYTY00V923+MOzmR+54Fv2ZOCsPFDq4KBjwuzxFP5tHyLbIyDrfbqR/ryXJWVjRgwU/vSXAsYVSTLEg== 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=XG+LWHx4rUTlaxnbpNYcgrqazHmW5wl0T12AvFyecytWmR/+uMnVzhQr5yGfaL68YnIIsZoYNaZo2Aftmc+Vf21RhxDATWbQ/0Ll4e1re2Gh3OMwsL0FDu9iQi+knToSPwfnwZRuJxAiDq6W8J1PGoTZ4zGJxED3HsJq+3ZhbWo= 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 AM7PR09MB4005.eurprd09.prod.outlook.com (2603:10a6:20b:11b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Fri, 4 Nov 2022 15:19:27 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::82f6:540b:bc00:80b5]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::82f6:540b:bc00:80b5%9]) with mapi id 15.20.5791.022; Fri, 4 Nov 2022 15:19:27 +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, =?UTF-8?q?Horia=20Geant=C4=83?= , Denys Drozdov , Ye Li , Gaurav Jain , Marcel Ziswiler , u-boot@lists.denx.de Subject: [PATCH v5 1/8] imx: imx8qm-rom7720: switch to binman Date: Fri, 4 Nov 2022 16:03:37 +0100 Message-Id: <20221104150345.23853-2-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221104150345.23853-1-oliver.graute@kococonnector.com> References: <20221104150345.23853-1-oliver.graute@kococonnector.com> Content-Type: text/plain X-ClientProxiedBy: AS8P189CA0036.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:458::29) To AM9PR09MB4884.eurprd09.prod.outlook.com (2603:10a6:20b:281::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR09MB4884:EE_|AM7PR09MB4005:EE_ X-MS-Office365-Filtering-Correlation-Id: fa045c76-6059-48bd-d435-08dabe77f654 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1YhukU20hX/6X1X85xnXlCNmcYMABKy+fl9Uhh3yJcnIGIedQ8FX9ytEzQIMsI7aFJZ2g3gJE3G2eOS+UcTkyZTQsie32Jse800pUPBIkGqWjOcAw+AQrPWgh5F36VgIy5Jp3wH3mYCM8CjwgGxdy3jqvS6FbVK7VMo9nAwWBlCCsl3rtj+vY5g+O/DnuSAEtw2Le+BoXZwJO46SLGwkxX7IjnmX7bFbK+X5cdQMkk//lKeU13eTBy17HSQU/0rOBBIP+/By2r1DTikqBU0jZFaI/bcgB4VLENAQ0A8PfqwKXMsjhaTOgFHkt+Ze9X/e4gJGkd6TKHpcwM9c7Gdsg5LXGsRfGAz50wk8sLPKOZoWpoMUaE3p0U++EAOL/SlPY7s/tr9sD3iW86EckMFYFVOpjBRZBXosO0gVimioalTqx/IlG7s5OLovDBj5I5erzUYx6GNUbGy5AjZzboq0bxfO4JEhY80rtGvCsxXYK+iGlUsO/KCbBhvEzIlUMOukEaicQKGjy5q601L6OegUbYvL+fu5tOJoOVLHhgRZw1kgDM48KXheZGpjfmeVYLZCmIc/tmWIGoO88iNQofOSUxtoXVG/orVA6xVuJa961JsFOmylmjDWNZGB2TMOcyS2HS6YX5qJKoRI9E35ORmRAyfid6vvw+Qux0t4oSRWl6NRuij0XSXW2ICTP4aE1kB0JC5UQs55rOEjkwnc9NGS9d9rYcoqqaFhdS25bpwTNmRi7OcsjHavk6FNrpjPcTjQhthOJJxz3FX6Y2VEccqtjjpIcv5lm/Swn0EQON6VI8I= 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)(396003)(136003)(366004)(39830400003)(376002)(451199015)(44832011)(4326008)(8676002)(26005)(36756003)(86362001)(41300700001)(66946007)(6512007)(66556008)(66476007)(8936002)(478600001)(186003)(5660300002)(7416002)(1076003)(6486002)(6506007)(52116002)(2616005)(54906003)(6916009)(6666004)(316002)(38350700002)(38100700002)(2906002)(83380400001)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ASIl1MPR9s9WQfihh9ew1J6KwDBGXLdiG4d3N1unYnHNbCgDbg7+DUgViZac?= =?us-ascii?Q?2voEsgqkecCDMfxmKJpuEAI5CsX6Fcrq+TL4GRWpcZCRuGPevpShSAFC8qq6?= =?us-ascii?Q?zPcOTgwXuPuo4VMgjIVmtfboWf5My1DsdP29xI+lFPje694nr4oF3x7PjyVN?= =?us-ascii?Q?PQrGDyPs89GsZ42ov/hQp7IwUy3yXlRfJKEj4u48Uo0Cw7PhNZ6c9okxY9GH?= =?us-ascii?Q?PB+zLMh48xT/RXGPLfnB4w/klBV+LL+Cez1bN1TSbmpe9lYRvy02T6GR+exH?= =?us-ascii?Q?aMurgEoC2noW6clcO81TkmkBFu3FvRrragefLWxQJVUjAkbMEGWaXUw+Cslj?= =?us-ascii?Q?AJo2p3opyqGtIonQZLLvktOM6qqS3pjphX055iGEUgIo62kXsb1heqUErA8t?= =?us-ascii?Q?1vY7KclmcZ8r/j8tYlb32zFD2g8essTqqwPlQgduP7/3VTDR8fR6MPpVUDYn?= =?us-ascii?Q?wr1kw3RI1FXhbmlceyk0sLnYbdvO4+yWictrQHEQxvFvKN2OkVY/im8azgoH?= =?us-ascii?Q?BinJO3oRryrl82rsrwDABWudovaB7L7bgJHs1d2Bxb7UKNz5LcdAwZQv0dgG?= =?us-ascii?Q?tjZVGRvedd+KM8JGLTnFZPvzaRagXyKkEEr2Z3tLoUkcTPaBCFw6XwNbp5z1?= =?us-ascii?Q?0P6Wg48xv2TnlztkTiWy7sCbZUPiRGbDKFPF9DricjGwenfBQWhYxqfNSXPa?= =?us-ascii?Q?a7MLijcsV4eFLqojscHGH80AzD3Fqq3wN+5yqwM4468LHYkTos67PIqHcEyk?= =?us-ascii?Q?Fm04IwjWY2cTt/krg3ytTLhHwHZQiYuqY+cFuKiXMt95YUayjSL3nxn6UqCo?= =?us-ascii?Q?zwAK8nogNjA6SgIkqCITlNefsR/2v08BidacdMNz+7sTm+pTnh0JrCvEm0t0?= =?us-ascii?Q?wtp/uU/XmnaYe3iraQJy5cYaCQbxVAlGCuspm20irZf8CiqQv4C49TlBIAXw?= =?us-ascii?Q?NO3ZyK2to2GVjESMQY9eV87osCODq5IlmMRfqhXHDV5wzNb5edBEAlzQ3w3o?= =?us-ascii?Q?1GdnfM+CO+xkuY+aWzfl4z9bhIgkUb2JMd2YDt2F6NC4dxIAdLfcQ6CX9jm4?= =?us-ascii?Q?dSM6YmzE2jWx5VMGAg13Iyv7Lhb9x7j+6cc1TDCOyPsik31QjlYABANzXHzs?= =?us-ascii?Q?seYYy28+GTj3rLSfvER54WeSKjc3YVBhT9FsdNA8Usuxh1HuLsi5hBNHOKqC?= =?us-ascii?Q?KUZQcp5kCOiPnS5dUUBP7H5dN+DHjQxHPlxIssvtRYsubAALw9O7NMhN6fhH?= =?us-ascii?Q?vLGyg1alJusQ/9TZ+2EkvMal+VrIVB6z0pwB4+v86v5aaKn9R9wc2aYeOHlo?= =?us-ascii?Q?iTETbQDlprzuEWJuvwJTfsSxi7cPCG71mImQRHGwFv4qNI5jXM3KHV7X8P8y?= =?us-ascii?Q?4rIP+do1UHGxUV108c/yFwCpLTbh6soCdtjpEO/KQk6zFZJhWwUy4Z2ADkSz?= =?us-ascii?Q?aIiDMRe5o6fcmEmx/1/CSuESmqtLK5jQjX6xgrLreE9C9m4qgKw10U7QPmQD?= =?us-ascii?Q?CWNa2s8wviSVp3LHlg4ZgQgPSRw+FSZQGTcmjTedA/hyys9UTbSRVu9rgCCg?= =?us-ascii?Q?d3vIKvI2um4+rJ+7qqKw1GV4aACn6y9QBqA6OArOvdlJr2QSoKrs4QQzLPmq?= =?us-ascii?Q?j3gJGCF9jH2o4J3Gx7VEVhw=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa045c76-6059-48bd-d435-08dabe77f654 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2022 15:19:27.0267 (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: b68Z3zCXck1O6EEib4hym2wK+MW0mUIJnWNVpKKPCHJzH1WtWVde6AMamvDi9qcDNxD/9iDqsl5UeQQnAwe2bG2j84/T9NNZZBGOyGrixK0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR09MB4005 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