From 86ddd732bd82b84724883b1f1579e18790611fe5 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 11 Mar 2016 20:22:28 -0800 Subject: kbuild: Allow drivers to fit src/drivers/[X]/[Y]/ scheme Reorder drivers to fit src/drivers/[X]/[Y]/ scheme to make them pluggable. Also, fix up the following driver subdirectories by switching to the src/drivers/[X]/[Y]/ scheme as these are hard requirements for the main change: * drivers/intel * drivers/pc80 * drivers/dec Change-Id: I455d3089a317181d5b99bf658df759ec728a5f6b Signed-off-by: Stefan Reinauer Reviewed-on: https://review.coreboot.org/14047 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/drivers/intel/Kconfig | 19 ------------------- src/drivers/intel/Makefile.inc | 6 ------ src/drivers/intel/fsp1_0/Makefile.inc | 3 +++ src/drivers/intel/fsp1_1/Makefile.inc | 4 ++++ src/drivers/intel/fsp2_0/Makefile.inc | 17 +++++++++++++++++ src/drivers/intel/i210/Makefile.inc | 6 +++++- src/drivers/intel/wifi/Makefile.inc | 18 ++++++++++++++++++ 7 files changed, 47 insertions(+), 26 deletions(-) delete mode 100644 src/drivers/intel/Kconfig delete mode 100644 src/drivers/intel/Makefile.inc (limited to 'src/drivers/intel') diff --git a/src/drivers/intel/Kconfig b/src/drivers/intel/Kconfig deleted file mode 100644 index e5525d8a97..0000000000 --- a/src/drivers/intel/Kconfig +++ /dev/null @@ -1,19 +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/fsp2_0/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 67c1163309..0000000000 --- a/src/drivers/intel/Makefile.inc +++ /dev/null @@ -1,6 +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_PLATFORM_USES_FSP2_0) += fsp2_0 -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 ea8f61e95a..4ff10687aa 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 f101cc448a..3f214cb4bf 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/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc index 61faefa3b0..3e94f2fffb 100644 --- a/src/drivers/intel/fsp2_0/Makefile.inc +++ b/src/drivers/intel/fsp2_0/Makefile.inc @@ -1,3 +1,18 @@ +# +# This file is part of the coreboot project. +# +# 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. +# + +ifeq ($(CONFIG_PLATFORM_USES_FSP2_0),y) + romstage-y += hand_off_block.c romstage-y += util.c romstage-y += memory_init.c @@ -9,3 +24,5 @@ ramstage-y += silicon_init.c ramstage-y += util.c CPPFLAGS_common += -I$(src)/drivers/intel/fsp2_0/include + +endif diff --git a/src/drivers/intel/i210/Makefile.inc b/src/drivers/intel/i210/Makefile.inc index a1f15de1c1..a69602246b 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 diff --git a/src/drivers/intel/wifi/Makefile.inc b/src/drivers/intel/wifi/Makefile.inc index 23f5541b4d..1435f8b7f7 100644 --- a/src/drivers/intel/wifi/Makefile.inc +++ b/src/drivers/intel/wifi/Makefile.inc @@ -1 +1,19 @@ +# +# This file is part of the coreboot project. +# +# 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. +# + +# really? +ifeq ($(CONFIG_GENERATE_SMBIOS_TABLES),y) + ramstage-$(CONFIG_PCIEXP_PLUGIN_SUPPORT) += wifi.c + +endif -- cgit v1.2.3