summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-11 14:35:59 +0900
committerTom Rini <trini@ti.com>2013-11-17 14:11:32 -0500
commitfdd91faef9148fd5a52467a91f79934ee4e7f2bd (patch)
tree2ebdb053501a52aea0f5db4ad384827ea745a14e
parentfc9ac3565a80d571def4f2eae4ad10c4ed90cbb2 (diff)
downloadu-boot-imx-fdd91faef9148fd5a52467a91f79934ee4e7f2bd.zip
u-boot-imx-fdd91faef9148fd5a52467a91f79934ee4e7f2bd.tar.gz
u-boot-imx-fdd91faef9148fd5a52467a91f79934ee4e7f2bd.tar.bz2
drivers/net/npe: descend only when CONFIG_IXP4XX_NPE=y
CONFIG_IXP4XX_NPE is defined only for CPU ixp. It is not necessary to filter by CPU ixp. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--Makefile4
-rw-r--r--drivers/net/npe/Makefile2
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 5cdfc6d..4724f41 100644
--- a/Makefile
+++ b/Makefile
@@ -242,9 +242,7 @@ LIBS-y += $(CPUDIR)/lib$(CPU).o
ifdef SOC
LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
endif
-ifeq ($(CPU),ixp)
-LIBS-y += drivers/net/npe/libnpe.o
-endif
+LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/libnpe.o
LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
LIBS-y += fs/libfs.o \
diff --git a/drivers/net/npe/Makefile b/drivers/net/npe/Makefile
index 7fa5ea6..e36c0bb 100644
--- a/drivers/net/npe/Makefile
+++ b/drivers/net/npe/Makefile
@@ -10,7 +10,7 @@ CFLAGS += $(LOCAL_CFLAGS)
CPPFLAGS += $(LOCAL_CFLAGS) # needed for depend
HOSTCFLAGS += $(LOCAL_CFLAGS)
-obj-$(CONFIG_IXP4XX_NPE) := npe.o \
+obj-y := npe.o \
miiphy.o \
IxOsalBufferMgt.o \
IxOsalIoMem.o \