From patchwork Thu Apr 6 09:22:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sekhar Nori X-Patchwork-Id: 96917 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp642992qgd; Thu, 6 Apr 2017 02:26:51 -0700 (PDT) X-Received: by 10.28.13.69 with SMTP id 66mr22394699wmn.137.1491470811139; Thu, 06 Apr 2017 02:26:51 -0700 (PDT) Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id 194si2149131wmt.32.2017.04.06.02.26.50; Thu, 06 Apr 2017 02:26:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ti.com Received: by lists.denx.de (Postfix, from userid 105) id B708BC21C72; Thu, 6 Apr 2017 09:24:17 +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=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 3DF45C21C7F; Thu, 6 Apr 2017 09:23:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 10A35C21C59; Thu, 6 Apr 2017 09:23:25 +0000 (UTC) Received: from fllnx210.ext.ti.com (fllnx210.ext.ti.com [198.47.19.17]) by lists.denx.de (Postfix) with ESMTPS id BB29FC21C58 for ; Thu, 6 Apr 2017 09:23:20 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id v369NCvZ009698; Thu, 6 Apr 2017 04:23:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1491470592; bh=eO+ybMZ8Qa5tzhkcRSmz5Q0gkJBo/MB0inMO3rLt+MY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=V60kK2f14JCBAExCewPZJOsOehF10hyglEE7Ixkt3Qjx9CVTY65VT3KbvdHV8eb5A UN5qMGd1VFbQdiXgFtcfUBJoPpKZTdChK2LXJzWymC7j5sQSBrHt5OW/KyrGu1AHzJ hZh47I8u+Iovo9MqT5BmDrBRG5WZiVUH/Pd0Ewno= Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v369NC9Z010332; Thu, 6 Apr 2017 04:23:12 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.294.0; Thu, 6 Apr 2017 04:23:11 -0500 Received: from psplinux063.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v369MvS5011120; Thu, 6 Apr 2017 04:23:10 -0500 From: Sekhar Nori To: Tom Rini , Peter Howard , Lokesh Vutla , Vitaly Andrianov Date: Thu, 6 Apr 2017 14:52:57 +0530 Message-ID: <20170406092257.15541-6-nsekhar@ti.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170406092257.15541-1-nsekhar@ti.com> References: <20170406092257.15541-1-nsekhar@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 5/5] davinci: omapl138_lcdk: switch to using common mmc args 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Now that we have common MMC/SD boot environment variables that can be used across TI platforms, switch OMAP-L138 LCDK to use them. As a nice side-effect, we get support for using uEnv.txt on this platform. Signed-off-by: Sekhar Nori Reviewed-by: Lukasz Majewski Reviewed-by: Tom Rini --- include/configs/omapl138_lcdk.h | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 599fd5b7a874..e70760402b43 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -261,30 +261,27 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_BOOTARGS "console=ttyS2,115200n8 root=/dev/mmcblk0p2 rw rootwait ip=off" #define CONFIG_BOOTCOMMAND \ - "if mmc rescan; then " \ + "run envboot; " \ "run mmcboot; " - "fi" #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0xc0700000\0" \ "fdtaddr=0xc0600000\0" \ "scriptaddr=0xc0600000\0" +#include + #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ + DEFAULT_MMC_TI_ARGS \ + "bootpart=0:2\0" \ + "bootdir=/boot\0" \ + "bootfile=zImage\0" \ "fdtfile=da850-lcdk.dtb\0" \ - "fdtboot=bootz ${loadaddr} - ${fdtaddr};\0" \ - "mmcboot=" \ - "if fatload mmc 0 ${scriptaddr} boot.scr; then " \ - "source ${scriptaddr}; " \ - "else " \ - "fatload mmc 0 ${loadaddr} " \ - __stringify(CONFIG_BOOTFILE) "; " \ - "fatload mmc 0 ${fdtaddr} ${fdtfile}; " \ - "run fdtboot; " \ - "fi;\0" + "boot_fdt=yes\0" \ + "boot_fit=0\0" \ + "console=ttyS2,115200n8\0" /* * U-Boot commands