diff options
| author | Guillaume GARDET <guillaume.gardet@free.fr> | 2016-06-17 11:45:37 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-19 09:57:09 -0400 |
| commit | 7a77e909a22848f5d5820fae58c087b83e90bdbc (patch) | |
| tree | 3f38d1778c44778f34d2548172999cad027bdaca /fs | |
| parent | 7a8f8865582583314c884e77a607f5b9dc9cf8b6 (diff) | |
| download | u-boot-imx-7a77e909a22848f5d5820fae58c087b83e90bdbc.zip u-boot-imx-7a77e909a22848f5d5820fae58c087b83e90bdbc.tar.gz u-boot-imx-7a77e909a22848f5d5820fae58c087b83e90bdbc.tar.bz2 | |
fs: cbfs: Fix build of fs/cbfs/cbfs.c when building u-boot sandbox on x86 32-bit
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cbfs/cbfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
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> |