summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-07-20 11:10:30 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-23 08:48:39 +0100
commit51b590db259375aa6259845862ca9020ed264b05 (patch)
tree21f33b36e23c47114e9d7b956f61493fc7966655 /meta/recipes-bsp/u-boot
parent99b082d0b61cecec1f4e12b3c5d54080f27281e4 (diff)
downloadpoky-51b590db259375aa6259845862ca9020ed264b05.tar.gz
u-boot: Upgrade to 2015.07 release
This upgrades the U-Boot and its related recipes for the 2015.07 release. The following recipes has been upgraded: - u-boot - u-boot-mkimage - u-boot-fw-utils The patches which were applied on top of the 2015.01 release are dropped as those are not needed in this release. The license checksum update was due minimal changes in the text, those have no impact in the license terms. (From OE-Core rev: 3157f8995e24f8a70492a261815be3a6fe51dcbd) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch36
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb)11
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch91
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2015.07.bb (renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb)12
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch192
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2015.07.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2015.01.bb)11
7 files changed, 110 insertions, 245 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
deleted file mode 100644
index 381b505d1e..0000000000
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001
2From: Masahiro Yamada <yamada.m@jp.panasonic.com>
3Date: Wed, 3 Dec 2014 10:22:50 +0900
4Subject: [PATCH] tools: env: fix build error
5
6Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig,
7tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG
8is defined.
9(I do not think this is the right way to fix the problem, but
10for now I do not have enough time to take a close look.)
11
12Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/]
13
14Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
15Reported-by: Denys Dmytriyenko <denys@ti.com>
16---
17 tools/env/fw_env.c | 3 +++
18 1 file changed, 3 insertions(+)
19
20diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
21index 1173eea..698fe51 100644
22--- a/tools/env/fw_env.c
23+++ b/tools/env/fw_env.c
24@@ -8,6 +8,9 @@
25 * SPDX-License-Identifier: GPL-2.0+
26 */
27
28+/* FIXME: Do not include this */
29+#include <linux/kconfig.h>
30+
31 #include <errno.h>
32 #include <env_flags.h>
33 #include <fcntl.h>
34--
352.2.0
36
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb
index b310b0d0aa..0df7a059d7 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb
@@ -1,18 +1,17 @@
1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" 1SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" 3LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
4SECTION = "bootloader" 4SECTION = "bootloader"
5DEPENDS = "mtd-utils" 5DEPENDS = "mtd-utils"
6 6
7# This revision corresponds to the tag "v2015.01" 7# This revision corresponds to the tag "v2015.07"
8# We use the revision in order to avoid having to fetch it from the 8# We use the revision in order to avoid having to fetch it from the
9# repo during parse 9# repo during parse
10SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" 10SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94"
11 11
12PV = "v2015.01+git${SRCPV}" 12PV = "v2015.07+git${SRCPV}"
13 13
14SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ 14SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
15 file://0001-tools-env-fix-build-error.patch"
16 15
17S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
18 17
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch
deleted file mode 100644
index 12db94ca12..0000000000
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch
+++ /dev/null
@@ -1,91 +0,0 @@
1Upstream-Status: Backport
2
3From 478b02f1a7043b673565075ea5016376f3293b23 Mon Sep 17 00:00:00 2001
4From: Hans de Goede <hdegoede@redhat.com>
5Date: Sat, 7 Feb 2015 22:52:40 +0100
6Subject: [PATCH] Add linux/compiler-gcc5.h to fix builds with gcc5
7
8Add linux/compiler-gcc5/h from the kernel sources at:
9
10commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b
11Author: Steven Noonan <steven@uplinklabs.net>
12Date: Sat Oct 25 15:09:42 2014 -0700
13
14 compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
15
16Signed-off-by: Hans de Goede <hdegoede@redhat.com>
17---
18 include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++
19 1 file changed, 65 insertions(+)
20 create mode 100644 include/linux/compiler-gcc5.h
21
22Index: git/include/linux/compiler-gcc5.h
23===================================================================
24--- /dev/null
25+++ git/include/linux/compiler-gcc5.h
26@@ -0,0 +1,65 @@
27+#ifndef __LINUX_COMPILER_H
28+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
29+#endif
30+
31+#define __used __attribute__((__used__))
32+#define __must_check __attribute__((warn_unused_result))
33+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
34+
35+/* Mark functions as cold. gcc will assume any path leading to a call
36+ to them will be unlikely. This means a lot of manual unlikely()s
37+ are unnecessary now for any paths leading to the usual suspects
38+ like BUG(), printk(), panic() etc. [but let's keep them for now for
39+ older compilers]
40+
41+ Early snapshots of gcc 4.3 don't support this and we can't detect this
42+ in the preprocessor, but we can live with this because they're unreleased.
43+ Maketime probing would be overkill here.
44+
45+ gcc also has a __attribute__((__hot__)) to move hot functions into
46+ a special section, but I don't see any sense in this right now in
47+ the kernel context */
48+#define __cold __attribute__((__cold__))
49+
50+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
51+
52+#ifndef __CHECKER__
53+# define __compiletime_warning(message) __attribute__((warning(message)))
54+# define __compiletime_error(message) __attribute__((error(message)))
55+#endif /* __CHECKER__ */
56+
57+/*
58+ * Mark a position in code as unreachable. This can be used to
59+ * suppress control flow warnings after asm blocks that transfer
60+ * control elsewhere.
61+ *
62+ * Early snapshots of gcc 4.5 don't support this and we can't detect
63+ * this in the preprocessor, but we can live with this because they're
64+ * unreleased. Really, we need to have autoconf for the kernel.
65+ */
66+#define unreachable() __builtin_unreachable()
67+
68+/* Mark a function definition as prohibited from being cloned. */
69+#define __noclone __attribute__((__noclone__))
70+
71+/*
72+ * Tell the optimizer that something else uses this function or variable.
73+ */
74+#define __visible __attribute__((externally_visible))
75+
76+/*
77+ * GCC 'asm goto' miscompiles certain code sequences:
78+ *
79+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
80+ *
81+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
82+ *
83+ * (asm goto is automatically volatile - the naming reflects this.)
84+ */
85+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
86+
87+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
88+#define __HAVE_BUILTIN_BSWAP32__
89+#define __HAVE_BUILTIN_BSWAP64__
90+#define __HAVE_BUILTIN_BSWAP16__
91+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.07.bb
index 773528803e..ba29bbb922 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.07.bb
@@ -1,20 +1,18 @@
1SUMMARY = "U-Boot bootloader image creation tool" 1SUMMARY = "U-Boot bootloader image creation tool"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" 3LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
4SECTION = "bootloader" 4SECTION = "bootloader"
5 5
6DEPENDS = "openssl" 6DEPENDS = "openssl"
7 7
8# This revision corresponds to the tag "v2015.01" 8# This revision corresponds to the tag "v2015.07"
9# We use the revision in order to avoid having to fetch it from the 9# We use the revision in order to avoid having to fetch it from the
10# repo during parse 10# repo during parse
11SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" 11SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94"
12 12
13PV = "v2015.01+git${SRCPV}" 13PV = "v2015.07+git${SRCPV}"
14 14
15SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ 15SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
16 file://gcc5.patch \
17 "
18 16
19S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
20 18
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 88e239d66a..c76f87f5a2 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -4,7 +4,7 @@ SECTION = "bootloaders"
4PROVIDES = "virtual/bootloader" 4PROVIDES = "virtual/bootloader"
5 5
6LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" 7LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
8 8
9SRC_URI = "git://git.denx.de/u-boot.git;branch=master" 9SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
10 10
diff --git a/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch b/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
index faf2985140..dfbcd45bea 100644
--- a/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
+++ b/meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
@@ -1,8 +1,9 @@
1From 9ba002f1b1afc7af84a352f4ecab32a30d7ba353 Mon Sep 17 00:00:00 2001 1From 92598e1515b2ec3851af1f064075d0457f01272d Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@freescale.com> 2From: Zhenhua Luo <zhenhua.luo@freescale.com>
3Date: Mon, 9 Feb 2015 18:33:56 +0800 3Date: Mon, 9 Feb 2015 18:33:56 +0800
4Subject: [PATCH] powerpc/cpu/*/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ 4Subject: [PATCH] powerpc/cpu/*/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_
5 definition 5 definition
6Organization: O.S. Systems Software LTDA.
6 7
7In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in 8In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in
8u-boot.lds overrides the linker built-in symbols 9u-boot.lds overrides the linker built-in symbols
@@ -19,48 +20,38 @@ Fixed the following build errors with binutils-2.25:
19Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> 20Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
20 21
21Upstream-Status: Pending 22Upstream-Status: Pending
23---
24 arch/powerpc/cpu/mpc512x/u-boot.lds | 1 -
25 arch/powerpc/cpu/mpc5xx/u-boot.lds | 1 -
26 arch/powerpc/cpu/mpc5xxx/u-boot.lds | 1 -
27 arch/powerpc/cpu/mpc8260/u-boot.lds | 1 -
28 arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 1 -
29 arch/powerpc/cpu/mpc83xx/u-boot.lds | 1 -
30 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 1 -
31 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 -
32 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 1 -
33 arch/powerpc/cpu/mpc85xx/u-boot.lds | 1 -
34 arch/powerpc/cpu/mpc86xx/u-boot.lds | 1 -
35 arch/powerpc/cpu/ppc4xx/u-boot.lds | 1 -
36 12 files changed, 12 deletions(-)
22 37
23Index: git/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds 38diff --git a/arch/powerpc/cpu/mpc512x/u-boot.lds b/arch/powerpc/cpu/mpc512x/u-boot.lds
24=================================================================== 39index 9658b21..b32f74e 100644
25--- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds 40--- a/arch/powerpc/cpu/mpc512x/u-boot.lds
26+++ git/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds 41+++ b/arch/powerpc/cpu/mpc512x/u-boot.lds
27@@ -44,7 +44,6 @@ SECTIONS 42@@ -24,7 +24,6 @@ SECTIONS
28 _GOT2_TABLE_ = .; 43 _GOT2_TABLE_ = .;
29 KEEP(*(.got2)) 44 KEEP(*(.got2))
30 KEEP(*(.got)) 45 KEEP(*(.got))
31- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); 46- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
32 _FIXUP_TABLE_ = .; 47 _FIXUP_TABLE_ = .;
33 KEEP(*(.fixup)) 48 KEEP(*(.fixup))
34 } 49 *(.fixup)
35Index: git/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds 50diff --git a/arch/powerpc/cpu/mpc5xx/u-boot.lds b/arch/powerpc/cpu/mpc5xx/u-boot.lds
36=================================================================== 51index 7198465..6a53571 100644
37--- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds 52--- a/arch/powerpc/cpu/mpc5xx/u-boot.lds
38+++ git/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds 53+++ b/arch/powerpc/cpu/mpc5xx/u-boot.lds
39@@ -22,7 +22,6 @@ SECTIONS 54@@ -33,7 +33,6 @@ SECTIONS
40 _GOT2_TABLE_ = .;
41 KEEP(*(.got2))
42 KEEP(*(.got))
43- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
44 _FIXUP_TABLE_ = .;
45 KEEP(*(.fixup))
46 }
47Index: git/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
48===================================================================
49--- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
50+++ git/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
51@@ -29,7 +29,6 @@ SECTIONS
52 _GOT2_TABLE_ = .;
53 KEEP(*(.got2))
54 KEEP(*(.got))
55- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
56 _FIXUP_TABLE_ = .;
57 KEEP(*(.fixup))
58 }
59Index: git/arch/powerpc/cpu/mpc85xx/u-boot.lds
60===================================================================
61--- git.orig/arch/powerpc/cpu/mpc85xx/u-boot.lds
62+++ git/arch/powerpc/cpu/mpc85xx/u-boot.lds
63@@ -50,7 +50,6 @@ SECTIONS
64 _GOT2_TABLE_ = .; 55 _GOT2_TABLE_ = .;
65 KEEP(*(.got2)) 56 KEEP(*(.got2))
66 KEEP(*(.got)) 57 KEEP(*(.got))
@@ -68,11 +59,11 @@ Index: git/arch/powerpc/cpu/mpc85xx/u-boot.lds
68 _FIXUP_TABLE_ = .; 59 _FIXUP_TABLE_ = .;
69 KEEP(*(.fixup)) 60 KEEP(*(.fixup))
70 } 61 }
71Index: git/arch/powerpc/cpu/mpc8260/u-boot.lds 62diff --git a/arch/powerpc/cpu/mpc5xxx/u-boot.lds b/arch/powerpc/cpu/mpc5xxx/u-boot.lds
72=================================================================== 63index cd9e23f..aa80d3d 100644
73--- git.orig/arch/powerpc/cpu/mpc8260/u-boot.lds 64--- a/arch/powerpc/cpu/mpc5xxx/u-boot.lds
74+++ git/arch/powerpc/cpu/mpc8260/u-boot.lds 65+++ b/arch/powerpc/cpu/mpc5xxx/u-boot.lds
75@@ -27,7 +27,6 @@ SECTIONS 66@@ -28,7 +28,6 @@ SECTIONS
76 _GOT2_TABLE_ = .; 67 _GOT2_TABLE_ = .;
77 KEEP(*(.got2)) 68 KEEP(*(.got2))
78 KEEP(*(.got)) 69 KEEP(*(.got))
@@ -80,11 +71,11 @@ Index: git/arch/powerpc/cpu/mpc8260/u-boot.lds
80 _FIXUP_TABLE_ = .; 71 _FIXUP_TABLE_ = .;
81 KEEP(*(.fixup)) 72 KEEP(*(.fixup))
82 } 73 }
83Index: git/arch/powerpc/cpu/74xx_7xx/u-boot.lds 74diff --git a/arch/powerpc/cpu/mpc8260/u-boot.lds b/arch/powerpc/cpu/mpc8260/u-boot.lds
84=================================================================== 75index 50cbf85..469fc29 100644
85--- git.orig/arch/powerpc/cpu/74xx_7xx/u-boot.lds 76--- a/arch/powerpc/cpu/mpc8260/u-boot.lds
86+++ git/arch/powerpc/cpu/74xx_7xx/u-boot.lds 77+++ b/arch/powerpc/cpu/mpc8260/u-boot.lds
87@@ -30,7 +30,6 @@ SECTIONS 78@@ -27,7 +27,6 @@ SECTIONS
88 _GOT2_TABLE_ = .; 79 _GOT2_TABLE_ = .;
89 KEEP(*(.got2)) 80 KEEP(*(.got2))
90 KEEP(*(.got)) 81 KEEP(*(.got))
@@ -92,23 +83,23 @@ Index: git/arch/powerpc/cpu/74xx_7xx/u-boot.lds
92 _FIXUP_TABLE_ = .; 83 _FIXUP_TABLE_ = .;
93 KEEP(*(.fixup)) 84 KEEP(*(.fixup))
94 } 85 }
95Index: git/arch/powerpc/cpu/mpc512x/u-boot.lds 86diff --git a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds
96=================================================================== 87index 774772b..4101eaf 100644
97--- git.orig/arch/powerpc/cpu/mpc512x/u-boot.lds 88--- a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds
98+++ git/arch/powerpc/cpu/mpc512x/u-boot.lds 89+++ b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds
99@@ -24,7 +24,6 @@ SECTIONS 90@@ -24,7 +24,6 @@ SECTIONS
100 _GOT2_TABLE_ = .; 91 _GOT2_TABLE_ = .;
101 KEEP(*(.got2)) 92 KEEP(*(.got2))
102 KEEP(*(.got)) 93 KEEP(*(.got))
103- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); 94- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
104 _FIXUP_TABLE_ = .; 95 }
105 KEEP(*(.fixup)) 96 __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
106 *(.fixup) 97
107Index: git/arch/powerpc/cpu/mpc5xx/u-boot.lds 98diff --git a/arch/powerpc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds
108=================================================================== 99index 3c177fa..dbd8bbe 100644
109--- git.orig/arch/powerpc/cpu/mpc5xx/u-boot.lds 100--- a/arch/powerpc/cpu/mpc83xx/u-boot.lds
110+++ git/arch/powerpc/cpu/mpc5xx/u-boot.lds 101+++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds
111@@ -33,7 +33,6 @@ SECTIONS 102@@ -26,7 +26,6 @@ SECTIONS
112 _GOT2_TABLE_ = .; 103 _GOT2_TABLE_ = .;
113 KEEP(*(.got2)) 104 KEEP(*(.got2))
114 KEEP(*(.got)) 105 KEEP(*(.got))
@@ -116,11 +107,11 @@ Index: git/arch/powerpc/cpu/mpc5xx/u-boot.lds
116 _FIXUP_TABLE_ = .; 107 _FIXUP_TABLE_ = .;
117 KEEP(*(.fixup)) 108 KEEP(*(.fixup))
118 } 109 }
119Index: git/arch/powerpc/cpu/mpc5xxx/u-boot.lds 110diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
120=================================================================== 111index f933b21..0399f93 100644
121--- git.orig/arch/powerpc/cpu/mpc5xxx/u-boot.lds 112--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
122+++ git/arch/powerpc/cpu/mpc5xxx/u-boot.lds 113+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
123@@ -28,7 +28,6 @@ SECTIONS 114@@ -44,7 +44,6 @@ SECTIONS
124 _GOT2_TABLE_ = .; 115 _GOT2_TABLE_ = .;
125 KEEP(*(.got2)) 116 KEEP(*(.got2))
126 KEEP(*(.got)) 117 KEEP(*(.got))
@@ -128,23 +119,35 @@ Index: git/arch/powerpc/cpu/mpc5xxx/u-boot.lds
128 _FIXUP_TABLE_ = .; 119 _FIXUP_TABLE_ = .;
129 KEEP(*(.fixup)) 120 KEEP(*(.fixup))
130 } 121 }
131Index: git/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds 122diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
132=================================================================== 123index b83c553..f044564 100644
133--- git.orig/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds 124--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
134+++ git/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds 125+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
135@@ -24,7 +24,6 @@ SECTIONS 126@@ -22,7 +22,6 @@ SECTIONS
136 _GOT2_TABLE_ = .; 127 _GOT2_TABLE_ = .;
137 KEEP(*(.got2)) 128 KEEP(*(.got2))
138 KEEP(*(.got)) 129 KEEP(*(.got))
139- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); 130- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
131 _FIXUP_TABLE_ = .;
132 KEEP(*(.fixup))
140 } 133 }
141 __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; 134diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
142 135index 5ae7b3e..889a4c2 100644
143Index: git/arch/powerpc/cpu/mpc83xx/u-boot.lds 136--- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
144=================================================================== 137+++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
145--- git.orig/arch/powerpc/cpu/mpc83xx/u-boot.lds 138@@ -29,7 +29,6 @@ SECTIONS
146+++ git/arch/powerpc/cpu/mpc83xx/u-boot.lds 139 _GOT2_TABLE_ = .;
147@@ -26,7 +26,6 @@ SECTIONS 140 KEEP(*(.got2))
141 KEEP(*(.got))
142- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
143 _FIXUP_TABLE_ = .;
144 KEEP(*(.fixup))
145 }
146diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
147index 2cf0b25..f15eaf3 100644
148--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
149+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
150@@ -50,7 +50,6 @@ SECTIONS
148 _GOT2_TABLE_ = .; 151 _GOT2_TABLE_ = .;
149 KEEP(*(.got2)) 152 KEEP(*(.got2))
150 KEEP(*(.got)) 153 KEEP(*(.got))
@@ -152,10 +155,10 @@ Index: git/arch/powerpc/cpu/mpc83xx/u-boot.lds
152 _FIXUP_TABLE_ = .; 155 _FIXUP_TABLE_ = .;
153 KEEP(*(.fixup)) 156 KEEP(*(.fixup))
154 } 157 }
155Index: git/arch/powerpc/cpu/mpc86xx/u-boot.lds 158diff --git a/arch/powerpc/cpu/mpc86xx/u-boot.lds b/arch/powerpc/cpu/mpc86xx/u-boot.lds
156=================================================================== 159index 58467c2..6c48f40 100644
157--- git.orig/arch/powerpc/cpu/mpc86xx/u-boot.lds 160--- a/arch/powerpc/cpu/mpc86xx/u-boot.lds
158+++ git/arch/powerpc/cpu/mpc86xx/u-boot.lds 161+++ b/arch/powerpc/cpu/mpc86xx/u-boot.lds
159@@ -32,7 +32,6 @@ SECTIONS 162@@ -32,7 +32,6 @@ SECTIONS
160 _GOT2_TABLE_ = .; 163 _GOT2_TABLE_ = .;
161 KEEP(*(.got2)) 164 KEEP(*(.got2))
@@ -164,22 +167,10 @@ Index: git/arch/powerpc/cpu/mpc86xx/u-boot.lds
164 _FIXUP_TABLE_ = .; 167 _FIXUP_TABLE_ = .;
165 KEEP(*(.fixup)) 168 KEEP(*(.fixup))
166 } 169 }
167Index: git/arch/powerpc/cpu/mpc8xx/u-boot.lds 170diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds
168=================================================================== 171index 1980508..55dd4e1 100644
169--- git.orig/arch/powerpc/cpu/mpc8xx/u-boot.lds 172--- a/arch/powerpc/cpu/ppc4xx/u-boot.lds
170+++ git/arch/powerpc/cpu/mpc8xx/u-boot.lds 173+++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds
171@@ -34,7 +34,6 @@ SECTIONS
172 _GOT2_TABLE_ = .;
173 KEEP(*(.got2))
174 KEEP(*(.got))
175- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
176 _FIXUP_TABLE_ = .;
177 KEEP(*(.fixup))
178 }
179Index: git/arch/powerpc/cpu/ppc4xx/u-boot.lds
180===================================================================
181--- git.orig/arch/powerpc/cpu/ppc4xx/u-boot.lds
182+++ git/arch/powerpc/cpu/ppc4xx/u-boot.lds
183@@ -46,7 +46,6 @@ SECTIONS 174@@ -46,7 +46,6 @@ SECTIONS
184 _GOT2_TABLE_ = .; 175 _GOT2_TABLE_ = .;
185 KEEP(*(.got2)) 176 KEEP(*(.got2))
@@ -188,3 +179,6 @@ Index: git/arch/powerpc/cpu/ppc4xx/u-boot.lds
188 _FIXUP_TABLE_ = .; 179 _FIXUP_TABLE_ = .;
189 KEEP(*(.fixup)) 180 KEEP(*(.fixup))
190 } 181 }
182--
1832.4.6
184
diff --git a/meta/recipes-bsp/u-boot/u-boot_2015.01.bb b/meta/recipes-bsp/u-boot/u-boot_2015.07.bb
index 70a1e545a0..3ba2f44eaa 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2015.07.bb
@@ -2,10 +2,11 @@ require u-boot.inc
2 2
3DEPENDS += "dtc-native" 3DEPENDS += "dtc-native"
4 4
5SRC_URI += "file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch" 5# This revision corresponds to the tag "v2015.07"
6# We use the revision in order to avoid having to fetch it from the
7# repo during parse
8SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94"
6 9
7# This revision corresponds to the tag "v2015.01" 10SRC_URI += "file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch"
8# We use the revision in order to avoid having to fetch it from the repo during parse
9SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
10 11
11PV = "v2015.01+git${SRCPV}" 12PV = "v2015.07+git${SRCPV}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 11:24:13 +0000