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 E986CC43217 for ; Mon, 21 Feb 2022 09:03:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CCA82838A3; Mon, 21 Feb 2022 10:03:32 +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="VvgANr3C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3D37F8388F; Mon, 21 Feb 2022 10:03:29 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0604.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::604]) (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 381EA8388F for ; Mon, 21 Feb 2022 10:03:23 +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=NjmBpH8EDj5Z3jPWbO1367tR4UTo0W/W+S8ap/poQkZeNBI9n9N217ztc+Jgu7G2b3fd2krcxOYziQ2ma9SGbashWvHOHC062NtnVbihF2hDnFWjafk3ieLQ7y63/QbqaFoOPkYYFuB4pZfgbVy/6/37HYQAQ/twCUr+8gCYnskhM2C5+a7AyJ7H1gZv3YDIi+9OBKzZcy/Ir8pevAVuweQuVWYcUd09k6CAJLztoXNDv1+b4pEL1Zl+QhbC58OIkV9yQhcO5dyIRPsb4LlWBC9Z73xpoGX7SvUjkFVad+DMuvm7u3pAz7NdiI7jsdaldSiV8o9AiqYynnkhUhIj0A== 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=0Mld2W4MB2bzAwJt2dxX/r73kFN86qeZA8TgSFmMfHM=; b=h6yKH23hrUdCnicPzhmAGHr22Nx5nXoUWxJs4ja9QrnLI86ncMZYh31Cl9BARgBvyDkUY6lOZTKJbGUg8BHP3WEYMnyVoGS/S0Ry8uKB7ds1Goip1YvCDUWWEMYxrdFCCM7tmH6BqhICKXu2sjRbAVyNSpzM8ZvKaUafrc0qfAwW/aJwsQyxe+3u1fmaX2CTK1hyNFwjhYIlqCZ8Yps08NqwfeTA/hYqNPwYbItmLYrO8t8JX7zFeunqLoAtUAiXh2YWWwOogWLN6rrTVhFMadBFNDG26/s+cXb1GK4fc9/ArujwdATpQVl2Men7M4mYIJmWdlRjrmmW/lRYHhXMig== 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=0Mld2W4MB2bzAwJt2dxX/r73kFN86qeZA8TgSFmMfHM=; b=VvgANr3C5s7oUCDn+iP4KX0Y+jl7GWKYsg0K/52WHm0BetXSlhC40eTdGWZlGNnKTlw5qnb5CWRM99xb82u/8KQV7dDr8YBL6Xr6ahJZGB8fPUj+N+YxAYRcpa2jYGUJldfZ/wXU7vWlIkpmYs4G0M7/dF6ufHva8qbrhzM3ZFM= 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 AM5PR0902MB2161.eurprd09.prod.outlook.com (2603:10a6:206:3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Mon, 21 Feb 2022 09:03:21 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::3c7a:2af6:3623:4c3d]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::3c7a:2af6:3623:4c3d%9]) with mapi id 15.20.4995.027; Mon, 21 Feb 2022 09:03:21 +0000 From: Oliver Graute To: sbabic@denx.de Cc: sjg@chromium.org, festevam@gmail.com, patrick.delaunay@foss.st.com, oliver.graute@gmail.com, Oliver Graute , "NXP i.MX U-Boot Team" , Peng Fan , Clement Faure , u-boot@lists.denx.de Subject: [PATCH v2] imx: imx8qm: cgtqmx8: switch to binman Date: Mon, 21 Feb 2022 10:01:38 +0100 Message-Id: <20220221090139.10066-1-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: AM0PR04CA0039.eurprd04.prod.outlook.com (2603:10a6:208:1::16) 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: 65196ddf-3313-436c-15f9-08d9f5190236 X-MS-TrafficTypeDiagnostic: AM5PR0902MB2161: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: Mxre24h1U2FPcF6wlgIJwNHZiYNCNXyWFZBgKcdfzlI6bLWPpB3b+pl4j1WFyA/NXZ5bpFzzidR40MCnIqTlP+4XFWMGo0XB3PERDgRUCtRDq0ZqKfYIytTZoq/MNQcmfwt1lhmPo34HZgos/nL1x5Q6NwrMiLfP4rSG/R150HrmMRrB1QbQECkn6uzqn3gbc1noirsXFlf6okF5mt/4ywXQV/FoteBC2kkJq70AST9NEjnXF3888xT+hOh1GdC8XBvuBPWDtVL5ZMspvQRGFlGngdfwXXuuNjnEJXCWaEB5GRTHI2NKfI/fnhk83kCtZqojKCZTBBLjF3HcTpXd90JsiXt0jHdYkezp0cvM8x11gVwcazQKqqjqoqJZaqf94xMxSW+79fE3sW/WCKDPm+pJYpGFx3owgUkSqyEv6nR+mZAl5jh5pQmKkwZYao1R6e8GA4JJqyJlPjv3HoZtu5KwCZWN9ulxpXEplumwQ7Ixhs5OuOa7I8kADuMe0waWLEkP3OGOtbIv4ifBrquoOdbLwRLC30JVZZI0bzlu8EpRcYqxopGdmwlKPqOl+6+hZV1PoO4ytuoi2uVimjxrK5CZhO9lMcR93zEQ4S/7kWCZf2w/JLhPU3tsAHWblH3waBCmcoqnkt3aNWYRw8KzFERy/4/qCgVjpR/0LKzAS5mbEzkzrA4Q3CBihH1xXSAqrNmTrt9tnNlLxwN8xe+6ZYSu0/BIpCVEubGgsOGGuwQ= 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)(39830400003)(366004)(396003)(376002)(346002)(4326008)(8676002)(66946007)(66556008)(66476007)(6486002)(6916009)(54906003)(508600001)(316002)(83380400001)(1076003)(6512007)(8936002)(5660300002)(2616005)(52116002)(44832011)(6666004)(2906002)(86362001)(6506007)(26005)(186003)(38350700002)(38100700002)(36756003)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?G4gQFyDnb15HCEaw1F2hYY+VyPcpxqBZQVs9pfWmV3qp8ZAC8udRAJK28A/+?= =?us-ascii?Q?OKMYelwuExi50wrjNJFwNwUoV0TAjCMpoG6p98Blx3CveogutTlD3d447SFj?= =?us-ascii?Q?XyZ49Ku/bqb4z3hHqErMhiO3ihi7G/6ZMEYC+UEgRr4l1dNeCpmO4OxOkXH0?= =?us-ascii?Q?9rgIeJvMF2Dw2ZIPZa0l3gAd6uz2S6lxrdLuZzI43UVIXrn/mU/lGgiAKKJF?= =?us-ascii?Q?OuYAgMwDGtxOt/adRe3hF7Se185C7G+F139gMZ3n23qJikFTOcXPSzaf95B1?= =?us-ascii?Q?AjSqddicZoyMjoCVmeMrNYj2r6lDnzHJpnHbXf0d8iAwLJcF8JdmORBKwYnl?= =?us-ascii?Q?d0xEa+J94wqp/vzaxOLBGeOySp7Rxqi7rGTV14VkhzbYm4UZ7AYDoSMx4dKD?= =?us-ascii?Q?KKs7G5kKq1nsxwej9rJG0R59l61YWokXnOiYCTsnAvzcfuJM/41i03ji30dq?= =?us-ascii?Q?jU0t7ZCutC+kb1OArrRWeLv0/5RZ5IMht2AbLK36oUvOClBDXIV+4G08DvN2?= =?us-ascii?Q?PiK5dtFCTpoqJyDmjO3qP5O1nj1JN593vXU1gkrvIdI9208GxM7V/EiUr9iR?= =?us-ascii?Q?yLFKBGm8S5ApOU2akel2+vcc1pcBb0yNVTOObgqSfRqZY3rV2DeEYN/+CkSZ?= =?us-ascii?Q?YtQ5ouqAmowYvcPbQbKMJkw09NV69irzyE5nAm8jPCgtE+1IHsYD5lGkbcyI?= =?us-ascii?Q?tkYAbEDiYzK50tjYBzuArobMVoZxy8hhN7CG+n+W1+E8FR20Z9pTm3BroGKC?= =?us-ascii?Q?heUBWrd/Q5Id4G17RnpSzfG2T2Al3UXPULyHLNdhWQdAL2WOxAMjnomWoHCj?= =?us-ascii?Q?AKq/smvO6sn2HfUWumEiQjo9Fy4o5bkKCaERvkwF4ZWGsEpHw6dhlTWk8wAR?= =?us-ascii?Q?iMNKEMyKJyWHfLAbOOa/1BXhZADFV6yCTdUOabc4lzCdaKdVN0nyqg/2mOUJ?= =?us-ascii?Q?QP4f00HZLIt605MPFIi1EP+nF+CcszxMVsTbThYBa+IE1DUruXY4+ee0YpRr?= =?us-ascii?Q?pMrXq8VXhxgsAKngXFkRwmAzglCf+xsdLMM0/IsfjiIGrPJdAWukolAs5o0n?= =?us-ascii?Q?3BJToFgMME1Mq6Bixsp0/XLrjrKTe6u8Nk5p72ikQysPabVxthbbF/bKTffa?= =?us-ascii?Q?T2rvE94u4v3wzSJuoH7MN1cqLjLKOf5wk5Z0Fk2rnQINB0tDKJ3BR9GL/Vy3?= =?us-ascii?Q?PbGePLFrgjyn0pnWHMuCVrQlyxZ9x/wHbRUylvYUOaDtJBkMs1SHYwESBDP/?= =?us-ascii?Q?NK0WG28m2ZpbVn+TjNwUzhJj4cw42n4P05B5Z+DGiQnH5OJ3hXfO5mkm8vsm?= =?us-ascii?Q?AmLSW5fTd6AbejP6zHfXx9jh3FD8vp8gi4gg/TNYAs7S5Psjfaf9o2LTo94z?= =?us-ascii?Q?eNlCJKIcjRZOjKiiGeo9PBmEblrOhtlpOAKcUvfb5oZnpmIAVpvK5fFumZmx?= =?us-ascii?Q?PIEbPdurRlFG4QfWrE6nwto+s2iakNIPcOTmULT9K0q0018Y0dwZDilbukpV?= =?us-ascii?Q?qAkmZowO57FzSYLx44S83evu6IcR3Guq6TKB+phG1MZofgXl/Q/CZRW+BEWG?= =?us-ascii?Q?y1SczusPPF6LLfBkigIe6Kzvv+ERd2Mxi4h2PFt3Eq03uC1klVioEAhqlMZS?= =?us-ascii?Q?M8j/8JmwG4UZ4emgGoxltPwrQEZBUP6d2PUf3AAjP0djuLJuQLBjN5Z/9zna?= =?us-ascii?Q?q289dw=3D=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65196ddf-3313-436c-15f9-08d9f5190236 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2022 09:03:21.3640 (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: iPkAHLPfXBpyTKXW3pNwwxdOHpNvBZ/Pnwm7kBs10jKMJrAxxZC2Wcx/KPJq4+owFLz/fAD+sy/7xV7YZSIK0AHkg1SA88qmuw/59dQOAVA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0902MB2161 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 Reviewed-by: Simon Glass --- Changes for v2 - added imx8qm-u-boot.dtsi here to - rebased on master arch/arm/dts/imx8qm-cgtqmx8.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 133 ++++++++++++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + board/congatec/cgtqmx8/imximage.cfg | 4 +- configs/cgtqmx8_defconfig | 2 +- doc/board/congatec/cgtqmx8.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-cgtqmx8.dts b/arch/arm/dts/imx8qm-cgtqmx8.dts index 555c357f6f..919d00644f 100644 --- a/arch/arm/dts/imx8qm-cgtqmx8.dts +++ b/arch/arm/dts/imx8qm-cgtqmx8.dts @@ -12,6 +12,7 @@ /memreserve/ 0x80000000 0x00020000; #include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi" / { model = "Congatec QMX8 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..2646985cd0 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -75,6 +75,7 @@ config TARGET_IMX8QM_MEK config TARGET_CONGA_QMX8 bool "Support congatec conga-QMX8 board" + select BINMAN select BOARD_LATE_INIT select SUPPORT_SPL select IMX8QM diff --git a/board/congatec/cgtqmx8/imximage.cfg b/board/congatec/cgtqmx8/imximage.cfg index 5ecde0c530..43035088e3 100644 --- a/board/congatec/cgtqmx8/imximage.cfg +++ b/board/congatec/cgtqmx8/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/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig index 54b2d20c61..d02cc1b345 100644 --- a/configs/cgtqmx8_defconfig +++ b/configs/cgtqmx8_defconfig @@ -21,7 +21,7 @@ CONFIG_REMAKE_ELF=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_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y diff --git a/doc/board/congatec/cgtqmx8.rst b/doc/board/congatec/cgtqmx8.rst index bccdef2f16..16711a844d 100644 --- a/doc/board/congatec/cgtqmx8.rst +++ b/doc/board/congatec/cgtqmx8.rst @@ -57,8 +57,7 @@ Build U-Boot $ export ATF_LOAD_ADDR=0x80000000 $ export BL33_LOAD_ADDR=0x80020000 $ make cgtqmx8_defconfig - $ make u-boot.bin - $ make flash.bin + $ make Flash the binary into the SD card --------------------------------- -- 2.17.1