aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot/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-22 23:25:00 +0100
commit3157f8995e24f8a70492a261815be3a6fe51dcbd (patch)
treebb1bdb2211476523b8e561478ffb588afed3f7c1 /meta/recipes-bsp/u-boot/u-boot
parent55851c6f389cb027496c96f6e0609c8892032e4d (diff)
downloadopenembedded-core-contrib-3157f8995e24f8a70492a261815be3a6fe51dcbd.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. 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/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch192
1 files changed, 93 insertions, 99 deletions
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
+