| author | Honglin Zhang <honglin.zhang@amlogic.com> | 2019-12-05 10:47:18 (GMT) |
|---|---|---|
| committer | Honglin Zhang <honglin.zhang@amlogic.com> | 2019-12-05 10:51:12 (GMT) |
| commit | f6775338c4f737037d0380b1529a9d4f203a1236 (patch) | |
| tree | 6f438b9f84429834bd3e04ae425fa2cc41332f0d | |
| parent | 9135cfb24e1d6fcc67367b1fe57c87afda61841b (diff) | |
| download | uboot-f6775338c4f737037d0380b1529a9d4f203a1236.zip uboot-f6775338c4f737037d0380b1529a9d4f203a1236.tar.gz uboot-f6775338c4f737037d0380b1529a9d4f203a1236.tar.bz2 | |
v2015: makefile: update to link dovi lib [1/1]
PD#SWPL-17818
Problem:
build error occurs for dovi.o on some build server
Solution:
link the lib dovi.a directly to make the dependancy clearly
Verify:
compiling pass
Change-Id: I8c71e9b8041c55a2e74240c8868da846dcb76124
Signed-off-by: Honglin Zhang <honglin.zhang@amlogic.com>
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | drivers/display/osd/Makefile | 2 | ||||
| -rw-r--r-- | drivers/display/osd/dv/Makefile | 8 |
3 files changed, 6 insertions, 17 deletions
@@ -673,6 +673,11 @@ u-boot-init := $(head-y) u-boot-main := $(libs-y) +ifeq ($(CONFIG_AML_DOLBY), y) +PLATFORM_CPPFLAGS += -I$(srctree)/drivers/display/osd/dv +PLATFORM_LIBS += $(srctree)/drivers/display/osd/dv/dovi.a +endif + # Add GCC lib ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y) PLATFORM_LIBGCC = arch/$(ARCH)/lib/lib.a @@ -871,12 +876,6 @@ acs.bin: tools prepare u-boot.bin bl21.bin: tools prepare u-boot.bin acs.bin $(Q)$(MAKE) -C $(srctree)/$(CPUDIR)/${SOC}/firmware/bl21 all FIRMWARE=$@ -.PHONY : dovi -dovi: tools prepare -ifeq ($(CONFIG_AML_DOLBY), y) - $(Q)$(MAKE) -C $(srctree)/drivers/display/osd/dv dovi.o -endif - # # U-Boot entry point, needed for booting of full-blown U-Boot # from the SPL U-Boot version. @@ -1114,7 +1113,7 @@ cmd_smap = \ $(CC) $(c_flags) -DSYSTEM_MAP="\"$${smap}\"" \ -c $(srctree)/common/system_map.c -o common/system_map.o -u-boot: dovi $(u-boot-init) $(u-boot-main) u-boot.lds +u-boot: $(u-boot-init) $(u-boot-main) u-boot.lds $(call if_changed,u-boot__) ifeq ($(CONFIG_KALLSYMS),y) $(call cmd,smap) diff --git a/drivers/display/osd/Makefile b/drivers/display/osd/Makefile index 6a01beb..3a15303 100644 --- a/drivers/display/osd/Makefile +++ b/drivers/display/osd/Makefile @@ -1,4 +1,2 @@ obj-$(CONFIG_AML_OSD) += osd_hw.o osd_fb.o osd_debug.o obj-$(CONFIG_AML_DOLBY) += dolby_vision.o - -obj-$(CONFIG_AML_DOLBY) += dv/ diff --git a/drivers/display/osd/dv/Makefile b/drivers/display/osd/dv/Makefile deleted file mode 100644 index f4a8c2d..0000000 --- a/drivers/display/osd/dv/Makefile +++ b/dev/null @@ -1,8 +0,0 @@ -.PHONY : dovi.o -dovi.o: - @echo "start to make dovi.o" - mkdir -p $(buildtree)/drivers/display/osd/dv - cp -a $(buildsrc)/drivers/display/osd/dv/dovi.a \ - $(buildtree)/drivers/display/osd/dv/dovi.o - -obj-$(CONFIG_AML_DOLBY) += dovi.o |