From b9cd72cdbfe307e58d749baa7d7d98272e381722 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 18 Jul 2016 18:38:22 +0900 Subject: [PATCH] zynq_zc706: bump U-Boot to xilinx-v2016.2 This is the latest release tag in the Xilinx repository, based on U-Boot v2016.01 in the mainline. It includes proper ps7_init_gpl.c/h in it, so builds working SPL without any manual intervention. BR2_TARGET_UBOOT_BOARD_NAME should be changed to zynq_zc706 since U-Boot now has separate defconfig files for ZC702 and ZC706 boards. BR2_TARGET_UBOOT_SPL_NAME should be changed to spl/boot.bin since the Zynq image support for the mkimage tool was upstreamed and it now generates boot.bin under spl/ directory. Signed-off-by: Masahiro Yamada Reviewed-by: Matt Weber Signed-off-by: Thomas Petazzoni --- board/xilinx/zc706/readme.txt | 69 +++++++++++------------------------ configs/zynq_zc706_defconfig | 7 ++-- 2 files changed, 25 insertions(+), 51 deletions(-) diff --git a/board/xilinx/zc706/readme.txt b/board/xilinx/zc706/readme.txt index b180dea1b1..5034658a95 100644 --- a/board/xilinx/zc706/readme.txt +++ b/board/xilinx/zc706/readme.txt @@ -6,51 +6,24 @@ ZC706 information including schematics, reference designs, and manuals are available from http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html. -uboot.bin -- U-Boot SPL w/ Xilinx boot.bin wrapper ---------------------------------------------------- - -Due to licensing issues, the files ps7_init.c/h are not distributed -with the U-Boot source code. These files are required to make a -boot.bin file. - -If you already have the Xilinx tools installed, the following sequence -will unpack, patch and build the rfs, kernel, uboot, and uboot-spl. - -make zynq_zc706_defconfig -make uboot-patch -cp ${XILINX_SDK_LIB}/hwplatform_templates/ZC706_hw_platform/ps7_init.{c,h} \ - output/build/uboot-xilinx-v2014.1/board/xilinx/zynq/ - -Where ${XILINX_SDK_LIB} is ${XILINX}/SDK/${VERSION}/data/embeddedsw/lib. - -After copying these files into the U-Boot source tree, you can -continue the build with: - -make - -*Notice* -While the build will successfully complete without the ps7_init.* -files, the uboot.bin file generated by this configuration will not -function properly on the ZC706. Therefore, it is imperative that the -ps7_init.* files be copied into the U-Boot source tree any time the -clean, or uboot-dirclean targets are executed. - -Resulting system ----------------- - -A FAT32 partition should be created at the beggining of the SD Card -and the following files should be installed: - -- boot.bin -- devicetree.dtb -- uImage -- uramdisk.image.gz -- u-boot.img - -All needed files can be taken from /images/ - -cp /images/boot.bin /media/sdcard/ -cp /images/uImage /media/sdcard/ -cp /images/u-boot.img /media/sdcard/ -cp /images/zynq-zc706.dtb /media/sdcard/devicetree.dtb -cp /images/rootfs.cpio.uboot /media/sdcard/uramdisk.image.gz +Steps to create a working system for ZC706 board: + +1) make zynq_zc706_defconfig +2) make +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-zc706.dtb) + into your SD card +4) boot your ZC706 board + +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 += one per line: + +kernel_image=myimage +modeboot=myboot +myboot=... diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 746abcb2ef..4ac2fe82c8 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -17,10 +17,11 @@ BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="zynq_zc70x" +BR2_TARGET_UBOOT_BOARDNAME="zynq_zc706" 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-v2014.1" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="boot.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" -- 2.30.2