From patchwork Thu Jan 16 21:58:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 311864 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 CE5282C0082 for ; Fri, 17 Jan 2014 08:59:23 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 888624ACE8; Thu, 16 Jan 2014 22:59:19 +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 1ms4SL96qaaG; Thu, 16 Jan 2014 22:59:19 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8CC494ACE9; Thu, 16 Jan 2014 22:58:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 17D0B4ABF1 for ; Thu, 16 Jan 2014 22:58:49 +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 QXyMqjBPomKU for ; Thu, 16 Jan 2014 22:58: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-gg0-f175.google.com (mail-gg0-f175.google.com [209.85.161.175]) by theia.denx.de (Postfix) with ESMTPS id 330724AB8E for ; Thu, 16 Jan 2014 22:58:31 +0100 (CET) Received: by mail-gg0-f175.google.com with SMTP id c2so1051326ggn.20 for ; Thu, 16 Jan 2014 13:58:30 -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=bgTnRPuqn/1paaLrtnyMKsLPd9G+x8p4YDVD1x1hnDA=; b=ThY7sNiHMvjRq8VGSALbOkE+b140R0WVAKUsHGi/37rk1QHYC9ee6cvISV/qdG6atO 8a4frJTmvPQ1LLqGRAzir2YjyLKrctDpnZChlnRHCwht/aM0nyZK3bN5VTVX5uWmV7DY Oi9tcxCmFmYSVnZQf8S9+L1R76HVT9e2Go4HfmUYKO6b02t/Po7y44Lb7kZYTie495k0 Lg1p6YoQ2FXhlyrY7E39fFVEEOHbv2rTzIiNCcHmLPvaVNeKgdTEV64B58dxMeviUFJR UKegyy2TT329LpGjmJ7TFqN7BYQvlyV4sarf6FAe42v00A6Ei1QMfQMH5ROkB2vYaRJw Sbdw== X-Received: by 10.236.83.7 with SMTP id p7mr6175495yhe.90.1389909510176; Thu, 16 Jan 2014 13:58:30 -0800 (PST) Received: from nano.lab.ossystems.com.br ([177.194.208.225]) by mx.google.com with ESMTPSA id s21sm14276032yhk.9.2014.01.16.13.58.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jan 2014 13:58:28 -0800 (PST) Received: by nano.lab.ossystems.com.br (Postfix, from userid 1000) id 500A917861344; Thu, 16 Jan 2014 19:58:19 -0200 (BRST) From: Otavio Salvador To: U-Boot Mailing List Date: Thu, 16 Jan 2014 19:58:04 -0200 Message-Id: <1389909486-12880-10-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 , Otavio Salvador Subject: [U-Boot] [PATCH 09/11] mx6slevk: 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/mx6slevk.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index b29f78c..5d88dc4 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -76,7 +76,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "console=ttymxc0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -93,22 +93,22 @@ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${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" \ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs " \ @@ -120,19 +120,19 @@ "else " \ "setenv get_cmd tftp; " \ "fi; " \ - "${get_cmd} ${uimage}; " \ + "${get_cmd} ${image}; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if ${get_cmd} ${fdt_addr} ${fdt_file}; 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 \ @@ -141,7 +141,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \