Message ID | 20190708015333.20411-45-peng.fan@nxp.com |
---|---|
State | Rejected |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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="FxDhbP6R"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45hphL0bwWz9s3l for <incoming@patchwork.ozlabs.org>; Mon, 8 Jul 2019 12:05:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 548DCC21D8A; Mon, 8 Jul 2019 01:57:35 +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 2DCFFC21EC8; Mon, 8 Jul 2019 01:45:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5850EC21E18; Mon, 8 Jul 2019 01:40:36 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80087.outbound.protection.outlook.com [40.107.8.87]) by lists.denx.de (Postfix) with ESMTPS id B09A9C21E07 for <u-boot@lists.denx.de>; Mon, 8 Jul 2019 01:40:32 +0000 (UTC) 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=+HfBQuk22bUNR+KtXMb0Awu3VJixwlm9LYjg8E4WGbs=; b=FxDhbP6RAN/i5HV+pebXd0DwmQNzaSRmQ7nNfOE+87q8F8G6I78BJJ1gRsad5v6keqg9wgk946+QuOXy51exmMCb+kr5q2Cnnioc9jHCgwiL5VwawK0IJFackk/x7gZ+/JDRKMlZsvEN9RsBC8L24AdMzVi0Ldwt9E1XVwMIzGA= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5906.eurprd04.prod.outlook.com (20.178.202.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.16; Mon, 8 Jul 2019 01:40:31 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::2023:c0e5:8a63:2e47]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::2023:c0e5:8a63:2e47%5]) with mapi id 15.20.2052.020; Mon, 8 Jul 2019 01:40:31 +0000 From: Peng Fan <peng.fan@nxp.com> To: "sbabic@denx.de" <sbabic@denx.de>, "festevam@gmail.com" <festevam@gmail.com> Thread-Topic: [PATCH V2 44/51] imx8mn: add get_boot_device Thread-Index: AQHVNS4hmiiJlTh+G06o6vtxA+iiPQ== Date: Mon, 8 Jul 2019 01:40:31 +0000 Message-ID: <20190708015333.20411-45-peng.fan@nxp.com> References: <20190708015333.20411-1-peng.fan@nxp.com> In-Reply-To: <20190708015333.20411-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: HK0PR01CA0059.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::23) 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: 9accb691-282d-45a9-4059-08d70345436e 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:AM0PR04MB5906; x-ms-traffictypediagnostic: AM0PR04MB5906: x-microsoft-antispam-prvs: <AM0PR04MB59069E4F993BE0E452CECC6788F60@AM0PR04MB5906.eurprd04.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:3826; x-forefront-prvs: 00922518D8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(4636009)(136003)(396003)(346002)(39860400002)(376002)(366004)(199004)(189003)(1076003)(2616005)(2501003)(6436002)(86362001)(14444005)(256004)(4326008)(446003)(6486002)(11346002)(5660300002)(73956011)(386003)(6506007)(99286004)(81166006)(66946007)(66446008)(64756008)(66556008)(52116002)(76176011)(8936002)(476003)(66476007)(44832011)(486006)(81156014)(8676002)(305945005)(7736002)(478600001)(102836004)(14454004)(36756003)(316002)(186003)(110136005)(54906003)(25786009)(6512007)(2906002)(66066001)(26005)(50226002)(71200400001)(71190400001)(53936002)(68736007)(3846002)(6116002)(32563001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5906; 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: Lgc5QhU9t7H1N+mtI7iqnnauHGggemMUHOVDAdU46AZInt8/1OOCH0uIjIBTns2Abc6M0pWvDER3tgutQ5BvVSwBVtqxA1Z+mXdyDaDWmFqjJt7hSnB8PxKm+QKKbIArxntjhdFryO2TQNMcKc5L+T2PZkoyqXYSmrX1H7E2jvtW12YwEotL1W3ap/Lt9OBPAXw4N71FBQcLM//FIatdCrIFXtYwhxqiv2P5+tDYdwAaPipscDd1lN7nu7/TMqGhteF/PKsC0Mz1UcRIZ9FF0ArB+t1AqMfbtSsKX4uSBFeZq1PdSAUWlJSTx6tqWLtxlrZhxIBkyc1HNzmFF9xnZttThxj9/2BIHXlK8j4nFesUyA7igHEppPRISYSpx/qqWNIwp9Jd2hH4NxB5onLsGY+OHhQsdsnXYabQJ0m2j4k= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9accb691-282d-45a9-4059-08d70345436e X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2019 01:40:31.7558 (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: AM0PR04MB5906 Cc: "u-boot@lists.denx.de" <u-boot@lists.denx.de>, dl-uboot-imx <uboot-imx@nxp.com> Subject: [U-Boot] [PATCH V2 44/51] imx8mn: add get_boot_device X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
Support i.MX8MM/N
|
expand
|
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 98896893c9..23e1de9401 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -263,6 +263,54 @@ int arch_cpu_init(void) return 0; } +#if defined(CONFIG_IMX8MN) +struct rom_api *g_rom_api = (struct rom_api *)0x980; + +enum boot_device get_boot_device(void) +{ + volatile gd_t *pgd = gd; + int ret; + u32 boot; + u16 boot_type; + u8 boot_instance; + enum boot_device boot_dev = SD1_BOOT; + + ret = g_rom_api->query_boot_infor(QUERY_BT_DEV, &boot, + ((uintptr_t)&boot) ^ QUERY_BT_DEV); + gd = pgd; + + if (ret != ROM_API_OKAY) { + puts("ROMAPI: failure at query_boot_info\n"); + return -1; + } + + boot_type = boot >> 16; + boot_instance = (boot >> 8) & 0xff; + + switch (boot_type) { + case BT_DEV_TYPE_SD: + boot_dev = boot_instance + SD1_BOOT; + break; + case BT_DEV_TYPE_MMC: + boot_dev = boot_instance + MMC1_BOOT; + break; + case BT_DEV_TYPE_NAND: + boot_dev = NAND_BOOT; + break; + case BT_DEV_TYPE_FLEXSPINOR: + boot_dev = QSPI_BOOT; + break; + case BT_DEV_TYPE_USB: + boot_dev = USB_BOOT; + break; + default: + break; + } + + return boot_dev; +} +#endif + bool is_usb_boot(void) { return get_boot_device() == USB_BOOT;
No ROM INFO structure on iMX8MN, use new ROM API to get boot device from ROM. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- arch/arm/mach-imx/imx8m/soc.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)