From patchwork Mon Mar 27 18:02:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 743937 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vsMRY4rSRz9s2s for ; Tue, 28 Mar 2017 05:06:49 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 75D5BC21C37; Mon, 27 Mar 2017 18:05:31 +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.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 47588C21C49; Mon, 27 Mar 2017 18:05:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AFE6CC21C4B; Mon, 27 Mar 2017 18:04:59 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id 5CC1BC21C35 for ; Mon, 27 Mar 2017 18:04:55 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 79so14830975pgf.0 for ; Mon, 27 Mar 2017 11:04:55 -0700 (PDT) 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:in-reply-to :references; bh=dAWUcCVdGSBsaaPjtJogg+W9+6b+Cl40UFV6/104SiA=; b=HoSxdMvgfyIMToi6mD6lbV/p37MKGDYSeMBv12V/oot6u1RgSwx7piUvnZTpSY3sjX l/Iy8EWaHJNnQh052nucxCy3RpC81z4MqSUlM7D8FJfX7QYbs7ngi10oCWTKfx4bbu6y HE8j0MExlsPQ/PnYanJDtVKgnfvlz5gvs+PYohKlsCoypDK3YgrxAwBtBuK62USl/WkT iTkIULdYHylAVCT8NGlypD9Z5UvqwoVLsPyllJYBHOdsBPp560QSOAgntR4hCd47oPOx 5/zwZPherZGOw4Z5SZHNZyPLwl2l3l/IyOJzPbUaEf8mI9Ev18VvkmUEYUmv1xjj98Ui vwOQ== X-Gm-Message-State: AFeK/H1VXhvFHi2E5XgzH8gfI0fPB2BjqEBJLJF6Rw9etk456WHjTv1Wp2eW5FuvU068MA== X-Received: by 10.84.232.205 with SMTP id x13mr5773812plm.102.1490637894053; Mon, 27 Mar 2017 11:04:54 -0700 (PDT) Received: from localhost.localdomain ([59.95.77.37]) by smtp.gmail.com with ESMTPSA id y5sm2513951pfd.33.2017.03.27.11.04.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Mar 2017 11:04:52 -0700 (PDT) From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 27 Mar 2017 23:32:20 +0530 Message-Id: <1490637743-18535-2-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490637743-18535-1-git-send-email-jagan@openedev.com> References: <1490637743-18535-1-git-send-email-jagan@openedev.com> Cc: Matteo Lisi Subject: [U-Boot] [PATCH 2/5] i.MX6Q: icorem6: Add mmc_late_init 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" From: Jagan Teki Let the runtime code can set the mmcdev and mmcroot based on the devno using mmc_get_env_dev instead of defining separately in build-time configs using mmc_late_init func. Cc: Stefano Babic Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- board/engicam/icorem6/icorem6.c | 22 ++++++++++++++++++++++ include/configs/imx6qdl_icore.h | 2 -- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index f78f8c9..55fc77f 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -7,6 +7,7 @@ */ #include +#include #include #include @@ -205,12 +206,33 @@ int board_early_init_f(void) return 0; } +#ifdef CONFIG_ENV_IS_IN_MMC +static void mmc_late_init(void) +{ + char cmd[32]; + char mmcblk[32]; + u32 dev_no = mmc_get_env_dev(); + + setenv_ulong("mmcdev", dev_no); + + /* Set mmcblk env */ + sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw", dev_no); + setenv("mmcroot", mmcblk); + + sprintf(cmd, "mmc dev %d", dev_no); + run_command(cmd, 0); +} +#endif + int board_late_init(void) { switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { case IMX6_BMODE_SD: case IMX6_BMODE_ESD: +#ifdef CONFIG_ENV_IS_IN_MMC + mmc_late_init(); +#endif setenv("modeboot", "mmcboot"); break; case IMX6_BMODE_NAND: diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h index b517e87..4bdba57 100644 --- a/include/configs/imx6qdl_icore.h +++ b/include/configs/imx6qdl_icore.h @@ -45,9 +45,7 @@ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ - "mmcdev=0\0" \ "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "nandroot=ubi0:rootfs rootfstype=ubifs\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \