GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Fix the config file dependency in the Makefile template 

The template had a dependency on config.h which was correct for coreboot,
where this build system originally came from, but not for libpayload which
uses the differently named libpayload-config.h, presumably to avoid colliding
with a config.h used by the actual payload. Because libpayload-config.h is now
effectively a dependency of everything, it doesn't have to be added piecemeal
in Makefile.inc.

Change-Id: I01f20d363cb1393fa1cdcf0dc916670db90294e9
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://review.coreboot.org/2763
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Gabe Black 2013-03-12 15:50:08 -07:00 committed by Ronald G. Minnich
parent a2d786f0e6
commit f06111aaf4
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
payloads/libpayload/Makefile
View File

@ -246,7 +246,7 @@ define create_cc_template
# $4 additional dependencies # $4 additional dependencies
ifn$(EMPTY)def $(1)-objs_$(2)_template ifn$(EMPTY)def $(1)-objs_$(2)_template
de$(EMPTY)fine $(1)-objs_$(2)_template de$(EMPTY)fine $(1)-objs_$(2)_template
$(obj)/$$(1).$(1).o: $$(1).$(2) $(obj)/config.h $(4) $(obj)/$$(1).$(1).o: $$(1).$(2) $(obj)/libpayload-config.h $(4)
@printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" @printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n"
$(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< $(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$<
en$(EMPTY)def en$(EMPTY)def

5
payloads/libpayload/Makefile.inc
View File

@ -47,11 +47,6 @@ classes-$(CONFIG_LZMA) += liblzma
libraries := $(classes-y) libraries := $(classes-y)
classes-y += head.o classes-y += head.o
libpci-c-deps = $(obj)/libpayload-config.h
libc-c-deps = $(obj)/libpayload-config.h
libcurses-c-deps = $(obj)/libpayload-config.h
head.o-S-deps = $(obj)/libpayload-config.h
subdirs-y := arch/$(ARCHDIR-y) subdirs-y := arch/$(ARCHDIR-y)
subdirs-y += crypto libc drivers libpci subdirs-y += crypto libc drivers libpci
subdirs-$(CONFIG_CURSES) += curses subdirs-$(CONFIG_CURSES) += curses