4 files changed, 11 insertions, 11 deletions

diff --git a/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch b/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
index 2564d1d4..64685e39 100644
--- a/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
+++ b/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
@@ -1,4 +1,4 @@
-From dff01fc9346e6f4e3386536df309d2e78f03f3ee Mon Sep 17 00:00:00 2001
+From a8dc33253472328f2af04973575f26e9106db1c3 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 21 Dec 2011 08:53:02 -0800
 Subject: [PATCH] config: Always use GNU ld
@@ -20,14 +20,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/config.mk b/config.mk
-index ddaa477..59b3e71 100644
+index ddaa477..139dfa0 100644
 --- a/config.mk
 +++ b/config.mk
 @@ -126,11 +126,13 @@ cc-option = $(strip $(if $(findstring $1,$(CC_OPTIONS)),$1,\
                 $(if $(call cc-option-sys,$1),$1,$2)))
  endif
  
-+exists_bfd_ld = $(shell if $(CROSS_COMPILE)ld.bfd -v >& /dev/null; \
++exists_bfd_ld = $(shell if $(CROSS_COMPILE)ld.bfd -v > /dev/null 2>&1; \
 +               then echo "$(1)"; else echo "$(2)"; fi; )
  #
  # Include the make variables (CC, etc...)
@@ -39,5 +39,5 @@ index ddaa477..59b3e71 100644
  CPP    = $(CC) -E
  AR     = $(CROSS_COMPILE)ar
 -- 
-1.7.5.4
+1.7.9.1
 
diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0007-config-Always-use-GNU-ld.patch b/recipes-bsp/u-boot/u-boot/2011.12/0007-config-Always-use-GNU-ld.patch
index 15f22b34..64685e39 100644
--- a/recipes-bsp/u-boot/u-boot/2011.12/0007-config-Always-use-GNU-ld.patch
+++ b/recipes-bsp/u-boot/u-boot/2011.12/0007-config-Always-use-GNU-ld.patch
@@ -1,7 +1,7 @@
-From 06fe8be6b5c70853c0e3fac93d7bba9cb3d0292f Mon Sep 17 00:00:00 2001
+From a8dc33253472328f2af04973575f26e9106db1c3 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 21 Dec 2011 08:53:02 -0800
-Subject: [PATCH 07/10] config: Always use GNU ld
+Subject: [PATCH] config: Always use GNU ld
 
 This patch makes sure that we always use the GNU ld. u-boot uses certain
 construct e.g. OVERLAY which are not implemented in gold therefore it
@@ -20,14 +20,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/config.mk b/config.mk
-index ddaa477..59b3e71 100644
+index ddaa477..139dfa0 100644
 --- a/config.mk
 +++ b/config.mk
 @@ -126,11 +126,13 @@ cc-option = $(strip $(if $(findstring $1,$(CC_OPTIONS)),$1,\
                 $(if $(call cc-option-sys,$1),$1,$2)))
  endif
  
-+exists_bfd_ld = $(shell if $(CROSS_COMPILE)ld.bfd -v >& /dev/null; \
++exists_bfd_ld = $(shell if $(CROSS_COMPILE)ld.bfd -v > /dev/null 2>&1; \
 +               then echo "$(1)"; else echo "$(2)"; fi; )
  #
  # Include the make variables (CC, etc...)
@@ -39,5 +39,5 @@ index ddaa477..59b3e71 100644
  CPP    = $(CC) -E
  AR     = $(CROSS_COMPILE)ar
 -- 
-1.7.2.5
+1.7.9.1
 
diff --git a/recipes-bsp/u-boot/u-boot_2011.09.bb b/recipes-bsp/u-boot/u-boot_2011.09.bb
index 4a9d3cb1..b164c777 100644
--- a/recipes-bsp/u-boot/u-boot_2011.09.bb
+++ b/recipes-bsp/u-boot/u-boot_2011.09.bb
@@ -1,6 +1,6 @@
 require u-boot.inc
 
-PR = "r6"
+PR = "r7"
 
 # SPL build
 UBOOT_BINARY = "u-boot.img"
diff --git a/recipes-bsp/u-boot/u-boot_2011.12.bb b/recipes-bsp/u-boot/u-boot_2011.12.bb
index 35ffd4b7..9bbd31e2 100644
--- a/recipes-bsp/u-boot/u-boot_2011.12.bb
+++ b/recipes-bsp/u-boot/u-boot_2011.12.bb
@@ -6,7 +6,7 @@ UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
 UBOOT_SYMLINK = "u-boot-${MACHINE}.img"
 
 PV = "2011.12"
-PR = "r5"
+PR = "r6"
 
 # No patches for other machines yet
 COMPATIBLE_MACHINE = "(beagleboard|pandaboard|hawkboard|am3517-evm|am37x-evm|omap3evm)"