Merge tag 'powerpc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / 44x / Kconfig

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 25b8d641ff9fa758b6a82f72a4ec2797c7dc8353..9b0afe935cc17422e35579cf28c73a4338bd3aa4 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -26,7 +26,7 @@ config BLUESTONE
        select PCI_MSI
        select PPC4xx_MSI
        select PPC4xx_PCI_EXPRESS
-       select IBM_EMAC_RGMII
+       select IBM_EMAC_RGMII if IBM_EMAC
        help
          This option enables support for the APM APM821xx Evaluation board.
 
@@ -125,8 +125,8 @@ config CANYONLANDS
        select PPC4xx_PCI_EXPRESS
        select PCI_MSI
        select PPC4xx_MSI
-       select IBM_EMAC_RGMII
-       select IBM_EMAC_ZMII
+       select IBM_EMAC_RGMII if IBM_EMAC
+       select IBM_EMAC_ZMII if IBM_EMAC
        help
          This option enables support for the AMCC PPC460EX evaluation board.
 
@@ -138,8 +138,8 @@ config GLACIER
        select 460EX # Odd since it uses 460GT but the effects are the same
        select PCI
        select PPC4xx_PCI_EXPRESS
-       select IBM_EMAC_RGMII
-       select IBM_EMAC_ZMII
+       select IBM_EMAC_RGMII if IBM_EMAC
+       select IBM_EMAC_ZMII if IBM_EMAC
        help
          This option enables support for the AMCC PPC460GT evaluation board.
 
@@ -164,7 +164,7 @@ config EIGER
        select 460SX
        select PCI
        select PPC4xx_PCI_EXPRESS
-       select IBM_EMAC_RGMII
+       select IBM_EMAC_RGMII if IBM_EMAC
        help
          This option enables support for the AMCC PPC460SX evaluation board.
 
@@ -213,7 +213,7 @@ config AKEBONO
        select NETDEVICES
        select ETHERNET
        select NET_VENDOR_IBM
-       select IBM_EMAC_EMAC4
+       select IBM_EMAC_EMAC4 if IBM_EMAC
        select USB if USB_SUPPORT
        select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
        select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
@@ -291,54 +291,54 @@ config 440EP
        bool
        select PPC_FPU
        select IBM440EP_ERR42
-       select IBM_EMAC_ZMII
+       select IBM_EMAC_ZMII if IBM_EMAC
 
 config 440EPX
        bool
        select PPC_FPU
-       select IBM_EMAC_EMAC4
-       select IBM_EMAC_RGMII
-       select IBM_EMAC_ZMII
+       select IBM_EMAC_EMAC4 if IBM_EMAC
+       select IBM_EMAC_RGMII if IBM_EMAC
+       select IBM_EMAC_ZMII if IBM_EMAC
        select USB_EHCI_BIG_ENDIAN_MMIO
        select USB_EHCI_BIG_ENDIAN_DESC
 
 config 440GRX
        bool
-       select IBM_EMAC_EMAC4
-       select IBM_EMAC_RGMII
-       select IBM_EMAC_ZMII
+       select IBM_EMAC_EMAC4 if IBM_EMAC
+       select IBM_EMAC_RGMII if IBM_EMAC
+       select IBM_EMAC_ZMII if IBM_EMAC
 
 config 440GP
        bool
-       select IBM_EMAC_ZMII
+       select IBM_EMAC_ZMII if IBM_EMAC
 
 config 440GX
        bool
-       select IBM_EMAC_EMAC4
-       select IBM_EMAC_RGMII
-       select IBM_EMAC_ZMII #test only
-       select IBM_EMAC_TAH  #test only
+       select IBM_EMAC_EMAC4 if IBM_EMAC
+       select IBM_EMAC_RGMII if IBM_EMAC
+       select IBM_EMAC_ZMII if IBM_EMAC #test only
+       select IBM_EMAC_TAH if IBM_EMAC  #test only
 
 config 440SP
        bool
 
 config 440SPe
        bool
-       select IBM_EMAC_EMAC4
+       select IBM_EMAC_EMAC4 if IBM_EMAC
 
 config 460EX
        bool
        select PPC_FPU
-       select IBM_EMAC_EMAC4
-       select IBM_EMAC_TAH
+       select IBM_EMAC_EMAC4 if IBM_EMAC
+       select IBM_EMAC_TAH if IBM_EMAC
 
 config 460SX
        bool
        select PPC_FPU
-       select IBM_EMAC_EMAC4
-       select IBM_EMAC_RGMII
-       select IBM_EMAC_ZMII
-       select IBM_EMAC_TAH
+       select IBM_EMAC_EMAC4 if IBM_EMAC
+       select IBM_EMAC_RGMII if IBM_EMAC
+       select IBM_EMAC_ZMII if IBM_EMAC
+       select IBM_EMAC_TAH if IBM_EMAC
 
 config 476FPE
        bool
@@ -347,8 +347,8 @@ config 476FPE
 config APM821xx
        bool
        select PPC_FPU
-       select IBM_EMAC_EMAC4
-       select IBM_EMAC_TAH
+       select IBM_EMAC_EMAC4 if IBM_EMAC
+       select IBM_EMAC_TAH if IBM_EMAC
 
 config 476FPE_ERR46
        depends on 476FPE