From patchwork Fri Nov 13 12:49:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 544259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 56DF2140549 for ; Fri, 13 Nov 2015 22:54:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A986395979; Fri, 13 Nov 2015 11:54:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v2bwU1EWpAsK; Fri, 13 Nov 2015 11:53:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8E3B495969; Fri, 13 Nov 2015 11:53:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D44ED1BFC18 for ; Fri, 13 Nov 2015 11:53:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D1B0886D10 for ; Fri, 13 Nov 2015 11:53:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TqiD5bZxqnHJ for ; Fri, 13 Nov 2015 11:53:56 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6B4D286CE3 for ; Fri, 13 Nov 2015 11:53:56 +0000 (UTC) Received: from serveur.trabucayre.com (unknown [78.252.129.8]) by smtp3-g21.free.fr (Postfix) with ESMTP id 2D2B3A61B4; Fri, 13 Nov 2015 12:53:52 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Fri, 13 Nov 2015 13:49:14 +0100 Message-Id: <1447418954-3350-1-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 2.1.4 Cc: Gwenhael Goavec-Merou Subject: [Buildroot] [PATCH] zedboard: uboot: load env earlier X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou By default, with the original patch bootcmd runs sdboot before loading uEnv.txt. Consequently, if the user change modeboot, the user's defined content is updated too late. By loading uEnv.txt before 'run $modeboot' the correct boot mode is used instead of default mode. Signed-off-by: Gwenhael Goavec-Merou Acked-By: Jan Viktorin --- .../0001-zynq-Create-zedboard-specific-U-Boot-environment.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch b/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch index 1971503..6dae31e 100644 --- a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch +++ b/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch @@ -11,7 +11,7 @@ diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 946de95..2400a88 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h -@@ -24,4 +24,29 @@ +@@ -24,4 +24,28 @@ #include @@ -20,7 +20,7 @@ index 946de95..2400a88 100644 + "envload=mmc info && if fatload mmc 0 0x1000 uEnv.txt;"\ + " then echo Importing uEnv.txt; env import -t 0x1000" \ + " $filesize; fi;\0" \ -+ "bootcmd=run $modeboot\0" \ ++ "bootcmd=run envload; run $modeboot\0" \ + "modeboot=sdboot\0" \ + "baudrate=115200\0" \ + "bootenv=uEnv.txt\0" \ @@ -28,8 +28,7 @@ index 946de95..2400a88 100644 + "kernel_image=uImage\0" \ + "ramdisk_image=rootfs.cpio.uboot\0" \ + "fpga_image=system.bit\0" \ -+ "sdboot=echo Booting from SD...;" \ -+ " run envload; run fpgaboot;" \ ++ "sdboot=echo Booting from SD...; run fpgaboot;" \ + " fatload mmc 0 0x1000000 ${kernel_image}" \ + " && fatload mmc 0 0x2000000 ${ramdisk_image}" \ + " && fatload mmc 0 0x3000000 ${devicetree_image}" \