lz4: Use a private header for U-Boot
At present U-Boot has a header file called lz4.h for its own use. If the host has its own lz4 header file installed (e.g. from the 'liblz4-dev' package) then host builds will use that instead. Move the U-Boot file into its own directory, as is done with various other headers with the same problem. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
94e922c76a
commit
2a2d8e94dd
5 changed files with 4 additions and 4 deletions
|
@ -7,7 +7,7 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <env.h>
|
#include <env.h>
|
||||||
#include <lz4.h>
|
#include <u-boot/lz4.h>
|
||||||
|
|
||||||
static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc,
|
static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||||
char *const argv[])
|
char *const argv[])
|
||||||
|
|
|
@ -61,7 +61,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
#include <display_options.h>
|
#include <display_options.h>
|
||||||
#include <gzip.h>
|
#include <gzip.h>
|
||||||
#include <image.h>
|
#include <image.h>
|
||||||
#include <lz4.h>
|
|
||||||
#include <imximage.h>
|
#include <imximage.h>
|
||||||
#include <relocate.h>
|
#include <relocate.h>
|
||||||
#include <linux/lzo.h>
|
#include <linux/lzo.h>
|
||||||
|
@ -71,6 +70,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
#include <lzma/LzmaDec.h>
|
#include <lzma/LzmaDec.h>
|
||||||
#include <lzma/LzmaTools.h>
|
#include <lzma/LzmaTools.h>
|
||||||
#include <u-boot/crc.h>
|
#include <u-boot/crc.h>
|
||||||
|
#include <u-boot/lz4.h>
|
||||||
|
|
||||||
static const table_entry_t uimage_arch[] = {
|
static const table_entry_t uimage_arch[] = {
|
||||||
{ IH_ARCH_INVALID, "invalid", "Invalid ARCH", },
|
{ IH_ARCH_INVALID, "invalid", "Invalid ARCH", },
|
||||||
|
|
|
@ -6,10 +6,10 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <compiler.h>
|
#include <compiler.h>
|
||||||
#include <image.h>
|
#include <image.h>
|
||||||
#include <lz4.h>
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
|
#include <u-boot/lz4.h>
|
||||||
|
|
||||||
static u16 LZ4_readLE16(const void *src)
|
static u16 LZ4_readLE16(const void *src)
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
#include <gzip.h>
|
#include <gzip.h>
|
||||||
#include <image.h>
|
#include <image.h>
|
||||||
#include <log.h>
|
#include <log.h>
|
||||||
#include <lz4.h>
|
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#include <mapmem.h>
|
#include <mapmem.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
|
#include <u-boot/lz4.h>
|
||||||
#include <u-boot/zlib.h>
|
#include <u-boot/zlib.h>
|
||||||
#include <bzlib.h>
|
#include <bzlib.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue