diff options
| -rw-r--r-- | board/avnet/zedboard/readme.txt | 52 | ||||
| -rw-r--r-- | board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch | 45 | ||||
| -rw-r--r-- | configs/zynq_zed_defconfig | 10 |
3 files changed, 13 insertions, 94 deletions
diff --git a/board/avnet/zedboard/readme.txt b/board/avnet/zedboard/readme.txt index 01ef97c2c0..b2c30a3e3d 100644 --- a/board/avnet/zedboard/readme.txt +++ b/board/avnet/zedboard/readme.txt @@ -9,52 +9,16 @@ Steps to create a working system for Zedboard: 1) make zynq_zed_defconfig 2) make -3) copy files BOOT.BIN, u-boot-dtb.img, rootfs.cpio.uboot, - uImage, zynq-zed.dtb into your SD card +3) All needed files will be available in the output/images directory. + Create a FAT32 partition at the beginning of your SD Card and copy files: + - boot.bin + - u-boot.img + - uImage + - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot) + - devicetree.dtb (should be renamed from zynq-zed.dtb) + into your SD card 4) boot your Zedboard -The expected output: - - U-Boot SPL 2015.07 (Jul 22 2015 - 12:01:55) - mmc boot - reading system.dtb - spl_load_image_fat_os: error reading image system.dtb, err - -1 - reading u-boot-dtb.img - reading u-boot-dtb.img - - U-Boot 2015.07 (Jul 22 2015 - 12:01:55 +0200) - - Model: Zynq ZED Board - I2C: ready - DRAM: ECC disabled 512 MiB - MMC: zynq_sdhci: 0 - Using default environment - ... - -When using an older U-Boot then 2015.07, a working ps7_init.c -file is required to be installed into the U-Boot directory -structure. From 2015.07, the major Zynq-based boards are -supported without any manual intervention. - -Resulting system ----------------- -A FAT32 partition should be created at the beginning of the SD Card -and the following files should be installed: - /BOOT.BIN - /zynq-zed.dtb - /uImage - /rootfs-cpio.uboot - /u-boot-dtb.img - - -All needed files can be taken from output/images/ - -BOOT.BIN, uImage and u-boot-dtb.img are direct copies of the same files -available on output/images/ - -There is a patch attached that redefines the U-Boot's environment -to work with Buildroot out-of-the-box. - You can alter the booting procedure by creating a file uEnv.txt in the root of the SD card. It is a plain text file in format <key>=<value> one per line: 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 deleted file mode 100644 index b7f8297cae..0000000000 --- a/board/avnet/zedboard/uboot/0001-zynq-Create-zedboard-specific-U-Boot-environment.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a4c0058967a551385da5e16d2787d9f704cab225 Mon Sep 17 00:00:00 2001 -From: Jan Viktorin <viktorin@rehivetech.com> -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,0 +24,0 @@ - - #include <configs/zynq-common.h> - -+#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 envload; 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 fpgaboot;" \ -+ " fatload mmc 0 0x1000000 ${kernel_image}" \ -+ " && fatload mmc 0 0x3000000 ${ramdisk_image}" \ -+ " && fatload mmc 0 0x2000000 ${devicetree_image}" \ -+ " && bootm 0x1000000 0x3000000 0x2000000\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/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 98b010ead5..84859bb65e 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -17,10 +17,10 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="zynq_zed" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.07" -BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/board/avnet/zedboard/uboot" +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_ZYNQ_IMAGE=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" |
