From patchwork Thu Jan 10 16:02:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 211075 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 4B58D2C0109 for ; Fri, 11 Jan 2013 03:03:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 198D54A1C6; Thu, 10 Jan 2013 17:03:29 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 QMAWqkyFABr0; Thu, 10 Jan 2013 17:03:28 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DBFCF4A1D9; Thu, 10 Jan 2013 17:03:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6FCC24A1D9 for ; Thu, 10 Jan 2013 17:03:24 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 2sKAL47N6VS8 for ; Thu, 10 Jan 2013 17:03:23 +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 tx2outboundpool.messaging.microsoft.com (tx2ehsobe005.messaging.microsoft.com [65.55.88.15]) by theia.denx.de (Postfix) with ESMTPS id 4DD9D4A1C6 for ; Thu, 10 Jan 2013 17:03:22 +0100 (CET) Received: from mail210-tx2-R.bigfish.com (10.9.14.238) by TX2EHSOBE014.bigfish.com (10.9.40.34) with Microsoft SMTP Server id 14.1.225.23; Thu, 10 Jan 2013 16:03:20 +0000 Received: from mail210-tx2 (localhost [127.0.0.1]) by mail210-tx2-R.bigfish.com (Postfix) with ESMTP id CDCE5840241; Thu, 10 Jan 2013 16:03:19 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1155h) Received: from mail210-tx2 (localhost.localdomain [127.0.0.1]) by mail210-tx2 (MessageSwitch) id 1357833785310891_27094; Thu, 10 Jan 2013 16:03:05 +0000 (UTC) Received: from TX2EHSMHS027.bigfish.com (unknown [10.9.14.242]) by mail210-tx2.bigfish.com (Postfix) with ESMTP id 3B86D74024F; Thu, 10 Jan 2013 16:03:05 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS027.bigfish.com (10.9.99.127) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 10 Jan 2013 16:03:00 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.2.318.3; Thu, 10 Jan 2013 16:03:00 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.244.82]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r0AG2rbN029738; Thu, 10 Jan 2013 09:02:54 -0700 From: Fabio Estevam To: Date: Thu, 10 Jan 2013 14:02:46 -0200 Message-ID: <1357833766-11042-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Cc: Fabio Estevam , u-boot@lists.denx.de, otavio.salvador@ossystems.com.br, daiane.angolini@freescale.com Subject: [U-Boot] [PATCH] mx6qsabresd: Fix booting the kernel from SDHC3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de commit 49ea0ff5 (mx6qsabresd: use on-board eMMC to store environment) broke booting a uImage from SDHC3. Adapt the default environment to use CONFIG_SYS_MMC_ENV_DEV as the correct mmc node for loading the kernel, since mmcdev should not be harcoded to zero. While at it, go back to using SDHC3 as default mmc, since we have Yocto images that generate an SD card containing U-boot,kernel and rootfs, so it is more convenient to keep using SDHC3 as it was originally. Signed-off-by: Fabio Estevam --- include/configs/mx6qsabre_common.h | 2 +- include/configs/mx6qsabresd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index bd2fb10..5d03b3d 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -86,7 +86,7 @@ "console=" CONFIG_CONSOLE_DEV "\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "mmcdev=0\0" \ + "mmcdev=CONFIG_SYS_MMC_ENV_DEV\0" \ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h index a1d9285..ccb7751 100644 --- a/include/configs/mx6qsabresd.h +++ b/include/configs/mx6qsabresd.h @@ -27,7 +27,7 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 #if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_SYS_MMC_ENV_DEV 2 /* eMMC/uSDHC4 */ +#define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ #define CONFIG_SYS_MMC_ENV_PART 1 /* Boot partition 1 */ #endif