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>
This commit is contained in:
parent
eb13b6f3e8
commit
ce22cd066b
|
@ -127,6 +127,7 @@ endif
|
||||||
ramstage-c-deps:=$$(OPTION_TABLE_H)
|
ramstage-c-deps:=$$(OPTION_TABLE_H)
|
||||||
romstage-c-deps:=$$(OPTION_TABLE_H)
|
romstage-c-deps:=$$(OPTION_TABLE_H)
|
||||||
bootblock-c-deps:=$$(OPTION_TABLE_H)
|
bootblock-c-deps:=$$(OPTION_TABLE_H)
|
||||||
|
smm-c-deps:=$$(OPTION_TABLE_H)
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# Add handler to compile ACPI's ASL
|
# Add handler to compile ACPI's ASL
|
||||||
|
|
|
@ -131,14 +131,6 @@ smm-y += gcc.c
|
||||||
|
|
||||||
$(obj)/lib/version.ramstage.o : $(obj)/build.h
|
$(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)
|
ifeq ($(CONFIG_RELOCATABLE_MODULES),y)
|
||||||
ramstage-y += rmodule.c
|
ramstage-y += rmodule.c
|
||||||
romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c
|
romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c
|
||||||
|
|
Loading…
Reference in New Issue