From patchwork Tue Dec 6 14:45:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabien Parent X-Patchwork-Id: 86851 Delivered-To: patch@linaro.org Received: by 10.182.112.6 with SMTP id im6csp2320509obb; Tue, 6 Dec 2016 06:45:30 -0800 (PST) X-Received: by 10.28.217.195 with SMTP id q186mr3151370wmg.17.1481035529996; Tue, 06 Dec 2016 06:45:29 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id r1si3930457wmf.122.2016.12.06.06.45.29; Tue, 06 Dec 2016 06:45:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D6CACA75B4; Tue, 6 Dec 2016 15:45:27 +0100 (CET) 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 Zcy0aMOUJXyd; Tue, 6 Dec 2016 15:45:27 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 29577A7573; Tue, 6 Dec 2016 15:45:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6279CA7573 for ; Tue, 6 Dec 2016 15:45:23 +0100 (CET) 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 oGykKhKz21lN for ; Tue, 6 Dec 2016 15:45:23 +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-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by theia.denx.de (Postfix) with ESMTPS id 22DDF4BA29 for ; Tue, 6 Dec 2016 15:45:19 +0100 (CET) Received: by mail-wm0-f50.google.com with SMTP id a197so130975808wmd.0 for ; Tue, 06 Dec 2016 06:45:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=exyyANmUZOSSQEdvjNsc2WlcNJIzazJF8EAl3N84Pj4=; b=rkGKvne/x7RPpsRQwyjy5fkaSov+YIPPUgej3MbXvdtSQby++kjf5ZUj7+XSK5UPzm ShGSPoXzKh2xnF3RhvP9/RHb+jMwOnD4JkUUuK/ODQ5qe2hWYTMYNmAAuGwCBlxy9pRN jIigZmfR6b+lRFZzrVaph7vDs3WKQhE++US+AL7ko1MBJR+Smts8qHYzM4zZI9c47fjn wWn+CXhEoTHLGKuWPGYUGqst7L9BK2zV3e4WLWb+CChkZxsOfjnxIOERIExqvxtyrcPp QkC0d1HW64i8TlalnThBzFdmsZ0hvBLA5WpTgKvBd3crhctN8myWPbpZx5KughZDXaXU n57A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=exyyANmUZOSSQEdvjNsc2WlcNJIzazJF8EAl3N84Pj4=; b=VlQ6Tv9tUG3+RSBUAUWVWxcKEultZqwe9z4bHISlo8ozvZQwrZCU8hbxBiX6N5vb63 BCVFvh4YA8S1vVBW0xtBrl2NOFjenkH4o7k5YZgXqgaoN5baOqjRgXgBBTp9oY3yTiEP yTHrlD73oycqyFsttaRQ4vdIMyDD4EarYME8gtNhncTwuE+zl9hlsphtlU8lVbA5hHh5 ZNCaZPnkpGByErtTY3hXGSJx+F9R88HrXHmfUEzdstVJtybOQqnTF+tBaHaRIKL1hDaw DnWgN9fsNuEu0KJyLoh2sKCgNVWQlqFSk2rGJ4wfD7b0S80sR2Lki/0B6+WfwlgqN8z1 Oz3Q== X-Gm-Message-State: AKaTC03o2ioDwi7nYAPH1b527jhAEqlEKl6VeHI2KWkfetIZjez2RVTngzYvsmg4fPVjInVr X-Received: by 10.28.211.72 with SMTP id k69mr2942699wmg.138.1481035519202; Tue, 06 Dec 2016 06:45:19 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id b15sm4401337wma.5.2016.12.06.06.45.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Dec 2016 06:45:18 -0800 (PST) From: Fabien Parent To: u-boot@lists.denx.de Date: Tue, 6 Dec 2016 15:45:09 +0100 Message-Id: <20161206144509.18985-1-fparent@baylibre.com> X-Mailer: git-send-email 2.11.0 Cc: Tom Rini Subject: [U-Boot] [PATCH v2] davinci: omapl138_lcdk: boot from zImage X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Stop booting legacy uImage and now boot zImage. Signed-off-by: Fabien Parent --- v1 .. v2 * Used __stringify(CONFIG_BOOTFILE) to avoid code duplication --- configs/omapl138_lcdk_defconfig | 1 + include/configs/omapl138_lcdk.h | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) -- 2.11.0 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot Reviewed-by: Tom Rini diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 52681c92d0..d030ffafc3 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " +CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 7c2f4141c9..ea28db2f59 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -247,7 +247,7 @@ */ #define CONFIG_MISC_INIT_R #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOOTFILE "uImage" /* Boot file name */ +#define CONFIG_BOOTFILE "zImage" /* Boot file name */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ @@ -276,19 +276,20 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdtaddr=0xc0600000\0" \ "fdtfile=da850-lcdk.dtb\0" \ - "fdtboot=bootm 0xc0700000 - ${fdtaddr};\0" \ + "fdtboot=bootz 0xc0700000 - ${fdtaddr};\0" \ "mmcboot=" \ "if fatload mmc 0 0xc0600000 boot.scr; then " \ "source 0xc0600000; " \ "else " \ - "fatload mmc 0 0xc0700000 uImage; " \ + "fatload mmc 0 0xc0700000 " \ + __stringify(CONFIG_BOOTFILE) "; " \ "fatload mmc 0 ${fdtaddr} ${fdtfile}; " \ "run fdtboot; " \ "fi;\0" \ "spiboot=" \ "sf probe 0; " \ "sf read 0xc0700000 0x80000 0x220000; " \ - "bootm 0xc0700000;\0" + "bootz 0xc0700000;\0" /* * U-Boot commands