diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch | 36 | ||||
| -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.patch | 91 | ||||
| -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.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch | 192 | ||||
| -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 @@ -From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001 -From: Masahiro Yamada <yamada.m@jp.panasonic.com> -Date: Wed, 3 Dec 2014 10:22:50 +0900 -Subject: [PATCH] tools: env: fix build error - -Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig, -tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG -is defined. -(I do not think this is the right way to fix the problem, but -for now I do not have enough time to take a close look.) - -Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/] - -Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> -Reported-by: Denys Dmytriyenko <denys@ti.com> ---- - tools/env/fw_env.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c -index 1173eea..698fe51 100644 ---- a/tools/env/fw_env.c -+++ b/tools/env/fw_env.c -@@ -8,6 +8,9 @@ - * SPDX-License-Identifier: GPL-2.0+ - */ - -+/* FIXME: Do not include this */ -+#include <linux/kconfig.h> -+ - #include <errno.h> - #include <env_flags.h> - #include <fcntl.h> --- -2.2.0 - 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 @@ SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" SECTION = "bootloader" DEPENDS = "mtd-utils" -# This revision corresponds to the tag "v2015.01" +# This revision corresponds to the tag "v2015.07" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" +SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94" -PV = "v2015.01+git${SRCPV}" +PV = "v2015.07+git${SRCPV}" -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ - file://0001-tools-env-fix-build-error.patch" +SRC_URI = "git://git.denx.de/u-boot.git;branch=master" S = "${WORKDIR}/git" 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 @@ -Upstream-Status: Backport - -From 478b02f1a7043b673565075ea5016376f3293b23 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Sat, 7 Feb 2015 22:52:40 +0100 -Subject: [PATCH] Add linux/compiler-gcc5.h to fix builds with gcc5 - -Add linux/compiler-gcc5/h from the kernel sources at: - -commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b -Author: Steven Noonan <steven@uplinklabs.net> -Date: Sat Oct 25 15:09:42 2014 -0700 - - compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 65 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -Index: git/include/linux/compiler-gcc5.h -=================================================================== ---- /dev/null -+++ git/include/linux/compiler-gcc5.h -@@ -0,0 +1,65 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#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 @@ SUMMARY = "U-Boot bootloader image creation tool" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" SECTION = "bootloader" DEPENDS = "openssl" -# This revision corresponds to the tag "v2015.01" +# This revision corresponds to the tag "v2015.07" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" +SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94" -PV = "v2015.01+git${SRCPV}" +PV = "v2015.07+git${SRCPV}" -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ - file://gcc5.patch \ - " +SRC_URI = "git://git.denx.de/u-boot.git;branch=master" S = "${WORKDIR}/git" 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" PROVIDES = "virtual/bootloader" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" SRC_URI = "git://git.denx.de/u-boot.git;branch=master" 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 @@ -From 9ba002f1b1afc7af84a352f4ecab32a30d7ba353 Mon Sep 17 00:00:00 2001 +From 92598e1515b2ec3851af1f064075d0457f01272d Mon Sep 17 00:00:00 2001 From: Zhenhua Luo <zhenhua.luo@freescale.com> Date: Mon, 9 Feb 2015 18:33:56 +0800 Subject: [PATCH] powerpc/cpu/*/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ definition +Organization: O.S. Systems Software LTDA. In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in u-boot.lds overrides the linker built-in symbols @@ -19,48 +20,38 @@ Fixed the following build errors with binutils-2.25: Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> Upstream-Status: Pending +--- + arch/powerpc/cpu/mpc512x/u-boot.lds | 1 - + arch/powerpc/cpu/mpc5xx/u-boot.lds | 1 - + arch/powerpc/cpu/mpc5xxx/u-boot.lds | 1 - + arch/powerpc/cpu/mpc8260/u-boot.lds | 1 - + arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 1 - + arch/powerpc/cpu/mpc83xx/u-boot.lds | 1 - + arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 1 - + arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 - + arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 1 - + arch/powerpc/cpu/mpc85xx/u-boot.lds | 1 - + arch/powerpc/cpu/mpc86xx/u-boot.lds | 1 - + arch/powerpc/cpu/ppc4xx/u-boot.lds | 1 - + 12 files changed, 12 deletions(-) -Index: git/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -+++ git/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -@@ -44,7 +44,6 @@ SECTIONS +diff --git a/arch/powerpc/cpu/mpc512x/u-boot.lds b/arch/powerpc/cpu/mpc512x/u-boot.lds +index 9658b21..b32f74e 100644 +--- a/arch/powerpc/cpu/mpc512x/u-boot.lds ++++ b/arch/powerpc/cpu/mpc512x/u-boot.lds +@@ -24,7 +24,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) - } -Index: git/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -+++ git/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -@@ -22,7 +22,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -Index: git/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -+++ git/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -@@ -29,7 +29,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -Index: git/arch/powerpc/cpu/mpc85xx/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc85xx/u-boot.lds -+++ git/arch/powerpc/cpu/mpc85xx/u-boot.lds -@@ -50,7 +50,6 @@ SECTIONS + *(.fixup) +diff --git a/arch/powerpc/cpu/mpc5xx/u-boot.lds b/arch/powerpc/cpu/mpc5xx/u-boot.lds +index 7198465..6a53571 100644 +--- a/arch/powerpc/cpu/mpc5xx/u-boot.lds ++++ b/arch/powerpc/cpu/mpc5xx/u-boot.lds +@@ -33,7 +33,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) @@ -68,11 +59,11 @@ Index: git/arch/powerpc/cpu/mpc85xx/u-boot.lds _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } -Index: git/arch/powerpc/cpu/mpc8260/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc8260/u-boot.lds -+++ git/arch/powerpc/cpu/mpc8260/u-boot.lds -@@ -27,7 +27,6 @@ SECTIONS +diff --git a/arch/powerpc/cpu/mpc5xxx/u-boot.lds b/arch/powerpc/cpu/mpc5xxx/u-boot.lds +index cd9e23f..aa80d3d 100644 +--- a/arch/powerpc/cpu/mpc5xxx/u-boot.lds ++++ b/arch/powerpc/cpu/mpc5xxx/u-boot.lds +@@ -28,7 +28,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) @@ -80,11 +71,11 @@ Index: git/arch/powerpc/cpu/mpc8260/u-boot.lds _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } -Index: git/arch/powerpc/cpu/74xx_7xx/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/74xx_7xx/u-boot.lds -+++ git/arch/powerpc/cpu/74xx_7xx/u-boot.lds -@@ -30,7 +30,6 @@ SECTIONS +diff --git a/arch/powerpc/cpu/mpc8260/u-boot.lds b/arch/powerpc/cpu/mpc8260/u-boot.lds +index 50cbf85..469fc29 100644 +--- a/arch/powerpc/cpu/mpc8260/u-boot.lds ++++ b/arch/powerpc/cpu/mpc8260/u-boot.lds +@@ -27,7 +27,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) @@ -92,23 +83,23 @@ Index: git/arch/powerpc/cpu/74xx_7xx/u-boot.lds _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } -Index: git/arch/powerpc/cpu/mpc512x/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc512x/u-boot.lds -+++ git/arch/powerpc/cpu/mpc512x/u-boot.lds +diff --git a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds +index 774772b..4101eaf 100644 +--- a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds ++++ b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds @@ -24,7 +24,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - *(.fixup) -Index: git/arch/powerpc/cpu/mpc5xx/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc5xx/u-boot.lds -+++ git/arch/powerpc/cpu/mpc5xx/u-boot.lds -@@ -33,7 +33,6 @@ SECTIONS + _GOT2_TABLE_ = .; + KEEP(*(.got2)) + KEEP(*(.got)) +- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); + } + __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; + +diff --git a/arch/powerpc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds +index 3c177fa..dbd8bbe 100644 +--- a/arch/powerpc/cpu/mpc83xx/u-boot.lds ++++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds +@@ -26,7 +26,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) @@ -116,11 +107,11 @@ Index: git/arch/powerpc/cpu/mpc5xx/u-boot.lds _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } -Index: git/arch/powerpc/cpu/mpc5xxx/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc5xxx/u-boot.lds -+++ git/arch/powerpc/cpu/mpc5xxx/u-boot.lds -@@ -28,7 +28,6 @@ SECTIONS +diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds +index f933b21..0399f93 100644 +--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds ++++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds +@@ -44,7 +44,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) @@ -128,23 +119,35 @@ Index: git/arch/powerpc/cpu/mpc5xxx/u-boot.lds _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } -Index: git/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds -+++ git/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds -@@ -24,7 +24,6 @@ SECTIONS +diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds +index b83c553..f044564 100644 +--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds ++++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds +@@ -22,7 +22,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); + _FIXUP_TABLE_ = .; + KEEP(*(.fixup)) } - __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1; - -Index: git/arch/powerpc/cpu/mpc83xx/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc83xx/u-boot.lds -+++ git/arch/powerpc/cpu/mpc83xx/u-boot.lds -@@ -26,7 +26,6 @@ SECTIONS +diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +index 5ae7b3e..889a4c2 100644 +--- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds ++++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +@@ -29,7 +29,6 @@ SECTIONS + _GOT2_TABLE_ = .; + KEEP(*(.got2)) + KEEP(*(.got)) +- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); + _FIXUP_TABLE_ = .; + KEEP(*(.fixup)) + } +diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds +index 2cf0b25..f15eaf3 100644 +--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds ++++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds +@@ -50,7 +50,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) @@ -152,10 +155,10 @@ Index: git/arch/powerpc/cpu/mpc83xx/u-boot.lds _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } -Index: git/arch/powerpc/cpu/mpc86xx/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc86xx/u-boot.lds -+++ git/arch/powerpc/cpu/mpc86xx/u-boot.lds +diff --git a/arch/powerpc/cpu/mpc86xx/u-boot.lds b/arch/powerpc/cpu/mpc86xx/u-boot.lds +index 58467c2..6c48f40 100644 +--- a/arch/powerpc/cpu/mpc86xx/u-boot.lds ++++ b/arch/powerpc/cpu/mpc86xx/u-boot.lds @@ -32,7 +32,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) @@ -164,22 +167,10 @@ Index: git/arch/powerpc/cpu/mpc86xx/u-boot.lds _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } -Index: git/arch/powerpc/cpu/mpc8xx/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/mpc8xx/u-boot.lds -+++ git/arch/powerpc/cpu/mpc8xx/u-boot.lds -@@ -34,7 +34,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -Index: git/arch/powerpc/cpu/ppc4xx/u-boot.lds -=================================================================== ---- git.orig/arch/powerpc/cpu/ppc4xx/u-boot.lds -+++ git/arch/powerpc/cpu/ppc4xx/u-boot.lds +diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds +index 1980508..55dd4e1 100644 +--- a/arch/powerpc/cpu/ppc4xx/u-boot.lds ++++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds @@ -46,7 +46,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) @@ -188,3 +179,6 @@ Index: git/arch/powerpc/cpu/ppc4xx/u-boot.lds _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } +-- +2.4.6 + 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 DEPENDS += "dtc-native" -SRC_URI += "file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch" +# This revision corresponds to the tag "v2015.07" +# We use the revision in order to avoid having to fetch it from the +# repo during parse +SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94" -# This revision corresponds to the tag "v2015.01" -# We use the revision in order to avoid having to fetch it from the repo during parse -SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368" +SRC_URI += "file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch" -PV = "v2015.01+git${SRCPV}" +PV = "v2015.07+git${SRCPV}" |