openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Make selects of IBM_EMAC_* depend on IBM_EMAC 

We have a bunch of Kconfig symbols which select various IBM_EMAC_*
symbols. These all cause warnings when IBM_EMAC is not selected.

eg.

  warning: (PPC_CELL_NATIVE && BLUESTONE && CANYONLANDS && GLACIER &&
  EIGER && 440EPX && 440GRX && 440GX && 460SX && 405EX) selects
  IBM_EMAC_RGMII which has unmet direct dependencies (NETDEVICES &&
  ETHERNET && NET_VENDOR_IBM)

So make them all depend on IBM_EMAC being enabled first.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2016-12-01 20:50:46 +11:00
parent 577ec789a7
commit 335967276b
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/platforms/40x/Kconfig
View File

@ -102,18 +102,18 @@ config 405GP
bool bool
select IBM405_ERR77 select IBM405_ERR77
select IBM405_ERR51 select IBM405_ERR51
select IBM_EMAC_ZMII select IBM_EMAC_ZMII if IBM_EMAC
config 405EX config 405EX
bool bool
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
config 405EZ config 405EZ
bool bool
select IBM_EMAC_NO_FLOW_CTRL select IBM_EMAC_NO_FLOW_CTRL if IBM_EMAC
select IBM_EMAC_MAL_CLR_ICINTSTAT select IBM_EMAC_MAL_CLR_ICINTSTAT if IBM_EMAC
select IBM_EMAC_MAL_COMMON_ERR select IBM_EMAC_MAL_COMMON_ERR if IBM_EMAC
config XILINX_VIRTEX config XILINX_VIRTEX
bool bool

56
arch/powerpc/platforms/44x/Kconfig
View File

@ -26,7 +26,7 @@ config BLUESTONE
select PCI_MSI select PCI_MSI
select PPC4xx_MSI select PPC4xx_MSI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
help help
This option enables support for the APM APM821xx Evaluation board. This option enables support for the APM APM821xx Evaluation board.
@ -125,8 +125,8 @@ config CANYONLANDS
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select PCI_MSI select PCI_MSI
select PPC4xx_MSI select PPC4xx_MSI
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
select IBM_EMAC_ZMII select IBM_EMAC_ZMII if IBM_EMAC
help help
This option enables support for the AMCC PPC460EX evaluation board. 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 460EX # Odd since it uses 460GT but the effects are the same
select PCI select PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
select IBM_EMAC_ZMII select IBM_EMAC_ZMII if IBM_EMAC
help help
This option enables support for the AMCC PPC460GT evaluation board. This option enables support for the AMCC PPC460GT evaluation board.
@ -164,7 +164,7 @@ config EIGER
select 460SX select 460SX
select PCI select PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
help help
This option enables support for the AMCC PPC460SX evaluation board. This option enables support for the AMCC PPC460SX evaluation board.
@ -213,7 +213,7 @@ config AKEBONO
select NETDEVICES select NETDEVICES
select ETHERNET select ETHERNET
select NET_VENDOR_IBM select NET_VENDOR_IBM
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select USB if USB_SUPPORT select USB if USB_SUPPORT
select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
@ -290,54 +290,54 @@ config 440EP
bool bool
select PPC_FPU select PPC_FPU
select IBM440EP_ERR42 select IBM440EP_ERR42
select IBM_EMAC_ZMII select IBM_EMAC_ZMII if IBM_EMAC
config 440EPX config 440EPX
bool bool
select PPC_FPU select PPC_FPU
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
select IBM_EMAC_ZMII select IBM_EMAC_ZMII if IBM_EMAC
select USB_EHCI_BIG_ENDIAN_MMIO select USB_EHCI_BIG_ENDIAN_MMIO
select USB_EHCI_BIG_ENDIAN_DESC select USB_EHCI_BIG_ENDIAN_DESC
config 440GRX config 440GRX
bool bool
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
select IBM_EMAC_ZMII select IBM_EMAC_ZMII if IBM_EMAC
config 440GP config 440GP
bool bool
select IBM_EMAC_ZMII select IBM_EMAC_ZMII if IBM_EMAC
config 440GX config 440GX
bool bool
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
select IBM_EMAC_ZMII #test only select IBM_EMAC_ZMII if IBM_EMAC #test only
select IBM_EMAC_TAH #test only select IBM_EMAC_TAH if IBM_EMAC #test only
config 440SP config 440SP
bool bool
config 440SPe config 440SPe
bool bool
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
config 460EX config 460EX
bool bool
select PPC_FPU select PPC_FPU
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select IBM_EMAC_TAH select IBM_EMAC_TAH if IBM_EMAC
config 460SX config 460SX
bool bool
select PPC_FPU select PPC_FPU
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
select IBM_EMAC_ZMII select IBM_EMAC_ZMII if IBM_EMAC
select IBM_EMAC_TAH select IBM_EMAC_TAH if IBM_EMAC
config 476FPE config 476FPE
bool bool
@ -346,8 +346,8 @@ config 476FPE
config APM821xx config APM821xx
bool bool
select PPC_FPU select PPC_FPU
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select IBM_EMAC_TAH select IBM_EMAC_TAH if IBM_EMAC
config 476FPE_ERR46 config 476FPE_ERR46
depends on 476FPE depends on 476FPE

8
arch/powerpc/platforms/cell/Kconfig
View File

@ -17,10 +17,10 @@ config PPC_CELL_NATIVE
select PPC_CELL_COMMON select PPC_CELL_COMMON
select MPIC select MPIC
select PPC_IO_WORKAROUNDS select PPC_IO_WORKAROUNDS
select IBM_EMAC_EMAC4 select IBM_EMAC_EMAC4 if IBM_EMAC
select IBM_EMAC_RGMII select IBM_EMAC_RGMII if IBM_EMAC
select IBM_EMAC_ZMII #test only select IBM_EMAC_ZMII if IBM_EMAC #test only
select IBM_EMAC_TAH #test only select IBM_EMAC_TAH if IBM_EMAC #test only
default n default n
config PPC_IBM_CELL_BLADE config PPC_IBM_CELL_BLADE