| Message ID | 1480507738-8035-1-git-send-email-breno.lima@nxp.com |
|---|---|
| State | Accepted |
| Commit | 51efabac487d832632f9797a94ed2ba6fe98e718 |
| 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 3tTM3g2Gnvz9vDp for <incoming@patchwork.ozlabs.org>; Thu, 1 Dec 2016 00:39:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D52B4B3865; Wed, 30 Nov 2016 14:39:57 +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 8UcepkrJvKei; Wed, 30 Nov 2016 14:39:57 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 68754B3857; Wed, 30 Nov 2016 14:39:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C511BB3857 for <u-boot@lists.denx.de>; Wed, 30 Nov 2016 14:39:53 +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 rSevOHw79Yhe for <u-boot@lists.denx.de>; Wed, 30 Nov 2016 14:39:53 +0100 (CET) X-Greylist: delayed 5566 seconds by postgrey-1.34 at theia; Wed, 30 Nov 2016 14:39:50 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 NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0056.outbound.protection.outlook.com [104.47.34.56]) by theia.denx.de (Postfix) with ESMTPS id 082CBB3846 for <u-boot@lists.denx.de>; Wed, 30 Nov 2016 14:39:50 +0100 (CET) Received: from DM5PR03CA0006.namprd03.prod.outlook.com (10.175.104.16) by DM5PR03MB2475.namprd03.prod.outlook.com (10.168.233.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13; Wed, 30 Nov 2016 12:07:02 +0000 Received: from BY2FFO11FD043.protection.gbl (2a01:111:f400:7c0c::118) by DM5PR03CA0006.outlook.office365.com (2603:10b6:3:118::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13 via Frontend Transport; Wed, 30 Nov 2016 12:07:02 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD043.mail.protection.outlook.com (10.1.14.228) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Wed, 30 Nov 2016 12:07:01 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:624; Count:8 Received: from b58964-3.am.freescale.net (b58964-3.am.freescale.net [10.29.244.171]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uAUC6xvt007853; Wed, 30 Nov 2016 05:06:59 -0700 From: Breno Lima <breno.lima@nxp.com> To: <sbabic@denx.de> Date: Wed, 30 Nov 2016 10:08:58 -0200 Message-ID: <1480507738-8035-1-git-send-email-breno.lima@nxp.com> X-Mailer: git-send-email 2.7.4 X-IncomingHeaderCount: 8 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131249812221160248; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(336004)(199003)(189002)(77096006)(50466002)(5003940100001)(7846002)(8666005)(39450400002)(2906002)(305945005)(4326007)(356003)(48376002)(81166006)(8936002)(81156014)(33646002)(97736004)(86362001)(626004)(92566002)(50226002)(68736007)(39380400001)(39400400001)(39410400001)(110136003)(47776003)(2351001)(106466001)(50986999)(5660300001)(104016004)(189998001)(8676002)(85426001)(38730400001)(39060400001)(6916009)(36756003)(105606002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2475; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD043; 1:J/LILWaJPZcGWmZGP/hv5hPy0T2UA9ErTmwtqCEO5y1ahfGMFSOHyplrZHagV7J4SnqPBUKn43TcbHS9SIapDoxDsuUBxrtcSYAub3pg1SsnbWB5lGhyR6MX9Sw4Pg5QkLK/xjNDGEVfcBzeYZiOj6yzOA+r2m8nhNXp3NUDQh/w46rQb4IGW22aFlURlV6NsLvFFXV/Sc03rU25a98yIgnDQRjlqqbSxmjf8oZfnVdMvgd/CQf9WiI3aWgxOBkbcXXx4m0+W8vRNQZmKC2JUi3Syhiz5DrETwXxfhQgRsw8j6Av3xAWWFg6Gojdr5q/gEuZMgeTbh7wtBkgTLwZ3Euy/6wrgRlL1I1KeCASensHuRZOGWO87HHHhIAgUb2tXPehqqGfLeQ1cxdmT/bgKYZPyRohWntjP44mv/dObgbnqKKKqdWro4XVWKoFrzzqV6xfAZld6XVg6gjhKBcr9h9cIy0pcYWN3EDa5pYNQDLaCuQJ9C5Bxz/Pnjd9uc8+iHzccEoy0s9FCFRrDNUywdm666tlbb+FOHzLePMpxLash2Gw68/HynkxlqPPB3wdWdHbOG3Q//SQptG238KOT7xbCVcgfRdzp8uMMaZboC21HXtmQG6Fo8B1x/4B5hJ9uCkm9pQDLAT/sE0Li1fhFJDiEMo6YxEC/uS+MqfVHj8ue9PAyltSRXC7IcikWpQ9GeZGJo4A4rGcL7aUnXntF9eo8qoX77T5o5HnaDI9ndU= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 797e2670-ffbf-48c0-6b38-08d4191964be X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 3:U+cMh6ya3bWfHShcz4i/ilkY4yR0a6mldmD7SDq1JBfY476WbS5nk1JR91Y2pgUr6wOh5AtffrSorv922GiOSWqn1fdxEY+owjxiRF9FchL+MmzHmbbYABAVH/hZWb0wKS7RdiNPAbAcZJm1AeYRRRFO9H1KvC1ZoBYLR3ilp3vYkdZEn3EbV+TUk6vbd+mPIDVSIIeiYRu9WWcOOMWJloa4T3+Y+K2cfjTUFD/GyM7aGqhlqtYFg8AsMRuROR9njYzCaAP5gg9wv1OQEcZYTSpYeVR9ynEmSEY7tI4K2IUmUMSHVzi7jMSfNwqN4psXA4A0jJhahTKSaF+XGpE/fuR+U+dkzGWG7a2DQQetIT6UnQ08pm2mMnY3BEwEh3KU; 25:4kjH7W8VD5v90QuvF3nJiUyOu7uTqwOqQ3Q9tnLWaBTHwM7EJpL9o/SnzpQE70jBy+SPi5uJDZLOhZCuBpeQAEFrCBeESHiJ8FiHKFWx+QYikb+om5UGO8a1hn+uzmopCderv8ybwHbh3xg9vSVhsT/MCoG8un7Wa+RInIkVVKqTkPxo6ZR3xFThj115/xxcDiGnJDAKSoSjcyO4+v6IA+CLYshmgIvMNzAPSOWEWcByRE3lgzZJXu2kQmBvaPRg5boM9BkHdEvmHmXQ4IHxPk8QarTP98eHyv8T1s+6iM9e6MrZdocb5u8QW/AUXSkXaQnKGuvhYLxtVzABUqcPqTK3lEwuJdadKNHD99FgPmZXtExC6z7u0snP6Ik5628nLLfCwj3jg1I3PJHSL6abAgRqRV/b7ZmswZysI3rR7SDJo3Jugh02YmMiXIQ+QWVAjQ1hA7cNf+1icVqL8peqag== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 31:0guOnGKRj/xK6RPNc2VzjBuuqZhaD9y35JE7ybhHNNuYJrpwXrRxmqX67smr6D04BtWMV0j/r44oawMvdfg2fXH2eJNyayw3uf6C8WvSJy3ZZmmkgxKxqbpkpr0Vhd4sT+IayKumbJAxuHxXf1JddDVk5OUJwdG+TzZp5nqU/UZBMZPr2KJeeFgljya/bIJE8hlbS68Wb4uYG0gQfJ4iX7rJSVB8NUErglHNnBXKz0ja1NOCrYfmrtLoUnFJH6v0jiFo4wr8Cgx5FDIgAqEKB5nDG6wPLTQ56XfcNpSQE0w= X-Microsoft-Antispam-PRVS: <DM5PR03MB2475304D487A64B988167934808C0@DM5PR03MB2475.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13018025)(13023025)(13017025)(13024025)(13015025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123565025)(20161123563025); SRVR:DM5PR03MB2475; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 4:TKTITw90H71dBqiawMuvHpEy/vx6zOx+cJtegUhMR54HyVKpvLSnmq47ZXX9BjN7UzEcLv4P8BwaQ479WVhfb5Dh+11di9LOkXHpj+cX/nzOjZDVjApEg75z0WQFWCtZozMusJY0eTXQ55v/LcKt5JsTQCeQK6yfc5SlLtBq6WBVC1EflRQ204Hbt6N/dqZN0vqRDw8G8hQxQHsrtJECMPjUVlX0gbHOBr4hoP/oFp6OQ3UyEKdMHjCYCLIqQjugtuorNVPlDHQzf7Ye6+JDyegXYpLk/kILUw0l/rIPRuL8WrDbiojc0+84GEe+ESLnPqnNeSAuMl6wY+k6V3qbgxjvsx3IVnPLz4vGxifFikwqvUBuiw9JOuA0gm61l/ignlna40zG4Rua1s71CFBv3z76rxiWLskADqdRJhr5YVueyImbaNTSdVBbbszuDZc0Fc0vN/B2Dne3ctLrvM6kHD64LO5mEisfAQ1i2MVk2vmG6U3KvKQ/6F/HIYS7wMyOLiUCCjdHJ9yppcdNY/wpZMX+2u7AUAFt0CHGcYCv9kys8+rqOerFXHhdE81piZslttyXYfDM6B1vAv8ZGBmBgqT4TkkkvtQ1e0odA7QZ/oTc7RPgxac/bSXUUfQEOh0es8wWOlNfTfKJclA3JhaN9r2Q1GfgFYITcU50VbYns3nnoBSEz6yECz5eYb8y8XE5jgc6ut5gsyKZR/Wa2AX9oykdjfG765ygjlhc0BhM9BlBRNPr+rZaUAYnDRKtuUQm X-Forefront-PRVS: 0142F22657 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2475; 23:20XXiZfYn+1ga3LxkwKdfpSbYUb1WAawD7vAtO9Be?= =?us-ascii?Q?ni+71Z+WzvQsEW4aKQy9jvkqBN2QzZhzRtEnQA9MMqwxk4c5jT7kPw+emdT3?= =?us-ascii?Q?t6NGxls+o5jVtY6HS8YjOwaW0TOZ4qnWIUSi2a3MF7gGBUJ6Z2hqL0DdzApU?= =?us-ascii?Q?4UtnFu0vs/+8ayFs7oUgrtJmqidQqSifxZw3ZPQEh55QAa3BOV3XnqTgZClk?= =?us-ascii?Q?mDfdh9bXX3rkk9pi5By+8M3QleSVNw6pDEe2pX5uPHDajJLkzAP7uY0mwKsd?= =?us-ascii?Q?yJAuK4E//h7aZSiDkrAYqTDiFK+ailk/K8lL2kIkDPNZtBZ1S3YVeFSEDiPu?= =?us-ascii?Q?xbNO6Kb4+Qi143nIsyBiCWPJINmoDBzUlMW64afCaiXkbUG5d6vDL4imrJyr?= =?us-ascii?Q?zwT2Vp5SIoHVMz3zFR0q8thKNcejRng4FJOxafFzW2t/i8E+1sgy2dqaGPR9?= =?us-ascii?Q?AgyQ68COOM14atgBCu4Shp2UXgps/S91vutgooXiRHiC/yGwurOrlPmPmQLD?= =?us-ascii?Q?slD2o3fIlH0ON6W9/WfY+vU6MuOgMNc8GAtBz1zqfce5eVS9eJ0ndYvsujVv?= =?us-ascii?Q?WBO6Sk4vVUyP5faAKv5teiNYoVcx0xP848WRmk/CC6bHyG999+WH6evlYVlO?= =?us-ascii?Q?aemy8E9yjXQ+16yNeHHrLQGvZ7dUadFodfwmBz5wA2ZtOqwa/0VnK5vjMJ+L?= =?us-ascii?Q?xmmW7AykgyYlozi38iB1IAWdMltiQl32yCO7Dj4CA7W8fBiQARTy2L+wU+X5?= =?us-ascii?Q?1HR/ye2czIXV6T1KUKvLmvYceOOXlWv56aJ1kQdni8kur4HKx1gW6uA+hHLY?= =?us-ascii?Q?Egm6gsTNRTihsdr3MHI8h/9YuJzocTkIwcUWLXMk+HR3WG6xVMU9danU9Dd5?= =?us-ascii?Q?qv/soNfzxot7oha/dupeOp4NXXZp48/fwHDyyEMIVijEBvdysQAeyKXPMcNO?= =?us-ascii?Q?/L3m35zDyIovNsOaOwVNHfzQ//dW41LF+YBZ1VbqVJVhawEQGotYB5HyDebj?= =?us-ascii?Q?Gk3C2HLNR5lLwtPXkU/pZsnPC1AyTRYrTM7DNSjiAKwoZc9PoQZzwyZPcGA0?= =?us-ascii?Q?0KQZNxREGTm25DMeAwLgOn5tLCSA/bG+cUIDLqd1owzvL0R0/Mte9SCjvt9U?= =?us-ascii?Q?tDQHCo+zTtLlZNbAHXjoqinozIGG3alLefKLa2usNjyYCYnEcWt4riEnrVTS?= =?us-ascii?Q?mo5OWeLHsoSKe4=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 6:ZPq2nLc8A/cuk5XM+1lmJGGCIJOf/Cm98QltYI0MMnobNnGuUGDvBAm6zRAQTM4/Fgd8YTUJjcqu1AQWlImLB34gl5nafMV6jdi8VuV9gx7nc78YOuVzYpOaE7bHOA/+M7fRRJNMbAT0t5wIft30Ax6WfpI30gmV2XzVBUbpHQuD/a8TcNg8t0FV4l/NzpeEIvN6z9vBAPn2pdhBDz2H7OJSJB88RVU+CwXiUhCBgHA+7pOibP/YHKXm5cRFe5LzdzJrbSoHFQTRT449TztWoLAuDVmY8G7q3aTKisl1iumhM0SuEA7BtYJr0QOrl+c2pZ04CdVdYrL/YC2iqawJ9ViWij65NvpOzmIOa3g8jPs9OCdeKuR51dmAUN8ZwIWLUCR26bokmsRy1QLa9xN1nB1koibQ6FlvMFpSX/z+xIr8rwKF03ZiK9OrTlrjcoOn; 5:vr9RX9zXpPLxs7woL4cQ6GOexgOWDH8AjO4DxezkhjA7U+yD3wvhNF65/cBhapZUP/98zS6SEBb2rnwUjbGAubFdfkEB8Hy8FYXulXEb4faD1Hf0yA5Zsmey6BYdZblK2eVw3nF2nAQzEuDt2SBXcyW9w8o/5+AxdnebwXivBqTx4mydvkpfhWts25G8q2Ny; 24:dS1lUTxNcK+aNtMs+shODllit0kKTqEbrOPWMUtuknLeaq9SH1r1jiK9sfx5bGP+AcQtnw8v9sXyxcb+WD0yMLblp4UvEBrAbDlHK2BHEbY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 7:JQ/nJx04TkhivcN73TxB5+gzfbOci2pog28yBFL17uzB0r/S/9H8eYeDAcd/vMP1UYchd9RTTN0CfZemtkC4zZ7LUIjrxA+133j+xs9pU7cu+QXkP1CKmMUH3hsnikfVPymcmDlknL4ZsfGs7gm3Ybw1rIL4oMRbSEDDOgHObYeOiefvL+DofMqiF81SNIkN4Zkt2hMMy/SzNj5/X9HyUbN1Y9KBvCoTSPaf7bm9bJmj6Y1/OllJtQ1qasSODziBjtT+H9GtqhOu6sjK3xtrHzHPWf6MT0ucWNbAS2vrC+yzA+/5hp+Di++xTERrlLCazfTyV00xwIDSLQ1yv71Y4P9aSpNDT2MUtekSj+mIYIQJUKm4NROgF6+tK3D1NPdBXkJuAmuGXIVvPQYWnrf64VqEGaoR5M/FvW0k8fyj5fCiTm40nnuLV0hAwNx6C77ZaRXUigROe9Ba3GXCNuAREQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2016 12:07:01.9288 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2475 Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de, Breno Lima <breno.lima@nxp.com>, brenomatheus@gmail.com Subject: [U-Boot] [PATCH] Revert "ARM: mx6: add MMC2 boot device detection support in SPL" 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> |
On Wed, Nov 30, 2016 at 10:08 AM, Breno Lima <breno.lima@nxp.com> wrote: > Commit 54e4fcfa3c749a78 ("ARM: mx6: add MMC2 boot device detection > support in SPL") prevents UDOO neo board to boot: > > Trying to boot from MMC2 > port 1 > MMC Device 1 not found > spl: could not find mmc device. error: -19 > SPL: failed to boot from all boot devices > > This reverts commit 54e4fcfa3c749a789192e83740a53234182f4ca3. > > Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index 325ba26..bdcda7d 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -14,9 +14,6 @@ #include <spl.h> #if defined(CONFIG_MX6) -#define MX6_MMC_PORT_MASK GENMASK(12, 11) -#define MX6_MMC_PORT_2 BIT(11) - /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */ u32 spl_boot_device(void) { @@ -58,11 +55,10 @@ u32 spl_boot_device(void) /* SD/eSD: 8.5.3, Table 8-15 */ case 0x4: case 0x5: + return BOOT_DEVICE_MMC1; /* MMC/eMMC: 8.5.3 */ case 0x6: case 0x7: - if ((reg & MX6_MMC_PORT_MASK) == MX6_MMC_PORT_2) - return BOOT_DEVICE_MMC2; return BOOT_DEVICE_MMC1; /* NAND Flash: 8.5.2 */ case 0x8 ... 0xf:
Commit 54e4fcfa3c749a78 ("ARM: mx6: add MMC2 boot device detection support in SPL") prevents UDOO neo board to boot: Trying to boot from MMC2 port 1 MMC Device 1 not found spl: could not find mmc device. error: -19 SPL: failed to boot from all boot devices This reverts commit 54e4fcfa3c749a789192e83740a53234182f4ca3. Signed-off-by: Breno Lima <breno.lima@nxp.com> --- arch/arm/imx-common/spl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)