soc/*/Makefile.inc: Do not add soc/common as a subdir
Aaron Durbin found that soc/common is already included as a subdir via the wildcard in Makefile.inc: subdirs-y += $(wildcard src/soc/*/*) Since the entire file is protected by CONFIG_SOC_INTEL_COMMON, there is no problem with including it for every platform. On the other hand, when it is included by the skylake and braswell makefiles, any rule is duplicated. As a result fix the braswell and skylake makefiles. Change-Id: If5bad903c78dbce418852935ee55cdc7162b3b2d Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-on: http://review.coreboot.org/11439 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins)
This commit is contained in:
parent
bf8589e957
commit
3cd280589c
|
@ -3,7 +3,6 @@ ifeq ($(CONFIG_SOC_INTEL_BRASWELL),y)
|
||||||
subdirs-y += bootblock
|
subdirs-y += bootblock
|
||||||
subdirs-y += microcode
|
subdirs-y += microcode
|
||||||
subdirs-y += romstage
|
subdirs-y += romstage
|
||||||
subdirs-y += ../common
|
|
||||||
subdirs-y += ../../../cpu/x86/lapic
|
subdirs-y += ../../../cpu/x86/lapic
|
||||||
subdirs-y += ../../../cpu/x86/mtrr
|
subdirs-y += ../../../cpu/x86/mtrr
|
||||||
subdirs-y += ../../../cpu/x86/smm
|
subdirs-y += ../../../cpu/x86/smm
|
||||||
|
|
|
@ -3,7 +3,6 @@ ifeq ($(CONFIG_SOC_INTEL_SKYLAKE),y)
|
||||||
subdirs-y += bootblock
|
subdirs-y += bootblock
|
||||||
subdirs-y += microcode
|
subdirs-y += microcode
|
||||||
subdirs-y += romstage
|
subdirs-y += romstage
|
||||||
subdirs-y += ../common
|
|
||||||
subdirs-y += ../../../cpu/intel/microcode
|
subdirs-y += ../../../cpu/intel/microcode
|
||||||
subdirs-y += ../../../cpu/intel/turbo
|
subdirs-y += ../../../cpu/intel/turbo
|
||||||
subdirs-y += ../../../cpu/x86/lapic
|
subdirs-y += ../../../cpu/x86/lapic
|
||||||
|
|
Loading…
Reference in New Issue