From patchwork Wed Aug 7 06:40:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1143285 X-Patchwork-Delegate: trini@ti.com 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="NO2JOals"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 463MN71VkMz9sPM for ; Wed, 7 Aug 2019 16:41:09 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DC7CEC21E77; Wed, 7 Aug 2019 06:41: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 153B8C21DB3; Wed, 7 Aug 2019 06:40:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A3D45C21DB3; Wed, 7 Aug 2019 06:40:56 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150058.outbound.protection.outlook.com [40.107.15.58]) by lists.denx.de (Postfix) with ESMTPS id 7E751C21DA6 for ; Wed, 7 Aug 2019 06:40:55 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mZN/c9Un8X5Tu2NZwQw055LTVsCDtG3Sw0sYo5DwbNcj9pMRQ7IIJpN959XMNmOb0m4jhf16k3BxiGKy5Fy5Pm8hY9BjHqypsL4E2zsHQzwsm+sjQme/cg6hRk2pQz7ZOJDj0TH2yaSyOl+gItrEX2/zvWuNv9ug/8bAbSBclX7Jk0mW+MxduSqjeqcbltc7r5o3bi8W70QYk+vlm8AWkw/a0jUATYH0zHMtJeSeq0DDNztfm7gYPhOHfOOXcS7x2VTo0uYfeqaNDV14iF9y0fQHFIemb5Nn9d80nei3A0XFqVPJtxVbOOYcnBZOAH1u9YIjH5vNjDG89xzeXTyGfg== 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=MpTkpoRIsniuy/kT8gsTKf3fzhuJ+ImGIAYB9gLKijA=; b=naspe3jZgZhtGCrB7VGhOruJOfn2gCObRET0cV5TcX0sULYkvrbsv6xQb1ic58ZLjz86xn6oMhQiIOlqDHNHI2yxoqoevBXzrzIncqVc8cDw3QQfci223GAyWBQVedcaxP4q83/nf2sGO7b4pukwDpUpRVFUOXztAimipXqx627LbCGWFwaPepjJG3jpQT5aEDMG+ZdWHxBN8eozQkpnCUglwqOLZenMkdJcUkYwBq5yHN7wcAJADYTUZqfXu1GNER6VdMFm+si+6b7/xo+930skb5qAHJKzwtt/DHb0neMStqiVO6faPXVfVUH8brJfUhHvZySzu/eO3ySFeHYQ+w== 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=MpTkpoRIsniuy/kT8gsTKf3fzhuJ+ImGIAYB9gLKijA=; b=NO2JOalsiwb7Ck+AzGcb9d/Hk+68LkAdb/o7WMwFdwDvEeZMNKLMM+sEt32WtP9bgk68OkUbApZZwbwa5npsxVB37gAA4N3fBtc1/YHbQYf0LBTqfaG7TtTusvbOC6W16X6eMWMSwzAPHsjaHDqwA7kobC7iX99/vp+vD2Enmu8= 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.2115.14; Wed, 7 Aug 2019 06:40:54 +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.2115.017; Wed, 7 Aug 2019 06:40:54 +0000 From: Peng Fan To: "philipp.tomsich@theobroma-systems.com" , "kever.yang@rock-chips.com" , "sbabic@denx.de" , "festevam@gmail.com" , "trini@konsulko.com" Thread-Topic: [PATCH] spl: pass args to board_return_to_bootrom Thread-Index: AQHVTOsPwZWurRuoqUCp/+7S7BNZaQ== Date: Wed, 7 Aug 2019 06:40:53 +0000 Message-ID: <20190807065627.9601-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: HK2PR03CA0061.apcprd03.prod.outlook.com (2603:1096:202:17::31) 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: c4418fec-0e61-48f8-791a-08d71b0231e9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB6675; x-ms-traffictypediagnostic: AM0PR04MB6675: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6790; x-forefront-prvs: 01221E3973 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(376002)(39860400002)(346002)(396003)(136003)(199004)(189003)(478600001)(966005)(14454004)(81156014)(50226002)(8676002)(81166006)(52116002)(8936002)(68736007)(6436002)(99286004)(110136005)(54906003)(316002)(6486002)(6506007)(386003)(102836004)(36756003)(305945005)(2906002)(186003)(26005)(7736002)(71200400001)(44832011)(486006)(1076003)(256004)(476003)(25786009)(66556008)(64756008)(66946007)(6306002)(66446008)(5660300002)(2616005)(2201001)(86362001)(4326008)(53936002)(2501003)(66066001)(6116002)(6512007)(66476007)(71190400001)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6675; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: 9FobqwpY1y2Cezm7CLN8w74Tosj6Bg9DnaPbpy6NcaNdA1vlkI4GU3dQLiajo5/r+uG66DjmVxegLf0pQESDGz1vbA4LCJ/2dzvtr8y1ltN7RVPS5zyosGba3O8PPbncuQ3NNaCrDSIph+lZulUTZjhOcrYN1YkqeSCDOrGvKAKmwXjfeUoYvpVI4Jw1awd03x8UrtlS4YW7BwS1Pl0TrNwwXgnD5J9v4veaES1foQ1ptFNB5JC9fvSBVbkqQnXoOyI97nZza4fkyr34PA9IUbdwgMQAKD9SFzhvIs5ky/PvRQejAG98hZonzt4+OubyGHO687peOrOtQHeL90XxOQKlwjgs+Dzr+bsRfhVoG0/AKLMmtwcJ4jQTwqcQRY60HTsxvc0udf1vY+9X1jTDgwQd69J4Wp98w11OnyP+AWA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4418fec-0e61-48f8-791a-08d71b0231e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2019 06:40:53.9142 (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: peng.fan@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6675 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH] spl: pass args to board_return_to_bootrom 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" Pass spl_image and bootdev to board_return_bootrom. i.MX8MN needs the args to let ROM to load images Cc: Simon Glass Cc: Philipp Tomsich Cc: Kever Yang Signed-off-by: Peng Fan Reviewed-by: Kever Yang --- This is to prepare i.MX8MM ROMAPI support, and This is an updated version for https://patchwork.ozlabs.org/patch/1128834/, because there are changes in rockchip spl/tpl. Kever, Philipp Please help review again. Thanks. arch/arm/cpu/arm926ejs/spear/spl.c | 5 ++++- arch/arm/mach-rockchip/spl.c | 5 ++++- arch/arm/mach-rockchip/tpl.c | 5 ++++- common/spl/spl_bootrom.c | 7 ++++--- include/spl.h | 3 ++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c index fc332fb626..a919a455eb 100644 --- a/arch/arm/cpu/arm926ejs/spear/spl.c +++ b/arch/arm/cpu/arm926ejs/spear/spl.c @@ -277,7 +277,8 @@ void board_init_f(ulong dummy) * BootROM code right after having initialized a few components like the DRAM). * The following function is called from SPL common code (board_init_r). */ -void board_return_to_bootrom(void) +int board_return_to_bootrom(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) { /* * Retrieve the BootROM's stack pointer and jump back to the start of @@ -294,4 +295,6 @@ void board_return_to_bootrom(void) "bl back_to_bootrom;" #endif ); + + return 0; } diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 33137cc5ef..92102b39e7 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -14,9 +14,12 @@ DECLARE_GLOBAL_DATA_PTR; -void board_return_to_bootrom(void) +int board_return_to_bootrom(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) { back_to_bootrom(BROM_BOOT_NEXTSTAGE); + + return 0; } __weak const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c index 55f6e922d0..c3734cb070 100644 --- a/arch/arm/mach-rockchip/tpl.c +++ b/arch/arm/mach-rockchip/tpl.c @@ -77,9 +77,12 @@ void board_init_f(ulong dummy) } } -void board_return_to_bootrom(void) +int board_return_to_bootrom(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) { back_to_bootrom(BROM_BOOT_NEXTSTAGE); + + return 0; } u32 spl_boot_device(void) diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c index 076f5d8d93..0eefd39a51 100644 --- a/common/spl/spl_bootrom.c +++ b/common/spl/spl_bootrom.c @@ -6,8 +6,10 @@ #include #include -__weak void board_return_to_bootrom(void) +__weak int board_return_to_bootrom(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) { + return 0; } static int spl_return_to_bootrom(struct spl_image_info *spl_image, @@ -19,8 +21,7 @@ static int spl_return_to_bootrom(struct spl_image_info *spl_image, * the ROM), it will implement board_return_to_bootrom() and * should not return from it. */ - board_return_to_bootrom(); - return false; + return board_return_to_bootrom(spl_image, bootdev); } SPL_LOAD_IMAGE_METHOD("BOOTROM", 0, BOOT_DEVICE_BOOTROM, spl_return_to_bootrom); diff --git a/include/spl.h b/include/spl.h index a90f971a23..f4a5461b4e 100644 --- a/include/spl.h +++ b/include/spl.h @@ -382,7 +382,8 @@ void spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3); * stage wants to return to the ROM code to continue booting, boards * can implement 'board_return_to_bootrom'. */ -void board_return_to_bootrom(void); +int board_return_to_bootrom(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev); /** * board_spl_fit_post_load - allow process images after loading finished