Emphasis that those headers are generated. Also naturally gitignore them.
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com --- Makefile | 2 +- board/aristainetos/aristainetos.c | 2 +- board/toradex/common/tdx-common.c | 2 +- common/splash.c | 4 ++-- tools/Makefile | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile index 44deb339af19..77f3fead7f26 100644 --- a/Makefile +++ b/Makefile @@ -2191,7 +2191,7 @@ CLEAN_DIRS += $(MODVERDIR) \ $(foreach d, spl tpl vpl, $(patsubst %,$d/%, \ $(filter-out include, $(shell ls -1 $d 2>/dev/null))))
-CLEAN_FILES += include/autoconf.mk* include/bmp_logo.h include/bmp_logo_data.h \ +CLEAN_FILES += include/autoconf.mk* include/generated/bmp_*.h \ include/config.h include/generated/env.* drivers/video/u_boot_logo.S \ tools/version.h u-boot* MLO* SPL System.map fit-dtb.blob* \ u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index 8cfac9fbb342..bd7f00dfc0fe 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -27,7 +27,6 @@ #include <asm/io.h> #include <asm/arch/sys_proto.h> #include <asm/sections.h> -#include <bmp_logo.h> #include <dm/root.h> #include <env.h> #include <i2c_eeprom.h> @@ -40,6 +39,7 @@ #include <power/da9063_pmic.h> #include <splash.h> #include <video.h> +#include <generated/bmp_logo.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index a6b45cdab810..ffd5946b4ec8 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -12,9 +12,9 @@ #include <sysinfo.h>
#ifdef CONFIG_VIDEO -#include <bmp_logo.h> #include <splash.h> #include <video.h> +#include <generated/bmp_logo.h> #endif
#include "tdx-cfg-block.h" diff --git a/common/splash.c b/common/splash.c index c5591293634a..096fcba09913 100644 --- a/common/splash.c +++ b/common/splash.c @@ -62,7 +62,7 @@ static struct splash_location default_splash_locations[] = {
#ifdef CONFIG_VIDEO_LOGO
-#include <bmp_logo_data.h> +#include <generated/bmp_logo_data.h>
static int splash_video_logo_load(void) { @@ -121,7 +121,7 @@ void splash_get_pos(int *x, int *y) #if CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(HIDE_LOGO_VERSION)
#ifdef CONFIG_VIDEO_LOGO -#include <bmp_logo.h> +#include <generated/bmp_logo.h> #endif #include <dm.h> #include <video_console.h> diff --git a/tools/Makefile b/tools/Makefile index 6a4280e3668f..edbe3fabc105 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -283,8 +283,8 @@ always := $(hostprogs-y) hostprogs-y += printinitialenv
# Generated LCD/video logo -LOGO_H = $(objtree)/include/bmp_logo.h -LOGO_DATA_H = $(objtree)/include/bmp_logo_data.h +LOGO_H = $(objtree)/include/generated/bmp_logo.h +LOGO_DATA_H = $(objtree)/include/generated/bmp_logo_data.h LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_H) LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_DATA_H)