aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2015-04-19 12:48:25 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-05-07 19:41:42 +0200
commit1d7b9de3504e90f0886fccec3a1f8a783fd4cc58 (patch)
treefe662f3c470cbd409166c2369b88a3f7b43fe87f
parent2e38cc5cea1a435db39d3ab2f9feca6117d60adf (diff)
downloadcoreboot-1d7b9de3504e90f0886fccec3a1f8a783fd4cc58.tar.gz
coreboot-1d7b9de3504e90f0886fccec3a1f8a783fd4cc58.tar.xz
coreboot-1d7b9de3504e90f0886fccec3a1f8a783fd4cc58.zip
kbuild: Use wildcard for driver subdirectories
Change-Id: Id1685c0b28ec8e3ab972a671af6f2de6f321c645 Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: http://review.coreboot.org/9805 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--Makefile.inc2
-rw-r--r--src/drivers/Makefile.inc44
-rw-r--r--src/drivers/pc80/Makefile.inc4
-rw-r--r--src/drivers/uart/Makefile.inc4
4 files changed, 9 insertions, 45 deletions
diff --git a/Makefile.inc b/Makefile.inc
index b24429c4d..06c330215 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -55,7 +55,7 @@ PHONY+= clean-abuild coreboot lint lint-stable build-dirs
subdirs-y := src/lib src/console src/device
subdirs-y += src/ec/acpi $(wildcard src/ec/*/*) $(wildcard src/southbridge/*/*)
subdirs-y += $(wildcard src/soc/*/*) $(wildcard src/northbridge/*/*)
-subdirs-y += src/superio src/drivers src/cpu src/vendorcode
+subdirs-y += src/superio $(wildcard src/drivers/*) src/cpu src/vendorcode
subdirs-y += util/cbfstool util/sconfig util/nvramtool util/broadcom
subdirs-y += $(wildcard src/arch/*)
subdirs-y += src/mainboard/$(MAINBOARDDIR)
diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
deleted file mode 100644
index 11ec9205a..000000000
--- a/src/drivers/Makefile.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2010 coresystems GmbH
-##
-## 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.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-subdirs-y += ams
-subdirs-y += ati
-subdirs-y += dec
-subdirs-y += emulation
-subdirs-y += generic
-subdirs-y += gic
-subdirs-y += i2c
-subdirs-y += intel
-subdirs-y += lenovo
-subdirs-y += maxim
-subdirs-y += net
-subdirs-y += parade
-subdirs-y += sil
-subdirs-y += trident
-subdirs-y += xgi
-subdirs-$(CONFIG_DRIVERS_UART) += uart
-subdirs-y += usb
-subdirs-y += ics
-subdirs-y += spi
-subdirs-y += ti
-subdirs-y += ipmi
-subdirs-y += elog
-subdirs-y += xpowers
-subdirs-$(CONFIG_ARCH_X86) += pc80
-subdirs-y += ricoh/rce822
diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc
index be8e8ea17..0788cc7df 100644
--- a/src/drivers/pc80/Makefile.inc
+++ b/src/drivers/pc80/Makefile.inc
@@ -1,3 +1,5 @@
+ifeq ($(CONFIG_ARCH_X86),y)
+
romstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
ramstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
ramstage-y += isa-dma.c
@@ -18,3 +20,5 @@ cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool
cmos.default-type = 0xaa
smm-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
+
+endif
diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc
index c4feb9a60..1a809e0a0 100644
--- a/src/drivers/uart/Makefile.inc
+++ b/src/drivers/uart/Makefile.inc
@@ -1,3 +1,5 @@
+ifeq ($(CONFIG_DRIVERS_UART),y)
+
romstage-y += util.c
ramstage-y += util.c
bootblock-y += util.c
@@ -28,3 +30,5 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += pl011.c
romstage-y += pl011.c
ramstage-y += pl011.c
endif
+
+endif