summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-11 14:35:51 +0900
committerTom Rini <trini@ti.com>2013-11-17 14:11:30 -0500
commit7b6af41ef342199e4967735ea17424b42ed742d2 (patch)
tree39baaeee06c1e1c5457e5bebcf7a85ec58e4886b
parent1b2226e0ceebf01e192715b77b96dbe9e9f75a4b (diff)
downloadblackbird-obmc-uboot-7b6af41ef342199e4967735ea17424b42ed742d2.tar.gz
blackbird-obmc-uboot-7b6af41ef342199e4967735ea17424b42ed742d2.zip
drivers: descend into sub directories only when it is necessary
- Descend into drivers/fpga/ only when CONFIG_FPGA=y - Descend into drivers/bios_emulator only when CONFIG_BIOSEMU=y Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--drivers/Makefile4
-rw-r--r--drivers/bios_emulator/Makefile2
-rw-r--r--drivers/fpga/Makefile2
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 9cec2ba6fe..95a4b80724 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,8 +1,8 @@
-obj-y += bios_emulator/
+obj-$(CONFIG_BIOSEMU) += bios_emulator/
obj-y += block/
obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
obj-y += crypto/
-obj-y += fpga/
+obj-$(CONFIG_FPGA) += fpga/
obj-y += hwmon/
obj-y += misc/
obj-y += pcmcia/
diff --git a/drivers/bios_emulator/Makefile b/drivers/bios_emulator/Makefile
index dd42e0f766..9aa8ea9020 100644
--- a/drivers/bios_emulator/Makefile
+++ b/drivers/bios_emulator/Makefile
@@ -2,7 +2,7 @@ X86DIR = x86emu
$(shell mkdir -p $(obj)$(X86DIR))
-obj-$(CONFIG_BIOSEMU) = atibios.o biosemu.o besys.o bios.o \
+obj-y = atibios.o biosemu.o besys.o bios.o \
$(X86DIR)/decode.o \
$(X86DIR)/ops2.o \
$(X86DIR)/ops.o \
diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile
index 4fcdf40fd0..dfb2e7fc76 100644
--- a/drivers/fpga/Makefile
+++ b/drivers/fpga/Makefile
@@ -5,7 +5,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
-ifdef CONFIG_FPGA
obj-y += fpga.o
obj-$(CONFIG_FPGA_SPARTAN2) += spartan2.o
obj-$(CONFIG_FPGA_SPARTAN3) += spartan3.o
@@ -19,4 +18,3 @@ obj-$(CONFIG_FPGA_ACEX1K) += ACEX1K.o
obj-$(CONFIG_FPGA_CYCLON2) += cyclon2.o
obj-$(CONFIG_FPGA_STRATIX_II) += stratixII.o
endif
-endif
OpenPOWER on IntegriCloud