diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2015-09-15 19:49:45 +1000 |
---|---|---|
committer | Nathan Rossi <nathan@nathanrossi.com> | 2015-09-15 21:57:38 +1000 |
commit | 02a97e0f1082376fd7982fceeb140a93497eecf8 (patch) | |
tree | 24e10bf3b5eab25af406ce44b62ddc9bf044f3b3 | |
parent | 117623e4042e6a2b3fa55e21ac75b3f82df74bc3 (diff) | |
download | meta-xilinx-02a97e0f1082376fd7982fceeb140a93497eecf8.tar.gz |
u-boot-xlnx: Update to 2015.04 'xilinx-v2015.2'
* Update to the 'xilinx-v2015.2' release tag, this corresponds to
2015.04 version of u-boot
* Update microblaze configuration patch for this version
* Swap picozed patch for a upstream backported version
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-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 @@ | |||
1 | include u-boot-xlnx.inc | 1 | include u-boot-xlnx.inc |
2 | include u-boot-xlnx-2015.01.inc | 2 | include u-boot-xlnx-2015.04.inc |
3 | 3 | ||
4 | COMPATIBLE_MACHINE = "zynq" | 4 | COMPATIBLE_MACHINE = "zynq" |
5 | 5 | ||
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 @@ | |||
1 | 1 | ||
2 | SRCREV = "58359ed54834e42e5f9ee336a7daa62c3c86c32a" | 2 | SRCREV = "1160fbcc619f23bf87cde01ed651566474e17eb9" |
3 | PV = "v2015.01${XILINX_EXTENSION}+git${SRCPV}" | 3 | PV = "v2015.04${XILINX_EXTENSION}+git${SRCPV}" |
4 | 4 | ||
5 | FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:" | 5 | FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:" |
6 | SRC_URI += " \ | 6 | 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 @@ | |||
1 | From 4955e7593d4d9b22761c0d1cac53d3f2ce7bc329 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nathan Rossi <nathan.rossi@xilinx.com> | 1 | From: Nathan Rossi <nathan.rossi@xilinx.com> |
3 | Date: Mon, 20 Apr 2015 17:57:34 +1000 | 2 | Date: Mon, 20 Apr 2015 17:57:34 +1000 |
4 | Subject: [PATCH] microblaze-generic_defconfig: Disable configs | 3 | Subject: [PATCH] microblaze-generic_defconfig: Disable configs |
@@ -6,20 +5,38 @@ Subject: [PATCH] microblaze-generic_defconfig: Disable configs | |||
6 | Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> | 5 | Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> |
7 | Upstream-Status: Configuration | 6 | Upstream-Status: Configuration |
8 | --- | 7 | --- |
9 | configs/microblaze-generic_defconfig | 3 --- | 8 | configs/microblaze-generic_defconfig | 4 +--- |
10 | 1 file changed, 3 deletions(-) | 9 | include/configs/microblaze-generic.h | 5 +++++ |
10 | 2 files changed, 6 insertions(+), 3 deletions(-) | ||
11 | 11 | ||
12 | diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig | 12 | diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig |
13 | index 5cfd596..5ce5492 100644 | 13 | index 4211d71..69b8023 100644 |
14 | --- a/configs/microblaze-generic_defconfig | 14 | --- a/configs/microblaze-generic_defconfig |
15 | +++ b/configs/microblaze-generic_defconfig | 15 | +++ b/configs/microblaze-generic_defconfig |
16 | @@ -1,6 +1,3 @@ | 16 | @@ -1,6 +1,4 @@ |
17 | -CONFIG_SPL=y | 17 | -CONFIG_SPL=y |
18 | +S:CONFIG_MICROBLAZE=y | 18 | CONFIG_MICROBLAZE=y |
19 | +S:CONFIG_TARGET_MICROBLAZE_GENERIC=y | 19 | CONFIG_TARGET_MICROBLAZE_GENERIC=y |
20 | -CONFIG_OF_CONTROL=y | 20 | -CONFIG_OF_CONTROL=y |
21 | -CONFIG_OF_EMBED=y | 21 | -CONFIG_OF_EMBED=y |
22 | CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" | 22 | CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" |
23 | +CONFIG_SYS_BOOTM_LEN=33554432 | ||
24 | diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h | ||
25 | index 073f3ef..26e85c7 100644 | ||
26 | --- a/include/configs/microblaze-generic.h | ||
27 | +++ b/include/configs/microblaze-generic.h | ||
28 | @@ -219,6 +219,11 @@ | ||
29 | #endif | ||
30 | |||
31 | /* | ||
32 | + * BOOTM options | ||
33 | + */ | ||
34 | +#define CONFIG_SYS_BOOTM_LEN (32 * 1024 * 1024) | ||
35 | + | ||
36 | +/* | ||
37 | * BOOTP options | ||
38 | */ | ||
39 | #define CONFIG_BOOTP_BOOTFILESIZE | ||
23 | -- | 40 | -- |
24 | 1.7.10.4 | 41 | 2.5.1 |
25 | 42 | ||
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 @@ | |||
1 | From 7bbdb62ff8513ff1d7c1bacb43be49d70c44539d Mon Sep 17 00:00:00 2001 | 1 | From 8d00cfe0fb3132a5d2035f5945e81c212121326e Mon Sep 17 00:00:00 2001 |
2 | From: Nathan Rossi <nathan.rossi@xilinx.com> | 2 | From: Nathan Rossi <nathan.rossi@xilinx.com> |
3 | Date: Tue, 7 Apr 2015 11:27:20 +1000 | 3 | Date: Tue, 14 Apr 2015 14:58:10 +1000 |
4 | Subject: [PATCH] zynq: Add Zynq PicoZed board support | 4 | Subject: [PATCH] zynq: Add Zynq PicoZed board support |
5 | 5 | ||
6 | The PicoZed is a System-on-Module board which is marketed as part of | 6 | 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 | |||
17 | boards is available at: http://zedboard.org/product/picozed | 17 | boards is available at: http://zedboard.org/product/picozed |
18 | 18 | ||
19 | Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> | 19 | Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> |
20 | Signed-off-by: Michal Simek <michal.simek@xilinx.com> | ||
21 | Upstream-Status: Backport | ||
20 | --- | 22 | --- |
21 | arch/arm/cpu/armv7/zynq/Kconfig | 4 ++++ | 23 | arch/arm/cpu/armv7/zynq/Kconfig | 4 ++++ |
22 | arch/arm/dts/Makefile | 1 + | 24 | arch/arm/dts/Makefile | 1 + |
23 | arch/arm/dts/zynq-picozed.dts | 23 +++++++++++++++++++++++ | 25 | arch/arm/dts/zynq-picozed.dts | 23 +++++++++++++++++++++++ |
24 | configs/zynq_picozed_defconfig | 6 ++++++ | 26 | configs/zynq_picozed_defconfig | 6 ++++++ |
25 | include/configs/zynq_picozed.h | 28 ++++++++++++++++++++++++++++ | 27 | include/configs/zynq_picozed.h | 27 +++++++++++++++++++++++++++ |
26 | 5 files changed, 62 insertions(+) | 28 | 5 files changed, 61 insertions(+) |
27 | create mode 100644 arch/arm/dts/zynq-picozed.dts | 29 | create mode 100644 arch/arm/dts/zynq-picozed.dts |
28 | create mode 100644 configs/zynq_picozed_defconfig | 30 | create mode 100644 configs/zynq_picozed_defconfig |
29 | create mode 100644 include/configs/zynq_picozed.h | 31 | create mode 100644 include/configs/zynq_picozed.h |
@@ -51,7 +53,7 @@ index 2482bbb..d0874ab 100644 | |||
51 | default "zynq_zc770" if TARGET_ZYNQ_ZC770 | 53 | default "zynq_zc770" if TARGET_ZYNQ_ZC770 |
52 | default "zynq_zybo" if TARGET_ZYNQ_ZYBO | 54 | default "zynq_zybo" if TARGET_ZYNQ_ZYBO |
53 | diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile | 55 | diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile |
54 | index 5b49004..8cdd003 100644 | 56 | index e08546b..84b0bed 100644 |
55 | --- a/arch/arm/dts/Makefile | 57 | --- a/arch/arm/dts/Makefile |
56 | +++ b/arch/arm/dts/Makefile | 58 | +++ b/arch/arm/dts/Makefile |
57 | @@ -44,6 +44,7 @@ dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \ | 59 | @@ -44,6 +44,7 @@ dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \ |
@@ -93,22 +95,22 @@ index 0000000..686b98f | |||
93 | +}; | 95 | +}; |
94 | diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig | 96 | diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig |
95 | new file mode 100644 | 97 | new file mode 100644 |
96 | index 0000000..8a4916a | 98 | index 0000000..b782873 |
97 | --- /dev/null | 99 | --- /dev/null |
98 | +++ b/configs/zynq_picozed_defconfig | 100 | +++ b/configs/zynq_picozed_defconfig |
99 | @@ -0,0 +1,6 @@ | 101 | @@ -0,0 +1,6 @@ |
100 | +CONFIG_SPL=y | 102 | +CONFIG_SPL=y |
101 | ++S:CONFIG_ARM=y | 103 | +CONFIG_ARM=y |
102 | ++S:CONFIG_ZYNQ=y | 104 | +CONFIG_ZYNQ=y |
103 | ++S:CONFIG_TARGET_ZYNQ_PICOZED=y | 105 | +CONFIG_TARGET_ZYNQ_PICOZED=y |
104 | +CONFIG_OF_CONTROL=n | 106 | +CONFIG_OF_CONTROL=n |
105 | +CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed" | 107 | +CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed" |
106 | diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h | 108 | diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h |
107 | new file mode 100644 | 109 | new file mode 100644 |
108 | index 0000000..337457c | 110 | index 0000000..d116e05 |
109 | --- /dev/null | 111 | --- /dev/null |
110 | +++ b/include/configs/zynq_picozed.h | 112 | +++ b/include/configs/zynq_picozed.h |
111 | @@ -0,0 +1,28 @@ | 113 | @@ -0,0 +1,27 @@ |
112 | +/* | 114 | +/* |
113 | + * (C) Copyright 2015 Xilinx, Inc. | 115 | + * (C) Copyright 2015 Xilinx, Inc. |
114 | + * | 116 | + * |
@@ -131,12 +133,11 @@ index 0000000..337457c | |||
131 | + | 133 | + |
132 | +#define CONFIG_ZYNQ_SDHCI1 | 134 | +#define CONFIG_ZYNQ_SDHCI1 |
133 | +#define CONFIG_ZYNQ_USB | 135 | +#define CONFIG_ZYNQ_USB |
134 | +#define CONFIG_ZYNQ_QSPI | ||
135 | +#define CONFIG_ZYNQ_BOOT_FREEBSD | 136 | +#define CONFIG_ZYNQ_BOOT_FREEBSD |
136 | + | 137 | + |
137 | +#include <configs/zynq-common.h> | 138 | +#include <configs/zynq-common.h> |
138 | + | 139 | + |
139 | +#endif /* __CONFIG_ZYNQ_PICOZED_H */ | 140 | +#endif /* __CONFIG_ZYNQ_PICOZED_H */ |
140 | -- | 141 | -- |
141 | 1.7.10.4 | 142 | 2.5.1 |
142 | 143 | ||
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 @@ | |||
1 | include u-boot-xlnx.inc | 1 | include u-boot-xlnx.inc |
2 | include u-boot-xlnx-2015.01.inc | 2 | include u-boot-xlnx-2015.04.inc |
3 | include u-boot-extra.inc | 3 | include u-boot-extra.inc |
4 | 4 | ||
5 | UBOOT_ENV_zc702-zynq7 = "uEnv" | 5 | UBOOT_ENV_zc702-zynq7 = "uEnv" |