[coreboot-gerrit] Patch set updated for coreboot: soc/*/Makefile.inc: Do not add soc/common as a subdir

Alexandru Gagniuc (mr.nuke.me@gmail.com) gerrit at coreboot.org
Fri Aug 28 22:39:40 CEST 2015


Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11439

-gerrit

commit 80d1d1b66308b1761d52f727ada4e2cbae5cd949
Author: Alexandru Gagniuc <mr.nuke.me at gmail.com>
Date:   Fri Aug 28 13:24:52 2015 -0400

    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 at gmail.com>
---
 src/soc/intel/braswell/Makefile.inc | 1 -
 src/soc/intel/skylake/Makefile.inc  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc
index 207f17d..9bf6cb2 100644
--- a/src/soc/intel/braswell/Makefile.inc
+++ b/src/soc/intel/braswell/Makefile.inc
@@ -3,7 +3,6 @@ ifeq ($(CONFIG_SOC_INTEL_BRASWELL),y)
 subdirs-y += bootblock
 subdirs-y += microcode
 subdirs-y += romstage
-subdirs-y += ../common
 subdirs-y += ../../../cpu/x86/lapic
 subdirs-y += ../../../cpu/x86/mtrr
 subdirs-y += ../../../cpu/x86/smm
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc
index 9fa9503..f004769 100644
--- a/src/soc/intel/skylake/Makefile.inc
+++ b/src/soc/intel/skylake/Makefile.inc
@@ -3,7 +3,6 @@ ifeq ($(CONFIG_SOC_INTEL_SKYLAKE),y)
 subdirs-y += bootblock
 subdirs-y += microcode
 subdirs-y += romstage
-subdirs-y += ../common
 subdirs-y += ../../../cpu/intel/microcode
 subdirs-y += ../../../cpu/intel/turbo
 subdirs-y += ../../../cpu/x86/lapic



More information about the coreboot-gerrit mailing list