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 EF948C43219 for ; Wed, 2 Nov 2022 15:58:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1392F85109; Wed, 2 Nov 2022 16:58:11 +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="Y1k0Kh9y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 576B5850FF; Wed, 2 Nov 2022 16:58:10 +0100 (CET) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2087.outbound.protection.outlook.com [40.107.104.87]) (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 97EA0850FB for ; Wed, 2 Nov 2022 16:58:07 +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=XuAy1u67UCQZEc9V1F5lvzx5z9BPAlL7Hu4d4C9ZicZMTDRZ2tKI6yEpP/ucPm2R/p/sbCF6diA8qf3hMkF9AZnNGx1atAEp+YVuBquSOQe5b5a/QwZTPyq8oSPKRz/vIjugLEyup+CmxWIEO1xEGQ6R9+xu4npn9hWAYTPKjCwxD5ZfthPlwrETBhaRZswOpRLSa/Fag0TOBhGMOWasg0kRZf/LsDmoDxNtWYoOkPGYGahTxzxpD8cADLf0ZeJwgArv5PT98DookOqQgvzt8k1xxPqTD8NKrQkyD7xObrkB3P2DtcRYhZlIa6jipMaIbNe2q1D1CmzIKDqxDDgwPA== 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=PZA8bhXNkckUx+K2uTTz9NDjdpnvOnMT/SqSI1JaVlo=; b=GFVcwUZ9OsQPWv6FPnPTsfwGRadEfoyW70sZvEkWwSl3KqN1mxHnFFLJ7PioM88FW75xOQaq5Yxmd6yRNlfWJOmMST2gYl+azjsaPiY5yX8tXHGGxJFyioRf9ct+W0ISmF7QIickM1XD6UmlnjgXbKDRcArYYK7K7cgDanTucyXeolb4lIP8hXWs7/lmRNMGQlwDRXhdi0AFFm5v2o7yTOeZgiVwdmT9JW6Ioj40i9UTjv+Ju/OQRtKvi1PXgbjM9VC05YOQq4OkwIWZadxiTqULwE10RPS9JFR7GUANk4BxkbMGLHNaiT7XQOhc8NyJb9P1FgGGrMyP2Y35BCvucQ== 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=PZA8bhXNkckUx+K2uTTz9NDjdpnvOnMT/SqSI1JaVlo=; b=Y1k0Kh9yCZPkOdYIkDkFgwwiujXjEt4oS20kNSWmD63k+pBFoSnSuy6ZZSk2+y4hKlcDUxcaML2bHadTCCtkUDh23kFav4Lt8Fx/XsakmycOa3Dt0r7DtOTWpHOIJ3iIyzsPCsGGXUPaHjE7SIHlH2It0WUrYLKe9fAfTOMOcQM= 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 PA4PR09MB4704.eurprd09.prod.outlook.com (2603:10a6:102:ed::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Wed, 2 Nov 2022 15:58:06 +0000 Received: from AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::82f6:540b:bc00:80b5]) by AM9PR09MB4884.eurprd09.prod.outlook.com ([fe80::82f6:540b:bc00:80b5%7]) with mapi id 15.20.5791.020; Wed, 2 Nov 2022 15:58:06 +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, =?UTF-8?q?Horia=20Geant=C4=83?= , Denys Drozdov , Ye Li , Gaurav Jain , Marcel Ziswiler , u-boot@lists.denx.de Subject: [PATCH v1] imx: imx8qxp: imx8qxp_mek switch to binman Date: Wed, 2 Nov 2022 16:56:50 +0100 Message-Id: <20221102155655.5296-4-oliver.graute@kococonnector.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221102155655.5296-1-oliver.graute@kococonnector.com> References: <20221102155655.5296-1-oliver.graute@kococonnector.com> Content-Type: text/plain X-ClientProxiedBy: AM6P195CA0022.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:81::35) To AM9PR09MB4884.eurprd09.prod.outlook.com (2603:10a6:20b:281::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR09MB4884:EE_|PA4PR09MB4704:EE_ X-MS-Office365-Filtering-Correlation-Id: faeb0ea2-0baf-47ad-b972-08dabceb080e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HfJPAEWF1A1c3DuKmnavAWb9krBjGETt6Necfytb0bDW9maQ2r04hQWco26oga82dSa1yH/QWeHcMSmxvDSlKpts8hrn/71c/S5yxWN4Pi1iIw3gI3wO4AOERQoUCfb+ERBSolm1Dif6S9ViWjWaexviX8M54lcU+IfzKXmwyoeL8jD8uobhMIzFehhz+q+5NEl/KxiwvppT637BqFqcd6Hxwf7oZNJkfx3fEbG8h4cYHKbgGY4w99pWaRZNzsSflTfz8ZpoSvAWg2cn51P2QXStNDcKg61fqvy9snyorOeWdXBWljFJ0L0lIZZuT+i0CTuVDaTjTcSPXyczalTk3DcgpycHFg6/EmRlqCucf18Nm5ImwoCmVAChe5czNPvxyXordJELDc+i4GKRiw7tqo7GtURuCxcQSqR4t0DIwEy9e5xXZuvn6a4rdfFvPHAFICRmWiJhUXSr9AnX1slfaeinarOugGI7uTVThMTrkQ3jtjTKfIhlxGw47iE2X0ODsg24+bhZGDUaCL7kjpDWEUYKVH45a++qVkUp/jxkrffkgethePsGuPPEiu2CcjUlX3jBzAehQaPiBqV0r9vu6yHq6C6mJ+CvWHbaJJ3ReyqNRbeIrOMUiXblUYtUAwC8Im8KD1OFH0TBR5lTLwzheknp+BV8vUbUsy80VjrgsQ+ac8vEfhJtCmdzpsDLLtj9cc0EdDb4N2qCPHULF68TzpcQZfD+V2WAHfSJuWE29G3LFB26X82cYwSmMPwerwd1mixzC8Ql+KMxWgNWIEf108zLEW5V8tdD1dHDo5gggtA= 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)(39830400003)(376002)(366004)(136003)(346002)(396003)(451199015)(36756003)(86362001)(38350700002)(38100700002)(83380400001)(6486002)(2906002)(44832011)(26005)(478600001)(2616005)(1076003)(52116002)(186003)(6666004)(6512007)(41300700001)(6916009)(316002)(66946007)(66476007)(66556008)(5660300002)(8676002)(7416002)(4326008)(8936002)(6506007)(54906003)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?umwdaCCWNENTKuT0Ve4VEZH76XqaJCMqytuGIiRarvUzk6rqwzyORy1jyg/J?= =?us-ascii?Q?PRbvybX6Q37A93v1xfEpCjazCVv2SydbDYh48PTTD2g9kkGubnIoq1sWSMMC?= =?us-ascii?Q?6VfmRDLiACA5MjdWQfEYXVLkP7I6bzPZtZ5YhX53nD/GNq+HJr2E6X7sLJYS?= =?us-ascii?Q?jXsUU1+Zl3BGlzJA4S6jliDeU8umtzdlI2G1KNzb13XN1R2Hh9VFVgFLDq/j?= =?us-ascii?Q?slvduvzR3tY/rZhuprhs67CenJs+KG5D1bqFu10zzkqo3XN9zGwhtOFSbhUV?= =?us-ascii?Q?ZO5QcpK5ayuKd1nkiLM+PHOIJtA6hGrNPXaUsWMqhgtZatBBo8Tn7xZ1+dXg?= =?us-ascii?Q?P54lDDkfhyYl0lih1qYA04Q8UN5olxZd3GPVwSG6awQrSoD7P0GVmseGXbVs?= =?us-ascii?Q?LuXDtT8KPHjbeF0YNm60wYdEREYf5kG61i+J6Nkc3YeVguVhfQp9a8lXu0pr?= =?us-ascii?Q?MY+5GvlcNEo20wg2PTyYCozXXuvjM3P+7RebkihVk45WRVwURIGXdMDT+Cca?= =?us-ascii?Q?jP2HXfROOd94KUTgAJYj54atE3V2jBnVwCGOP4rZPI733VUK2bD0FB/3dg+i?= =?us-ascii?Q?G+N2aaWaDprImVlwzmPXUjxc3/PYJ9uZKKvhALERN65pNx3vvVWtXGC9h4lO?= =?us-ascii?Q?jZJ5znmB9b+iNBB5s28P+jzQB9mnJhl35k10m0xIT6/BR3VLHF8166FoIN+A?= =?us-ascii?Q?G3NrDqtE1GLGYdCT1PL8GyxUJhjPfEFkx5HES137bfmqBou7bwnWiwUCzNrU?= =?us-ascii?Q?s0b97oJPOyczh4MyT2c1+bNZy8bpiYNynnMBJC3KML7g9FGG7rCTMdenVaJt?= =?us-ascii?Q?FgQRY9IBZgcIqAEQZoZXEqY2dr0hcpIUq+MT57Xjkz24njmEuEwD2c6T7B9C?= =?us-ascii?Q?CX6aFO7yMWiZLvriqZ/gmPWRZf9SMDFnBhpQf1POmXOrWQXWgJ2Kn7mTl9O/?= =?us-ascii?Q?m7haJ38uORtVJGyfUILm7zX99Jr0Yv4Gn3MfOSSUm4a07B90Uo0q5VS5zewa?= =?us-ascii?Q?gTqMSmjGyrSqnEQBbHN4uUqydOkJrDJPMXNnk+a3Y051z1zhM9AGXqO2PGke?= =?us-ascii?Q?CmnQpxoMMAoysovxwgQSgp8oRtcNHYk3hF2Tgsm9oo7GZuI9e3WHKaYosmAQ?= =?us-ascii?Q?xwYnASJbYc1eoBFzyHh72kDbD2kOfwTB9/v4EaMh95XaEtVFJV9KtnxmwCQ+?= =?us-ascii?Q?cGpnNJ32f/C/Oc4ybGUp68v5wZL5rqm+SbTwCpyr8P0m3YPAj2dtlB0+SVX9?= =?us-ascii?Q?TWzpf2vy7Y3cwzU3Ico8WrMcJfJnMFxKlJbG/T+DYdvI1FYUd8t/Ra4szBoV?= =?us-ascii?Q?4GO8cUZc5EX5gMhixMMTkGE0Ukenalcfzgn01QZWYP77XCRvDXRMmy5gDuHV?= =?us-ascii?Q?BJnNvq9lnQow7/4/Btu+rIB6Yk+5jvsP0/IFm5NkoMcHL0afBk4H9apkE22h?= =?us-ascii?Q?9qERdwJjkR+AcPRtcPwOQLGnMsUDQRGPi00o+wGA7cz/Ug6tzCzFBs9JiHXh?= =?us-ascii?Q?0kkL6fKO+lgzQFIEDb14rBlSkX59z7Z/7pZ5rcuc+EDOQKMRHRxSUEl06W7t?= =?us-ascii?Q?QQzkQCz1G+6DvHH2EYs4gIfB8gceXkfpKlVLf1oXw9aFsDkt8rb83xcYvPx7?= =?us-ascii?Q?M6Cx7eNueMJjhU1i1tCM6Q0=3D?= X-OriginatorOrg: kococonnector.com X-MS-Exchange-CrossTenant-Network-Message-Id: faeb0ea2-0baf-47ad-b972-08dabceb080e X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4884.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2022 15:58:06.5646 (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: V0JeisSvAzweEnEpObe2pVyVesoJEAajOG/WQnwzKDacOYqgPwxOBvP50ar0ILb89DmHUcXgqBDHYkf+Hjmk+ZDyKf3htQ4AS/hisruF4h4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR09MB4704 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 --- arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 127 +++++++++++++++++++++++ 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 +- 5 files changed, 132 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi index ae037c7550..073a401a1c 100644 --- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi @@ -3,6 +3,133 @@ * Copyright 2018, 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 = "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"; + }; + }; +}; + &{/imx8qx-pm} { u-boot,dm-spl; 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