| Message ID | 20190430103056.32537-23-peng.fan@nxp.com |
|---|---|
| State | Superseded |
| 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="En9Qt6Cy"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44td8j2Zpxz9sBV for <incoming@patchwork.ozlabs.org>; Tue, 30 Apr 2019 20:30:45 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0DED9C21E13; Tue, 30 Apr 2019 10:25:55 +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 078B1C21E6C; Tue, 30 Apr 2019 10:19:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 67290C21DFA; Tue, 30 Apr 2019 10:18:54 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80044.outbound.protection.outlook.com [40.107.8.44]) by lists.denx.de (Postfix) with ESMTPS id 2B6EEC21E60 for <u-boot@lists.denx.de>; Tue, 30 Apr 2019 10:18:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xei5T+IfQjBiTVwisnYmypK1kW5N+ajseD6i5Zy4wgA=; b=En9Qt6CyJpJeQCZJytiCEzZNQ4vVdIe7LjfNZjBjHPi7stS2dCmkun3klvyKqIPW4u2U/dg2Od2Ci/NQPHoUG7DyMu3UHYtvNpIsBSKUpKRg6ysMaJvUpylOsifHTussjDsCph0gQXVsldIm9zcnzhpxhke9FZcY8vk/ouQDWwc= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5204.eurprd04.prod.outlook.com (20.176.214.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1835.15; Tue, 30 Apr 2019 10:18:49 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::3173:24:d401:2378]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::3173:24:d401:2378%6]) with mapi id 15.20.1835.018; Tue, 30 Apr 2019 10:18:49 +0000 From: Peng Fan <peng.fan@nxp.com> To: "sbabic@denx.de" <sbabic@denx.de>, "festevam@gmail.com" <festevam@gmail.com>, "lukma@denx.de" <lukma@denx.de> Thread-Topic: [i.MX8MM+CCF 22/41] imx: spl: add spl_board_boot_device for i.MX8MM Thread-Index: AQHU/z4a6c+9ezceqU68oOQnLWTYkg== Date: Tue, 30 Apr 2019 10:18:49 +0000 Message-ID: <20190430103056.32537-23-peng.fan@nxp.com> References: <20190430103056.32537-1-peng.fan@nxp.com> In-Reply-To: <20190430103056.32537-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: HK0PR03CA0057.apcprd03.prod.outlook.com (2603:1096:203:52::21) 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: 72f856a9-c170-439b-9ff5-08d6cd553c46 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB5204; x-ms-traffictypediagnostic: AM0PR04MB5204: x-microsoft-antispam-prvs: <AM0PR04MB5204E7AEB9E87B8B139EBEBE883A0@AM0PR04MB5204.eurprd04.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:2201; x-forefront-prvs: 00235A1EEF x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(136003)(346002)(366004)(189003)(199004)(7736002)(8676002)(110136005)(4744005)(305945005)(6512007)(53936002)(50226002)(81156014)(66066001)(4326008)(68736007)(25786009)(97736004)(2501003)(316002)(44832011)(54906003)(8936002)(26005)(186003)(102836004)(446003)(476003)(486006)(76176011)(66446008)(71190400001)(71200400001)(11346002)(66946007)(99286004)(81166006)(66556008)(64756008)(52116002)(66476007)(6506007)(14454004)(6486002)(2616005)(1076003)(73956011)(6436002)(2201001)(478600001)(3846002)(86362001)(5660300002)(386003)(36756003)(2906002)(6116002)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5204; 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: 44Idc1Iu4tLjGheSBGBy5YwZqPBhAyGTp/4it7/TCvwsEiotGaa8Sd3APCoon9hhSRynCuLLMY2P03YdNkOZ06guX3686BaLwei0yL/EstVhpal9FurpX0FmCBAq26FxT4Sd47H06ex8KyT3lIp/Bia7BMA5Z3Vx5BNqVzPQVYCXY9byejPIa7Qk3hYfc2MlgRQdZqy0TsLiIG1Fh4hdSQVreWw6VzotAqe4udZk2sK7672Ocoy8plvwhuV89iufKX8X89hGWjkKo0uOCCc0ZdwOhpraMbmsZ3o1VsqIf3nCSxwiFKJCMzHTyDMr/izNBQivr4iI94Xjs7+/z2SH6he3nx50P4akaFRDToyhbQSYodd8qXtUz4OjHQwH7+VTWCsuBrV07NcLJK9smUh15NrUgPCsB0vakGFq/jFEqq8= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72f856a9-c170-439b-9ff5-08d6cd553c46 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Apr 2019 10:18:49.1516 (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-Transport-CrossTenantHeadersStamped: AM0PR04MB5204 Cc: "trini@konsulko.com" <trini@konsulko.com>, "u-boot@lists.denx.de" <u-boot@lists.denx.de>, dl-uboot-imx <uboot-imx@nxp.com>, "sr@denx.de" <sr@denx.de> Subject: [U-Boot] [i.MX8MM+CCF 22/41] imx: spl: add spl_board_boot_device for i.MX8MM 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 |
i.MX8MM + CCF
|
expand
|
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 9f1e0f6a72..a6d7b69ad8 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -18,6 +18,11 @@ DECLARE_GLOBAL_DATA_PTR; +__weak int spl_board_boot_device(enum boot_device boot_dev_spl) +{ + return 0; +} + #if defined(CONFIG_MX6) /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */ u32 spl_boot_device(void) @@ -125,6 +130,9 @@ u32 spl_boot_device(void) enum boot_device boot_device_spl = get_boot_device(); + if (IS_ENABLED(CONFIG_IMX8MM)) + return spl_board_boot_device(boot_device_spl); + switch (boot_device_spl) { #if defined(CONFIG_MX7) case SD1_BOOT:
Differnet board has different controller used, it is hard to use one layout for them all. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- arch/arm/mach-imx/spl.c | 8 ++++++++ 1 file changed, 8 insertions(+)