summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-11 14:35:57 +0900
committerTom Rini <trini@ti.com>2013-11-17 14:11:31 -0500
commit4c76b552313f3a12a38789afa828c6a7e9e71d7a (patch)
tree0a488ca5813895fc39097b5c9d12353d6a6a059b
parentc54ecaa965211c3f34004031b3574c069402dc8e (diff)
downloadu-boot-imx-4c76b552313f3a12a38789afa828c6a7e9e71d7a.zip
u-boot-imx-4c76b552313f3a12a38789afa828c6a7e9e71d7a.tar.gz
u-boot-imx-4c76b552313f3a12a38789afa828c6a7e9e71d7a.tar.bz2
drivers/qe: move the entry to drivers/Makefile
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--Makefile4
-rw-r--r--drivers/Makefile1
-rw-r--r--drivers/qe/Makefile4
3 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 3a8ea67..0e9609f 100644
--- a/Makefile
+++ b/Makefile
@@ -271,11 +271,7 @@ LIBS-y += drivers/power/libpower.o \
drivers/power/pmic/libpmic.o \
drivers/power/battery/libbattery.o
LIBS-y += drivers/spi/libspi.o
-ifeq ($(CPU),mpc83xx)
-LIBS-y += drivers/qe/libqe.o
-endif
ifeq ($(CPU),mpc85xx)
-LIBS-y += drivers/qe/libqe.o
LIBS-y += drivers/net/fm/libfm.o
endif
LIBS-y += drivers/serial/libserial.o
diff --git a/drivers/Makefile b/drivers/Makefile
index 95a4b80..5d03f37 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -13,3 +13,4 @@ obj-y += tpm/
obj-y += twserial/
obj-y += video/
obj-y += watchdog/
+obj-$(CONFIG_QE) += qe/
diff --git a/drivers/qe/Makefile b/drivers/qe/Makefile
index b8c15f8..7f1bd06 100644
--- a/drivers/qe/Makefile
+++ b/drivers/qe/Makefile
@@ -4,5 +4,5 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(and $(CONFIG_QE),$(CONFIG_OF_LIBFDT)) += fdt.o
-obj-$(CONFIG_QE) += qe.o uccf.o uec.o uec_phy.o
+obj-y := qe.o uccf.o uec.o uec_phy.o
+obj-$(CONFIG_OF_LIBFDT) += fdt.o