Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / drivers / net / fm / Makefile

diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile
index 9692575dc83017f8836c9e14c8bc3224f5a5a16c..9aaa82853579dd3b9e9ccae58b0eeb269a83ac8a 100644 (file)
--- a/drivers/net/fm/Makefile
+++ b/drivers/net/fm/Makefile
@@ -32,15 +32,23 @@ COBJS-y += init.o
 COBJS-y += tgec.o
 COBJS-y += tgec_phy.o
 
+# Soc have FMAN v3 with mEMAC
+COBJS-$(CONFIG_SYS_FMAN_V3) += memac_phy.o
+COBJS-$(CONFIG_SYS_FMAN_V3) += memac.o
+
 # SoC specific SERDES support
 COBJS-$(CONFIG_P1017)  += p1023.o
 COBJS-$(CONFIG_P1023)  += p1023.o
 # The P204x, P304x, and P5020 are the same
-COBJS-$(CONFIG_PPC_P2040) += p5020.o
 COBJS-$(CONFIG_PPC_P2041) += p5020.o
 COBJS-$(CONFIG_PPC_P3041) += p5020.o
 COBJS-$(CONFIG_PPC_P4080) += p4080.o
 COBJS-$(CONFIG_PPC_P5020) += p5020.o
+COBJS-$(CONFIG_PPC_P5040) += p5040.o
+COBJS-$(CONFIG_PPC_T4240) += t4240.o
+COBJS-$(CONFIG_PPC_T4160) += t4240.o
+COBJS-$(CONFIG_PPC_B4420) += b4860.o
+COBJS-$(CONFIG_PPC_B4860) += b4860.o
 endif
 
 COBJS  := $(COBJS-y)