New patch to review for coreboot: drivers/intel: Switch to src/drivers/[X]/[Y]/ scheme

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14062

-gerrit

commit 0ab2f330ae5cd9df6ace37c3086d331d43389420
Author: Stefan Reinauer 
Date:   Fri Mar 11 20:43:00 2016 -0800

drivers/intel: Switch to src/drivers/[X]/[Y]/ scheme

Reorder drivers to fit src/drivers/[X]/[Y]/ scheme to make
    them pluggable.

Change-Id: I5de5c3eb19c85effb3a689ce723b092bb8f35e06
    Signed-off-by: Stefan Reinauer 
---
 src/drivers/intel/Kconfig             | 18 ------------------
 src/drivers/intel/Makefile.inc        |  5 -----
 src/drivers/intel/fsp1_0/Makefile.inc |  3 +++
 src/drivers/intel/fsp1_1/Makefile.inc |  4 ++++
 src/drivers/intel/i210/Makefile.inc   |  6 +++++-
 5 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/drivers/intel/Kconfig b/src/drivers/intel/Kconfig
deleted file mode 100644
index 19986f4..0000000
--- a/src/drivers/intel/Kconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2013 Google Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-
-source src/drivers/intel/fsp1_1/Kconfig
-source src/drivers/intel/gma/Kconfig
-source src/drivers/intel/i210/Kconfig
diff --git a/src/drivers/intel/Makefile.inc b/src/drivers/intel/Makefile.inc
deleted file mode 100644
index e54f07b..0000000
--- a/src/drivers/intel/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-subdirs-y += gma
-subdirs-$(CONFIG_GENERATE_SMBIOS_TABLES) += wifi
-subdirs-$(CONFIG_PLATFORM_USES_FSP1_0) += fsp1_0
-subdirs-$(CONFIG_PLATFORM_USES_FSP1_1) += fsp1_1
-subdirs-$(CONFIG_DRIVER_INTEL_I210) += i210
diff --git a/src/drivers/intel/fsp1_0/Makefile.inc b/src/drivers/intel/fsp1_0/Makefile.inc
index ea8f61e..4ff1068 100644
--- a/src/drivers/intel/fsp1_0/Makefile.inc
+++ b/src/drivers/intel/fsp1_0/Makefile.inc
@@ -13,6 +13,8 @@
 # GNU General Public License for more details.
 #

+ifeq ($(CONFIG_PLATFORM_USES_FSP1_0),y)
+
 ramstage-y += fsp_util.c hob.c
 romstage-y += fsp_util.c hob.c

@@ -44,3 +46,4 @@ mrc.cache-type := mrc_cache
 endif
 endif

+endif
diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc
index f101cc4..3f214cb 100644
--- a/src/drivers/intel/fsp1_1/Makefile.inc
+++ b/src/drivers/intel/fsp1_1/Makefile.inc
@@ -14,6 +14,8 @@
 # GNU General Public License for more details.
 #

+ifeq ($(CONFIG_PLATFORM_USES_FSP1_1),y)
+
 verstage-y += car.c
 verstage-y += fsp_util.c
 verstage-y += verstage.c
@@ -53,3 +55,5 @@ fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE))
 fsp.bin-position := $(CONFIG_FSP_LOC)
 fsp.bin-type := fsp
 endif
+
+endif
diff --git a/src/drivers/intel/i210/Makefile.inc b/src/drivers/intel/i210/Makefile.inc
index a1f15de..a696022 100644
--- a/src/drivers/intel/i210/Makefile.inc
+++ b/src/drivers/intel/i210/Makefile.inc
@@ -1 +1,5 @@
-ramstage-y += i210.c
\ No newline at end of file
+ifeq ($(CONFIG_DRIVER_INTEL_I210),y)
+
+ramstage-y += i210.c
+
+endif