From patchwork Tue Aug 27 06:24:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1153592 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="SzQm4lPu"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46Hf5q4Yyrz9s7T for ; Tue, 27 Aug 2019 16:26:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4E264C21C27; Tue, 27 Aug 2019 06:25:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 99E26C21F41; Tue, 27 Aug 2019 06:24:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C7976C21F4A; Tue, 27 Aug 2019 06:24:45 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150080.outbound.protection.outlook.com [40.107.15.80]) by lists.denx.de (Postfix) with ESMTPS id C7FD0C21F0B for ; Tue, 27 Aug 2019 06:24:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bPolxMRWq9CrPUtNf1r/FcmL1OY3eqOa4zZj3Z2uk7lJpInvNV7McK/6Z5RkMXq5Z0HTlYrWA4/LELDWId62ih+B4mE0MAkdew76Zp8vVYS+A7/Sd4N8Ipq7yMXAQougTuU4H5zJR4OoJm95lyxfuU2rmg3fKkutkIzLnNYb/wQYKvmg2ENMkH0U8Kxy2qBg8E4J3cGDoa4ubMp/H7c8JTZ993LMh/IwHIjpp5R8BpOHaucVlhJXkm09N3DyA0eyv9VZP9c7IOvAHN+dpSppAN7R4dHI8lJjIulW6cD0LT1qratURWwUNFPhSk9B48+XUgiRZIHIfJoz0xwXCv1lCw== 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-SenderADCheck; bh=yZY8mlHDsZWSWHXBY32CA0WTHU72MZmZBEX2HqkYShU=; b=M+0nT6XmzWgydzZJLbPKovHhfWMC+ZJv2p+6me4l6ALXgA+Olc819q+VSSfnjfpm4Ggz7O6NRSF1NPfOeLPzbkMc1yfYJ9opcnnsESHoT6fOeYcykIp+drwtJBWUZzfLfowBXqgknjOuo7XDAfAYIbPi0eo2hbW0ONg5tVPUOZ7c2edEkGrDAabSFaYFK6BxDPPLMtf0xRLfAfsNVJ4ZRMchvqWRR9n8tDl3C0DO/2TDzke6pfd50eJI92WgQdGs1is+tHF88c3f+98PXRhyfxVenX80jf2i0DjH70pyQxZTJvQjeiHKG05OtMeG+OqykFRbqV/TUF/Z9/WppRUhTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yZY8mlHDsZWSWHXBY32CA0WTHU72MZmZBEX2HqkYShU=; b=SzQm4lPuw3M+GBvsqnlzSun61YEtGI1Cy3qqMN601FdOUGfOktIpEBrqhpmNFWIc4e0cv/pkzF1iY9/r1AYzVPUrDC9HEZiG2KYRQ7La48g+g8d2LzqndRs4+QYgPronmPNjt7lrzskJRXt6fZOOqIY3tHOdxghsj0A+BVTMcsw= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6675.eurprd04.prod.outlook.com (20.179.253.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.20; Tue, 27 Aug 2019 06:24:40 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4%4]) with mapi id 15.20.2178.022; Tue, 27 Aug 2019 06:24:40 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" , "lukma@denx.de" Thread-Topic: [PATCH V3 01/27] imx: mkimage_fit_atf: Fix FIT image for correct boot order Thread-Index: AQHVXKAbdiQFeULrI0aKwlJIyUVC1Q== Date: Tue, 27 Aug 2019 06:24:40 +0000 Message-ID: <20190827064033.28973-2-peng.fan@nxp.com> References: <20190827064033.28973-1-peng.fan@nxp.com> In-Reply-To: <20190827064033.28973-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK2PR03CA0066.apcprd03.prod.outlook.com (2603:1096:202:17::36) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 96eb1eba-fab9-4915-0e7e-08d72ab73ded x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB6675; x-ms-traffictypediagnostic: AM0PR04MB6675: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:530; x-forefront-prvs: 0142F22657 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(346002)(376002)(396003)(136003)(39860400002)(189003)(199004)(2201001)(2501003)(4326008)(50226002)(86362001)(26005)(14444005)(6506007)(71190400001)(1076003)(256004)(102836004)(2616005)(386003)(66476007)(64756008)(66556008)(5660300002)(446003)(66946007)(486006)(11346002)(186003)(6116002)(3846002)(110136005)(8936002)(81156014)(81166006)(53936002)(99286004)(8676002)(6436002)(52116002)(66446008)(476003)(76176011)(14454004)(44832011)(66066001)(36756003)(2906002)(478600001)(71200400001)(305945005)(6512007)(316002)(54906003)(25786009)(7736002)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6675; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Oo5AitH3TwG3hunGwdv1n4jaDvKqu/udBFl9uWlgtw3aIgQAFINXEfPWzcPVGrXYy7lctJepqkcDcoOwGre1UY0okO9VTnI0BtHLYkrIhij8B87/HI7SyT1hd9jTgDig0QjP4ER6hPsYPOFMqeWeppgx32DlWx6jdjmd4BHoXjN3+iUBDY0/RJgxU2MqYCAHXfqcWuwheNqfhaYAHrpyYLgWDR/0LUvoBsE9/aHsc2Frd87eM+B4FxsnkbAPoGStgF8BIjRtxsfsh30wllLH3W+ZWhUoqZfJzMxKODPGLw4OyJEE+dm1/7dwUy9FL1w+p4JZESRIsXL4qpF2rT/FUvtThsJwwRRJpyh0MX2oAaVKwk3oAhW4TlkG1dN9W9iYvbU02eQI9PIG0GPUuvK/M6tvsKTTS2yDHCyEqSQ7Tk0= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96eb1eba-fab9-4915-0e7e-08d72ab73ded X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2019 06:24:40.5690 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: X9JhiTlrVxXpIE8PhBJrfvTnxz8tyLaqk72aiRtkA839LXvOFcin0HcfrkQs3/D08V7tVyvI7JLlCcxCdlBq6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6675 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH V3 01/27] imx: mkimage_fit_atf: Fix FIT image for correct boot order X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Frieder Schrempf Fix the FIT image metadata for i.MX8 to result in the intended boot order (SPL -> ATF -> U-Boot). Signed-off-by: Frieder Schrempf Signed-off-by: Peng Fan --- arch/arm/mach-imx/mkimage_fit_atf.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh index 38c9858e84..ad81d5ecab 100755 --- a/arch/arm/mach-imx/mkimage_fit_atf.sh +++ b/arch/arm/mach-imx/mkimage_fit_atf.sh @@ -55,6 +55,7 @@ cat << __HEADER_EOF images { uboot@1 { description = "U-Boot (64-bit)"; + os = "u-boot"; data = /incbin/("$BL33"); type = "standalone"; arch = "arm64"; @@ -63,6 +64,7 @@ cat << __HEADER_EOF }; atf@1 { description = "ARM Trusted Firmware"; + os = "arm-trusted-firmware"; data = /incbin/("$BL31"); type = "firmware"; arch = "arm64"; @@ -114,8 +116,8 @@ if [ -f $BL32 ]; then cat << __CONF_SECTION_EOF config@$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1", "tee@1"; + firmware = "atf@1"; + loadables = "uboot@1", "tee@1"; fdt = "fdt@$cnt"; }; __CONF_SECTION_EOF @@ -123,8 +125,8 @@ else cat << __CONF_SECTION1_EOF config@$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1"; + firmware = "atf@1"; + loadables = "uboot@1"; fdt = "fdt@$cnt"; }; __CONF_SECTION1_EOF