| author | Honglin Zhang <honglin.zhang@amlogic.com> | 2019-12-03 12:16:40 (GMT) |
|---|---|---|
| committer | Honglin Zhang <honglin.zhang@amlogic.com> | 2019-12-03 12:16:40 (GMT) |
| commit | 87dd1f4b56fe5c931b9b4571ab5a57909f341938 (patch) | |
| tree | 3156f910d6c126a1e1607f3af6cc802fa28ea27e | |
| parent | bccc68acc3c16f0a41fedda7073a7b4e96e55e25 (diff) | |
| download | uboot-87dd1f4b56fe5c931b9b4571ab5a57909f341938.zip uboot-87dd1f4b56fe5c931b9b4571ab5a57909f341938.tar.gz uboot-87dd1f4b56fe5c931b9b4571ab5a57909f341938.tar.bz2 | |
v2015: makefile: update dovi compiling sequence [1/1]
PD#SWPL-17818
Problem:
build error occurs for dovi.o on some build server
Solution:
refine dovi.o compiling folder and make built-in.o based
on u-boot makefile for LD
Verify:
compiling pass
Change-Id: Ic7220332f57110096fbf126ffc7f7ffb69146257
Signed-off-by: Honglin Zhang <honglin.zhang@amlogic.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | drivers/display/osd/Makefile | 3 | ||||
| -rw-r--r-- | drivers/display/osd/dv/Makefile | 10 |
3 files changed, 10 insertions, 6 deletions
@@ -727,7 +727,6 @@ ALL-y += u-boot.hex ifeq ($(CONFIG_NEED_BL301), y) ALL-y += bl301.bin endif -ALL-$(CONFIG_AML_DOLBY) += dovi ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin ifeq ($(CONFIG_SPL_FSL_PBL),y) ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin @@ -1115,7 +1114,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: dovi $(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 30737e4..6a01beb 100644 --- a/drivers/display/osd/Makefile +++ b/drivers/display/osd/Makefile @@ -1,3 +1,4 @@ obj-$(CONFIG_AML_OSD) += osd_hw.o osd_fb.o osd_debug.o obj-$(CONFIG_AML_DOLBY) += dolby_vision.o -obj-$(CONFIG_AML_DOLBY) += dovi.o + +obj-$(CONFIG_AML_DOLBY) += dv/ diff --git a/drivers/display/osd/dv/Makefile b/drivers/display/osd/dv/Makefile index 8abb16e..f4a8c2d 100644 --- a/drivers/display/osd/dv/Makefile +++ b/drivers/display/osd/dv/Makefile @@ -1,4 +1,8 @@ -.PHONY dovi.o: +.PHONY : dovi.o dovi.o: - mkdir -p ../../../../build/drivers/display/osd/ - cp dovi.a ../../../../build/drivers/display/osd/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 |