[coreboot] New patch to review for coreboot: 50cc8ab libpayload: Fix the config file dependency in the Makefile template

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Fri Mar 15 21:22:55 CET 2013

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2763


commit 50cc8ab7838e3d2fe43db16d9a29efc090b7ee77
Author: Gabe Black <gabeblack at google.com>
Date:   Tue Mar 12 15:50:08 2013 -0700

    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 at google.com>
 payloads/libpayload/Makefile     | 2 +-
 payloads/libpayload/Makefile.inc | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index c4a77bf..bfa1abf 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -246,7 +246,7 @@ define create_cc_template
 # $4 additional dependencies
 ifn$(EMPTY)def $(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"
 	$(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$<
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
index b06288b..9e6dc75 100644
--- a/payloads/libpayload/Makefile.inc
+++ b/payloads/libpayload/Makefile.inc
@@ -47,11 +47,6 @@ classes-$(CONFIG_LZMA) += liblzma
 libraries := $(classes-y)
 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 += crypto libc drivers libpci
 subdirs-$(CONFIG_CURSES) += curses

More information about the coreboot mailing list