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 38DE4C433FE for ; Fri, 4 Nov 2022 15:20:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5773185269; Fri, 4 Nov 2022 16:19:54 +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="Y2QcoLKY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6EEDF85267; Fri, 4 Nov 2022 16:19:51 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130055.outbound.protection.outlook.com [40.107.13.55]) (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 3B5C98524E for ; Fri, 4 Nov 2022 16:19:47 +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=XqYBeV0Rcq4jQhHlXrT92Gu7YuaA9txUw4ljezNgHODOGNLtJoJ8XGR8k77MuvSize1MIdOWyMYQ5PyRhYiqot/33TPF8pT4IsLgUHW5O/1RqeM/RHK3hFHLDXop0wCjgV8yd1MDvZRwrDyZqRtBn4tmBVhBlu3WooaAzXYG4x94zf2yz3XW/bGMU5jcwysFa24PSkAqWX0DkplK09uNFjDiP956HYKla+VA7uxLEhDyWHHreaVVEsdGL8tT8MBOjlbltYNlY+qQY9+ofGtNB66UP2FxZJCyEqWK+M5hO0q9T2Z+b9+AJo6C31ASd1UIHGnxJIPHjmfH1ajK5qD65A== 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=th32h+Smq163JovtsyXTZkHfu/avdOl18xZF1m/NKgg=; b=D2/X2kQ5zyrn81W9G5jcrHABV1beeqhRd5gcBFl9eupElJy7Ur5UZRcD2wsuj4VLfVloyE4S7rwnZQUDM684XqZGPsvlfrWa99ij4d6shyYuL5T0WzyDgvxHGErWzc7+eoNWfzgkJxmEUYliDwQ1xuq+SP8zI6SNyMyISW6CTE6EMPlRVpcSNNyv/1FKVOxr9syLsdew2etIl85x3AfE8JzEQy+nHMcEmCdMLwtCEdJTt95N96kA29Yr37r+o5+C+Qd2gmqW/hBIULIEwX+fQOf/AavptpyFJhWATpX5WkkoJatfNnUsLFT43ktToTX3JyM+xXA+CniAVBNlr6ES5Q== 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=th32h+Smq163JovtsyXTZkHfu/avdOl18xZF1m/NKgg=; b=Y2QcoLKYOaOWTmxPN6T5Yy2AQfhrXZKSod6b+pZuBHS+1bkZVI6Qps6dD/Os1g3eEtPJC/KQVZRewPzaRBI3OyRf+9aajPqPRRNRQ/HxRiLgCqDssMocghJ2COIWpGbuPOAhFiqso5AHH2hH7KWalcjD45zzVsAyFoqRPA8vFsU= 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:46 +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:46 +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, Denys Drozdov , Ye Li , Marcel Ziswiler , =?UTF-8?q?Horia=20Geant=C4=83?= , Gaurav Jain , u-boot@lists.denx.de Subject: [PATCH v2 3/8] imx: imx8qxp: imx8qxp_mek switch to binman Date: Fri, 4 Nov 2022 16:03:39 +0100 Message-Id: <20221104150345.23853-4-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: FR2P281CA0012.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::22) 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: 71de9229-f71c-4f7a-ec92-08dabe7801ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZJ1DSSvbasrloGSLfrMPH+x5fK45yLbQVI40fdAFLf8ZMsv9XTaQvbsoqaM+nOr7M+G+n+DMDgepKXtW6hFGgj5VLbR/fhfVkpyE6bK5eAbHNDmhBBEWx5u6kWlanzfnCGbLKXDscOJyF16o+wj3dfftwuD7q8Ewtgf0k6pw8V/fJr6Shp0gjB64CyrrFz9Mt5EeZH+3bOh/wYhXiQITMfFAlnHKO+eCf5Sclfnqltxj+nGgN+qwd1Cum3xdP4tYhwiIVEdeXMmb07DF0UyQcrf0i/uW8N8EXDhBF6K9VjZU4Fq3ptLr3sadmSIPRy9VKzjMCCCUGN9idpOmWCfIwB88FN0Y2kLPBXx9x+lhpcODxiIVonkMr2jtJuXrJI/nxVejo0qA0Eqas0ncq8O42LkoLJo87jhqABxJm0EJsvclP950WBNgbOxYtD98gUjuk7DXqs27SKoQ1e8gYNnduPGmyVGgaXMzDjdIot8WNR64UJmn5/ydFvfzs+IdL5v5d0fWNfxwZ5R4GyZMWK3EpV4rfIJaIVJDDwMClH7k8d33djJCqDwdL6gGnPhPom0zvG9j4chMxJC3RwYMwoANWtSJ9Plpx7qnBpzb4hNnfT8RrVIPvSki3VFX8LuZaiA1QNDP+yY52gy6E5qcKwcLpZ/RdpX9tl7vzvGqM9oGsx2xqoH7PnsxE7BR1kbbKLvo2Jm0BtowXpKX0Y8MpkVHwTZ2kI5lYRKDFrCWK/CQuNjDZ5RVIAXQ0pn4UuTxpiK3aDiEMlHBEDt4Cyoqa8qLUAs8j8QSq1vNTOyTuPIgqjM= 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?KSS87E/yICJWtchc85nY5NfmkKUkoLwSBeI873O83KXqbVOBZ9OuXfydw2Un?= =?us-ascii?Q?VjnCHkTzya2oAIsHGISibwuOd5VqdiglVFDH693+LIJAS61LKiMERF4JZLqn?= =?us-ascii?Q?FTN2COSKjOZme2GMQ45YYx7JrzBCcuDXc/bRVpbUh3nVzjjC4TLCIeATROSn?= =?us-ascii?Q?vAYThAleuMc5Iw00OcJu+E2tLer5l51br5/8et/H9Aj8RzZUvRGJxI59PAZD?= =?us-ascii?Q?x/PGM7v4pgG6c7T6ijNvXozt/sR2NdWoWhnGP7gFGkyYyqueGTUcFmHVdgGk?= =?us-ascii?Q?afFJm6OGfjfS8z9V7Q6c+nxQzXULkGmGArgH+qUgXt9B/7xn47vbVksAFD9N?= =?us-ascii?Q?rF/tUtY+ulTg9azKkdnQMJX3uKex/E0+raKZ1OATnSED7aS1gf5ODd5MBrgw?= =?us-ascii?Q?3LxHMQdhDZfm+U3JhsiS01LhbXpVhQ+tdVRG4bhHYyBcJ1eksnnkaI66DwBi?= =?us-ascii?Q?UdWS8an18mkdcg+B5fzxoX49M+Zt4i/aJXFvpQv6DFsHnPkDjdFZt2ZUzd62?= =?us-ascii?Q?ypKVpjSfe2IOeZDhQg5xfIvV3th51wkE5ojvBS3n06wLAZW3Xa9zgZdc0iPL?= =?us-ascii?Q?MzND+mILPjcBE/tWw52177Pf5XhZ1y0G146Cb86/zMyQ7oDRZudH72XFEzZP?= =?us-ascii?Q?GPcqZ3hy2ExM8gyDzaNOZPuAX9QxRRWZ3FgydRMA0cwHU9NzYfooIxE9o47o?= =?us-ascii?Q?ygSsZQ9MiQYC1DKHXcCbQ88+ySgpm9DVh1LRIsy2J+c54DPIsCdIea15Xpi5?= =?us-ascii?Q?n0YsESmACgDNfGZMR8axc25xjkSPmOWJkolXVPxNpabjsreZokH8vzOQ81x5?= =?us-ascii?Q?2jn54rzbSLHcNHyALXh4Gd6WxcTjJBowov2pObbJnihUi/TmRCyiB7NoRROQ?= =?us-ascii?Q?bpo+2Qt7EyzOkHw5MvePaClHriSwyfPwHrMhiHgn9xIuzvUwlccfzDYPeiHd?= =?us-ascii?Q?40g+q8b/3/8SEWuHZVp9uMOqMXcP2bN91Gxq3Twed3hdYueZOtME0g+44NGN?= =?us-ascii?Q?sDgBP50Zui7KuuGwi93OQjm+g2v60Ykt0ZOmZbBpS5gZgnLoCps52s0DeL3Q?= =?us-ascii?Q?oKbNSEDt5PLyN4hk4DVW5sWyK1uXPmaOnh/h2u/izMl6Ld1AT40cfzvO7U7M?= =?us-ascii?Q?sDICc4tZfc1muC2dK/DG+GdBFXERLFxfX9Zi/DuXBPkcfkTiZ0LKzsLbQ3In?= =?us-ascii?Q?i+KKqcDRlWt3MGZv6ehO+v0az9PCUAH4Qk1rgVWf7xRD+daxUJOWYwTGpCez?= =?us-ascii?Q?ErLO+6Cvx1a62POjPwvUckh2c08RO/sI/7Pe4T49k6U4Jlfh2xiyhzFBPMBj?= =?us-ascii?Q?LwgUwSSmeG8hcClCtCWMIszEcG8hbGtpD4HR7+fr2VhknNGirFVrp1av7DFo?= =?us-ascii?Q?Um+84wj7qlYIQmXizKPhbOem7B7O3jesaAp7xVoao5Dj2q8RH+xWpOpK2yib?= =?us-ascii?Q?E+EoK1kucQN/k1LCtoKP47jL/2zr6JUAgb/TiDO3oiIvC8kXZFKXgPmy3kzr?= =?us-ascii?Q?fjNw5Q4wg4zEZ9dU83VTs9/1I5GJZxqqqCEyeGT4zj7PJ/mQC+QCAIfEmDb8?= =?us-ascii?Q?D8OpAmfALPoYCbIfJc25EDZAy6QfgKMLQP9SD84Xn16CIyK8NkRWHZoqhkyJ?= =?us-ascii?Q?XO0w1D5B5FxiCXifc/caOU4=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71de9229-f71c-4f7a-ec92-08dabe7801ba 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:46.1976 (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: U5N/nXgeWB2KOvm+QZOjQgAniS6y4ynnzOumyZa6xCCOPjtYZW0r5FZjwSMsMAClNggrPSPZBCtVFMUJhCeQ4eoia6L9QXHmUrsS4GNZrNM= 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 pack images Signed-off-by: Oliver Graute Reviewed-by: Peng Fan --- Changes v2: - use common imx8qxp-u-boot.dtsi arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 2 + arch/arm/dts/imx8qxp-u-boot.dtsi | 133 +++++++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + board/freescale/imx8qxp_mek/imximage.cfg | 3 +- configs/imx8qxp_mek_defconfig | 2 + doc/board/nxp/imx8qxp_mek.rst | 2 +- 6 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/imx8qxp-u-boot.dtsi diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi index ae037c7550..2218e3ea74 100644 --- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright 2018, 2021 NXP */ +#include "imx8qxp-u-boot.dtsi" + &{/imx8qx-pm} { u-boot,dm-spl; diff --git a/arch/arm/dts/imx8qxp-u-boot.dtsi b/arch/arm/dts/imx8qxp-u-boot.dtsi new file mode 100644 index 0000000000..01183f8ade --- /dev/null +++ b/arch/arm/dts/imx8qxp-u-boot.dtsi @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2018, 2021 NXP + */ + +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { +#ifdef CONFIG_SPL + 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"; + }; + }; + }; +#endif + + 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 = "mx8qx-mek-scfw-tcm.bin"; + type = "blob-ext"; + }; + }; + + seco { + arch = "arm64"; + compression = "none"; + description = "Seco Firmware"; + type = "firmware"; + + seco_blob { + filename = "mx8qxc0-ahab-container.img"; + type = "blob-ext"; + }; + }; + + fdt { + type = "flat_dt"; + compression = "none"; + + uboot-fdt-blob { + filename = "u-boot.dtb"; + type = "blob-ext"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + 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 d423cf8563..23a7fcf361 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -90,6 +90,7 @@ config TARGET_IMX8QM_ROM7720_A1 config TARGET_IMX8QXP_MEK bool "Support i.MX8QXP MEK board" + select BINMAN select BOARD_LATE_INIT select IMX8QXP select FSL_CAAM diff --git a/board/freescale/imx8qxp_mek/imximage.cfg b/board/freescale/imx8qxp_mek/imximage.cfg index 89a4736ab7..88d6955a9e 100644 --- a/board/freescale/imx8qxp_mek/imximage.cfg +++ b/board/freescale/imx8qxp_mek/imximage.cfg @@ -7,8 +7,7 @@ */ -/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 +BOOT_FROM sd /* SoC type IMX8QX */ SOC_TYPE IMX8QX /* Append seco container image */ diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 73600c5a8c..0e22f13c7f 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -23,6 +23,8 @@ CONFIG_SYS_LOAD_ADDR=0x80280000 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_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=3 diff --git a/doc/board/nxp/imx8qxp_mek.rst b/doc/board/nxp/imx8qxp_mek.rst index 215627cfa6..708db1952e 100644 --- a/doc/board/nxp/imx8qxp_mek.rst +++ b/doc/board/nxp/imx8qxp_mek.rst @@ -50,7 +50,7 @@ Build U-Boot .. code-block:: bash $ make imx8qxp_mek_defconfig - $ make flash.bin + $ make Flash the binary into the SD card --------------------------------- -- 2.17.1