diff options
| author | Simon Glass <sjg@chromium.org> | 2021-10-09 09:28:21 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-09 13:09:56 -0400 |
| commit | 2a2d8e94ddc75c2c8d456e9163aa5dac510badcf (patch) | |
| tree | e085b4c6bf58d86374bc541da07bf26716f274a1 | |
| parent | 94e922c76a0e1fcdead3359e340f53fd0709a963 (diff) | |
| download | u-boot-2a2d8e94ddc75c2c8d456e9163aa5dac510badcf.zip u-boot-2a2d8e94ddc75c2c8d456e9163aa5dac510badcf.tar.gz u-boot-2a2d8e94ddc75c2c8d456e9163aa5dac510badcf.tar.bz2 | |
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>
| -rw-r--r-- | cmd/unlz4.c | 2 | ||||
| -rw-r--r-- | common/image.c | 2 | ||||
| -rw-r--r-- | include/u-boot/lz4.h (renamed from include/lz4.h) | 0 | ||||
| -rw-r--r-- | lib/lz4_wrapper.c | 2 | ||||
| -rw-r--r-- | test/compression.c | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/cmd/unlz4.c b/cmd/unlz4.c index 323ab46..5f20838 100644 --- a/cmd/unlz4.c +++ b/cmd/unlz4.c @@ -7,7 +7,7 @@ #include <common.h> #include <command.h> #include <env.h> -#include <lz4.h> +#include <u-boot/lz4.h> static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/common/image.c b/common/image.c index 5b77113..3fa60b5 100644 --- a/common/image.c +++ b/common/image.c @@ -61,7 +61,6 @@ DECLARE_GLOBAL_DATA_PTR; #include <display_options.h> #include <gzip.h> #include <image.h> -#include <lz4.h> #include <imximage.h> #include <relocate.h> #include <linux/lzo.h> @@ -71,6 +70,7 @@ DECLARE_GLOBAL_DATA_PTR; #include <lzma/LzmaDec.h> #include <lzma/LzmaTools.h> #include <u-boot/crc.h> +#include <u-boot/lz4.h> static const table_entry_t uimage_arch[] = { { IH_ARCH_INVALID, "invalid", "Invalid ARCH", }, diff --git a/include/lz4.h b/include/u-boot/lz4.h index 1276fb9..1276fb9 100644 --- a/include/lz4.h +++ b/include/u-boot/lz4.h diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c index cdbcd05..ebcb5c0 100644 --- a/lib/lz4_wrapper.c +++ b/lib/lz4_wrapper.c @@ -6,10 +6,10 @@ #include <common.h> #include <compiler.h> #include <image.h> -#include <lz4.h> #include <linux/kernel.h> #include <linux/types.h> #include <asm/unaligned.h> +#include <u-boot/lz4.h> static u16 LZ4_readLE16(const void *src) { diff --git a/test/compression.c b/test/compression.c index 4cd1be5..26d3c80 100644 --- a/test/compression.c +++ b/test/compression.c @@ -9,11 +9,11 @@ #include <gzip.h> #include <image.h> #include <log.h> -#include <lz4.h> #include <malloc.h> #include <mapmem.h> #include <asm/io.h> +#include <u-boot/lz4.h> #include <u-boot/zlib.h> #include <bzlib.h> |