From patchwork Wed Nov 30 17:12:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 701095 X-Patchwork-Delegate: sbabic@denx.de Return-Path: 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 3tTRlJ3nWtz9t14 for ; Thu, 1 Dec 2016 04:11:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4D96BA7594; Wed, 30 Nov 2016 18:11:06 +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 y4swVp8smoeC; Wed, 30 Nov 2016 18:11:05 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 76F90A7576; Wed, 30 Nov 2016 18:11:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AAD31A7576 for ; Wed, 30 Nov 2016 18:11:01 +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 Sw0fvcV5Ym5J for ; Wed, 30 Nov 2016 18:11:01 +0100 (CET) X-Greylist: delayed 16292 seconds by postgrey-1.34 at theia; Wed, 30 Nov 2016 18:10:58 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 NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0060.outbound.protection.outlook.com [104.47.38.60]) by theia.denx.de (Postfix) with ESMTPS id 2E12CA7573 for ; Wed, 30 Nov 2016 18:10:58 +0100 (CET) Received: from CY4PR03CA0020.namprd03.prod.outlook.com (10.168.162.30) by BN6PR03MB2468.namprd03.prod.outlook.com (10.168.223.22) 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 17:10:42 +0000 Received: from BY2FFO11FD044.protection.gbl (2a01:111:f400:7c0c::148) by CY4PR03CA0020.outlook.office365.com (2603:10b6:903:33::30) 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 17:10:41 +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 BY2FFO11FD044.mail.protection.outlook.com (10.1.14.229) 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 17:10:40 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:603; 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 uAUHAbal024109; Wed, 30 Nov 2016 10:10:38 -0700 From: Breno Lima To: Date: Wed, 30 Nov 2016 15:12:16 -0200 Message-ID: <1480525936-23418-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: 131249994410620006; (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)(189002)(199003)(356003)(81156014)(50226002)(8936002)(39410400001)(105606002)(48376002)(39400400001)(39380400001)(68736007)(5660300001)(85426001)(50466002)(92566002)(2351001)(86362001)(97736004)(106466001)(8666005)(5003940100001)(110136003)(7846002)(81166006)(305945005)(104016004)(47776003)(626004)(8676002)(6916009)(39450400002)(38730400001)(33646002)(39060400001)(77096006)(189998001)(50986999)(36756003)(4326007)(6666003)(2906002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2468; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD044; 1:z6B9gm7Kh0RSyz2SGDccfjQJDkJ6nUHSVh0xpUj2CCIwTZfcD7ICFx4Vk2pLbXGQi4prje2CBKwl6YN/q52cMZ9y1N3vovVa4d70wN68p5/LBZy2jNA/5Lnkj/S6tJO02AGKRKVo+OD9pho19fiiPHtEPUr47wsDbee5POzy8U62OdQdoSVcgxy8sFbYWFdGWhvhyta296W3V00x/+PEHEkLleJHF2RLLO1lQGIOjIQp2jPt9JHxcWZyzfORpVspRrMFevZybXDxR0IH7F3xoMkK7BLzaKRQ1AexpGoxYiyDSGbHA5me4lHD+TEx8HjddIyXs2/qtsN0NgDe4c2gaM0IzvOhwFrEqf2NFbomC6Ek9a2yKlHLaxwMpz/cc8sbde1OjxXyDpD1YOLHARijxU/Nf1rQd6FU6X/Pba+Q7nyueNl3N/hinBH8wQNqyTFKTNDVbVZ8nhoeEiKb/CFQfN4Tah8LNw6EVFbg/Ozg08/vkfSnp/9sQJqPpLC9QyZDzQBvf861tbtmX3ISPIWYop84mfTSh5jI+BMGh1xFjxPHnJqvSYlF0WLT+s9QnPLXu/xXWiJ7PUfjRXmX+gsCGMwnDF8UNZKltT7MFMGqatN2Mt8lS8jW/A6A5kvoVBRXJW5O+Z9ZlwMTS67hXDE3ujsaKzpwwwxOskxH23aSG42SHWW6h7+n9f+aow9F7Vjas2UzVXBjpbOQhqkg48sRR0OO0urGrq6Lt/yMBOtsZCI= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 47bace7e-9cc7-4966-9305-08d41943d012 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN6PR03MB2468; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2468; 3:fRx2+p4uoEmOLdI4f7NH9BvXKX2/OrWWHbl0BkK7JJsi3PfgoLgOwpxJHHjatTbgGuwmkgMWuNpEV4WxgGZaSQVaDPR+7rWHGf3Al+sAlo7mttxR6/mnrt4rx7pwv+pEo9FOr++8AhvHmbXb2HnB2R0sgGOFUnFT4Qfxt+BBKubmnW/5IsXLSXUJQyTxRVcmazSxfQM7pJXGeBvypsXrDh3JcEfZ/lMqiBVtmQsfsYIdsEg1psuT4lyr0o1zIrNwRdi4YlKjQEWVGziHF05EWkWVbcocWeTWO6PrdFb9kDm9chqtsuKr3nmpRachqztb8OK5vYgt6vaO5KFnrHhbrh+Xm16TWFr0n/o2I/UTWLDhHb/gPbpbLlXw4VNgD8zD X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2468; 25:ncKoLtOpusyOvsz1B+ggNWcrg/7jIIBndLkinfUsEa/VYluQ2vYzqqcYZvz4uOHRnVqg7sO2NlIIvKqmHxYPq29Fl5RiYolmqUvP5wIdcwuyXKKkDBFLMYn8EHhi40xCwCkIrPS189ANSJqEyO4wuRYo/yt7D2UZpDLUvtgp9NwbfgFfwLc0tNS8KKl0LbrmsexRM46P1+Ux3AsnDhnaIrG5ePagUHOeMOa9KZ5S+OetOIp0N5YfJD5DxrvjcEkwMy+9AuGXcqci07Oqz+hqi/7Z3GGDkhNwP1PYgnoYxCLdwhFF7FhRXwnjVxJsNo2DL7kk+GB0y8vC1XUQQPfScXhdxbCoSaXQM6NbcXGdHWpTpCd5zXyGbtN32r6dqwBjfbTlo+O7UmM361F0I48ZqBepkvsDK98gqGHXk8Vt/xuwQIoBdfhttZYmc7Np1mrJyyQpZoFMYXFDoaDkuL7HjoPhIWAycvMonHtNl7h52hnIaX5aS6VZKfyYlnTdGSt2G2QtQYjDf+fQDo10rxQIE0f5ZnKJXBaLU3plNQgXOheXcBe/pY4PvTjT3z07sA3VVn+J1lAz1B8KdCXBdPH0yF2OG4ZcXbjJpxWBookdnMcD1T97ar+S9CsHRAl6DD2umAdIXNmY5HkZ4yDS3cXw/n0Eyg2n68inqApEecMRy/9bezTmt+Dfzaew26Mmfxdow9T58fRxMsWg9/PG5OtvUP925fVVGrOm5CqdoHSE1Ehb+8XoEkMzGOc2AFJA/lDc2/UNiqHvsTPodZFQTb+SxQ== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2468; 31:xk28kW6pW4cTdiL+MTXKycN9/7iNeaDJRFxiYNXhZTwLgLKSBIRrltfDby+5aW/ZmUa2kcw+AkOTtgQeqbTjGNwv0Cyn0l2tg6TOJQe/wqvE3OpW2MmPjbzgDOrqtMhjLUduffuU3i7RVtHPkFBjN134y5i6qrjeXuNo2OT1enbRZI9/E4DwSICyowalKFxx7Zh6BCCnUBcqmr85HsaZ9zh5RfEcUooLdKANO5hA3l2LWuG4bqR53SWJWdBhw/cIFRSkulkUaSl7N5wYTzGgNA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(8121501046)(5005006)(13018025)(13023025)(13017025)(13024025)(13015025)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123565025)(20161123561025)(20161123563025)(20161123559025); SRVR:BN6PR03MB2468; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2468; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2468; 4:1GUuaIjEP1g3vINJEwwc2/azr0DsJ2A7lCuRSS/5oXgVKf8HF5z3M4iTXJRh+ffCFNmMETp60G2UJC5wrAwOCwQCNkT11eiRp5I++whnt2q0zeENAHNHs1tTS3oFInBefRI6TXc5jvlkLTwEK+rofUVAILzJRtz+XsldZLC136qZR/krMgdRtuGxXRZ/daW7PmYvebjWFenwyyl5ek7Mw3/Lph46MpyeIxUntKXyGzodR242reCMo/Zgr83qQ8KzTJE0y/xI6h3+3L2U1e1DFyoLEZDzqJuG8i4UWW32QP9OCmr86/RTAV4q1xfz0XLZ9N5LnWngrUiUVvONU6df7ckNRxtWSBzb9cjvzlsnz0g8gVkhhbb4KpdXa/hcriqx+LP+39gcjJHYsT9Jt4cPZcOFh1BCdtNQ2Ng/of4MFFcPLRz4mlfkxq+qcrnMccTEhktZAnIt4dYhiAAV4EQXXZTuEsbmk4DLq8jd6tXKI3o49cw8eKgU28ORE1uKOCAn3vO32WnheCkaEQxGiGp7E2+Ybk1GSLbBAPruWdSZd6KsKKSJ2eLW2tzS6DJ/hLMfwJ2qG/iVHxLnVFJ2YDizopMMOvAWBO8nA2BeXau25xBAa6zIzQx7A7TSufVuY5dIL08s2lu0h8/woYxgmcHXeg4c1hJuWWEiqPcQsPkKJ7yar76dXDFD/G79lN24eNQZP/Ukh+FzYRX11moctENJWLGEz8PwDWDXV8l432bw/W09Gutzqnjsw1zvmn1iR7Wy X-Forefront-PRVS: 0142F22657 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2468; 23:s7NmL6qhQkmKXC4UhU1xvn8yZnV7O1Ahajfk8ID5D?= =?us-ascii?Q?u53wWGOBbjCdwKvvXj/6fDzPBhJYQvKcM4bGucQwRvBJ3kX0HairucOhOF3W?= =?us-ascii?Q?WsUK/Nfqo3GosTN7HWrxgdowAjwOc8AcveJno5m9Z3GoTTN0pYoOJWeCCHHD?= =?us-ascii?Q?buoiCXNQXZvAjRGbUP8sLWbc62hQ0EjjY7qkwcywKWHYbi8oLQSLWDYiPTT8?= =?us-ascii?Q?A4aDTsrdLGNYpzYNjtyhojyPjmXR1qY2tkV5pAUvmx6HdSsR6jlhBFKOTMqc?= =?us-ascii?Q?U0xYOPWCVihZG3HcoHUEYl8RnyKXh7LnzrgsG7JwsAf5IeSXH0K8IuiLK2qk?= =?us-ascii?Q?c8DN+6MIOCsvOsKBJAkTiAT3mwKXFM0tq1dSoD3lxbRgxEAAIHhd1N97jV+i?= =?us-ascii?Q?AGQBDyGpaOFBG/dK3qpFfbJ+E0aHtGgV2AhTSZOjCT4CkVpCb57KbaakNKyB?= =?us-ascii?Q?YgSioqugtvKTEclK3jso3JMStrDx5ptxbjEGhXz3xc1CYptS6gX/U+nTzwkJ?= =?us-ascii?Q?1JCjd1Tq65zyzdzZIFOqbeo/YySwovQTmwuBwDOuviVZ3UX+n5PERdYrRgcH?= =?us-ascii?Q?XdAR+y1SPFZ6wzDqOYrXqW8L8LQTFjuD+jGYxxTKCEVSq3F7kB4aYHF67kr6?= =?us-ascii?Q?kTuz74pFiFLMh+8mtirnKMGixAcsRK3PF8gPijV5zRoiimLTE1DWmGuOJz//?= =?us-ascii?Q?3PK4/RXswR6H3FfjawPd2SwkMwdWxatNsbOTDM5EL+0vAxqyynortRiJol99?= =?us-ascii?Q?zeFJXX5x6I5OFS9LP7aw9f8elbJAmFw1C0aSzqTNLoxWTjkMD+xs67bkLF/4?= =?us-ascii?Q?F8u3yd+Af4CHO8Tkby0GIZqTu8zrEeIc1zJHLz9b9N+6NiaRePzpzQiE3C1J?= =?us-ascii?Q?qga9Bo6dUXsI2BosZyI1c52SupsfkZHRsQsVjFefphWd+IUkMe0fKrIqQNsH?= =?us-ascii?Q?i32bW1RZEZVkLhiHRn/WPLcso8lkK4nw2XQ3wqK0goEIRyRvE3FS5J8eBqD4?= =?us-ascii?Q?cTQcC/xLiDf0QNXR4FvmNWTidm0yl06gHIWfpsR/BLVRBLumLbsSroHmx2Vx?= =?us-ascii?Q?WzB9VScQzfs0fMySnF8QUt0m3JDHzw1X5gEH+C2Q5OG/QJKlzKkzjaPZFg34?= =?us-ascii?Q?iF3g50YPxekQUeN/8Gh/G3Oz+McQjAmZ0PtXrvV1fxKaAOI8aBezJ2gaXSOH?= =?us-ascii?Q?WA0Z8K9WvL2I5DY3GWh+IAi3Ndz+paoXeAV?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2468; 6:mvz8Ji7SceGIeixD2vGqr09YLBIO3j39efACOrySitRTEpSzrmfW4yXgiSO2gjN6MbFzzmgebVOTqEQb+cWDxN+iIu29M5fS4xBnEB6V8Od7DmLp4OGeE/I7SRaltomujkpPcTLhoSn/VcoZ9kA1Ac3nbilv0FPXbE51UdlSPJzCYaxjnAJM6XtkVjjZTLGX4kp9XkGd6ACLz3mh4bMFTgr9KQVEucxwB2f4MQwxotyfUirerauuepvGl0ZwtTvPD5Gph4xg6irJLRjJoRPpUI4ug8ltuBzpwpyOGCprq3ei9I7jRsh5uJ3w+TjkhtQN6Gk7b5IrCpHNZ8NVxBdpZipynZmfHuVhA/Rg479huuAvARjRf3mVQYLCABKyGdf4T87CKmHhfti/D2mpm/ekxpjr+JD36QYcJFc8dkEdcvsSjqUzE+7kElxxBKppGkpT; 5:m9Q7T8ChIiuySBNlpAkBfU6Er+/o7q7LJVQkFU+FPIScaaaQMcyDmhb/2fmmHMXLTIsJ+/9R4OFy2SdX1CPRhebZxEfEQqw9R4c6nXXErnO50fuXqFQpQWydDGw7O7WS4OuxjgSLr/jWtlP9Io8jPuJ9IjyibRe7Bjc7t3Am19iok7Ojo9Rq47bt4ybJXAnh; 24:ppy0UaxWPmS0yrPUvrB+Se4G4mgOSOoGdWcR+32DdaD0C7MJVDsUrzcce+TnnGxmRQ7cV6DG+Jbv0CJugi4LTz0Z/R8KKzpYHid4XLyLfxk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2468; 7:Fj6FThC2AoXT+k+/XRVKPNsIyAWV94lWE+RN3t7xrMqE5jZNy2sSnSDS+1Y1uOnMrYJ3jZzVS83IEeoDOU6toRN6dfODxBLSPpmUYXJSzAo+AuIzaejiJLvDnV4/fo1KGao9GnABa1PCAmx7RQSb/dC4ShXH6wjJiJ62g4Ew9eTZSKrd5VL3sg1ylx2tJk15locTY7DNTqM8yiEP5N4WmfM9+UzU4A+FxIPHWjjMy4SRQnv1iCs0p8gyDQ3ds+XFFYsrmoj5MCjK/YNzzrWNIKDTLLuYa14hUws3filjRaK3ae77d02DJYbaGWJ0LOVMCSwYIHX890AIfT9hW7wUBlmPE4PPB0kCIyMrs/u+INzIFq/g+lTu64zTXQNSpOQ1j2YTmMcseaT/EZRx+Fl7jhClJiL3OxymSW0K6OjgBFyDnHCvcjk7rRmDMC04X92TNmodC5xbLLCMMjHo1ujCqw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2016 17:10:40.8591 (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: BN6PR03MB2468 Cc: fabio.estevam@nxp.com, u-boot@lists.denx.de, Breno Lima , brenomatheus@gmail.com Subject: [U-Boot] [PATCH] imx_common: spl: Fix SPL boot from SD card X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Since commit 54e4fcfa3c749a78 ("ARM: mx6: add MMC2 boot device detection support in SPL") we can no longer boot from SD card on a mx6sx Udoo neo board: U-Boot SPL 2016.11-32108-g9cd37b0 (Nov 30 2016 - 11:05:54) Trying to boot from MMC2 MMC Device 1 not found spl: could not find mmc device. error: -19 SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### Prior to this commit we had the following logic: /* 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: return BOOT_DEVICE_MMC1; and in the case of MX6SX Udoo board we entered the case 0x5 (SD card boot) and returned BOOT_DEVICE_MMC1 as expected. Now this does not happen anymore and BOOT_DEVICE_MMC2 is returned, which breaks the boot. In order to fix this problem keep the original behavior for the SD card case by returning BOOT_DEVICE_MMC1. Tested on mx6cuboxi and mx6sx UDOO neo boards. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- arch/arm/imx-common/spl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index 325ba26..cbcd936 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -58,6 +58,7 @@ 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: