Message ID | 1450167975-13265-4-git-send-email-Peng.Fan@freescale.com |
---|---|
State | Deferred |
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 Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3C8091402D9 for <incoming@patchwork.ozlabs.org>; Tue, 15 Dec 2015 19:28:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7DA154BBE1; Tue, 15 Dec 2015 09:27:45 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YZWIoPp4XFRo; Tue, 15 Dec 2015 09:27:45 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 51CF74BBB4; Tue, 15 Dec 2015 09:27:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C361A4BB1B for <u-boot@lists.denx.de>; Tue, 15 Dec 2015 09:27:15 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eYLkrG5bNQik for <u-boot@lists.denx.de>; Tue, 15 Dec 2015 09:27:15 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bn0104.outbound.protection.outlook.com [157.56.110.104]) by theia.denx.de (Postfix) with ESMTPS id 4F5684BB0E for <u-boot@lists.denx.de>; Tue, 15 Dec 2015 09:27:06 +0100 (CET) Received: from DM2PR03CA0033.namprd03.prod.outlook.com (10.141.96.32) by DM2PR0301MB0686.namprd03.prod.outlook.com (10.160.96.24) with Microsoft SMTP Server (TLS) id 15.1.337.19; Tue, 15 Dec 2015 08:26:58 +0000 Received: from BL2FFO11FD021.protection.gbl (2a01:111:f400:7c09::184) by DM2PR03CA0033.outlook.office365.com (2a01:111:e400:2428::32) with Microsoft SMTP Server (TLS) id 15.1.355.16 via Frontend Transport; Tue, 15 Dec 2015 08:26:57 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; denx.de; dkim=none (message not signed) header.d=none; denx.de; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD021.mail.protection.outlook.com (10.173.161.100) with Microsoft SMTP Server (TLS) id 15.1.346.13 via Frontend Transport; Tue, 15 Dec 2015 08:26:57 +0000 Received: from linux-7smt.suse ([10.193.99.203]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id tBF8QbsD006496; Tue, 15 Dec 2015 01:26:55 -0700 From: Peng Fan <Peng.Fan@freescale.com> To: <u-boot@lists.denx.de> Date: Tue, 15 Dec 2015 16:26:14 +0800 Message-ID: <1450167975-13265-4-git-send-email-Peng.Fan@freescale.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1450167975-13265-1-git-send-email-Peng.Fan@freescale.com> References: <1450167975-13265-1-git-send-email-Peng.Fan@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD021; 1:Uz9gwSsmYgKz2h6j96FKqkBq+SuciaJKUyWxo4ivVGmurI4cjVwdllUyJO5fsyFFtbOv0L6XE78Stra/JanZPsKetuvFupnv6NznBEInnLgQEWRUHJ86YFWwy7k84NYrR4xmvqvGFzDbcfP+zMv8gZEsDCIqLusoiddqoQwSlqg713I0054vjfNfwPOkHirEUoeOTTrqbzpcngc/+ZG5kFWu5Lm6+eBgX6KldnGhso9MaaRHg3gSVfLuTkn2m5etzSYpBX2AzBupMU62S65d32R4JQTCPlGqNUc/B8hg5tKHYFw3zE0j04KA6s4ybM1j4TO5IKyOgI+eQ8VS8IohyJEnK6LpG8g47ccbqmpCNCzzwHoOMHFQgHQ/mVXye2dHLdsCUDA5yxq7yj0K6o73RsoH6a2eV4arOq81yCKenEI= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(86362001)(47776003)(1096002)(85326001)(87936001)(1220700001)(36756003)(106466001)(586003)(19580405001)(2950100001)(104016004)(2351001)(19580395003)(76176999)(5008740100001)(81156007)(50986999)(48376002)(92566002)(5003940100001)(97736004)(189998001)(50226001)(6806005)(110136002)(5001960100002)(77096005)(50466002)(11100500001)(229853001)(32563001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB0686; H:tx30smr01.am.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0686; 2:j+V7eRJ90ZyO7fNthf01tdkffXKzPLZubiSplhx7MCdACI66U4K28iEvwXPISQoUVz5iWBjBlzXjOTw7djH7xkG4PWbJBRJfHvFDrcJmbcvlBb6BvyzJ/4PIFk4fKzHjhuEXbykaIfyWTVe1kuteUA==; 3:DhNbSHDYxXy5lDKbq+rhLsB32ggxi6IXN5no4X298nHm7MwmQiGtuwA4ir+pwFLPrNaI9IQlfdMxUDpaNvwtuJtwlpE1tOgcPtN/tSXVDZ20FaVswL1IdV3N9sX7d9aV6Id6I4pbimD6Fcy+la5qh1+fP5RH4cw+tTuNmfrwUWd/phZsScBesQwIpfUq+FNdy3QC5SDSESBUJBI9QTp88oUJZEKxB6Hb2l94E9p0ngw=; 25:e+8W+W1a5znGmEsdq2QHvnNmvHTNXrOKvIXGZ2h+KMfMQdB8N/iWxGRZmQ5LAhVzmkobl+RFmLOeUM0ywXI4BpiJFerKY7fm4qyWfSsrJNN8j1BV+cDnPlWE3UwBKoq5GAbjkwSj5LEruMiHlekXkntKpKc9ODps4xukE9HGCsID802pEiHIpP6l5svfATXYmKLRjtdEvOMgJFgUliRn4PZ1Y7UlKoMxSQ8Pby52IX7h1h4vd5+naTSftDnNlPse X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0686; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0686; 20:iepl69odvCSXpiv9NTkXNL/qAqbPaYXGFyGcLopsOUP+Kvb7RctissThz4f+1qna42Mk1St2EkAMOTH3aX2iuKRMvBcbEkst561KHQj82wNvbabZsXRva81K2QJFrwyeJ8WGGpNfwXLqNJ1DlbUqaLB8HblQf5Eb/TL+SdUWHkvzbf0GQnsI4ckEz2MGoMkWsc6fCn+RAG0WSpXxFmJ+0e8uLoWKhkuy9smR/JbplLGoVvPTqDbW8K7Ja/Vtu9LzwDxGG6ixV/7+3MGfR3UGJQGx5pQ6qZckuZrbQlWq+/ISRKO2hd9pl5qcMpq0UtlyU89VB1nqbkvQQ71/Qj91V+WayKCx0Boe88JPMM525Pk=; 4:5hSGYd4XJ9ZcmleR+3GCGh6+Wl2FJPE3Ex48qa67VxuyqRhfslTwoknP77jjTNQPQ4Y6+GWysU4lcPkNwSQVsiBgl3niC64mtC4zwBsXIcnelIsQsHwH7fma6qWHJ6SGDtweJwxkqVxTT26FyQHcBuYPR2kzfRJA0NMRBeB6jVSU7o/XFiy8q54AO+uEr0mqii/v6Y5jwQmfJ5zwpQsmPKV8O9zWiqlvk8+DHe9UzjGolZ/JnRXAuWP6LIHghxzmf8IxPQcPihgMelaR/BErUqJ1J9aXkDIFedfHhEkWX3M7xMEi9eU9YZpIo0LYobfpJ3ATlLNrA/7rLr0+lTJEM2q2spHCZeqFLOuOIgwH5037mzKj1dMuRJGRkJ/I73oUfPwITJxPXfq/XONnLKf4ZynbMTP9Le25NvByQ78kWic= X-Microsoft-Antispam-PRVS: <DM2PR0301MB0686DDDA81F1E9C435FD9B6382EE0@DM2PR0301MB0686.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501046); SRVR:DM2PR0301MB0686; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0686; X-Forefront-PRVS: 07915F544A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0686; 23:Eb1ntnODE/cm54llpK6JMIPweYHuU5qTsPzFsHf?= =?us-ascii?Q?5qODG99uG75HbMMlv/WHPpZHK9WFwKfmSv8cbuugzzzooCEFtbxDSfLxJxzT?= =?us-ascii?Q?OsNv1r1xsCJ0jPpo6hDjamhUbGR3igr4Qx0pQ/HtOM5jCCeJ48BOJ8pMwQ7r?= =?us-ascii?Q?rcp3zXlkoNyMQTDl+TCUCHtpaT6BY7rfkgB3MgHjLchuI4HLNUiNJ44/L0gu?= =?us-ascii?Q?Wd0LOL/UkaAMXlr2mqVd8eBbp5bYCycBIcEzJEGFXh8oxO3kcc5xWP5SpxKW?= =?us-ascii?Q?DxUSas7/aNKO6THMqfkO6ankqX72IEHnMGtXUfoiNMBWE6FBjMFb0HOP9UOC?= =?us-ascii?Q?J5M3CRd59P/++33lWXtw1TglrFNnrEmGyI84G9DDz+TBuALTqx7bLLCHkrf/?= =?us-ascii?Q?XT+QUoAh1+Dq6e04mSISE2fapGMW0ipdk6R2ku88uJ02r0x2j2HOCwCQeQSk?= =?us-ascii?Q?9NkSDwCiNaYAXKXc8cXQSQtvX7J5JMNTDrxoVlZ5CrBkFFvZU7O+Lsb9FMp4?= =?us-ascii?Q?C28hVALPYshq77J2faC/cxZkfXDCZginD/NCMqXzatRJ1u3qENsS3dQyaMYb?= =?us-ascii?Q?8Z5lyVefMzmeKysx/d5nXJqZP2zfL6ZpnRNNbePBW4CnT6mKlvv9WMDkLIvi?= =?us-ascii?Q?fVCn74xFAaqxBwSE3F6kHTVmP9SySsBn8+bqxMsGNEe3CxsnB3qCitSHA8hV?= =?us-ascii?Q?Wrkhsy2G0YWtLTukNMqmUoeolaoRy7l1oIf+sUQr3p52trRAyL2c0jLl/rsu?= =?us-ascii?Q?5QHeZyE2x9fcsgHSO3rgmwsoirYKfXHL9MrF3mYw1VrXD1tnSE+nHv2lZFYz?= =?us-ascii?Q?JbwK2PU+pfeks61FJvwOAf6qI7tUml0JLhA/FwwZN4boAeunomyd1K3R63ox?= =?us-ascii?Q?xkmfcR+U4LXYDWjuN9P46dNkPGPnwKe3FKcscB9tsX2LXH80fReX8MMLLT7N?= =?us-ascii?Q?tgnSJL3amp0L5SRBDa9URBRpawXRHhzPsaa1PDdkF1wpbkun0H3VQi6c5jRP?= =?us-ascii?Q?RHrE=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0686; 5:Lo7W2xSUsLYYz49Y0C+N22aChtz9Jrh/XpdFPtuaeleCI9IXa2hOyFH1mPpvLGlR0kW0ymVesMzM2Ec2B5zo8lTUerEEIBn+3vXu4fr7bYuFg0gH78t7W94myuhUEUfNmXSYjQGMAHeu3rnEPwK1lg==; 24:dB1w1cWdcF7gs/gU3RmMEUzDaoWPMo3Ww77u/ig5plD2Gl9Y9txEPfUCTaCO8wYw/SrsLLa8Z+lnlvikuzzPAAEFlI8mxFS09BYky17yG94= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2015 08:26:57.1718 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0686 Subject: [U-Boot] [PATCH 4/5] imx: mx6slevk: implement mmc_get_env_devno X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/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: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 5eab4b5..7617c76 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -170,6 +170,22 @@ static struct fsl_esdhc_cfg usdhc_cfg[3] = { {USDHC3_BASE_ADDR, 0, 4}, }; +int mmc_get_env_devno(void) +{ + struct src *src_regs = (struct src *)SRC_BASE_ADDR; + u32 soc_sbmr = readl(&src_regs->sbmr1); + u32 bootsel; + + bootsel = (soc_sbmr & 0x000000FF) >> 6 ; + + /* If not boot from sd/mmc, use default value */ + if (bootsel != 1) + return CONFIG_SYS_MMC_ENV_DEV; + + /* BOOT_CFG2[3] and BOOT_CFG2[4] */ + return (soc_sbmr & 0x00001800) >> 11; +} + int board_mmc_getcd(struct mmc *mmc) { struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
Implement mmc_get_env_devno, support loading env successfully when booting from different slots. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> --- board/freescale/mx6slevk/mx6slevk.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)