fix linking error reported by mt

6 files changed, 24 insertions, 13 deletions

diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 2b8404d39..192785aa9 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		u-boot
 PKG_VERSION:=		2015.07
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		0b48c9bd717f2c322ef791f8282e14c88be942dc7d1226df7e31a812a3af94d9
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
diff --git a/package/u-boot/patches/patch-arch_arm_lib_bootm_c b/package/u-boot/patches/patch-arch_arm_lib_bootm_c
index 1498f47dd..dab77668b 100644
--- a/package/u-boot/patches/patch-arch_arm_lib_bootm_c
+++ b/package/u-boot/patches/patch-arch_arm_lib_bootm_c
@@ -1,6 +1,6 @@
---- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/arch/arm/lib/bootm.c	2015-01-06 09:00:23.000000000 +0100
-+++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/arch/arm/lib/bootm.c	2015-01-07 18:11:45.971158851 +0100
-@@ -70,8 +70,8 @@ void arch_lmb_reserve(struct lmb *lmb)
+--- u-boot-2015.07.orig/arch/arm/lib/bootm.c	2015-07-14 19:32:21.000000000 +0200
++++ u-boot-2015.07/arch/arm/lib/bootm.c	2015-07-27 13:51:04.000000000 +0200
+@@ -71,8 +71,8 @@ void arch_lmb_reserve(struct lmb *lmb)
   */
  static void announce_and_cleanup(int fake)
  {
diff --git a/package/u-boot/patches/patch-common_image_c b/package/u-boot/patches/patch-common_image_c
index 07a5f106b..a895239a5 100644
--- a/package/u-boot/patches/patch-common_image_c
+++ b/package/u-boot/patches/patch-common_image_c
@@ -1,6 +1,6 @@
---- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/common/image.c	2014-12-31 15:12:25.000000000 -0600
-+++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/common/image.c	2015-01-02 03:10:44.486002312 -0600
-@@ -86,6 +86,7 @@ static const table_entry_t uimage_arch[]
+--- u-boot-2015.07.orig/common/image.c	2015-07-14 19:32:21.000000000 +0200
++++ u-boot-2015.07/common/image.c	2015-07-27 13:51:04.000000000 +0200
+@@ -87,6 +87,7 @@ static const table_entry_t uimage_arch[]
  	{	IH_ARCH_ARM64,		"arm64",	"AArch64",	},
  	{	IH_ARCH_ARC,		"arc",		"ARC",		},
  	{	IH_ARCH_X86_64,		"x86_64",	"AMD x86_64",	},
diff --git a/package/u-boot/patches/patch-include_image_h b/package/u-boot/patches/patch-include_image_h
index 1f6eec416..0cb62c6ba 100644
--- a/package/u-boot/patches/patch-include_image_h
+++ b/package/u-boot/patches/patch-include_image_h
@@ -1,6 +1,6 @@
---- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/include/image.h	2014-12-31 15:12:25.000000000 -0600
-+++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/include/image.h	2015-01-02 03:11:36.078001840 -0600
-@@ -180,6 +180,7 @@ struct lmb;
+--- u-boot-2015.07.orig/include/image.h	2015-07-14 19:32:21.000000000 +0200
++++ u-boot-2015.07/include/image.h	2015-07-27 13:51:04.000000000 +0200
+@@ -182,6 +182,7 @@ struct lmb;
  #define IH_ARCH_ARM64		22	/* ARM64	*/
  #define IH_ARCH_ARC		23	/* Synopsys DesignWare ARC */
  #define IH_ARCH_X86_64		24	/* AMD x86_64, Intel and Via */
diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile
new file mode 100644
index 000000000..83da79edb
--- /dev/null
+++ b/package/u-boot/patches/patch-tools_Makefile
@@ -0,0 +1,11 @@
+--- u-boot-2015.07.orig/tools/Makefile	2015-07-14 19:32:21.000000000 +0200
++++ u-boot-2015.07/tools/Makefile	2015-07-27 19:45:38.000000000 +0200
+@@ -123,7 +123,7 @@ endif
+ # MXSImage needs LibSSL
+ ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
+ HOSTLOADLIBES_mkimage += \
+-	$(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto")
++	$(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto -dl")
+ endif
+ 
+ HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)
diff --git a/package/u-boot/patches/patch-tools_env_fw_env_h b/package/u-boot/patches/patch-tools_env_fw_env_h
index 53548351f..b829036d9 100644
--- a/package/u-boot/patches/patch-tools_env_fw_env_h
+++ b/package/u-boot/patches/patch-tools_env_fw_env_h
@@ -1,6 +1,6 @@
---- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/tools/env/fw_env.h	2015-01-06 09:00:23.000000000 +0100
-+++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/tools/env/fw_env.h	2015-01-07 13:13:44.399072426 +0100
-@@ -14,6 +14,8 @@
+--- u-boot-2015.07.orig/tools/env/fw_env.h	2015-07-14 19:32:21.000000000 +0200
++++ u-boot-2015.07/tools/env/fw_env.h	2015-07-27 13:51:04.000000000 +0200
+@@ -16,6 +16,8 @@
  #include <config.h>
  #endif