Merge tag 'video-20211009' of https://source.denx.de/u-boot/custodians/u-boot-video
- add 30bpp support (EFI, simplefb, vidconsole)
- fix video console name in CONSOLE_MUX Kconfig help
- move mxsfb driver config option to Kconfig
- remove unused mx3fb driver
# gpg verification failed.
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 @@
#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 @@
#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
similarity index 100%
rename from include/lz4.h
rename to 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>