* [U-Boot] [PATCH] fs: cbfs: Fix build of fs/cbfs/cbfs.c when building u-boot sandbox on x86 32-bit
@ 2016-06-17 9:45 Guillaume GARDET
2016-06-17 23:00 ` Simon Glass
2016-06-19 14:12 ` Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Guillaume GARDET @ 2016-06-17 9:45 UTC (permalink / raw)
To: u-boot
Fix the following build errors when building sandbox on x86 32-bit:
In file included from fs/cbfs/cbfs.c:8:0:
include/malloc.h:364:7: error: conflicting types for 'memset'
void* memset(void*, int, size_t);
^
In file included from include/compiler.h:123:0,
from include/cbfs.h:10,
from fs/cbfs/cbfs.c:7:
include/linux/string.h:78:15: note: previous declaration of 'memset' was here
extern void * memset(void *,int,__kernel_size_t);
^
In file included from fs/cbfs/cbfs.c:8:0:
include/malloc.h:365:7: error: conflicting types for 'memcpy'
void* memcpy(void*, const void*, size_t);
^
In file included from include/compiler.h:123:0,
from include/cbfs.h:10,
from fs/cbfs/cbfs.c:7:
include/linux/string.h:81:15: note: previous declaration of 'memcpy' was here
extern void * memcpy(void *,const void *,__kernel_size_t);
^
scripts/Makefile.build:280: recipe for target 'fs/cbfs/cbfs.o' failed
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
---
fs/cbfs/cbfs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index c81b611..95a48a4 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
+#include <common.h>
#include <cbfs.h>
#include <malloc.h>
#include <asm/byteorder.h>
--
1.8.4.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] fs: cbfs: Fix build of fs/cbfs/cbfs.c when building u-boot sandbox on x86 32-bit
2016-06-17 9:45 [U-Boot] [PATCH] fs: cbfs: Fix build of fs/cbfs/cbfs.c when building u-boot sandbox on x86 32-bit Guillaume GARDET
@ 2016-06-17 23:00 ` Simon Glass
2016-06-19 14:12 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Simon Glass @ 2016-06-17 23:00 UTC (permalink / raw)
To: u-boot
On 17 June 2016 at 03:45, Guillaume GARDET <guillaume.gardet@free.fr> wrote:
> Fix the following build errors when building sandbox on x86 32-bit:
>
> In file included from fs/cbfs/cbfs.c:8:0:
> include/malloc.h:364:7: error: conflicting types for 'memset'
> void* memset(void*, int, size_t);
> ^
> In file included from include/compiler.h:123:0,
> from include/cbfs.h:10,
> from fs/cbfs/cbfs.c:7:
> include/linux/string.h:78:15: note: previous declaration of 'memset' was here
> extern void * memset(void *,int,__kernel_size_t);
> ^
> In file included from fs/cbfs/cbfs.c:8:0:
> include/malloc.h:365:7: error: conflicting types for 'memcpy'
> void* memcpy(void*, const void*, size_t);
> ^
> In file included from include/compiler.h:123:0,
> from include/cbfs.h:10,
> from fs/cbfs/cbfs.c:7:
> include/linux/string.h:81:15: note: previous declaration of 'memcpy' was here
> extern void * memcpy(void *,const void *,__kernel_size_t);
> ^
> scripts/Makefile.build:280: recipe for target 'fs/cbfs/cbfs.o' failed
>
>
> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Simon Glass <sjg@chromium.org>
>
> ---
> fs/cbfs/cbfs.c | 1 +
> 1 file changed, 1 insertion(+)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] fs: cbfs: Fix build of fs/cbfs/cbfs.c when building u-boot sandbox on x86 32-bit
2016-06-17 9:45 [U-Boot] [PATCH] fs: cbfs: Fix build of fs/cbfs/cbfs.c when building u-boot sandbox on x86 32-bit Guillaume GARDET
2016-06-17 23:00 ` Simon Glass
@ 2016-06-19 14:12 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2016-06-19 14:12 UTC (permalink / raw)
To: u-boot
On Fri, Jun 17, 2016 at 11:45:37AM +0200, Guillaume GARDET wrote:
> Fix the following build errors when building sandbox on x86 32-bit:
>
> In file included from fs/cbfs/cbfs.c:8:0:
> include/malloc.h:364:7: error: conflicting types for 'memset'
> void* memset(void*, int, size_t);
> ^
> In file included from include/compiler.h:123:0,
> from include/cbfs.h:10,
> from fs/cbfs/cbfs.c:7:
> include/linux/string.h:78:15: note: previous declaration of 'memset' was here
> extern void * memset(void *,int,__kernel_size_t);
> ^
> In file included from fs/cbfs/cbfs.c:8:0:
> include/malloc.h:365:7: error: conflicting types for 'memcpy'
> void* memcpy(void*, const void*, size_t);
> ^
> In file included from include/compiler.h:123:0,
> from include/cbfs.h:10,
> from fs/cbfs/cbfs.c:7:
> include/linux/string.h:81:15: note: previous declaration of 'memcpy' was here
> extern void * memcpy(void *,const void *,__kernel_size_t);
> ^
> scripts/Makefile.build:280: recipe for target 'fs/cbfs/cbfs.o' failed
>
>
> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> Cc: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160619/77af3d80/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-19 14:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-17 9:45 [U-Boot] [PATCH] fs: cbfs: Fix build of fs/cbfs/cbfs.c when building u-boot sandbox on x86 32-bit Guillaume GARDET
2016-06-17 23:00 ` Simon Glass
2016-06-19 14:12 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.