From patchwork Fri Dec 21 16:59: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: 207852 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 BC9D92C007D for ; Sat, 22 Dec 2012 04:04:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 31D164A0BE; Fri, 21 Dec 2012 18:04:54 +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 Q-MG5MgM77Vs; Fri, 21 Dec 2012 18:04:54 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BD7664A0BF; Fri, 21 Dec 2012 18:04:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 809484A0C0 for ; Fri, 21 Dec 2012 18:04:43 +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 W--1TzE3TBLe for ; Fri, 21 Dec 2012 18:04:42 +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 mail-yh0-f42.google.com (mail-yh0-f42.google.com [209.85.213.42]) by theia.denx.de (Postfix) with ESMTPS id 6D03F4A0BF for ; Fri, 21 Dec 2012 18:04:40 +0100 (CET) Received: by mail-yh0-f42.google.com with SMTP id g71so1015581yhg.1 for ; Fri, 21 Dec 2012 09:04:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=DaR7zOokSfS6Ges0cS9c9y20D5YsSW7DrI8kHn5afMg=; b=NFG0IoCWOg5qd6wcEKyA88X4xY3N1/pBxEHl8OmprFtTBSrqdp9Q3K/Dv5NXuWdAKh 2vUWYorz9/3CmQVPGU3TMJ5dvrqW8+IFBk4a3Nj/cZx1z909tmLwZiKccrcK9Y+HT75G PzTXWDZjgasCsEI0qJ22nrn5p0rJfkmkaZaQ0De7Y0F5Kp+IPZ87YkGESlwvI/kXGlS5 AE9PcVMlZMHgEpoT2ASkzMPx4uL5/uUTEAOjF/X0FR8IG12GldK5AIaBGpuSRorHvMUn tOTeeQlq9Q/eHosrsX979Dxv5/Zf626dbthPJjR0JhuZFHthoUVHdccUEi20blcX4HCy iY5Q== X-Received: by 10.236.59.98 with SMTP id r62mr13224883yhc.130.1356108986214; Fri, 21 Dec 2012 08:56:26 -0800 (PST) Received: from nano.lab.ossystems.com.br.lab.ossystems.com.br ([187.23.158.26]) by mx.google.com with ESMTPS id k63sm11162510yhj.20.2012.12.21.08.56.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 08:56:25 -0800 (PST) From: Otavio Salvador To: U-Boot Mailing List Date: Fri, 21 Dec 2012 14:59:10 -0200 Message-Id: <1356109151-6623-9-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356109151-6623-1-git-send-email-otavio@ossystems.com.br> References: <1356109151-6623-1-git-send-email-otavio@ossystems.com.br> Cc: Fabio Estevam , Otavio Salvador Subject: [U-Boot] [PATCH 8/9] mx6qsabrelite: Add support to dynamically choose between ftd use or not 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 Signed-off-by: Otavio Salvador --- include/configs/mx6qsabrelite.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index 0f6bbb4..c74d75c 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -154,6 +154,8 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ + "ftd_file=imx6q-sabrelite.dtb\0" \ + "ftd_addr=0x11000000\0" \ "console=ttymxc1\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -169,13 +171,23 @@ "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ - "bootm\0" \ + "if fatload mmc ${mmcdev}:${mmcpart} ${ftd_addr} ${ftd_file}; then " \ + "bootm ${loadaddr} - ${ftd_addr}; " \ + "else " \ + "bootm; " \ + "fi;\0" \ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ "run netargs; " \ - "dhcp ${uimage}; bootm\0" \ + "dhcp ${uimage}; " \ + "if dhcp ${ftd_addr} ${ftd_file}; then " \ + "bootm ${loadaddr} - ${ftd_addr}; " \ + "else " \ + "bootm; " \ + "fi;\0" + #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev};" \