From patchwork Thu May 23 19:11:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1104358 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sOzna91X"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 458zdh02plz9sDX for ; Fri, 24 May 2019 05:12:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 397C0C21E0F; Thu, 23 May 2019 19:11:51 +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=FREEMAIL_FROM, 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 EAD0AC21DB6; Thu, 23 May 2019 19:11:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9CB6EC21DB6; Thu, 23 May 2019 19:11:47 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id 1FF17C21DAF for ; Thu, 23 May 2019 19:11:47 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id z4so5806298iol.0 for ; Thu, 23 May 2019 12:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CX/RIF/iVCe3Deohy4GXvZrjQxd7oMk/G8avyFkc5Mo=; b=sOzna91XKFWjPRSmjO/WN6HPYKoD79s5LA8WkYh8a3wz7unEmjs1i/0OaExQXqXbXN vIcD3aARrghat4Q/FsTvV03q94G62k8G4fJxPCiRUCb7mpWeE43h816XLfYAzZtVPXZj gZFDWD5flRCKVfl6QYR0UeFfgrfnzSer9Sk1/S8hHb6UX094yVoJNapdDNORmCr/z/hF nUiSAmnrpNUkjaB9PFScsV3Q4xsP6/Aj3V9CnqnqugVoLY5sW7HPk8XRLLfnB0HhiWCf FtpSsRAZ1eOUhwzWmKkiV7rFDJ9aP1Yc6WbrOTyr3D0AjLuEj4hFpswcXd6iUChP6eK5 NYBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CX/RIF/iVCe3Deohy4GXvZrjQxd7oMk/G8avyFkc5Mo=; b=P9veTBk5Z+Qzyuf22jeH3Iy6hrt0IesKev63uDWoeAMCIWK/4Fh25Iyrr/h1NoN5SC 44zyWXhrJR0twLk1f5bMCfB57jLpdVBOEaD2hUXcdIWHg4aIQ5K9wMccriMXX0PnhZg8 joFBPB8fXQ0LZza0/NCys4owKQpplZ7/J0XlqPPB0jWvnAlnTVHOLli1nSdHWw7BUqr8 qlYW4d2sT5Z+IQIHs9CoeQOdgcevGD/CKWK5xWlEXQTTnCLX3ubafyVC8w9scAOqXvQ6 UZ8ZJsN0HgdJauWGKX+A2N3QzzRRGNPkTv3wbsxTvlH8136qQq9FZV6CKnkAkd/y3dIT ERjw== X-Gm-Message-State: APjAAAW/BrmEfkD9uCyQ8PEMiRbuJKotVz1gHb5Ev+5OKJqWT5Z1uktm IzIkYfXL6BfryJcofxiOGOuSQr/ghJ8= X-Google-Smtp-Source: APXvYqyenKQzm2IPgHmZuC9aOo9cu1nbTBAoEBPsAlpgmxxSWRvtQSrEOYudg5tJYmnMg2TTlSVTkQ== X-Received: by 2002:a6b:e40f:: with SMTP id u15mr19616448iog.164.1558638705154; Thu, 23 May 2019 12:11:45 -0700 (PDT) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id p2sm151999itb.29.2019.05.23.12.11.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 12:11:44 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Thu, 23 May 2019 14:11:30 -0500 Message-Id: <20190523191132.17439-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: adam.ford@logicpd.com, uboot-imx@nxp.com Subject: [U-Boot] [PATCH 1/3] spl: imx6: Let spl_boot_device return USDHC1 or USDHC2 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Currently, when the spl_boot_device checks the boot device, it will only return MMC1 when it's either sd or eMMC regardless of whether or not it's MMC1 or MMC2. This is a problem when booting from MMC2 if MMC isn't being manually configured like in the DM_SPL case with SPL_OF_CONTROL. This patch will check the register and return either MMC1 or MMC2. Signed-off-by: Adam Ford diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 9f1e0f6a72..1f230aca33 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -24,6 +24,7 @@ u32 spl_boot_device(void) { unsigned int bmode = readl(&src_base->sbmr2); u32 reg = imx6_src_get_boot_mode(); + u32 mmc_index = ((reg >> 11) & 0x03); /* * Check for BMODE if serial downloader is enabled @@ -84,11 +85,12 @@ u32 spl_boot_device(void) /* SD/eSD: 8.5.3, Table 8-15 */ case IMX6_BMODE_SD: case IMX6_BMODE_ESD: - return BOOT_DEVICE_MMC1; - /* MMC/eMMC: 8.5.3 */ case IMX6_BMODE_MMC: case IMX6_BMODE_EMMC: - return BOOT_DEVICE_MMC1; + if (mmc_index == 1) + return BOOT_DEVICE_MMC2; + else + return BOOT_DEVICE_MMC1; /* NAND Flash: 8.5.2, Table 8-10 */ case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX: return BOOT_DEVICE_NAND;