From patchwork Wed Sep 26 13:52:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 975148 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="NtgAGfmK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42L03m3hGWz9s4s for ; Thu, 27 Sep 2018 00:01:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2BF07C21E89; Wed, 26 Sep 2018 13:56:21 +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=BAD_ENC_HEADER, 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 6CBADC21F17; Wed, 26 Sep 2018 13:48:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1FB46C21EC8; Wed, 26 Sep 2018 13:48:21 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20041.outbound.protection.outlook.com [40.107.2.41]) by lists.denx.de (Postfix) with ESMTPS id 5F87FC21E70 for ; Wed, 26 Sep 2018 13:48:02 +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=yoMfeEvvA1UKRKknG7/UgShO425qXTs92GVnZv5ftsY=; b=NtgAGfmKV7aKM4OXzTcWMjhSK6U2oCPqfsjNToQ6qbv6HIfiNYwV6bbvq6he4/l+Q+Ep2o3raDfN73vpsz7ByoaMsCQo90wLa9YDYegiSKLzjxPWoZMy+4Xhoxu4Jk3jXF1GtExztobuvvC+C5TgroJguKirDiSQtRVePoDLuMo= Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by AM0PR04MB4482.eurprd04.prod.outlook.com (2603:10a6:208:73::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.22; Wed, 26 Sep 2018 13:47:59 +0000 From: Peng Fan To: sbabic@denx.de, agust@denx.de Date: Wed, 26 Sep 2018 21:52:41 +0800 Message-Id: <20180926135256.2098-18-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180926135256.2098-1-peng.fan@nxp.com> References: <20180926135256.2098-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK0PR01CA0053.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::17) To AM0PR04MB4482.eurprd04.prod.outlook.com (2603:10a6:208:73::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4779fd67-071d-4f4b-8fe6-08d623b6ad10 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4482; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4482; 3:9o+8f9GIF1LpgVEoDDRbuZXE1UlhOBQQCicseKV7S5fOH5Q70PnJxK8QOMD7br990KpJrVCgA/ktWcqhydXIHqSnH2ItEBh3DfIjb1bVQYTkoKR9v4rrb8vr7Ucs+IaTL8PMEpBIaBrWkgVFyZzybzScNo6KMTNSSWdT6YuxMCu2dbza33ukn7+neZHlqcWYEGNHMo+wjflKQ4ketsx2xGw+FpyxPwJO5GlZSpx0LAUEwtVhrXQmSOQhO60gaLIa; 25:6ngoD+iMvtAthGV6XYE1hkrlA2qrudV96oJmWUFTMi6VDMddkdRyQhxZnythTALjaXySTssjo0yy1LJgWNQMeJI9sOL2V/nxVM54TzeVO+Yc9qxrg0uz7bT92UZeJJtVVYZgIcc2Ea1dG04cIEeOVXSk7o4cZIAzh/C/rqNBDhldct5huqRli7B29cYBnLOxCh3Uk2krvbVZ6K87x2Cgwr7hsTBsXQ2ulUfqEGB2mrbLqX6dn9dmcnsmIXE8kwgB0PQTnDoq9SSQ1srzOckehNj2bmdsSWKT/b6Y+clgTFS1jA/Cl4A1/XsP/dpP6+rofVS7VxmPT91WznfZLwLpNg==; 31:Xk9gluip5uzaK+tL242zooGlLGfDIrCQeA+XiUPQJdw235izzQK9y40VWjzCMP0/p1n+nnxM07vV02jO+9+gZ7wq4wjBs5YNVtb+iSbnQ6+N59IRjaPO3++V1ddLDoSgJtPiNCewNabRAHZXTP2u+8Rk86yYStqz2eA8XL3547b3z3syrHm9PRI4BUkz4p6KBLYsXwv5oLmTAH+JvWHmC+pNqTr8M7y8CQ9ic2r26O0= X-MS-TrafficTypeDiagnostic: AM0PR04MB4482: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4482; 20:jJSTwypKEHBBUD3nmiviwQ8b//Wc3GiOQB+mPBWTf12FysFD8noASAfKUmWAY3eu4qt1qK0e02gV8AVsoZF7ze6qd4bSKlZ1dVMNjjJzR5gWCoqXGY6/pBVjUKlKld53NdiO/pAo1fQkuODJNncnlBq836TLfxb+xVO/BRl7SJJoFP/AK9Z5UaJXP8gv2EJ6rvGdVfzNERh4N5+o79/P0VPfxjVrHYcqR/AUj4U3rowQ02/Tl04vhmov6h6rdpPF3Gi0I5dNKxmAbbk6wvKxGuBL5vqToJGnyK4mbpL0LCmgcMebiOPWI+9vLyVkP0jsYW3jOUDAJW2ElmeRSqIba8Elmp3WYDc80/WujZD1rGxCpPT/f6eJvRiugfVaPET7fx57ra57k/31zN9FfWpOJjgskHN3C4rGBS7ikLoEVdveDkNgscVQ/d9ngba4b+6JcLxsBrTM7Qfn2dOoJCg71fpgk8IdVgweawKla4omNVbGjw2dEwgBcLGzEaED23Mx; 4:TxFzIBsmorfJ41eYWUxUp4tScnSh8api7nW2Fo3D5w/+aXMSAQRsb46ZIqKRPKXqe+9leyEMO3o4s0K4tT9psjmSPIOeu+EqAi45QGbFn6XhK5QpzxEh7Bwn0TO5P1iTrUduYTwnp1a3G6fWIASbPq/H+fdgc7CC+JqOnY1O7oZHyRX9qp49CRWz8arWKQvR8PAxw88suesugtYTlLfHKIV0/noeci5+c6eMDgTPoq+U2lkX8b5k3DmKSV44d86UCyzqnFPrANmm+wq5rOcg8Dst/H0tCih7fUD11aalCeJoYAQ4vLeG4IQH8LYrVw/S X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231355)(944501410)(52105095)(6055026)(149066)(150057)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991041); SRVR:AM0PR04MB4482; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4482; X-Forefront-PRVS: 08076ABC99 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(39860400002)(366004)(376002)(346002)(396003)(189003)(199004)(16586007)(34290500001)(3846002)(6116002)(76176011)(51416003)(52116002)(305945005)(7736002)(36756003)(47776003)(66066001)(6486002)(105586002)(53936002)(1076002)(386003)(6506007)(6512007)(106356001)(86362001)(50226002)(186003)(97736004)(478600001)(16526019)(48376002)(486006)(476003)(50466002)(2616005)(446003)(11346002)(8676002)(8936002)(81166006)(44832011)(81156014)(4326008)(2906002)(25786009)(6666003)(5660300001)(6346003)(26005)(68736007)(316002)(956004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4482; H:linux-u7w5.ap.freescale.net.net; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4482; 23:ggsVC7IhX2QHC6BiODJ0MZZ5Hv8mHQd2gdhDZ0Gld?= nOuLDJsKLYs8lt5xDtHVWTuQenuVuLkivzEW/wgImynTJdfdPS/Gpo0fJBd762NqGNx8b6vlDCejDDgwo78e7RiK+SxCRQW+IUb1JvVa8ahmEPFljyqVckPCx64dlQ7cBsDS5HP7Mk0r9U6gbdSc+iQ1TogNWsEVBELaf8oCyhHwayMRir5YE7KBx1NfiAroMLYf0bcC171ClxyT1tyIQhRLmKzv1klJw9k4crAxXRnyktFt28fIpJsPjN7vwo2rMf4TSunUV2E0f352EGXjDO8PrsSD17KdWiOuyFJ0TwDVbSMYNu1H/B6BMy3LpJvZSN6Tsi6iQwSNlY0TnOQVGXUpU5LEnYkYCx9s0QelVBP7QoDeGxkrFU63+lo0IJzOE2K2NZLzdXaDv8Z4Zt6LY7tSgIKiO3PkFn+rhj3+poUHrfybaStflM+V3NrDCknpAAC1NIi93KnauUj+6caceVff5mZJyYxDlnA122hXTg52OlZDsQxfYXsp9CyWyBqkdAYNzcjgqmasV3vwbxrauFf3LKQaDHYUGxPEOqwpUJUHHrGjUgh21WydkZq4TzFFBcXYr2lAR0i6H/bY8ZkdymUAUOpXK5sMEkqbZccNk0B2XRguzlhQDt///dhfr4Xgk0EkYHSHbQ/O5ydZ3hnSBcU0VfsRY8utcIhnTWrIpsFA5onfBgbINi4vNDncc7JRica2zDm8oZaLjOtfoQ+LwilEsYPhdx2TonY6GWvWPv+R5RpQPJtJfWkfI6thuq1tkBjxM0iimWfH6bFKXyIkUp0t21RSPKkBgWyS1UK/7mKdGEu7ML5J/ht/D8RzrTPZhO9bnS0TIAdmjGiBtNkXASajNgnEq9/KZpPS1yQGitC3s0g1QgzdxEJoj7uVrD8ylu3NVipQ8/kvEU2yhPiV6lW+M33EwY2K+xf198/GzprAeUEQ8H8Q6A0zNV1bgZ4g3NFYfUxvvZ1XnqIrtVPelM/Knp3zKBOq1Hv8urbs5OJFj8Aqi2wvWM/QXVjyX0ALe8BLw2MUjYemAUovTfo9JKyy+hwY4X49N3pu8F+xV1Qlclf6c/ciefvQNGOFyCDjq0qOszg0251bDaKX1yUticaXuP4jdKN9g5Itpk56lTGY1sdPCBqOnYlPtZYaTUBVndkOxCXHWgHyXEDlQGa1wHfjU8KJTXGdCHMOCg2sJDheQ== X-Microsoft-Antispam-Message-Info: tyJnz+yZuzqiIJeCFyv5HTzQSZJ1qacLDfFIuCgAm8wUhN7FMlwwcwPXqxe8a4g/oeWVReZMqJtBkPByFIyVzLcXNl4/HhoPfbLS0mK71db2OWPpBsHkzD0IbLky3HULSRuMX+ojMI29AFviAGip0xKzoftPG9NtWhrd5+gxJ2C9JKo33jL17CM4B5kI3cCerfI4y7ytu3z8HY/MZ2LjmcmYpkCSDkGFpupyd9q/C698lgkMBoxFJfZfuJorr7wDEemUE5gEreneFFKt7Jbzppcln8O57tjCzaTZ5UKvhWtpVQKoHsJvwB7G4HpWLqh7yKzviSlzwXKvgdFSon3vOWV3bmIgtOj2p+2ttxh6fLQ= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4482; 6:CS6ekIj5ZtWZFzWABk7z9uuoP6Tpr2q221JOW5XycJbQwBV3GTRkrI1CSSHxcYOBQV+tEgRrrdTik1N24Pfd0p/MHs6BIOgLqHiFc4yTqT1TF9de4wccOhEf4eOiZXYhpS3mD+Ie3nQVwaqOqU/0vwXGAGqB8TMoWkC5SbhbrWIldvW4JZUpGniD0YtlHXYJOwSzMPTb5NqVabNeEDB2ReUeXdVC6T965ZXnTpAdWmetpIVUP8Tzbbg9gRmVkIa/2nzNrkcr+6AV8yUI0LSOboTjLQr2NVCiFMavdOu07QHZWzTHXpgYQ6MBtooRQ92pbzbsA3eHwmZOuEJy/QJ6yH2b8FOplnrfAnMdXlsYoJL8RHKN5UqDg8rC1M5I+7RE0SBn4d1zhZgXgPgywz1GJQYVmcrGhKlyN9sJJvejS9nwi/F+1laHvamEnY5Bw9TcqgA7AUhB83Pt3zm+we6tvg==; 5:eOTte56wPRyFi/xLgulBoYhEA+fJy9+kNC673KqXTK1X1t2QwsGNDwgG7r6+1EZXhDg30GZBWu2xSQF7IVMntLNvpy6UO8stym256KwYU1r3zxsFinAc/mDFQOhFh+Fdu3saxjDcDVccE/UPPyVFqbkBiLWH14FdFK6NbL5lfUw=; 7:dw1T2PPUrS87Xfvrn1pOPR7232QKrxQARIQ1k5lABl3UCtX3o1Uh/iVFlH1YTyykuQSTt99LngpkNyUVocvuLHjA6NguvY8RYeW3/4q8X59NRg3uFYLFRRdWW6AquJtgoBUZUbXPIAXkSnAGwC7Zmki36AJbHC3jVkrvXqYakFeQRg7EcsDRwImac65I99GpjtIvLwunc7cpFcyYvb67iI03QVDESU2a2MA63ABygAvhTlw04gck/Tl7DCpMFPW+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2018 13:47:59.2348 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4779fd67-071d-4f4b-8fe6-08d623b6ad10 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4482 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V5 17/32] imx8: implement mmc_get_env_dev 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" Implement mmc_get_env_dev for i.MX8. Signed-off-by: Peng Fan Cc: Stefano Babic --- arch/arm/mach-imx/imx8/cpu.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 90b6ea4211..0cacaa895c 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -176,3 +176,35 @@ enum boot_device get_boot_device(void) return boot_dev; } + +#ifdef CONFIG_ENV_IS_IN_MMC +__weak int board_mmc_get_env_dev(int devno) +{ + return CONFIG_SYS_MMC_ENV_DEV; +} + +int mmc_get_env_dev(void) +{ + sc_rsrc_t dev_rsrc; + int devno; + + sc_misc_get_boot_dev(-1, &dev_rsrc); + + switch (dev_rsrc) { + case SC_R_SDHC_0: + devno = 0; + break; + case SC_R_SDHC_1: + devno = 1; + break; + case SC_R_SDHC_2: + devno = 2; + break; + default: + /* If not boot from sd/mmc, use default value */ + return CONFIG_SYS_MMC_ENV_DEV; + } + + return board_mmc_get_env_dev(devno); +} +#endif