summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-11 14:35:58 +0900
committerTom Rini <trini@ti.com>2013-11-17 14:11:31 -0500
commitfc9ac3565a80d571def4f2eae4ad10c4ed90cbb2 (patch)
treee4daed6609669cce7f1cd6c00a1d0f956044f507
parent4c76b552313f3a12a38789afa828c6a7e9e71d7a (diff)
downloadu-boot-imx-fc9ac3565a80d571def4f2eae4ad10c4ed90cbb2.zip
u-boot-imx-fc9ac3565a80d571def4f2eae4ad10c4ed90cbb2.tar.gz
u-boot-imx-fc9ac3565a80d571def4f2eae4ad10c4ed90cbb2.tar.bz2
drivers/net/fm: descend only when CONFIG_FMAN_ENET=y
CONFIG_FMAN_ENET is defined only for CPU mpc85xx. We do not need to filter by CPU mpc85xx. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--Makefile4
-rw-r--r--drivers/net/fm/Makefile2
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 0e9609f..5cdfc6d 100644
--- a/Makefile
+++ b/Makefile
@@ -271,9 +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),mpc85xx)
-LIBS-y += drivers/net/fm/libfm.o
-endif
+LIBS-$(CONFIG_FMAN_ENET) += drivers/net/fm/libfm.o
LIBS-y += drivers/serial/libserial.o
LIBS-y += drivers/usb/eth/libusb_eth.o
LIBS-y += drivers/usb/gadget/libusb_gadget.o
diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile
index 2efba76..d0fd7fc 100644
--- a/drivers/net/fm/Makefile
+++ b/drivers/net/fm/Makefile
@@ -4,7 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
-ifdef CONFIG_FMAN_ENET
obj-y += dtsec.o
obj-y += eth.o
obj-y += fm.o
@@ -33,4 +32,3 @@ obj-$(CONFIG_PPC_T4240) += t4240.o
obj-$(CONFIG_PPC_T4160) += t4240.o
obj-$(CONFIG_PPC_B4420) += b4860.o
obj-$(CONFIG_PPC_B4860) += b4860.o
-endif