From patchwork Tue Oct 2 19:22:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 188648 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 0AD232C00A2 for ; Wed, 3 Oct 2012 05:48:17 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EEDC028080; Tue, 2 Oct 2012 21:48:13 +0200 (CEST) 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 jgXvODU3JWLW; Tue, 2 Oct 2012 21:48:13 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ACF2E28077; Tue, 2 Oct 2012 21:48:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8601828077 for ; Tue, 2 Oct 2012 21:21:52 +0200 (CEST) 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 k25XX8Kdy98Z for ; Tue, 2 Oct 2012 21:21:48 +0200 (CEST) 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 mail-gh0-f172.google.com (mail-gh0-f172.google.com [209.85.160.172]) by theia.denx.de (Postfix) with ESMTPS id A00A528071 for ; Tue, 2 Oct 2012 21:21:45 +0200 (CEST) Received: by ghbg10 with SMTP id g10so1904879ghb.3 for ; Tue, 02 Oct 2012 12:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=hHwDsaeRm5fZ+CCzlbIX26mVdi6NDprTkf++NjzHBt4=; b=1Dn76c/lyaAh4K7tIAbW/HdiwsBrvXeZGYTCKJUpLQFF6iqG4RdCLIwdab7qPf3Icf u/ycQG5MdWULUuXbkJIzIG86PFwd92lCm28SUDpfNHuUsrn2GlPwqnjCH9sLEKjT3bOi z2x2/yCU7tsBL/ztIRtTGptJFTxh6B4SRhCkuElhtRnJPQAMfTeCrqWPFeGNdBl/fIpD Ovhfaks2R9frcFTM7Y0ebJfygg8pX+6HNt/5GCP3Z8h2wNhGHVlFAXwcNPwlejx8bMuJ q5cx9jfLOGgM9MgKFhyeHL+LbLEw/UEIP6UVB3xtB9rsBi/Lq/YhcJPI3Qxbh5A+plaT uzxg== Received: by 10.101.139.29 with SMTP id r29mr1002808ann.60.1349205703882; Tue, 02 Oct 2012 12:21:43 -0700 (PDT) Received: from nano.lab.ossystems.com.br.lab.ossystems.com.br ([177.100.163.15]) by mx.google.com with ESMTPS id r43sm2738960yhc.0.2012.10.02.12.21.41 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 12:21:42 -0700 (PDT) From: Otavio Salvador To: U-Boot Mailing List Date: Tue, 2 Oct 2012 16:22:10 -0300 Message-Id: <1349205730-19174-1-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.7.10.4 X-Mailman-Approved-At: Tue, 02 Oct 2012 21:48:07 +0200 Cc: Fabio Estevam , Otavio Salvador Subject: [U-Boot] [PATCH] mx6qsabreauto: Change mmcroot so it works out of box 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The mmcroot setting vary between mx6qsabreauto and mx6qsabresd so we move this to the board configuration file. Signed-off-by: Otavio Salvador Acked-by: Fabio Estevam --- include/configs/mx6qsabre_common.h | 2 +- include/configs/mx6qsabreauto.h | 3 ++- include/configs/mx6qsabresd.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index 247e8d6..e25e943 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -86,7 +86,7 @@ "initrd_high=0xffffffff\0" \ "mmcdev=0\0" \ "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ + "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index a878dec..760f3ce 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * - * Configuration settings for the Freescale i.MX6Q SabreSD board. + * Configuration settings for the Freescale i.MX6Q SabreAuto board. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -15,6 +15,7 @@ #define CONFIG_MACH_TYPE 3529 #define CONFIG_MXC_UART_BASE UART4_BASE #define CONFIG_CONSOLE_DEV "ttymxc3" +#define CONFIG_MMCROOT "/dev/mmcblk0p2" #define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024) #include "mx6qsabre_common.h" diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h index f2ce79e..771d129 100644 --- a/include/configs/mx6qsabresd.h +++ b/include/configs/mx6qsabresd.h @@ -20,6 +20,7 @@ #define CONFIG_MACH_TYPE 3980 #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONSOLE_DEV "ttymxc0" +#define CONFIG_MMCROOT "/dev/mmcblk1p2" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) #include "mx6qsabre_common.h"