From patchwork Wed Jan 1 05:45:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 305933 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 764912C00BB for ; Wed, 1 Jan 2014 16:51:26 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F3B6B4ABD2; Wed, 1 Jan 2014 06:51:24 +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 s6MTQB-mUdII; Wed, 1 Jan 2014 06:51:24 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CC3D94ABD5; Wed, 1 Jan 2014 06:51:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C66074ABD2 for ; Wed, 1 Jan 2014 06:51:15 +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 6PRggoZGS4Gy for ; Wed, 1 Jan 2014 06:51:08 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=SKIP(-1.5) (only DNSBL check requested) Received: from mail-gg0-f171.google.com (mail-gg0-f171.google.com [209.85.161.171]) by theia.denx.de (Postfix) with ESMTPS id 3DAB74A86E for ; Wed, 1 Jan 2014 06:51:06 +0100 (CET) Received: by mail-gg0-f171.google.com with SMTP id j1so2596557ggn.16 for ; Tue, 31 Dec 2013 21:51:05 -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=KQwoViFzeV6hoJD/MGV4iRT+IIrvcEh3A2B4ehAM4Hk=; b=VeKgr7PHiTefhNiLpzVI4p2Khcv3oBpZmEs4ICq6h0iWbxzgytYpPSpY7tPLta42k8 vf5jBCb3lBqX5Qi/DrYjDllGSGMPKNHuPSvucY90FtuYofPXHPA4NJz8wfyI0zlpAyTC qQL4Qc8WQRxI6WBjR9IeaEsvCfU2oAEWZx8yWouDaya7dfcV647GnabSw3JEZ/3larTl wi/nC4AfBKSacdZIUJV+tyYnUo8+XP+gCrVuwmOdSnq15a9Ua9VprC5f5h6GQqA8R7Ji TpYL6Y5brOfwlN9KV9yDyUwqLP6KriN051C1VxuekFl6m5WfT4syTa1aLWST4bORvqkf M7aw== X-Received: by 10.236.111.38 with SMTP id v26mr53010598yhg.40.1388555161054; Tue, 31 Dec 2013 21:46:01 -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 m9sm45380687yha.2.2013.12.31.21.45.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2013 21:46:00 -0800 (PST) Received: by nano.lab.ossystems.com.br (Postfix, from userid 1000) id F18B61773C064; Wed, 1 Jan 2014 03:45:51 -0200 (BRST) From: Otavio Salvador To: U-Boot Mailing List Date: Wed, 1 Jan 2014 03:45:50 -0200 Message-Id: <1388555150-11436-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 v2] 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, 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 --- Changes in v2: - Rework commit log (wd) 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; " \