From patchwork Tue Jul 14 15:16:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Viktorin X-Patchwork-Id: 495126 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id AD5DF140771 for ; Wed, 15 Jul 2015 01:31:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 07372A428C; Tue, 14 Jul 2015 15:31:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RTqHNL8pcC5q; Tue, 14 Jul 2015 15:31:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F0DD9A429B; Tue, 14 Jul 2015 15:31:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D0EF31C20E0 for ; Tue, 14 Jul 2015 15:31:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C91CC32C65 for ; Tue, 14 Jul 2015 15:31:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GkLjllUOP6ep for ; Tue, 14 Jul 2015 15:31:39 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from we2-f167.wedos.net (w-smtp-out-7.wedos.net [46.28.106.5]) by silver.osuosl.org (Postfix) with ESMTPS id DA7FB33A35 for ; Tue, 14 Jul 2015 15:31:38 +0000 (UTC) Received: from ([147.229.13.147]) by we2-f167.wedos.net (WEDOS Mail Server mail2) with ASMTP (SSL) id BAH00129 for ; Tue, 14 Jul 2015 17:19:29 +0200 Date: Tue, 14 Jul 2015 17:16:08 +0200 From: Jan Viktorin To: buildroot@buildroot.org Message-ID: <20150714171608.5d71bdcf@pcviktorin.fit.vutbr.cz> Organization: RehiveTech In-Reply-To: <20150714171214.706e9e4d@pcviktorin.fit.vutbr.cz> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 6/7] zedboard: Patch default U-Boot environment for zedboard 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch changes the U-Boot's default environment to boot Zedboard out-of-the-box from SD card. The sdboot procedure tries to load a file system.bit into the Zynq's PL (only if it exists). It is also possible to alter the booting by an uEnv.txt file located on your SD card. The uEnv.txt is a plain text file with = pairs one per line. Signed-off-by: Jan Viktorin --- ...eate-zedboard-specific-U-Boot-environment.patch | 46 ++++++++++++++++++++++ configs/zedboard_defconfig | 1 + 2 files changed, 47 insertions(+) create mode 100644 board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch 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 new file mode 100644 index 0000000..1971503 --- /dev/null +++ b/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch @@ -0,0 +1,46 @@ +From a4c0058967a551385da5e16d2787d9f704cab225 Mon Sep 17 00:00:00 2001 +From: Jan Viktorin +Date: Thu, 18 Jun 2015 16:26:02 +0200 +Subject: [PATCH 2/2] zynq: Create zedboard-specific U-Boot environment + +--- + include/configs/zynq_zed.h | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +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 @@ + + #include + ++#undef CONFIG_EXTRA_ENV_SETTINGS ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ "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" \ ++ "modeboot=sdboot\0" \ ++ "baudrate=115200\0" \ ++ "bootenv=uEnv.txt\0" \ ++ "devicetree_image=zynq-zed.dtb\0" \ ++ "kernel_image=uImage\0" \ ++ "ramdisk_image=rootfs.cpio.uboot\0" \ ++ "fpga_image=system.bit\0" \ ++ "sdboot=echo Booting from SD...;" \ ++ " run envload; run fpgaboot;" \ ++ " fatload mmc 0 0x1000000 ${kernel_image}" \ ++ " && fatload mmc 0 0x2000000 ${ramdisk_image}" \ ++ " && fatload mmc 0 0x3000000 ${devicetree_image}" \ ++ " && bootm 0x1000000 0x2000000 0x3000000\0" \ ++ "fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image};" \ ++ " then echo Booting FPGA from ${fpga_image};" \ ++ " fpga info 0 && fpga loadb 0 0x1000000 $filesize;" \ ++ " else echo FPGA image ${fpga_image} was not found," \ ++ " skipping...; fi;\0" ++ + #endif /* __CONFIG_ZYNQ_ZED_H */ +-- +2.4.3 + diff --git a/configs/zedboard_defconfig b/configs/zedboard_defconfig index cd6436c..99720db 100644 --- a/configs/zedboard_defconfig +++ b/configs/zedboard_defconfig @@ -21,6 +21,7 @@ BR2_TARGET_UBOOT_BOARDNAME="zynq_zed" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.denx.de/u-boot.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2015.07-rc2" +BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/board/avnet/zedboard/uboot" BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_ZYNQ_IMAGE=y