From patchwork Tue Dec 31 20:44:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 305914 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 30EEB2C0091 for ; Wed, 1 Jan 2014 07:52:27 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EEB724AFD5; Tue, 31 Dec 2013 21:52:23 +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 21qji9-oIo+z; Tue, 31 Dec 2013 21:52:23 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6EBB54AFC0; Tue, 31 Dec 2013 21:52:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 928EA4AFC0 for ; Tue, 31 Dec 2013 21:52:18 +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 ufl2qsgtXTrW for ; Tue, 31 Dec 2013 21:52:12 +0100 (CET) X-Greylist: delayed 464 seconds by postgrey-1.27 at theia; Tue, 31 Dec 2013 21:52:04 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-f176.google.com (mail-gg0-f176.google.com [209.85.161.176]) by theia.denx.de (Postfix) with ESMTPS id 2CC314AFB8 for ; Tue, 31 Dec 2013 21:52:04 +0100 (CET) Received: by mail-gg0-f176.google.com with SMTP id l12so2570921gge.35 for ; Tue, 31 Dec 2013 12:52:03 -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:organization; bh=xhY8C7xwQr2u8RaaPwNCVChrwwa7nmMXFN1TVqyc/+Q=; b=ZptWEn+tYRUFrvFoJbVkY2mW4V3Bs2Bf4n2v8rW7MUadROzX1vnRA6si5o48bPgUv5 tmmIm5+HFjvvmN5D4EMR02QUfBXpJMPNbQyflzXdXCJ+yJI595dMES3p3JqKjLkcihvn B9pgFc9GU3RRIZjMYzs8zpKCM7ds1x2JGxyONCFd8aXzHrNLtbpZCQMGYd41PP6zIOv5 S5CulArQLji34m2c3M+TGDNlFv2V/6HztdzfA70Erqozigzt4OD+XOXVSJjJpDWhPa0O LxSqF5TQ/sk8l2cAD2L39ZaYmERf7vsq5Mlcky9ayZHe5UXcNQBULM7B1bhCusCzAkd5 WXEQ== X-Received: by 10.236.105.236 with SMTP id k72mr51728427yhg.30.1388522657536; Tue, 31 Dec 2013 12:44:17 -0800 (PST) Received: from nano.lab.ossystems.com.br (72.17.156.179.nw.nuvox.net. [72.17.156.179]) by mx.google.com with ESMTPSA id f78sm68059743yhp.12.2013.12.31.12.44.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2013 12:44:16 -0800 (PST) Received: by nano.lab.ossystems.com.br (Postfix, from userid 1000) id 02D62176969A5; Tue, 31 Dec 2013 18:44:15 -0200 (BRST) From: Otavio Salvador To: U-Boot Mailing List Date: Tue, 31 Dec 2013 18:44:09 -0200 Message-Id: <1388522649-5316-1-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.8.5.2 Organization: O.S. Systems Software LTDA. Cc: Fabio Estevam , Wandboard Development Mailing List , Otavio Salvador , John Weber Subject: [U-Boot] [PATCH] wandboard: 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 From: John Weber Change the default environment to use zImage instead of uImage, because using zImage does not require a LOADADDR assignment when building the kernel to be consistent with the loadaddr environment variable in u-boot, decreasing the chance for error. 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. The zImage works for FSL Linux's kernel fork versions 3.0.35, 3.10.9, and 3.10.17; this also works fine for mainline kernels. There is no reason to continue using uImage for default environment. Signed-off-by: John Weber Signed-off-by: Otavio Salvador Reviewed-by: Fabio Estevam --- include/configs/wandboard.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 5134b2e..3424124 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -115,7 +115,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ + "image=zImage\0" \ "console=ttymxc0\0" \ "splashpos=m,m\0" \ "fdt_high=0xffffffff\0" \ @@ -173,22 +173,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 " \ @@ -200,19 +200,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 \ @@ -220,7 +220,7 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ + "if run loadimage; then " \ "run mmcboot; " \ "else run netboot; " \ "fi; " \