From 23bfadf1f5478083d8458f82e1e472c7b96e13d2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 11 Jun 2016 22:23:03 +0200 Subject: u-boot: update to 2016.05, add a fix for imx6 from the mailinglist --- package/u-boot/Makefile | 4 ++-- package/u-boot/patches/patch-common_image_c | 6 +++--- package/u-boot/patches/patch-drivers_video_ipu_common_c | 11 +++++++++++ package/u-boot/patches/patch-include_image_h | 6 +++--- package/u-boot/patches/patch-tools_env_fw_env_h | 6 +++--- 5 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 package/u-boot/patches/patch-drivers_video_ipu_common_c (limited to 'package') diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 6458b1198..e704f1c0b 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2016.03 +PKG_VERSION:= 2016.05 PKG_RELEASE:= 1 -PKG_HASH:= e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb +PKG_HASH:= 87d02275615aaf0cd007b54cbe9fbadceef2bee7c79e6c323ea1ae8956dcb171 PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot HOST_BUILDDEP:= libressl-host device-tree-compiler-host diff --git a/package/u-boot/patches/patch-common_image_c b/package/u-boot/patches/patch-common_image_c index a895239a5..fb3a7a3a0 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-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[] +--- u-boot-2016.05.orig/common/image.c 2016-05-16 16:40:32.000000000 +0200 ++++ u-boot-2016.05/common/image.c 2016-06-11 21:40:16.405472773 +0200 +@@ -91,6 +91,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-drivers_video_ipu_common_c b/package/u-boot/patches/patch-drivers_video_ipu_common_c new file mode 100644 index 000000000..003ef3c2d --- /dev/null +++ b/package/u-boot/patches/patch-drivers_video_ipu_common_c @@ -0,0 +1,11 @@ +--- u-boot-2016.05.orig/drivers/video/ipu_common.c 2016-05-16 16:40:32.000000000 +0200 ++++ u-boot-2016.05/drivers/video/ipu_common.c 2016-06-11 22:10:53.808259263 +0200 +@@ -352,7 +352,7 @@ static int ipu_pixel_clk_set_rate(struct + */ + __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id)); + +- clk->rate = (u64)(clk->parent->rate * 16) / div; ++ clk->rate = (u64)lldiv(clk->parent->rate * 16, div); + + return 0; + } diff --git a/package/u-boot/patches/patch-include_image_h b/package/u-boot/patches/patch-include_image_h index 0cb62c6ba..1f1480e82 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-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; +--- u-boot-2016.05.orig/include/image.h 2016-05-16 16:40:32.000000000 +0200 ++++ u-boot-2016.05/include/image.h 2016-06-11 21:40:16.425472773 +0200 +@@ -179,6 +179,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_env_fw_env_h b/package/u-boot/patches/patch-tools_env_fw_env_h index b829036d9..d6d46fa43 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-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 @@ +--- u-boot-2016.05.orig/tools/env/fw_env.h 2016-05-16 16:40:32.000000000 +0200 ++++ u-boot-2016.05/tools/env/fw_env.h 2016-06-11 21:40:16.429472773 +0200 +@@ -19,6 +19,8 @@ #include #endif -- cgit v1.2.3