On 30/03/2018 18:52, Joe Hershberger wrote: > Some boards expect to find more than one phy while other boards are old > and need to be limited to a specific phy address. Only limit the phy > address for boards that opt in. > > Signed-off-by: Joe Hershberger <[email protected]> > > --- > > configs/am335x_baltos_defconfig | 1 + > configs/am335x_shc_defconfig | 1 + > configs/am335x_shc_ict_defconfig | 1 + > configs/am335x_shc_netboot_defconfig | 1 + > configs/am335x_shc_prompt_defconfig | 1 + > configs/am335x_shc_sdboot_defconfig | 1 + > configs/am335x_shc_sdboot_prompt_defconfig | 1 + > configs/devkit3250_defconfig | 1 + > configs/ds414_defconfig | 1 + > configs/khadas-vim_defconfig | 1 + > configs/libretech-cc_defconfig | 1 + > configs/p212_defconfig | 1 + > configs/pepper_defconfig | 1 + > configs/work_92105_defconfig | 1 + > configs/x600_defconfig | 1 + > drivers/net/phy/Kconfig | 8 ++++++++ > 16 files changed, 23 insertions(+) > > diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig > index ab7d96d..ed7d3a7 100644 > --- a/configs/am335x_baltos_defconfig > +++ b/configs/am335x_baltos_defconfig > @@ -42,6 +42,7 @@ CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SYS_OMAP24_I2C_SPEED=1000 > CONFIG_MMC_OMAP_HS=y > CONFIG_NAND=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_OMAP3_SPI=y > diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig > index fb714da..ade16b9 100644 > --- a/configs/am335x_shc_defconfig > +++ b/configs/am335x_shc_defconfig > @@ -35,6 +35,7 @@ CONFIG_CMD_MMC=y > # CONFIG_SPL_ISO_PARTITION is not set > CONFIG_ENV_IS_IN_MMC=y > CONFIG_MMC_OMAP_HS=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_OMAP3_SPI=y > diff --git a/configs/am335x_shc_ict_defconfig > b/configs/am335x_shc_ict_defconfig > index 2568e3d..ac19a74 100644 > --- a/configs/am335x_shc_ict_defconfig > +++ b/configs/am335x_shc_ict_defconfig > @@ -36,6 +36,7 @@ CONFIG_CMD_MMC=y > # CONFIG_SPL_ISO_PARTITION is not set > CONFIG_ENV_IS_IN_MMC=y > CONFIG_MMC_OMAP_HS=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_OMAP3_SPI=y > diff --git a/configs/am335x_shc_netboot_defconfig > b/configs/am335x_shc_netboot_defconfig > index 16071fb..31f1847 100644 > --- a/configs/am335x_shc_netboot_defconfig > +++ b/configs/am335x_shc_netboot_defconfig > @@ -37,6 +37,7 @@ CONFIG_CMD_MMC=y > # CONFIG_SPL_ISO_PARTITION is not set > CONFIG_ENV_IS_IN_MMC=y > CONFIG_MMC_OMAP_HS=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_OMAP3_SPI=y > diff --git a/configs/am335x_shc_prompt_defconfig > b/configs/am335x_shc_prompt_defconfig > index bbad6dd..803304e 100644 > --- a/configs/am335x_shc_prompt_defconfig > +++ b/configs/am335x_shc_prompt_defconfig > @@ -34,6 +34,7 @@ CONFIG_CMD_MMC=y > # CONFIG_SPL_ISO_PARTITION is not set > CONFIG_ENV_IS_IN_MMC=y > CONFIG_MMC_OMAP_HS=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_OMAP3_SPI=y > diff --git a/configs/am335x_shc_sdboot_defconfig > b/configs/am335x_shc_sdboot_defconfig > index 82a61a3..2d4f4d1 100644 > --- a/configs/am335x_shc_sdboot_defconfig > +++ b/configs/am335x_shc_sdboot_defconfig > @@ -36,6 +36,7 @@ CONFIG_CMD_MMC=y > # CONFIG_SPL_ISO_PARTITION is not set > CONFIG_ENV_IS_IN_MMC=y > CONFIG_MMC_OMAP_HS=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_OMAP3_SPI=y > diff --git a/configs/am335x_shc_sdboot_prompt_defconfig > b/configs/am335x_shc_sdboot_prompt_defconfig > index 82a61a3..2d4f4d1 100644 > --- a/configs/am335x_shc_sdboot_prompt_defconfig > +++ b/configs/am335x_shc_sdboot_prompt_defconfig > @@ -36,6 +36,7 @@ CONFIG_CMD_MMC=y > # CONFIG_SPL_ISO_PARTITION is not set > CONFIG_ENV_IS_IN_MMC=y > CONFIG_MMC_OMAP_HS=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_OMAP3_SPI=y > diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig > index e1a9b49..b69808c 100644 > --- a/configs/devkit3250_defconfig > +++ b/configs/devkit3250_defconfig > @@ -36,6 +36,7 @@ CONFIG_MTD_NOR_FLASH=y > CONFIG_NAND=y > CONFIG_SPL_NAND_SIMPLE=y > CONFIG_PHYLIB=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHY_ADDR=31 > CONFIG_DM_SERIAL=y > CONFIG_SYS_NS16550=y > diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig > index 5d1d6ab..d68e64e 100644 > --- a/configs/ds414_defconfig > +++ b/configs/ds414_defconfig > @@ -39,6 +39,7 @@ CONFIG_SPL_OF_TRANSLATE=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_BAR=y > CONFIG_SPI_FLASH_STMICRO=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHY_GIGE=y > CONFIG_MVNETA=y > CONFIG_PCI=y > diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig > index f4674ef..0bfb594 100644 > --- a/configs/khadas-vim_defconfig > +++ b/configs/khadas-vim_defconfig > @@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DM_GPIO=y > CONFIG_DM_MMC=y > CONFIG_MMC_MESON_GX=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHY_ADDR=8 > CONFIG_PHY_MESON_GXL=y > CONFIG_DM_ETH=y > diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig > index 18ddb45..931496c 100644 > --- a/configs/libretech-cc_defconfig > +++ b/configs/libretech-cc_defconfig > @@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DM_GPIO=y > CONFIG_DM_MMC=y > CONFIG_MMC_MESON_GX=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHY_ADDR=8 > CONFIG_PHY_MESON_GXL=y > CONFIG_DM_ETH=y > diff --git a/configs/p212_defconfig b/configs/p212_defconfig > index b6923f3..44221fc 100644 > --- a/configs/p212_defconfig > +++ b/configs/p212_defconfig > @@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DM_GPIO=y > CONFIG_DM_MMC=y > CONFIG_MMC_MESON_GX=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHY_ADDR=8 > CONFIG_PHY_MESON_GXL=y > CONFIG_DM_ETH=y > diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig > index a802e57..2752436 100644 > --- a/configs/pepper_defconfig > +++ b/configs/pepper_defconfig > @@ -30,6 +30,7 @@ CONFIG_CMD_SPI=y > CONFIG_CMD_EXT4_WRITE=y > CONFIG_MMC_OMAP_HS=y > CONFIG_PHYLIB=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_NETDEVICES=y > diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig > index 2451b56..76418f0 100644 > --- a/configs/work_92105_defconfig > +++ b/configs/work_92105_defconfig > @@ -35,6 +35,7 @@ CONFIG_SPL_DM=y > CONFIG_DM_GPIO=y > # CONFIG_MMC is not set > CONFIG_PHYLIB=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_DM_SERIAL=y > CONFIG_SYS_NS16550=y > CONFIG_LPC32XX_SSP=y > diff --git a/configs/x600_defconfig b/configs/x600_defconfig > index 445759e..10d596b 100644 > --- a/configs/x600_defconfig > +++ b/configs/x600_defconfig > @@ -44,6 +44,7 @@ CONFIG_FPGA_SPARTAN3=y > CONFIG_SYS_I2C_DW=y > # CONFIG_MMC is not set > CONFIG_MTD_NOR_FLASH=y > +CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_NETDEVICES=y > diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig > index 179e041..f5821df 100644 > --- a/drivers/net/phy/Kconfig > +++ b/drivers/net/phy/Kconfig > @@ -13,12 +13,20 @@ menuconfig PHYLIB > > if PHYLIB > > +config PHY_ADDR_ENABLE > + bool "Limit phy address" > + default y if ARCH_SUNXI > + help > + Select this if you want to control which phy address is used > + > +if PHY_ADDR_ENABLE > config PHY_ADDR > int "PHY address" > default 1 if ARCH_SUNXI > default 0 > help > The address of PHY on MII bus. Usually in range of 0 to 31. > +endif > > config B53_SWITCH > bool "Broadcom BCM53xx (RoboSwitch) Ethernet switch PHY support." > Hi,
For p212, libretech-cc and khadas-vim, Acked-by: Neil Armstrong <[email protected]> Neil _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
