From patchwork Thu Jan 16 21:57:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 311867 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 3028E2C0082 for ; Fri, 17 Jan 2014 09:04:45 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3BE6F4AB4E; Thu, 16 Jan 2014 23: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 qGCiUUwh6mcV; Thu, 16 Jan 2014 23:04:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DA3974ABF1; Thu, 16 Jan 2014 23:04:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A0EA44ABAB for ; Thu, 16 Jan 2014 23:04:37 +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 U726McLDcEqS for ; Thu, 16 Jan 2014 23:04:31 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=ERR(-1.5) (only DNSBL check requested) Received: from mail-gg0-f173.google.com (mail-gg0-f173.google.com [209.85.161.173]) by theia.denx.de (Postfix) with ESMTPS id 25B9F4AB4E for ; Thu, 16 Jan 2014 23:04:23 +0100 (CET) Received: by mail-gg0-f173.google.com with SMTP id n5so1056648ggj.4 for ; Thu, 16 Jan 2014 14:04:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :organization; bh=E2xyRiEYGa188XdyvLvSktxYM/4wU26aDYzlSpJTsjM=; b=nH/LghOZExgtPY1YFXHWlqaYyfRIO1V2dYxU1uofTbZluZ63DhC5DF0C5NlSf+1pxh fg3zr9itgjg/86BVhoqKbVpOL7mi+VHtMlr6qGgmZTilcpT9WtTWFqXV2XF+2Nthzda7 DsncDgcR5DGYv+NbQ+Qu2TMxzhAEblzU+VLsPylwbp/Se1aQD1mdhLSFFBv5TJZ02buo IN4GbLuaXPgD05RWZJz1NNVWal1bxeWz9yFUkg6Ld1cijjPz0ioQNR7T1h4fR8VaJkOi KGgPi5eXMzNCGN/crFmtE3CUhJyGJZHYCo2vW5ChOMFcrR6y/ZdQU9Bg6/Z3FE/X1Cs4 4f8g== X-Received: by 10.236.100.173 with SMTP id z33mr12659117yhf.9.1389909504473; Thu, 16 Jan 2014 13:58:24 -0800 (PST) Received: from nano.lab.ossystems.com.br ([177.194.208.225]) by mx.google.com with ESMTPSA id c44sm14258848yho.20.2014.01.16.13.58.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jan 2014 13:58:23 -0800 (PST) Received: by nano.lab.ossystems.com.br (Postfix, from userid 1000) id D39EB17861334; Thu, 16 Jan 2014 19:58:18 -0200 (BRST) From: Otavio Salvador To: U-Boot Mailing List Date: Thu, 16 Jan 2014 19:57:56 -0200 Message-Id: <1389909486-12880-2-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1389909486-12880-1-git-send-email-otavio@ossystems.com.br> References: <1389909486-12880-1-git-send-email-otavio@ossystems.com.br> Organization: O.S. Systems Software LTDA. Cc: Fabio Estevam , Marek Vasut , Otavio Salvador Subject: [U-Boot] [PATCH 01/11] cgtqmx6eval: Set default environment to use zImage 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 Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador --- include/configs/cgtqmx6eval.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 29a023c..b189bf1 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -75,7 +75,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "boot_dir=/boot\0" \ "console=ttymxc1\0" \ @@ -92,24 +92,24 @@ "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ - "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \ - "${boot_dir}/${uimage}\0" \ + "loadimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \ + "${boot_dir}/${image}\0" \ "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \ "${boot_dir}/${fdt_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ - "bootm ${loadaddr} - ${fdt_addr}; " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ "else " \ "if test ${boot_fdt} = try; then " \ - "bootm; " \ + "bootz; " \ "else " \ "echo WARN: Cannot load the DT; " \ "fi; " \ "fi; " \ "else " \ - "bootm; " \ + "bootz; " \ "fi;\0" #define CONFIG_BOOTCOMMAND \ @@ -118,7 +118,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else "\ "echo ERR: Fail to boot from mmc; " \