summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-09-18 15:43:41 +0900
committerTom Rini <trini@ti.com>2014-09-24 18:30:29 -0400
commitf494e0a1847d74e68c460c90253836ea21c431ac (patch)
tree4cf67964e5c4a04c431eac2613b82be014a786c8 /drivers
parentd660b409dc3658087ce15e7d50ed007f1cfa09e8 (diff)
downloadtalos-obmc-uboot-f494e0a1847d74e68c460c90253836ea21c431ac.tar.gz
talos-obmc-uboot-f494e0a1847d74e68c460c90253836ea21c431ac.zip
kbuild: refactor some makefiles
[1] Move driver/core/, driver/input/ and drivers/input/ entries from the top Makefile to drivers/Makefile [2] Remove the conditional by CONFIG_DM in drivers/core/Makefile because the whole drivers/core directory is already selected by CONFIG_DM in the upper level [3] Likewise for CONFIG_DM_DEMO in drivers/demo/Makefile [4] Simplify common/Makefile - both CONFIG_DDR_SPD and CONFIG_SPD_EEPROM are boolean macros so they can directly select objects Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/Makefile3
-rw-r--r--drivers/core/Makefile2
-rw-r--r--drivers/demo/Makefile2
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index b22b109404..d8361d95fd 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,3 +1,5 @@
+obj-$(CONFIG_DM) += core/
+obj-$(CONFIG_DM_DEMO) += demo/
obj-$(CONFIG_BIOSEMU) += bios_emulator/
obj-y += block/
obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
@@ -16,3 +18,4 @@ obj-y += watchdog/
obj-$(CONFIG_QE) += qe/
obj-y += memory/
obj-y += pwm/
+obj-y += input/
diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index 90b2a7f068..c7905b1440 100644
--- a/drivers/core/Makefile
+++ b/drivers/core/Makefile
@@ -4,4 +4,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_DM) := device.o lists.o root.o uclass.o util.o
+obj-y := device.o lists.o root.o uclass.o util.o
diff --git a/drivers/demo/Makefile b/drivers/demo/Makefile
index baaa2baa4e..171ddf3678 100644
--- a/drivers/demo/Makefile
+++ b/drivers/demo/Makefile
@@ -4,6 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_DM_DEMO) += demo-uclass.o demo-pdata.o
+obj-y += demo-uclass.o demo-pdata.o
obj-$(CONFIG_DM_DEMO_SIMPLE) += demo-simple.o
obj-$(CONFIG_DM_DEMO_SHAPE) += demo-shape.o
OpenPOWER on IntegriCloud