diff options
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-spl-xlnx_2015.04.bb (renamed from recipes-bsp/u-boot/u-boot-spl-xlnx_2015.01.bb) | 2 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-xlnx-2015.04.inc (renamed from recipes-bsp/u-boot/u-boot-xlnx-2015.01.inc) | 4 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch | 33 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-xlnx/zynq-Add-Zynq-PicoZed-board-support.patch | 35 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb (renamed from recipes-bsp/u-boot/u-boot-xlnx_2015.01.bb) | 2 |
5 files changed, 47 insertions, 29 deletions
diff --git a/recipes-bsp/u-boot/u-boot-spl-xlnx_2015.01.bb b/recipes-bsp/u-boot/u-boot-spl-xlnx_2015.04.bb index aea587e3..052a65d4 100644 --- a/recipes-bsp/u-boot/u-boot-spl-xlnx_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-spl-xlnx_2015.04.bb @@ -1,5 +1,5 @@ include u-boot-xlnx.inc -include u-boot-xlnx-2015.01.inc +include u-boot-xlnx-2015.04.inc COMPATIBLE_MACHINE = "zynq" diff --git a/recipes-bsp/u-boot/u-boot-xlnx-2015.01.inc b/recipes-bsp/u-boot/u-boot-xlnx-2015.04.inc index 8ee028ed..9206c2ca 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx-2015.01.inc +++ b/recipes-bsp/u-boot/u-boot-xlnx-2015.04.inc @@ -1,6 +1,6 @@ -SRCREV = "58359ed54834e42e5f9ee336a7daa62c3c86c32a" -PV = "v2015.01${XILINX_EXTENSION}+git${SRCPV}" +SRCREV = "1160fbcc619f23bf87cde01ed651566474e17eb9" +PV = "v2015.04${XILINX_EXTENSION}+git${SRCPV}" FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:" SRC_URI += " \ diff --git a/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch b/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch index 6de7b0e7..316d89af 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch +++ b/recipes-bsp/u-boot/u-boot-xlnx/microblaze-generic_defconfig-Disable-configs.patch @@ -1,4 +1,3 @@ -From 4955e7593d4d9b22761c0d1cac53d3f2ce7bc329 Mon Sep 17 00:00:00 2001 From: Nathan Rossi <nathan.rossi@xilinx.com> Date: Mon, 20 Apr 2015 17:57:34 +1000 Subject: [PATCH] microblaze-generic_defconfig: Disable configs @@ -6,20 +5,38 @@ Subject: [PATCH] microblaze-generic_defconfig: Disable configs Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> Upstream-Status: Configuration --- - configs/microblaze-generic_defconfig | 3 --- - 1 file changed, 3 deletions(-) + configs/microblaze-generic_defconfig | 4 +--- + include/configs/microblaze-generic.h | 5 +++++ + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig -index 5cfd596..5ce5492 100644 +index 4211d71..69b8023 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig -@@ -1,6 +1,3 @@ +@@ -1,6 +1,4 @@ -CONFIG_SPL=y - +S:CONFIG_MICROBLAZE=y - +S:CONFIG_TARGET_MICROBLAZE_GENERIC=y + CONFIG_MICROBLAZE=y + CONFIG_TARGET_MICROBLAZE_GENERIC=y -CONFIG_OF_CONTROL=y -CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" ++CONFIG_SYS_BOOTM_LEN=33554432 +diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h +index 073f3ef..26e85c7 100644 +--- a/include/configs/microblaze-generic.h ++++ b/include/configs/microblaze-generic.h +@@ -219,6 +219,11 @@ + #endif + + /* ++ * BOOTM options ++ */ ++#define CONFIG_SYS_BOOTM_LEN (32 * 1024 * 1024) ++ ++/* + * BOOTP options + */ + #define CONFIG_BOOTP_BOOTFILESIZE -- -1.7.10.4 +2.5.1 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 diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2015.01.bb b/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb index 81499125..fd28fbee 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb @@ -1,5 +1,5 @@ include u-boot-xlnx.inc -include u-boot-xlnx-2015.01.inc +include u-boot-xlnx-2015.04.inc include u-boot-extra.inc UBOOT_ENV_zc702-zynq7 = "uEnv" |