diff mbox

uboot-tools: fix for linux 4.4

Message ID 1452856397-21566-1-git-send-email-Gerhard@Heift.Name
State Rejected
Headers show

Commit Message

Gerhard Heift Jan. 15, 2016, 11:13 a.m. UTC
Since linux 4.4 <mtd/mtd-user.h> does not include <stdint.h> any more, so it
had to be included explicitly.

See commit 137d36af4a53858b8db7ca83c8480247118b8bdf of the linux kernel.

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=137d36af4a53858b8db7ca83c8480247118b8bdf

Signed-off-by: Gerhard Heift <Gerhard@Heift.Name>
---
 ...stdint.h-where-mtd-mtd-user.h-is-included.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/uboot-tools/0003-include-stdint.h-where-mtd-mtd-user.h-is-included.patch

Comments

Peter Korsgaard Jan. 15, 2016, 6:01 p.m. UTC | #1
>>>>> "Gerhard" == Gerhard Heift <gerhard@heift.name> writes:

 > Since linux 4.4 <mtd/mtd-user.h> does not include <stdint.h> any more, so it
 > had to be included explicitly.

 > See commit 137d36af4a53858b8db7ca83c8480247118b8bdf of the linux kernel.

 > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=137d36af4a53858b8db7ca83c8480247118b8bdf

Has this been fixed upstream? U-Boot 2016.01 is out, so if it is fixed
upstream then I would prefer to change the version instead.

If it isn't upstream, please send the fix to the u-boot list first.

Thanks!
Gerhard Heift Jan. 15, 2016, 6:18 p.m. UTC | #2
2016-01-15 19:01 GMT+01:00 Peter Korsgaard <peter@korsgaard.com>:
>>>>>> "Gerhard" == Gerhard Heift <gerhard@heift.name> writes:
>
>  > Since linux 4.4 <mtd/mtd-user.h> does not include <stdint.h> any more, so it
>  > had to be included explicitly.
>
>  > See commit 137d36af4a53858b8db7ca83c8480247118b8bdf of the linux kernel.
>
>  > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=137d36af4a53858b8db7ca83c8480247118b8bdf
>
> Has this been fixed upstream? U-Boot 2016.01 is out, so if it is fixed
> upstream then I would prefer to change the version instead.

No, this is not yet fixed in 2016-01.

> If it isn't upstream, please send the fix to the u-boot list first.

I sent this fix to the u-boot list too, but it since the list is
moderated the mail is not yet approved by a moderater and therefor not
yet public.

> Thanks!

Regards,
  Gerhard
Thomas Petazzoni Jan. 16, 2016, 1:14 p.m. UTC | #3
Dear Gerhard Heift,

On Fri, 15 Jan 2016 19:18:22 +0100, Gerhard Heift wrote:

> > Has this been fixed upstream? U-Boot 2016.01 is out, so if it is fixed
> > upstream then I would prefer to change the version instead.
> 
> No, this is not yet fixed in 2016-01.
> 
> > If it isn't upstream, please send the fix to the u-boot list first.
> 
> I sent this fix to the u-boot list too, but it since the list is
> moderated the mail is not yet approved by a moderater and therefor not
> yet public.

Are you sure the problem is not fixed by
http://git.denx.de/?p=u-boot.git;a=commit;h=69bf2d2fafe64349be3c3ef1256e3c68f812bb25,
which was merged as part of 2016.01 ? The problem description looks
really similar.

Thanks,

Thomas
Gerhard Heift Jan. 16, 2016, 2:13 p.m. UTC | #4
2016-01-16 14:14 GMT+01:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Dear Gerhard Heift,
>
> On Fri, 15 Jan 2016 19:18:22 +0100, Gerhard Heift wrote:
>
>> > Has this been fixed upstream? U-Boot 2016.01 is out, so if it is fixed
>> > upstream then I would prefer to change the version instead.
>>
>> No, this is not yet fixed in 2016-01.
>>
>> > If it isn't upstream, please send the fix to the u-boot list first.
>>
>> I sent this fix to the u-boot list too, but it since the list is
>> moderated the mail is not yet approved by a moderater and therefor not
>> yet public.
>
> Are you sure the problem is not fixed by
> http://git.denx.de/?p=u-boot.git;a=commit;h=69bf2d2fafe64349be3c3ef1256e3c68f812bb25,
> which was merged as part of 2016.01 ? The problem description looks
> really similar.

You are correct. I only looked for patches after the release of linux
4.4 and missed that one.
So bumping u-boot-tools to 2016.01 works for me.

> Thanks,
>
> Thomas

Thanks,
  Gerhard
Peter Korsgaard Jan. 18, 2016, 3:32 p.m. UTC | #5
>>>>> "Gerhard" == Gerhard Heift <gerhard@heift.name> writes:

Hi,

>> Are you sure the problem is not fixed by
 >> http://git.denx.de/?p=u-boot.git;a=commit;h=69bf2d2fafe64349be3c3ef1256e3c68f812bb25,
 >> which was merged as part of 2016.01 ? The problem description looks
 >> really similar.

 > You are correct. I only looked for patches after the release of linux
 > 4.4 and missed that one.
 > So bumping u-boot-tools to 2016.01 works for me.

Ok, good. I've committed a version bump and marked this patch as
rejected.
diff mbox

Patch

diff --git a/package/uboot-tools/0003-include-stdint.h-where-mtd-mtd-user.h-is-included.patch b/package/uboot-tools/0003-include-stdint.h-where-mtd-mtd-user.h-is-included.patch
new file mode 100644
index 0000000..f114221
--- /dev/null
+++ b/package/uboot-tools/0003-include-stdint.h-where-mtd-mtd-user.h-is-included.patch
@@ -0,0 +1,44 @@ 
+From: Gerhard Heift <Gerhard@Heift.Name>
+Date: Fri, 15 Jan 2016 10:34:46 +0100
+Subject: [PATCH] include stdint.h where mtd/mtd-user.h is included
+
+Since linux 4.4 mtd/mtd-user.h does not include stdint.h any more, so it
+has to be included explicitly.
+
+See commit 137d36af4a53858b8db7ca83c8480247118b8bdf of the linux kernel.
+
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=137d36af4a53858b8db7ca83c8480247118b8bdf
+
+Signed-off-by: Gerhard Heift <Gerhard@Heift.Name>
+---
+ tools/env/fw_env.c               | 1 +
+ tools/palmtreo680/flash_u-boot.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
+index 39f7333..098c7c7 100644
+--- a/tools/env/fw_env.c
++++ b/tools/env/fw_env.c
+@@ -29,6 +29,7 @@
+ # include <linux/mtd/mtd.h>
+ #else
+ # define  __user	/* nothing */
++# include <stdint.h>
+ # include <mtd/mtd-user.h>
+ #endif
+ 
+diff --git a/tools/palmtreo680/flash_u-boot.c b/tools/palmtreo680/flash_u-boot.c
+index 3d8296f..7a9b37d 100644
+--- a/tools/palmtreo680/flash_u-boot.c
++++ b/tools/palmtreo680/flash_u-boot.c
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <stdint.h>
+ #include <mtd/mtd-user.h>
+ #include "libmtd.h"
+ 
+-- 
+2.7.0.rc3
+