summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-10-27 23:50:15 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-11-09 21:38:04 -0800
commit96e21f86e8266ed40759e5495ee461265d7f6d28 (patch)
treec832ea73b28de835d1cae2ee6d5123f99bf4607f /cpu
parent9eb79bd8856bcab896ed5e1f1bca159807a124dd (diff)
downloadu-boot-imx-96e21f86e8266ed40759e5495ee461265d7f6d28.zip
u-boot-imx-96e21f86e8266ed40759e5495ee461265d7f6d28.tar.gz
u-boot-imx-96e21f86e8266ed40759e5495ee461265d7f6d28.tar.bz2
Changed PPC4xx EMAC driver to require CONFIG_PPC4xx_EMAC
All in-tree IBM/AMCC PPC4xx boards using the EMAC get this new CONFIG Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Acked-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ppc4xx/4xx_enet.c9
-rw-r--r--cpu/ppc4xx/Makefile1
2 files changed, 1 insertions, 9 deletions
diff --git a/cpu/ppc4xx/4xx_enet.c b/cpu/ppc4xx/4xx_enet.c
index d7b16da..1978269 100644
--- a/cpu/ppc4xx/4xx_enet.c
+++ b/cpu/ppc4xx/4xx_enet.c
@@ -91,13 +91,6 @@
#include <miiphy.h>
#include <malloc.h>
-/*
- * Only compile for platform with AMCC EMAC ethernet controller and
- * network support enabled.
- * Remark: CONFIG_405 describes Xilinx PPC405 FPGA without EMAC controller!
- */
-#if defined(CONFIG_CMD_NET) && !defined(CONFIG_405) && !defined(CONFIG_IOP480)
-
#if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))
#error "CONFIG_MII has to be defined!"
#endif
@@ -2131,5 +2124,3 @@ int emac4xx_miiphy_initialize (bd_t * bis)
return 0;
}
#endif /* !defined(CONFIG_NET_MULTI) */
-
-#endif
diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile
index 463b575..adfe13c 100644
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@@ -38,6 +38,7 @@ COBJS += 44x_spd_ddr2.o
ifdef CONFIG_PPC4xx_DDR_AUTOCALIBRATION
COBJS += 4xx_ibm_ddr2_autocalib.o
endif
+COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
COBJS += 4xx_pci.o
COBJS += 4xx_pcie.o
COBJS += bedbug_405.o