Skip to contentSkip to conversation

zedboard: Use default U-Boot after bump to 2015.07

PATCH New Jan Viktorin 2 participants 2 messages Jul 22, 2015

lore
Share & tools
lore

Jan Viktorin

author
#0 lore raw

PATCH 1/1 zedboard: Use default U-Boot after bump to 2015.07

The U-Boot v2015.07+ is required for successful out-of-the-box build for common Xilinx Zynq boards (including Zedboard). Such U-Boot is default since e13609ddf42a.

Signed-off-by Jan Viktorin <[email protected]>
---
 board/avnet/zedboard/readme.txt | 4 ++--
 configs/zedboard_defconfig      | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
board/avnet/zedboard/readme.txt +2 -2
index e0ce024..c62be79 100644
@@ -15,14 +15,14 @@ Steps to create a working system for Zedboard:
 
 The expected output:
 
- U-Boot SPL 2015.07-rc2 (Jun 18 2015 - 16:42:58)
+ U-Boot SPL 2015.07 (Jul 22 2015 - 11:19:31)
  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-rc2 (Jun 18 2015 - 16:42:58 +0200)
+ U-Boot 2015.07 (Jul 22 2015 - 11:19:31 +0200)
 
  Model: Zynq ZED Board
  I2C:   ready
configs/zedboard_defconfig +0 -3
index 99720db..5c3143a 100644
@@ -18,9 +18,6 @@ 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_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
Signature · 1 line
2.4.5
#1 lore raw

PATCH 1/1 zedboard: Use default U-Boot after bump to 2015.07

Jan,

Quoted 5 lines · Jan Viktorin
configs/zedboard_defconfig +0 -0
index 99720db..5c3143a 100644

configs/zedboard_defconfig BR2_TARGET_ROOTFS_CPIO_GZIP=y · line 23

Quoted 9 lines
configs/zedboard_defconfig +0 -3
@@ -18,9 +18,6 @@ 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_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

This is not good: we want defconfig to explicitly state which U-Boot and kernel versions they use. Imagine that in 3 months time, the U-Boot package gets updated to use 2015.11 by default, and that it doesn't work on Zedboard: your defconfig is broken. Also your patch may no longer apply.

While there is certainly some variation that will occur on the compiler/C library version, we really would like to keep the U-Boot and kernel versions explicit.

So instead of this change, can you change to point to the 2015.07 U-Boot tarball?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com