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 11A6DC433EF for ; Wed, 12 Jan 2022 09:15:22 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9BB1C830EB; Wed, 12 Jan 2022 10:15:20 +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="aYOEWWy0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DB2CA80882; Wed, 12 Jan 2022 10:15:18 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::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 7164D830EB for ; Wed, 12 Jan 2022 10:15:14 +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=ZSbM89TTta+KrzR4V0LAtilalSYUzjXGxsrsLLgIfAN2LppqMzZL6DxyLGAsTbd2slREoLTI4voNjdR6zqhoE6cBkc49iZaTS9PgEfoGcfym/BwrpQINFHwIMGRyjuLDOsav2zrZCf4hqAVcqSejiaXr3ilLI0tZiN4rLfSd1+SMf3GSeJBJCvwnu9BRATTwWn8wWbZnCJ3yVqU+LZ0hy3YHbsuO+flwPJF8eQy/nzRaEPBSL+IZ29MD+7lgbuWMx4faM86kKMLN1HqWhEB+pEGpqQTkAyNBqrWM/7GoS0UlQnB4ZFY93t8i6RwgYIQWvFQyHIlHzJWWygaAYiKOmQ== 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=BSSZTDC02SO34KAauDvr6Q0Xwo6JRXjgeW+nPcsv8Dw=; b=mabRELKzcTiWAyMOTYE3NZjDhAVVrwkpgWpElv98jQR98MLh8hoCiHvvT0vZxfJC4Kd6wB0BoIzcsmhcYUW4DcEQ5Jpw8LM548USglxxnp8OyROiHXODL8LI6QQhwX/yrWvDcQSSVwp8VbNGbM//3rOOKgCjdVB/xxlPehSMHEg/Gz3P9l8Uz8WfOHheqolL3754mg5DwYnSrul4qnTxh7p68u0D5sQ/PoHvjL3OdHdltn3+KeZZR9Q1ofFdpXMiVIjosN9y12tqFV3rqGFATjL/vnwIfNbtspIf/rX8OXxaCHSyMxVnM6klTryUj33DKjdJDsmIuvZE6LQxGsHrdQ== 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=BSSZTDC02SO34KAauDvr6Q0Xwo6JRXjgeW+nPcsv8Dw=; b=aYOEWWy0i7r0uUMgEShUwOZEl98vyb7M2ZqwanUYWaCA1GhWpq9aQ+ygcV5TUBhox3vWXj4Kp+bVxjAJ3SEwFQJXaBHqW2vwyLqpq/5b/XLqeo5ZjRzlh/1LsLyRgjPr0fVOcHXy6a/r4C0Z16DLiDJnQiFscgwTNVBsCtEBhEg= 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 AM6PR09MB2519.eurprd09.prod.outlook.com (2603:10a6:20b:47::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Wed, 12 Jan 2022 09:15:12 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::34fd:921d:b6fe:bd47]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::34fd:921d:b6fe:bd47%7]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 09:15:12 +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: Wed, 12 Jan 2022 10:13:24 +0100 Message-Id: <20220112091325.12341-1-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110103033.29958-1-oliver.graute@kococonnector.com> References: <20220110103033.29958-1-oliver.graute@kococonnector.com> Content-Type: text/plain X-ClientProxiedBy: AM8P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::23) 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: ee566fb2-3395-43db-7d62-08d9d5ac0964 X-MS-TrafficTypeDiagnostic: AM6PR09MB2519:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1417; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: METbBHuhhmLJ5/eOkpVsLBff11fC767TbfkVR1+2IOu3zVaqUBFZdY+7BJ9RebxTZV/KEsSOGURSAQyIJKUhFt2H2gvCDe6chse/5HjtqNLLsCt4orH8ja4qA2SKD/KM+e/MFO7TbL3WXczcay/m6tdBKct5kXkzLJ3bOlKU00Ug7XDY31jn5Bk7wDleWoCtkYm1nH2WgVG+qisB0i7LF98X/pxiBVtwGINRyc2613B9Y6CI407Vw2DQ4CfqpmmIETKvQnX3zLFpHF70mWQT5WBHmNpJvUKL3KFiILIEudEuWTWl8W3A6a+8SOqgGUkHYKKsZg+LuGOd9CJB1d4zN7qYQJveucnhYW6NkC8XIUZzPWeHWnXEvoIjq8C35p/ciyta0eFVFjGZw6e22iETqSIivOIAdv68cHV0hKSUt9eaOWPV7da41QxwEDVTf345qOJHAQz5jF/6Tym0lmWUfoonm9X8AZWjfLKKFHMgRhRwXvyIAvyelasHCSQDFRy8x74xxPnehWAzE/TEkj5nJXshU8qP4/gtwZsS330/Qfq8hFk/0pNh/LujmkeXpB++hwm+d3scdZPq1InNq2dU/9xrKpZYZWRZGZ0/w0r65KORyJGWNCHg/xjtZmoHfY7F8waCGhs3XtUX6+0xw3rNQVqfXJG+/7szKpJWPGZbW/jARpLVU6NoeylqvelZu+IBajkKm7XHtLTX/VAnhBulWVKyQeVoU0OHsm9Pf6noMS4= 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)(2906002)(66556008)(83380400001)(66946007)(8936002)(66476007)(6486002)(36756003)(86362001)(508600001)(8676002)(44832011)(110136005)(186003)(316002)(38350700002)(6666004)(38100700002)(2616005)(6506007)(5660300002)(1076003)(4326008)(6512007)(26005)(52116002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eT8wz3Xy75QvlbiM123kVBinuovKbbFk/SPw7FAmy3AAey1IyH+UmNLBHSry?= =?us-ascii?Q?fC7x4s3UH8s70YB4RJkPAM9GuF5bUHEDWz7JSp+XN+rgU2gdsuJpYyBDoX60?= =?us-ascii?Q?eRF5OZpwS1Ix8GQ73+WGjJR1LiQsykhbrx9zGSeCsrTEJzUJnlBo7pHWBa0Y?= =?us-ascii?Q?b6L/jp68srITsdFEnRMFAhPeXLcVZWfMZePgbFAAnVM2kGIj09U2g31v6JSy?= =?us-ascii?Q?UhlRZL6DfArz2RHbRs6H7FPeL4rexqUCVpw2lqBDz4s0hBOFSknDGw74zYnI?= =?us-ascii?Q?cwmMSVkHn+ZJ51eECtLFxAT9XqzS+5Cbqz0wdKc4dKkx7b5IOxiQt8RFOhiH?= =?us-ascii?Q?8wX8bsI8IHhMW3T9SU+9ivdqkwzvcr3iwxyulbFsLd6LuKXEoFf+Tc9+lpoi?= =?us-ascii?Q?XWshkatEud8/bhfPg5whs2SLNc+dK2pV9EGwqjPy0z4fkOIpQ/xshB+wz/pz?= =?us-ascii?Q?1Wfb5VWyQRwQiCbDLnDjD30BHDZlVPpaQ4t7G89YQJX7TEucBGmLdYrYYjYh?= =?us-ascii?Q?hjqJevgU25TawY9HHWAs1z8YK/6uWObmpGRX5uPKVLptByR5VmB5IXmzJ5Y5?= =?us-ascii?Q?JhyBGs8kXZY2fJ2dgipb1xaK9Qu4NSc69AhaE89Mwe4n0u34P8SrvS6qKLgA?= =?us-ascii?Q?JsUkzMUvsl1lJIbBxE1UEpm0BP8L+8GIVNhkrr1OKMEb7mvj5dC/+icnp11B?= =?us-ascii?Q?FVbzb/bEGegQYLDnNj/jE0KSqS4ngoSbel7GpVEA3D1Nqr0Ucq5ir5XoD4Bj?= =?us-ascii?Q?7p9HapkswG3dcVshaeWard8zv/3wwy1wLMjKFVWLwJqoK8eNUvqoHj1Ws2tK?= =?us-ascii?Q?+kmUDI4kFVdociXWpjZnlo73JXRMgPa4SLISOhNgaPZ4WZXHIY1tfpSxlExy?= =?us-ascii?Q?kvTrONON6dhMwI6dlPIhQiDxlKkhWiCPJECoPWoooLYxz1ckwK6SBBrfrDuN?= =?us-ascii?Q?k5glqy9zHGsUgq1PrqjafudRBgD81BApsmdPaixGBtbKSn77FM1IcrZOW/L/?= =?us-ascii?Q?5JfTK5o5xwVveAajgY7E7o7MhQyahoJLsttZ26P5QEGJRiLX1/t7oYB71IN1?= =?us-ascii?Q?3+vb13Icd5alAtdIwB1WSXY8EM//wks/X6bYoMNx3j1Tcm+nwxYBMUoCAJSZ?= =?us-ascii?Q?RIZTZSktXzx7r5S5VbQadeCH93tI6Wbwa5yIDKGrbdPj/GwWAMwiLoAse/9Q?= =?us-ascii?Q?9MyuY3NzjknvUJwhjScNuo2L3kK00qI8Z4s2KcgdkBIHCjFQmu4F/tIcHfMO?= =?us-ascii?Q?nLGggAglc7OGvarTUluRLUYIIuzi64BuOgGOyKb9TuRIgEp1q2RoCm3IIkxX?= =?us-ascii?Q?P3aOJ9rXHYta9uz1xnaxDS3C90OVXieYCXLw5Zn4txk/HzRcahfupOsTL4qg?= =?us-ascii?Q?lH+6I81jbayIHjCuA1epoctVxx8OjPO8ZxeGpvAJ0fXJDxZ5DwWj2sdgXW3u?= =?us-ascii?Q?pP0IV2Dqd2KI2DuGxqhZkeXriFkiuCYIsq5yPdl4SY8ngBQtuBz1gQpUm+eO?= =?us-ascii?Q?BL1MJFVcP+BlHdoxZX4B7PSk6fHQ+HBJJPsm4zAJs10ZV0IGHrdNtBZE6zSq?= =?us-ascii?Q?adOlA4J+u7Gnsi0Zds4Cc2Sq6SIbHcEZSAoTb0NPeUhzRDw9S0btN0UhoWAs?= =?us-ascii?Q?LYk+dCV81zN9NLemZX+VCqXcooLIba5K63wV5wJSueDczYBEA8nd4Z+Va2aD?= =?us-ascii?Q?udPPVw=3D=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee566fb2-3395-43db-7d62-08d9d5ac0964 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 09:15:12.1744 (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: NPdX/NXhhHMI3aIfPXjVnnKaugFOPVbnWMKLC6y+l2hd6/sw0csfJPykN44GVMI2xxd1FiyxrZwdWeDzkUFGi/4ktD0ep798V67aSswOrVA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR09MB2519 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 Signed-off-by: Oliver Graute --- A flash.bin is now generated by binman but its now bigger then with mkimage_fit_atf.sh 800K vs. 1.1M and is currently NOT booting. So something is still messed up. arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 136 ++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 16 +-- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +- doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +- 6 files changed, 142 insertions(+), 17 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..98379516cc --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021 NXP + */ + +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot { + align-size = <4>; + align = <4>; + filename = "u-boot.bin"; + pad-byte = <0xff>; + + u-boot-spl { + align-end = <4>; + }; + }; + + spl { + filename = "spl.bin"; + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x100000"; + + blob { + filename = "u-boot.bin"; + }; + }; + }; + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,external-offset = ; + + 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"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl { + filename = "spl.bin"; + offset = <0x0>; + type = "blob-ext"; + }; + + binman_uboot: uboot { + filename = "u-boot.itb"; + offset = <0x6e400>; + 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..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..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 --------------------------------- -- 2.17.1