diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-08-29 21:53:56 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-08-29 21:53:56 +0200 |
| commit | ba7b5b2348b684cf8ec424b2e38e267dc1cfd2fb (patch) | |
| tree | 51b9b7d75872533eda4d1451671f6f6507941492 | |
| parent | 81789c39db3f0f6b621df8c0ec66014d701f368e (diff) | |
| download | u-boot-ba7b5b2348b684cf8ec424b2e38e267dc1cfd2fb.tar.gz | |
miiphyutil: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/miiphyutil.c | 2 | ||||
| -rw-r--r-- | drivers/net/phy/Makefile | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/common/Makefile b/common/Makefile index 918b90856b..6ba20c0254 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 eac8275a40..5ef4a33ce7 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -29,7 +29,6 @@ #include <common.h> #include <miiphy.h> -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) #include <asm/types.h> #include <linux/list.h> #include <malloc.h> @@ -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 10dc082069..4fe3b05212 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 |