[PATCH] drivers: Conditionally stop recursing into subdirectories

[Iulia Manda]

This patch stops the build from recursing into drivers' subdirectories.
Because in a tinyconfig build the generated built-in.o-s were empty (no file
was compiled), this is speeding up the compilation process.

Signed-off-by: Iulia Manda <iulia....@gmail.com>
---
drivers/Makefile | 16 ++++++++--------
drivers/char/Makefile | 2 +-
drivers/gpu/Makefile | 3 ++-
drivers/gpu/drm/Makefile | 4 ++--
drivers/misc/Makefile | 4 ++--
drivers/platform/Makefile | 8 ++++----
drivers/video/Makefile | 2 +-
7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/drivers/Makefile b/drivers/Makefile
index 67d2334..e9514f6 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_GENERIC_PHY) += phy/
# GPIO must come after pinctrl as gpios may need to mux pins etc
obj-y += pinctrl/
obj-y += gpio/
-obj-y += pwm/
+obj-$(CONFIG_PWM) += pwm/
obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_PARISC) += parisc/
obj-$(CONFIG_RAPIDIO) += rapidio/
@@ -63,7 +63,7 @@ obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
obj-$(CONFIG_NUBUS) += nubus/
-obj-y += macintosh/
+obj-$(CONFIG_MACINTOSH_DRIVERS) += macintosh/
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/
@@ -72,10 +72,10 @@ obj-$(CONFIG_MTD) += mtd/
obj-$(CONFIG_SPI) += spi/
obj-$(CONFIG_SPMI) += spmi/
obj-y += hsi/
-obj-y += net/
+obj-$(NETDEVICES) += net/
obj-$(CONFIG_ATM) += atm/
obj-$(CONFIG_FUSION) += message/
-obj-y += firewire/
+obj-$(CONFIG_FIREWIRE) += firewire/
obj-$(CONFIG_UIO) += uio/
obj-$(CONFIG_VFIO) += vfio/
obj-y += cdrom/
@@ -111,12 +111,12 @@ obj-$(CONFIG_ACCESSIBILITY) += accessibility/
obj-$(CONFIG_ISDN) += isdn/
obj-$(CONFIG_EDAC) += edac/
obj-$(CONFIG_EISA) += eisa/
-obj-y += lguest/
+obj-$(LGUEST) += lguest/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
-obj-y += mmc/
+obj-$(CONFIG_MMC) += mmc/
obj-$(CONFIG_MEMSTICK) += memstick/
-obj-y += leds/
+obj-$(NEW_LEDS) += leds/
obj-$(CONFIG_INFINIBAND) += infiniband/
obj-$(CONFIG_SGI_SN) += sn/
obj-y += firmware/
@@ -137,7 +137,7 @@ obj-$(CONFIG_VLYNQ) += vlynq/
obj-$(CONFIG_STAGING) += staging/
obj-y += platform/
#common clk code
-obj-y += clk/
+obj-$(COMMON_CLK) += clk/

obj-$(CONFIG_MAILBOX) += mailbox/
obj-$(CONFIG_HWSPINLOCK) += hwspinlock/
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d06cde26..45fb5f2 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -49,7 +49,7 @@ obj-$(CONFIG_GPIO_TB0219) += tb0219.o
obj-$(CONFIG_TELCLOCK) += tlclk.o

obj-$(CONFIG_MWAVE) += mwave/
-obj-y += agp/
+obj-$(CONFIG_AGP) += agp/
obj-$(CONFIG_PCMCIA) += pcmcia/

obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 70da9eb..d0f1987 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1,3 +1,4 @@
-obj-y += drm/ vga/
+obj-y += drm/
+obj-$(CONFIG_VGA_ARB) += vga/
obj-$(CONFIG_TEGRA_HOST1X) += host1x/
obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 66e4039..6cab208 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -65,6 +65,6 @@ obj-$(CONFIG_DRM_TEGRA) += tegra/
obj-$(CONFIG_DRM_STI) += sti/
obj-$(CONFIG_DRM_IMX) += imx/
obj-y += i2c/
-obj-y += panel/
-obj-y += bridge/
+obj-$(CONFIG_DRM_PANEL) += panel/
+obj-$(CONFIG_DRM_PTN3460) += bridge/
obj-$(CONFIG_HSA_AMD) += amd/amdkfd/
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 7d5c4cd..f6bb7d1 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -37,12 +37,12 @@ obj-$(CONFIG_TI_DAC7512) += ti_dac7512.o
obj-$(CONFIG_C2PORT) += c2port/
obj-$(CONFIG_HMC6352) += hmc6352.o
obj-y += eeprom/
-obj-y += cb710/
+obj-$(CB710_CORE) += cb710/
obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o
obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o
obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o
obj-$(CONFIG_PCH_PHUB) += pch_phub.o
-obj-y += ti-st/
+obj-$(CONFIG_TI_ST) += ti-st/
obj-y += lis3lv02d/
obj-y += carma/
obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
index 3656b7b..c0833f5 100644
--- a/drivers/platform/Makefile
+++ b/drivers/platform/Makefile
@@ -2,7 +2,7 @@
# Makefile for linux/drivers/platform
#

-obj-$(CONFIG_X86) += x86/
-obj-$(CONFIG_OLPC) += olpc/
-obj-$(CONFIG_GOLDFISH) += goldfish/
-obj-$(CONFIG_CHROME_PLATFORMS) += chrome/
+obj-$(CONFIG_X86_PLATFORM_DEVICES) += x86/
+obj-$(CONFIG_OLPC) += olpc/
+obj-$(CONFIG_GOLDFISH) += goldfish/
+obj-$(CONFIG_CHROME_PLATFORMS) += chrome/
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 9ad3c17..0112aa0 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -3,7 +3,7 @@ obj-$(CONFIG_HDMI) += hdmi.o

obj-$(CONFIG_VT) += console/
obj-$(CONFIG_LOGO) += logo/
-obj-y += backlight/
+obj-$(BACKLIGHT_LCD_SUPPORT) += backlight/

obj-y += fbdev/

--
1.7.10.4