diff --git a/0001-clearfog-needs-HUSH-parser-for-distro-boot.patch b/0001-clearfog-needs-HUSH-parser-for-distro-boot.patch deleted file mode 100644 index 2bb5620..0000000 --- a/0001-clearfog-needs-HUSH-parser-for-distro-boot.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8e1dd4390d9a9c7453b7687d1f3a1d611a978b9f Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Thu, 19 May 2016 00:28:30 +0100 -Subject: [PATCH] clearfog needs HUSH parser for distro boot - ---- - configs/clearfog_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig -index 0fde640..75ea200 100644 ---- a/configs/clearfog_defconfig -+++ b/configs/clearfog_defconfig -@@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y - CONFIG_SYS_MALLOC_F_LEN=0x2000 - CONFIG_TARGET_CLEARFOG=y - CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" -+CONFIG_HUSH_PARSER=y - CONFIG_SPL=y - CONFIG_CMD_BOOTZ=y - # CONFIG_CMD_IMLS is not set --- -2.7.4 - diff --git a/U-Boot-video-ipu_common-fix-build-error.patch b/U-Boot-video-ipu_common-fix-build-error.patch deleted file mode 100644 index 8438eda..0000000 --- a/U-Boot-video-ipu_common-fix-build-error.patch +++ /dev/null @@ -1,57 +0,0 @@ -From patchwork Thu Apr 28 02:07:53 2016 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [U-Boot] video: ipu_common: fix build error -From: Peng Fan -X-Patchwork-Id: 615976 -Message-Id: <1461809273-4603-1-git-send-email-van.freenix@gmail.com> -To: u-boot@lists.denx.de -Cc: Tom Rini , Fabio Estevam -Date: Thu, 28 Apr 2016 10:07:53 +0800 - -Some toolchains fail to build -"clk->rate = (u64)(clk->parent->rate * 16) / div;" -And the cast usage is wrong. - -Use the following code to fix the issue, -" - do_div(parent_rate, div); - clk->rate = parent_rate; -" - -Reported-by: Peter Robinson -Signed-off-by: Peng Fan -Cc: Stefano Babic -Cc: Fabio Estevam -Cc: Tom Rini -Cc: Anatolij Gustschin -Cc: Peter Robinson ---- - -Hi Peter, - - Please help test this patch to see whether this fix your issue or not. - Thanks for pointing out this issue. - -Thanks, -Peng. - - drivers/video/ipu_common.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c -index 36d4b23..5676a0f 100644 ---- a/drivers/video/ipu_common.c -+++ b/drivers/video/ipu_common.c -@@ -352,7 +352,9 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, unsigned long rate) - */ - __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id)); - -- clk->rate = (u64)(clk->parent->rate * 16) / div; -+ do_div(parent_rate, div); -+ -+ clk->rate = parent_rate; - - return 0; - } diff --git a/0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch b/add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch similarity index 100% rename from 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch rename to add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch diff --git a/armv7-boards b/armv7-boards index ee7a9a4..e5d27bc 100644 --- a/armv7-boards +++ b/armv7-boards @@ -37,6 +37,7 @@ Hyundai_A7HD i12-tvbox icnova-a20-swac iNet_86VS +inet86dz Itead_Ibox_A20 jesurun_q5 jetson-tk1 diff --git a/armv8-boards b/armv8-boards index 8874fbb..e1b0828 100644 --- a/armv8-boards +++ b/armv8-boards @@ -1,4 +1,5 @@ dragonboard410c +espresso7420 hikey odroid-c2 p2371-2180 diff --git a/0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch b/copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch similarity index 100% rename from 0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch rename to copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch diff --git a/mvebu-enable-generic-distro-boot-config.patch b/mvebu-enable-generic-distro-boot-config.patch index dbe7209..1b60791 100644 --- a/mvebu-enable-generic-distro-boot-config.patch +++ b/mvebu-enable-generic-distro-boot-config.patch @@ -33,15 +33,6 @@ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 6d4bbd1..7050a83 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h -@@ -57,7 +57,7 @@ - #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ - 115200,230400, 460800, 921600 } - /* auto boot */ --#define CONFIG_BOOTDELAY 3 /* default enable autoboot */ -+#define CONFIG_BOOTDELAY 2 /* default enable autoboot */ - #define CONFIG_PREBOOT - - /* @@ -148,4 +148,88 @@ #define CONFIG_LZO #endif diff --git a/0005-port-utilite-to-distro-generic-boot-commands.patch b/port-utilite-to-distro-generic-boot-commands.patch similarity index 100% rename from 0005-port-utilite-to-distro-generic-boot-commands.patch rename to port-utilite-to-distro-generic-boot-commands.patch diff --git a/uboot-tools.spec b/uboot-tools.spec index 7a535a2..7892046 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2016.07 -Release: 0.3%{?candidate:.%{candidate}}%{?dist} +Release: 0.4%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities Group: Development/Tools @@ -12,10 +12,10 @@ Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candida Source1: armv7-boards Source2: armv8-boards -Patch1: 0001-Copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch -Patch2: 0004-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch -Patch3: 0005-port-utilite-to-distro-generic-boot-commands.patch -#Patch4: mvebu-enable-generic-distro-boot-config.patch +Patch1: copy-gcc5-over-to-compiler-gcc6.h-as-a-beginning-of-.patch +Patch2: add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch +Patch3: port-utilite-to-distro-generic-boot-commands.patch +Patch4: mvebu-enable-generic-distro-boot-config.patch BuildRequires: bc BuildRequires: dtc @@ -192,6 +192,9 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir} %endif %changelog +* Thu Jul 7 2016 Peter Robinson 2016.07-0.4rc3 +- Minor updates and cleanups + * Tue Jul 5 2016 Peter Robinson 2016.07-0.3rc3 - 2016.07 RC3