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 A9419C433F5 for ; Mon, 10 Jan 2022 10:32:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AB900803CE; Mon, 10 Jan 2022 11:32:25 +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="j1LLPWeS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C22B781E06; Mon, 10 Jan 2022 11:32:23 +0100 (CET) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::612]) (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 70D0A801B2 for ; Mon, 10 Jan 2022 11:32:20 +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=mnDWM46qkrorLe/xridH9YINZssbtc9a1PUuWvxYqI3pzJOYEE3wA8xhD3l23hjgSPSVnwOLoU8Fn+HKfs+X2T8PNe4cp2tlt3xlUJ/l9KNLg0U3C62ahrAhYLX9Q5/EFxFc5vSmo34qtdt37U6v/kaO6asp7KMZf1sTmGax0OUbo2bcfE2xJy9CQKZlRBhpyuzOaRxpU9XXtrxD/eai08qTNUVUE6Bq5sxWXV+1/hqdxqoo+4qBbv7+CAtWI6joazGV1zlDX5zZfBf9ZI1yC4FIfk6pRmb40g5GP09Tr3H032aoSzHR4ziTRremES/3rWNlTjb5sGShozD8InUZFA== 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=0d4t0P55OkHH7RImwA3gojwrd0jdQ1wrayNwJjwi4Iw=; b=OxorswZIYG5ZWAW9ag4Z74GOZ1RnsWAvF7xkgPgzjDhXb4RBT5aC5aTnxbkvGIAB8G+7JQLLrkxYTTJzBEkDVVOiweue90JH1MKIz1cj2SdMfl1TR5zAG8iZBHTDH5P1pKbv+cOWGUsVZ5mBCMAhS9h7Qjz2VxlUuQkrxbPEmuSWuUqOlgmcK8gKJ8R4K7dMk9W7i3Md1MAuSmDt2PeQ0hdp+VH3AOJticRq/t8im8TT/3JkooXT5oBX1hQL6LjoJq2VOJalmNilz4DXbFMBYs+wUhyliOi9nCBgbBMQT/HFEJrln2m5Vfk/OFe5rB7V5cJXETJlNK5O8WyopxEXyg== 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=0d4t0P55OkHH7RImwA3gojwrd0jdQ1wrayNwJjwi4Iw=; b=j1LLPWeSsMvRFH6gtu1Eutu6EjEpHE8VsYhDhpb/3hoDLLayKSq8DLWkEriXf84K9wKzwxUUV55x0gix4nQjRTAArs9c+L9SYKgx17ot6oDRE7SHDK8bKvXIENH+y81vDiN9NS0dQTTkqzEeldHrsSowSRtDxKvEU+jzeGpeRvY= 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 AM9PR09MB4674.eurprd09.prod.outlook.com (2603:10a6:20b:2de::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 10:32:19 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::34fd:921d:b6fe:bd47]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::34fd:921d:b6fe:bd47%8]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 10:32:19 +0000 From: Oliver Graute To: Oliver Graute , Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" Cc: aford173@gmail.com, peng.fan@nxp.com, marcel.ziswiler@toradex.com, tharvey@gateworks.com, andrey.zhizhikin@leica-geosystems.com, u-boot@lists.denx.de Subject: [RFC] imx: imx8qm-rom7720: switch to binman Date: Mon, 10 Jan 2022 11:30:32 +0100 Message-Id: <20220110103033.29958-1-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: AM4PR0302CA0036.eurprd03.prod.outlook.com (2603:10a6:205:2::49) 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: 6d7bb7e9-d61b-4174-e631-08d9d4247a70 X-MS-TrafficTypeDiagnostic: AM9PR09MB4674:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2150; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XM7YNK7hzTj+1PIg2fA5ZTcL7dpfBofq/I9U/cdI/qkKbE8qX1sNDPv5/nxe6d/dcrDPr36J5e3mxSnH9BxHcaLQvC3onxOgDz+OByNYnLhsaaWL5VVRXoGG99L3plPaw6ILkA4sndScylj+jIcQVsrGtzdrgTCn7EHuCvykXzER2KQ6AswUVIxmSOabRQ74QHsdtRuAch77T4hu8ZWGMXSIIsr+hLW5pb4JqDO/2GakSof1AeHhM6cnaEh2k2jEDgwZH+e3MkMx5SALsyMJIuswKX6lvmQ28JjiLK1CYFgpiii95KxNNS9ezXtGpSzYjqbbHJrOT1Ca6jGxCpv2x4fBcABiTyLyYjqdxmswaBQgrXMezArJN5m0DkhyFjohFYVHBC8kppfFV+Lb2QjvzkOPfPbMhKALPqj9/YU20AFU8Ih/zAoXyh/Apu+Pt+HxNORVy6UNXV7kV5c3ReWLcMiNHZcptpBvNCS2mwfGcs+BB6RMEP+8gfmdV/Ocsb4fkb6ntClOxKb1gHeQdNQYlw9hyFl2JyRWThBe59FE+THgmw4+EIhmcN191c9tK9NAgTGGXsA4rBwr6r/NPURnbjpygNUyXiuIlyWrsmVEYWSgoyoSW6e7XNvs1X1scEUIzrZmsAUqkqoJcP4igbXGTPrVHj1z8muiWK/WvPe+d62oW424GB670smQtx47xT+AWDTqvEpzzpbx3FaDWlbguNUAdgVwAaHb9PwvEtpBb5s= 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:(366004)(66476007)(66556008)(6666004)(110136005)(4326008)(26005)(66946007)(2616005)(86362001)(186003)(6486002)(316002)(8936002)(6512007)(1076003)(38350700002)(508600001)(8676002)(83380400001)(36756003)(38100700002)(52116002)(44832011)(5660300002)(6506007)(2906002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pNQLonrxTASUwx7c2Y4oVKdqqcG+m2euyFxIRei8ivrMtR+9kIIL30YjRtu3?= =?us-ascii?Q?iIbbLSeJqzy9WoN59wXaVw93K1ZaMX71yISFuRPmLUYWWpt6MZI+Fxp+3vLK?= =?us-ascii?Q?7yaD8/0uq/JGqomA+UBGPBtDqhaslSlMbcOvorNZ0yYdC9zC5SHcCJ7u8fUt?= =?us-ascii?Q?Zlwz6xmLaOOYm70xqDc2IGJAbvrTohYBF4Y0MW73Hj4WMeLJTzEKSM5omXKK?= =?us-ascii?Q?hnB0DLoJtxi7SrFVdl2Khkb7MnfVtnFW9MO/7J3RQG5Tu16rJVXc5MI7v8lw?= =?us-ascii?Q?0O2PLme3vgnQ0N5Jab4wWsgTaGHPC+Rx4y1bLivwnH7yw2h6pcQYi1AA+dar?= =?us-ascii?Q?51ATJhQm/ndxwmeXTEUNBTx5vYrifNC84Lp0xAvPXYPFpMQxR2ChCFvu1XWk?= =?us-ascii?Q?zpII9xL4EUPdY56HfCtMLYxXnbYmOXXjx43L4RlNpanilkpHx71CZkkUc/KK?= =?us-ascii?Q?WUGtmwBrNbqPXYp88fVokQ3RoERZU1CR+FHgt8+4EDPeqbqG9Ws5Uidq9IBu?= =?us-ascii?Q?eAA15lkzOyY1mYovPhbZqWMIjNnawAwLoMHmjrmEsh9ODdsw7LuqfcBv1S2u?= =?us-ascii?Q?9aaegSivdwJyFr3PAPqNE7Q3TKlHmQsQ2Jzh2/kYI90Q5tbtqTfUXXdeB/O8?= =?us-ascii?Q?+4Xn2iglscuL5YdP+A06EzOscOyJBjZQwEQnTwTS8hCScknj43wRmjgS9ecn?= =?us-ascii?Q?sOFaoM8Mtd+f60slvnIoBS/gHfIg7+eZZjpMNfCLR4ttoidEgHEsEHBEZoD0?= =?us-ascii?Q?L9HaqXU4fX//pKoee+Qn3hZzmRAq/29xeIYESssSE6kvr+8D8Z80HiXcng3K?= =?us-ascii?Q?fVA9BiELA7fN5KKu8CCjLevc8xODMxL9VnxJHEoygDarxFZDCKMAHMiZPqBR?= =?us-ascii?Q?0uSvASmvZC6/C8qNpoSyT7BObRH8SgvqRrx3vgM4UbcCitGxJYbvPKc+tJr6?= =?us-ascii?Q?3krz0a66caZKh7w+VoauVpOJx1NQYwv8yZI5CgaNWO5vuBwIeur6DsXfcWM+?= =?us-ascii?Q?l/uvniDgarM7K6pf7syEQyrEJSwIgZfl3eNF50nCHreuIaDSnqDUZ7gBikIO?= =?us-ascii?Q?g1az29HSgCOF0t9jym+hSeOqmJGlaY3zJpQTgG5zoguOrR58h9Ef+Uslg/RC?= =?us-ascii?Q?ALEFagVadw8wa9FM4W0SnenpZ3iwNypyJVl4CiYvXs/5FKyIvRWzRmJ3+cvn?= =?us-ascii?Q?nulE8Fpm+U8bT/0vXMifD93hKXC7IFjXkpGLWtl6jrV7Z3v0BLNUl6NffAdw?= =?us-ascii?Q?l4kQe1LzaFT7awmB8BGm+rM3NcXrpOylQO1QFYiLQVmIbK4BJWHaPF+TWWUg?= =?us-ascii?Q?5j6XbwclvWdjNpEhH4HcNyt0pjVftGf35lGGh7sFR8ZtBZs8D/h9Uatkh3Qy?= =?us-ascii?Q?b6FYnQ4RX2ET66zfbC0NwJ35TZ4yw5U22RtwsYdY9b3+ZYZXlH5UWpwaGdqh?= =?us-ascii?Q?aA0skj1n2XPw8ewveTiFI0wSRF3VztXLZpuu3UjkhkH1NafbniwfB+0xpUoi?= =?us-ascii?Q?TNq1OH5vMdPoGG49AUh0sTUZTiauDRAp22Ju5tX/d8f/VGn7W5RlRWMhv/7f?= =?us-ascii?Q?p0wTl4GPc3pDRmaZKk3fIzwMaBE5L3XcjHbs+T+xELvzU3OLkxeUzLAnKWwP?= =?us-ascii?Q?CtoAEITliI5L2ScCepgK3RL0vlJzAAh6QzZPsCCQEHLGxTPbQo2tqdO4qDI8?= =?us-ascii?Q?6+KPrA=3D=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d7bb7e9-d61b-4174-e631-08d9d4247a70 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 10:32:19.0890 (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: V2vWv+rRmRDUZHi2LAW4TnmFxmS4DRSZt6zlxmxSlBQrJ1VggowisyQvxHv/psoDalHkrboW+jLwMZXNvPk/UzE0CudGv6ftB8dqIw3uGXs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR09MB4674 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.2 at phobos.denx.de X-Virus-Status: Clean Switch to use binman to pack images --- Run into this issue on the first try to get binman working: make[1]: Nothing to be done for 'SPL'. BINMAN flash.bin MKIMAGE flash.bin Error: spl/u-boot-spl.cfgout[16] - Invalid command (LOADER) arch/arm/mach-imx/Makefile:190: recipe for target 'flash.bin' failed make[1]: *** [flash.bin] Error 1 make[1]: *** Deleting file 'flash.bin' Makefile:1519: recipe for target 'flash.bin' failed make: *** [flash.bin] Error 2 Some clue howto fix that? arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 95 +++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 16 +--- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +- 5 files changed, 100 insertions(+), 15 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..77e5cd6989 --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021 NXP + */ + +/ { + binman: binman { + multiple-images; + }; + +}; + +&binman { + u-boot-nodtb { + filename = "u-boot-nodtb.bin"; + pad-byte = <0xff>; + align-size = <4>; + align = <4>; + + u-boot-spl { + align-end = <4>; + }; + + }; + + flash { + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x100000"; + + blob { + filename = "u-boot-nodtb.bin"; + }; + + }; + + }; + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,external-offset = ; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = ; + + uboot_blob: blob-ext { + filename = "u-boot-nodtb.bin"; + }; + }; + + atf { + description = "ARM Trusted Firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <0x80000000>; + entry = <0x80000000>; + + atf_blob: blob-ext { + filename = "bl31.bin"; + }; + }; + + fdt { + description = "imx8qm-rom7720-a1"; + type = "flat_dt"; + compression = "none"; + + uboot_fdt_blob: blob-ext { + filename = "u-boot.dtb"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + description = "imx8qm-rom7720-a1"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt"; + }; + }; + }; + }; +}; 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..30556ff9d7 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -5,17 +5,5 @@ #define __ASSEMBLY__ -/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 -/* SoC type IMX8QM */ -SOC_TYPE IMX8QM -/* Append seco container image */ -APPEND mx8qm-ahab-container.img -/* Create the 2nd container */ -CONTAINER -/* Add scfw image with exec attribute */ -IMAGE SCU mx8qm-val-scfw-tcm.bin -/* Add ATF image with exec attribute */ -IMAGE A35 bl31.bin 0x80000000 -/* Add U-Boot image with load attribute */ -DATA A35 u-boot-dtb.bin 0x80020000 +BOOT_FROM sd +LOADER u-boot-dtb.bin 0x10000 diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index fb43fa1962..07ea6e191d 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_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_LOG=y CONFIG_BOARD_EARLY_INIT_F=y -- 2.17.1