summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2013-11-30 21:06:18 +0200
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2013-12-01 23:15:08 +0100
commitce22cd066bfa1c3c2c24ef6c6759620c52aeba22 (patch)
treec96bf6b651700ccc4c6b6a1e38bcb6f84948211f
parenteb13b6f3e886d6f97105464cc2292e775ac83778 (diff)
downloadcoreboot-ce22cd066bfa1c3c2c24ef6c6759620c52aeba22.tar.xz
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@gmail.com> Reviewed-on: http://review.coreboot.org/4299 Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--Makefile.inc1
-rw-r--r--src/lib/Makefile.inc8
2 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 69ad3a1e9f..0fb86ce643 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 b0d9366113..92ec663408 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