From 55195773eacefb22dd483a3c560ea30a14263ce1 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 29 Aug 2008 01:18:01 +0200 Subject: miiphybb: move to drivers/net/phy Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- drivers/net/phy/Makefile | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 drivers/net/phy/Makefile (limited to 'drivers/net/phy/Makefile') diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile new file mode 100644 index 00000000000..10dc0820692 --- /dev/null +++ b/drivers/net/phy/Makefile @@ -0,0 +1,46 @@ +# +# (C) Copyright 2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB := $(obj)libphy.a + +COBJS-$(CONFIG_BITBANGMII) += miiphybb.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(LIB) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### -- cgit v1.3.1 From ba7b5b2348b684cf8ec424b2e38e267dc1cfd2fb Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 29 Aug 2008 21:53:56 +0200 Subject: miiphyutil: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 2 +- common/miiphyutil.c | 2 -- drivers/net/phy/Makefile | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/net/phy/Makefile') diff --git a/common/Makefile b/common/Makefile index 918b90856b1..6ba20c0254b 100644 --- a/common/Makefile +++ b/common/Makefile @@ -84,6 +84,7 @@ COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o COBJS-y += cmd_load.o COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o COBJS-y += cmd_mem.o +COBJS-$(CONFIG_MII)$(CONFIG_CMD_MII) += miiphyutil.o COBJS-$(CONFIG_CMD_MII) += cmd_mii.o COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o @@ -133,7 +134,6 @@ COBJS-$(CONFIG_LCD) += lcd.o COBJS-y += lists.o COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o COBJS-y += memsize.o -COBJS-y += miiphyutil.o COBJS-y += s_record.o COBJS-y += serial.o ifdef CONFIG_CMD_USB diff --git a/common/miiphyutil.c b/common/miiphyutil.c index eac8275a405..5ef4a33ce77 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -29,7 +29,6 @@ #include #include -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) #include #include #include @@ -487,4 +486,3 @@ int miiphy_link (char *devname, unsigned char addr) } } #endif -#endif /* CONFIG_MII */ diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 10dc0820692..4fe3b052121 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -1,5 +1,5 @@ # -# (C) Copyright 2006 +# (C) Copyright 2008 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this -- cgit v1.3.1