From patchwork Wed Jan 26 15:52:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Graute X-Patchwork-Id: 1584530 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=WjZ6FOeV; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JkT1g3PWtz9t6g for ; Thu, 27 Jan 2022 02:59:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 54A788313B; Wed, 26 Jan 2022 16:59:31 +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="WjZ6FOeV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8043383388; Wed, 26 Jan 2022 16:59:29 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::62d]) (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 75C5D810EC for ; Wed, 26 Jan 2022 16:59:26 +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=BV8KbAH983W4BJL7slrHy+WTAdxa3dzR6CVxSjHFbhvSgfRLohA39YaDkE+gB6lZE2zeH9nYpTEsPEc9DBC1VoHAbvi2oq4a1nSMmqYswNiw4G7VfcSbNdHSbuyA5UpSthELU56dxGV4DCItB97RFeQE7H+j4SLfC5d7PtA8hW7I1mLB3wJIA6lEn1rd2EyZ9XLQPKGVOC3MwInzT5m3sgj7dngosX5s+pNbHPr8jG5JVuipsOPktiVZoFzaolcr4NejGvWmlXiyLlUfKCp3x5xSifyVeTCZnhEXx8cP/hMCg9mxxR2w9GTEXX4j6poUz8dCj7ym9voERNHxvlvtsw== 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=Ex0MY0j7iRE3Xt/gXQIDxMBgxNP9s3HWgWxNjoEk5u8=; b=DY5XcjJKUycGppJOgjbpl9IiE1WIK1X+/A6lKrVgUqZK2n60wyGyi1SdBF3pGYTU6CUo6wzRV7V+hAkfCUJj0z0oIAAuq+0+KInW78PnOBJ1H9OewwcS4OqubJqHuz10RrpDT+eGv/bc81ryBPb18KHZITVzJxzsXmhutL80+sjPmbhnr6Ca0m8obVWGfP4h7WIAAuu5XipvBD04d1MTz1kBnf0wuN1Kr+KMDCpbtZllSk0rTJoc3cZP2kkEyDGjPmxpY4gHM2/unofOXADdPoII/NMhp+cnwQ99zWD7kTciBpvkHYaMCruG7dcqFPkGm9KEwbXGBuDMizkMh1kDMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=Ex0MY0j7iRE3Xt/gXQIDxMBgxNP9s3HWgWxNjoEk5u8=; b=WjZ6FOeVOa9wxaYrhUZJaMLCJVg1kN1lV1XYYKU1gXKY1J2BA3FVjhTr5a7SC5JcMxpvJETFyew4iuAfaGdpPROQfjGXgABQy7xebFFP9g3fK22JdB7McO5CV3vB525rGy3ivdUVr1z2alr3ozijaKu/hYyX4/IKXeHcvVElRqQ= 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 VI1PR0902MB1918.eurprd09.prod.outlook.com (2603:10a6:802:a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.13; Wed, 26 Jan 2022 15:59:23 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::44bf:3514:da43:3a85]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::44bf:3514:da43:3a85%4]) with mapi id 15.20.4930.015; Wed, 26 Jan 2022 15:59:23 +0000 From: Oliver Graute To: sbabic@denx.de Cc: festevam@gmail.com, uboot-imx@nxp.com, aford173@gmail.com, peng.fan@nxp.com, marcel.ziswiler@toradex.com, andrey.zhizhikin@leica-geosystems.com, oliver.graute@gmail.com, Oliver Graute , u-boot@lists.denx.de Subject: [PATCH v1] imx: imx8qm-rom7720: switch to binman Date: Wed, 26 Jan 2022 16:52:04 +0100 Message-Id: <20220126155204.25099-1-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: AM4PR05CA0025.eurprd05.prod.outlook.com (2603:10a6:205::38) 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: ff310af5-e31a-41f2-f8ff-08d9e0e4d227 X-MS-TrafficTypeDiagnostic: VI1PR0902MB1918:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:935; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R7cmmCEYfZM+9zynd7jbtR0rZh7yvZSmW9gHWIo7JRba2DBw5IieK4Vk5EO8eX/n6x4jEy0FpNnwM011OUltGaTKtKjtJlz8SVoB/Fw0jxpeovq4bC67bUM98pROt5mtiYjvrm14AYbrAdEd9wDkH6+XG1ahrlJwswKRg6zJMApWrtJlAC/cvD8rdOvo2UvqeEl5YdpXHEKshJO95a1Se0Z9tavmIpgOnqVeakl00/jL+3BU73WtEzr9KnWPNNyX1geRWlRwBee5z+CtUNyIWZ9/Iomoq64g4+egU+oAt8B8qlHEV5visxBQA95uuBCAW8kMW+FHmmFtSWEkbBhWZz3KE/+9THoRNx2122SUURxo+w0bLen9i3J0uear2JBgl/DskdcQe5DlG9Cn18yF3/bBSYRzo3Dw6fgDuF8RsQQxIeYdAUW+622oaMPA9BaWAuWo9PVvl4iCXgcMTqRWlq5jBY8qbj1GXuhkYOfuyPDPH8j1SthAE5X9Z+CK7/JrboEK+PhG9P7wytSseZq5480asvuoDpDFL7/UHA1MN8JQymkvRgAI3ko64SQWswkUdV1D4V7R99+8pd9n9iptvO4TI8oG5MNK1x64eIvAesr4YdeWBsvBmVHGCEKN6fzwBSlQORIzClZ8kruwcfhtrLp0wXUMUdL+Us145Q5JA2v/3QyTS/ngvw5x3PD+VlmZaXY/fd35H/wX3ACTAXvEGYCacZ4fmggFX2nHtUnzZZU= 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:(136003)(366004)(346002)(376002)(396003)(39830400003)(66556008)(66476007)(1076003)(38100700002)(2906002)(316002)(6506007)(38350700002)(66946007)(6512007)(5660300002)(83380400001)(52116002)(36756003)(4326008)(8676002)(86362001)(508600001)(6486002)(26005)(2616005)(186003)(6916009)(8936002)(44832011)(6666004)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4jMV4toZ548srO0VF9qwNn53BC7XJyChY/91k3hMX4sMQUaDCsBGg5d7TMIoUygwQdp8qYa/bigu24xBWb5jZarnIm7ISsWerWMsj+jHwnjAEgJPJ5/sPAu3+um+gp7O3Nv9IQiUZM44c937QQCPxC0FE+cClK0FHhEjyxjDOx+W+8ES+hjFIyTNh20BdgnRC/w0qC2fcdlYTx3tYReBKbMgbS2ioyydy7nKr+yEJBC59J9nZny2OjIf9kY6SU3ksEYLX0xvDQQZ5T02AYpJjhXzORRGlUHxMOQDZvQceY3/KLvMLHfX+GQgOetDPjaanE5GZDoT0+1ZvDwfDssJfIrdMuF1lawb+VJlN3P2MIp+Ex3ZvKlFZLc4gE2OUGtl3UbwCz/xNwqnESxNjoCobHpALm6BP4QfuGoWwREl0gM5ql5p3CDEEbkMQGZxh71kjuzZ3jS8K3/enXbval5h1yMztwUqFLIYBjHbIEGOd49o0zwaRNIeSZwZ1tJ9/LhOUhGUD+/aMfycL1fj3MvB8wVK2t+nbYbo4HPa31DU1xk5g7kqdz5s3bsXMP266RrXwetxQdau2Em2HaUt/eiRB7NtP+CwWbE/OQXhG++lz9KcE07h2vQwNZG5eIv79AZ4YFagN9PR0DlY5XhmdOLnUoa1JELHM+wom/3D11ChMto7QBlIik6hBqV9iuC2X4OiWjRBL16lY5m4pReMthNiN5yQrWFrOoMsHnc8bhAx0LmuUWRsInVBvMDmPNSPTH/dWsTL7mYfw7l1e70rvJeDgh+i/oKKU6MYFT37lC2/YskX0TfFLEG45UdIHgea78N4/V+ap3xrD5uEsw/ddczoGq3YZKuxDqis6nRgEU9yy//TFSYlFk44f5VKZfTIQXTZopyi1Hs0UQCE6kFv4/8UhPDLDW3PxQra0rDt3lRTXt6agh/EctayGwtXAI5NWociqApZ+TjlUxGLy1WXSzZw7onvu/6yc/BAYx3ZTxSrad7i1ykzko8v/1gohucWA4CQwQd+RW7lNzZ7ygcqkOGiQFIQKdPMuKhW2f9h3Gno/QY3LWl13PYEWKtc7AleYk63t1y8RG+0wE3nLSA6US88ef8UHfOVoAVhZ934GE/XuevoXWgB8kZvOY5Q5yj0mOFqlI4u9NRuQCYTRNboBTxM3oBNdpezfQPPafg9l5wx2IujLgWzbJgadU1h8fmteCQFHgxM7j3lZMOM91FRotsbubsDTXS0ON2tZsluv1MnoQHsBmHE2cicfR78OPYZcP48JiDZsHYsv71O/SUxmaPkY+H4lhaaHpYauKcJ2Ar65Ffe/kxVFvSEUOGxziEBKTPciq9En+2vBfeHaQxqzGe8DhgElqoyyLwUf0mm1TMrccrVYAOvy2+klX+65FIQF4TB3f8SPKZhWWOJi7Wo7oj0LhxPjMESqvUXblrKyuGJ6glB9BGt8+yvD4BqkaWBAeR+oDfSYnMB/myPMp/5mNmkkf8Y39Lnqm6ZNU48IMxvGRQEX0MYef2OReownFZY09GdrioFHS8jHnpZXLfLiwQJkiOHQXTQFUwW1w7LnADn5KG5juU1B4FUuBtr2EBC4X5Q8epPpnV5xKufMv+cSNVzTyK6Fdrxc7XVTScGx//4RwmHB+4i7Nigj71cida1DMjDAbEdyunAQYwpmodp5RhHTw== X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff310af5-e31a-41f2-f8ff-08d9e0e4d227 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 15:59:23.4667 (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: N2wJSCNZsAoEkY3kjjYVZQIhlsWnkIdFKCaILzSg5/qtaiaBi6Iq+H6Xb5i4DSAaOC0VAZmzWYiY3VP3cRtQ+p5l/Wxa6oVWYJXU4pRN+Po= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0902MB1918 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 --- 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 @@ #define __ASSEMBLY__ -/* 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_SYS_LOAD_ADDR=0x80280000 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_LOG=y CONFIG_BOARD_EARLY_INIT_F=y 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 ---------------------------------