1 files changed, 18 insertions, 17 deletions

diff --git a/recipes-bsp/u-boot/u-boot-xlnx/zynq-Add-Zynq-PicoZed-board-support.patch b/recipes-bsp/u-boot/u-boot-xlnx/zynq-Add-Zynq-PicoZed-board-support.patch
index c3521500..73220774 100644
--- a/recipes-bsp/u-boot/u-boot-xlnx/zynq-Add-Zynq-PicoZed-board-support.patch
+++ b/recipes-bsp/u-boot/u-boot-xlnx/zynq-Add-Zynq-PicoZed-board-support.patch
@@ -1,6 +1,6 @@
-From 7bbdb62ff8513ff1d7c1bacb43be49d70c44539d Mon Sep 17 00:00:00 2001
+From 8d00cfe0fb3132a5d2035f5945e81c212121326e Mon Sep 17 00:00:00 2001
 From: Nathan Rossi <nathan.rossi@xilinx.com>
-Date: Tue, 7 Apr 2015 11:27:20 +1000
+Date: Tue, 14 Apr 2015 14:58:10 +1000
 Subject: [PATCH] zynq: Add Zynq PicoZed board support
 
 The PicoZed is a System-on-Module board which is marketed as part of
@@ -17,13 +17,15 @@ More information on this board, its variants and available carrier
 boards is available at: http://zedboard.org/product/picozed
 
 Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+Upstream-Status: Backport
 ---
- arch/arm/cpu/armv7/zynq/Kconfig |    4 ++++
- arch/arm/dts/Makefile           |    1 +
- arch/arm/dts/zynq-picozed.dts   |   23 +++++++++++++++++++++++
- configs/zynq_picozed_defconfig  |    6 ++++++
- include/configs/zynq_picozed.h  |   28 ++++++++++++++++++++++++++++
- 5 files changed, 62 insertions(+)
+ arch/arm/cpu/armv7/zynq/Kconfig |  4 ++++
+ arch/arm/dts/Makefile           |  1 +
+ arch/arm/dts/zynq-picozed.dts   | 23 +++++++++++++++++++++++
+ configs/zynq_picozed_defconfig  |  6 ++++++
+ include/configs/zynq_picozed.h  | 27 +++++++++++++++++++++++++++
+ 5 files changed, 61 insertions(+)
  create mode 100644 arch/arm/dts/zynq-picozed.dts
  create mode 100644 configs/zynq_picozed_defconfig
  create mode 100644 include/configs/zynq_picozed.h
@@ -51,7 +53,7 @@ index 2482bbb..d0874ab 100644
         default "zynq_zc770" if TARGET_ZYNQ_ZC770
         default "zynq_zybo" if TARGET_ZYNQ_ZYBO
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 5b49004..8cdd003 100644
+index e08546b..84b0bed 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -44,6 +44,7 @@ dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
@@ -93,22 +95,22 @@ index 0000000..686b98f
 +};
 diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
 new file mode 100644
-index 0000000..8a4916a
+index 0000000..b782873
 --- /dev/null
 +++ b/configs/zynq_picozed_defconfig
 @@ -0,0 +1,6 @@
 +CONFIG_SPL=y
-++S:CONFIG_ARM=y
-++S:CONFIG_ZYNQ=y
-++S:CONFIG_TARGET_ZYNQ_PICOZED=y
++CONFIG_ARM=y
++CONFIG_ZYNQ=y
++CONFIG_TARGET_ZYNQ_PICOZED=y
 +CONFIG_OF_CONTROL=n
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
 diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
 new file mode 100644
-index 0000000..337457c
+index 0000000..d116e05
 --- /dev/null
 +++ b/include/configs/zynq_picozed.h
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,27 @@
 +/*
 + * (C) Copyright 2015 Xilinx, Inc.
 + *
@@ -131,12 +133,11 @@ index 0000000..337457c
 +
 +#define CONFIG_ZYNQ_SDHCI1
 +#define CONFIG_ZYNQ_USB
-+#define CONFIG_ZYNQ_QSPI
 +#define CONFIG_ZYNQ_BOOT_FREEBSD
 +
 +#include <configs/zynq-common.h>
 +
 +#endif /* __CONFIG_ZYNQ_PICOZED_H */
 -- 
-1.7.10.4
+2.5.1