From ce22cd066bfa1c3c2c24ef6c6759620c52aeba22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 30 Nov 2013 21:06:18 +0200 Subject: [PATCH] Fix build with USE_OPTION_TABLE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/4299 Reviewed-by: Alexandru Gagniuc Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- Makefile.inc | 1 + src/lib/Makefile.inc | 8 -------- 2 files changed, 1 insertion(+), 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