[coreboot-gerrit] New patch to review for coreboot: f96a70e Fix build with USE_OPTION_TABLE

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Sat Nov 30 20:08:04 CET 2013


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4299

-gerrit

commit f96a70ee0794c017c0ee7d100b1e32530283b6a1
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sat Nov 30 21:06:18 2013 +0200

    Fix build with USE_OPTION_TABLE
    
    Parallelized build might try to build SMM before option_table.h is
    created. Remove related redundant explicit rules.
    
    Change-Id: Ida8b5c408af05adcf3210ce7bfc8a1e5959194c7
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 Makefile.inc         | 1 +
 src/lib/Makefile.inc | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 69ad3a1..0fb86ce 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -127,6 +127,7 @@ endif
 ramstage-c-deps:=$$(OPTION_TABLE_H)
 romstage-c-deps:=$$(OPTION_TABLE_H)
 bootblock-c-deps:=$$(OPTION_TABLE_H)
+smm-c-deps:=$$(OPTION_TABLE_H)
 
 #######################################################################
 # Add handler to compile ACPI's ASL
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index b0d9366..92ec663 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -131,14 +131,6 @@ smm-y += gcc.c
 
 $(obj)/lib/version.ramstage.o : $(obj)/build.h
 
-OPTION_TABLE_H:=
-ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)
-OPTION_TABLE_H:=$(obj)/option_table.h
-endif
-
-$(obj)/lib/uart8250mem.smm.o : $(OPTION_TABLE_H)
-$(obj)/lib/uart8250.smm.o : $(OPTION_TABLE_H)
-
 ifeq ($(CONFIG_RELOCATABLE_MODULES),y)
 ramstage-y += rmodule.c
 romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c



More information about the coreboot-gerrit mailing list