diff mbox

zedboard: Use default U-Boot after bump to 2015.07

Message ID 20150722113054.1c0508f0@pcviktorin.fit.vutbr.cz
State Changes Requested
Headers show

Commit Message

Jan Viktorin July 22, 2015, 9:30 a.m. UTC
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 <viktorin@rehivetech.com>
---
 board/avnet/zedboard/readme.txt | 4 ++--
 configs/zedboard_defconfig      | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

Comments

Thomas Petazzoni July 22, 2015, 9:35 a.m. UTC | #1
Jan,

On Wed, 22 Jul 2015 11:30:54 +0200, Jan Viktorin wrote:

> diff --git a/configs/zedboard_defconfig b/configs/zedboard_defconfig
> index 99720db..5c3143a 100644
> --- a/configs/zedboard_defconfig
> +++ b/configs/zedboard_defconfig
> @@ -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
diff mbox

Patch

diff --git a/board/avnet/zedboard/readme.txt b/board/avnet/zedboard/readme.txt
index e0ce024..c62be79 100644
--- a/board/avnet/zedboard/readme.txt
+++ b/board/avnet/zedboard/readme.txt
@@ -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
diff --git a/configs/zedboard_defconfig b/configs/zedboard_defconfig
index 99720db..5c3143a 100644
--- a/configs/zedboard_defconfig
+++ b/configs/zedboard_defconfig
@@ -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