From f02b8d17619f76124045a9e75acc17d8de3207a1 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Sun, 1 Apr 2018 09:22:34 +0000 Subject: [PATCH] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig This converts CONFIG_DRIVER_TI_CPSW to Kconfig Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> --- configs/am335x_baltos_defconfig | 2 +- configs/am335x_boneblack_defconfig | 2 +- configs/am335x_boneblack_vboot_defconfig | 2 +- configs/am335x_evm_defconfig | 2 +- configs/am335x_evm_nor_defconfig | 2 +- configs/am335x_evm_norboot_defconfig | 2 +- configs/am335x_evm_spiboot_defconfig | 2 +- configs/am335x_evm_usbspl_defconfig | 2 +- configs/am335x_hs_evm_defconfig | 2 +- configs/am335x_hs_evm_uart_defconfig | 2 +- configs/am335x_igep003x_defconfig | 2 +- configs/am335x_pdu001_defconfig | 1 + configs/am335x_shc_defconfig | 2 +- configs/am335x_shc_ict_defconfig | 2 +- configs/am335x_shc_netboot_defconfig | 2 +- configs/am335x_shc_prompt_defconfig | 2 +- configs/am335x_shc_sdboot_defconfig | 2 +- configs/am335x_shc_sdboot_prompt_defconfig | 2 +- configs/am335x_sl50_defconfig | 2 +- configs/am43xx_evm_defconfig | 2 +- configs/am43xx_evm_ethboot_defconfig | 2 +- configs/am43xx_evm_qspiboot_defconfig | 2 +- configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/am57xx_evm_defconfig | 2 +- configs/am57xx_hs_evm_defconfig | 2 +- configs/birdland_bav335a_defconfig | 2 +- configs/birdland_bav335b_defconfig | 2 +- configs/brppt1_mmc_defconfig | 2 +- configs/brppt1_nand_defconfig | 2 +- configs/brppt1_spi_defconfig | 2 +- configs/brxre1_defconfig | 2 +- configs/chiliboard_defconfig | 2 +- configs/cl-som-am57x_defconfig | 2 +- configs/cm_t335_defconfig | 2 +- configs/cm_t43_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/draco_defconfig | 2 +- configs/etamin_defconfig | 2 +- configs/pcm051_rev1_defconfig | 2 +- configs/pcm051_rev3_defconfig | 2 +- configs/pengwyn_defconfig | 2 +- configs/pepper_defconfig | 2 +- configs/pxm2_defconfig | 2 +- configs/rastaban_defconfig | 2 +- configs/rut_defconfig | 2 +- configs/thuban_defconfig | 2 +- configs/ti814x_evm_defconfig | 2 +- drivers/net/Kconfig | 7 +++++++ include/configs/am335x_shc.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/am57xx_evm.h | 1 - include/configs/bur_am335x_common.h | 1 - include/configs/cl-som-am57x.h | 1 - include/configs/cm_t43.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/ti814x_evm.h | 1 - include/configs/ti_am335x_common.h | 1 - scripts/config_whitelist.txt | 1 - 61 files changed, 56 insertions(+), 59 deletions(-) diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 8839538881..7206601e06 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -42,7 +42,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_OMAP24_I2C_SPEED=1000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index e31366d3d5..7039c6bdc8 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -30,7 +30,7 @@ CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 5ff51e3b02..3974bd649e 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -34,8 +34,8 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y CONFIG_DM_ETH=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 1e8a467030..b94f053756 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -39,8 +39,8 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y CONFIG_DM_ETH=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 49a04f925e..172973ac17 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -29,7 +29,7 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 22182f5d9b..176c820656 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -24,7 +24,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index c0ebb4d19a..32620f7674 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -27,7 +27,7 @@ CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index b240505a6d..51415c0b7a 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -37,7 +37,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 74fe162cff..cd0d90e9b1 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -46,8 +46,8 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y CONFIG_DM_ETH=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index 97519ea5bd..6991179b85 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -42,8 +42,8 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y CONFIG_DM_ETH=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index c1cdf96f96..139f994811 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -42,7 +42,7 @@ CONFIG_ENV_IS_IN_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_MTD_UBI_FASTMAP=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig index a9d0f8e016..87ae88ca61 100644 --- a/configs/am335x_pdu001_defconfig +++ b/configs/am335x_pdu001_defconfig @@ -39,6 +39,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_SDHCI=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_DM_PMIC=y diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index 3843727c8d..1d85c82cc3 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -36,7 +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_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index fe69ba7459..3f1c636275 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -37,7 +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_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index 3d911064f9..c6ec9124b9 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -38,7 +38,7 @@ CONFIG_CMD_MMC=y # CONFIG_SPL_ISO_PARTITION is not set CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_OMAP_HS=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/am335x_shc_prompt_defconfig b/configs/am335x_shc_prompt_defconfig index 5607789685..b452a5b1fe 100644 --- a/configs/am335x_shc_prompt_defconfig +++ b/configs/am335x_shc_prompt_defconfig @@ -35,7 +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_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index 0b4ffdf53a..4ac0f3cc89 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -37,7 +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_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/am335x_shc_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig index 0b4ffdf53a..4ac0f3cc89 100644 --- a/configs/am335x_shc_sdboot_prompt_defconfig +++ b/configs/am335x_shc_sdboot_prompt_defconfig @@ -37,7 +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_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index bf0efb3102..ea70ef4be9 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -40,7 +40,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_MMC_OMAP_HS=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 0cb79ea663..802a8fbf1b 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -35,7 +35,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 8e51dc776a..1bb33959e2 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -41,7 +41,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 3fbf701e60..2639ad4790 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -39,7 +39,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 505890ea41..605c2c7faf 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -49,7 +49,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 98b0cea131..8d65f03beb 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -46,7 +46,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 9f2a7f7bc5..535a3b4107 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -51,10 +51,10 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_DM_PMIC=y CONFIG_PMIC_PALMAS=y CONFIG_DM_REGULATOR=y diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index b3e739a348..034fad55f2 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -54,10 +54,10 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_DM_PMIC=y CONFIG_PMIC_PALMAS=y CONFIG_DM_REGULATOR=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 5a20dc96fd..bbfe22824b 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -48,7 +48,7 @@ CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index b9ad03bd2b..21fecdef91 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -48,7 +48,7 @@ CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index 2079ed92e3..e202bc348e 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -54,7 +54,7 @@ CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_SUBNETMASK=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_MMC_OMAP_HS=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index 66cea791ce..8adbfa0136 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -56,7 +56,7 @@ CONFIG_BOOTP_SUBNETMASK=y CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_NAND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index 67c254fa06..2ab44c3d45 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -63,7 +63,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 4b07bea30a..45f11d1f4b 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -54,7 +54,7 @@ CONFIG_BOOTP_DNS=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_SUBNETMASK=y CONFIG_MMC_OMAP_HS=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index d934182dbb..344a3a08dc 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -34,7 +34,7 @@ CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index d826b70112..eff22bf53d 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -42,7 +42,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index c8390bd2c2..9b0eed8a69 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -45,7 +45,7 @@ CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index f74854776d..31da64b605 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -55,7 +55,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index cb210cf8f0..56defe18b5 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -60,8 +60,8 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_DM_ETH=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_SPL_PHY=y CONFIG_PMIC_PALMAS=y diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index 3e18023b0e..fffcc600a0 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -59,8 +59,8 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_DM_ETH=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_GIGE=y CONFIG_SPL_PHY=y CONFIG_PMIC_PALMAS=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 87b0726c75..ae1822cdb3 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -65,7 +65,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 77f82af27a..6e5d4c297d 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -65,7 +65,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 079ac8bce5..871dc2a327 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -42,7 +42,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index f43c00801e..8f957e2084 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -42,7 +42,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_MMC_OMAP_HS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 0a8edb4e7c..4ac03dc68e 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -46,7 +46,7 @@ CONFIG_CMD_DIAG=y CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index b9ee513a1b..e175d11350 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -29,9 +29,9 @@ CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_MMC_OMAP_HS=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_NETDEVICES=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 5833a1af31..65e13a66e4 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -67,7 +67,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 30ef7fcd93..ae6bbcab0b 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -65,7 +65,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 7605b0e285..f4e96fb0c8 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -68,7 +68,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 5136dba09b..2db2112007 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -65,7 +65,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig index 337f4f34fd..f26cd52a51 100644 --- a/configs/ti814x_evm_defconfig +++ b/configs/ti814x_evm_defconfig @@ -36,6 +36,6 @@ CONFIG_BOOTP_DNS=y CONFIG_BOOTP_GATEWAY=y CONFIG_BOOTP_SUBNETMASK=y CONFIG_MMC_OMAP_HS=y -CONFIG_PHYLIB=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f2cfcb0606..98573cb22a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -11,6 +11,13 @@ config DM_ETH This is currently implemented in net/eth.c Look in include/net.h for details. +config DRIVER_TI_CPSW + bool "TI Common Platform Ethernet Switch" + select PHYLIB + help + This driver supports the TI three port switch gigabit ethernet + subsystem found in the TI SoCs. + menuconfig NETDEVICES bool "Network device support" depends on NET diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 60b162e534..e72cecab87 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -250,7 +250,6 @@ #undef CONFIG_TIMER #endif -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 663f861706..c1a6f00666 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -221,7 +221,6 @@ #define CONFIG_NET_RETRY_COUNT 10 #endif -#define CONFIG_DRIVER_TI_CPSW #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ #define CONFIG_SYS_RX_ETH_BUFFER 64 diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index c079a3ace0..7211cde252 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -78,7 +78,6 @@ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 4aa0cb698d..37d6aa5f4c 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ /* Network defines */ -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ #define CONFIG_PHY_NATSEMI diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 596e0605e3..4b2a0c3b8e 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -81,7 +81,6 @@ /* USB Networking options */ /* CPSW Ethernet */ -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_SEND_HOSTNAME diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index da78519c8e..07395de384 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -45,7 +45,6 @@ 50, 51, 52, 53, 54, 55, 56, 57, } /* CPSW Ethernet support */ -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_SEND_HOSTNAME diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index e82de2a637..13efc3e56e 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -97,7 +97,6 @@ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ #define CONFIG_PHY_TI diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b23e20a563..dfa7114e39 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -192,7 +192,6 @@ # define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ #endif /* SPI support */ -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS2 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 2f9056cad8..55df77de81 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -155,7 +155,6 @@ #endif /* Ethernet */ -#define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 9832e09aac..83e26dbb6e 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -35,7 +35,6 @@ #define CONFIG_MII /* Required in net/eth.c */ #endif -#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ /* * SPL related defines. The Public RAM memory map the ROM defines the * area between 0x402F0400 and 0x4030B800 as a download area and diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 23a1dc9abd..151a8bd008 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -409,7 +409,6 @@ CONFIG_DRIVER_NE2000_BASE CONFIG_DRIVER_NE2000_CCR CONFIG_DRIVER_NE2000_VAL CONFIG_DRIVER_SMC911X_BASE -CONFIG_DRIVER_TI_CPSW CONFIG_DRIVER_TI_EMAC CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE CONFIG_DRIVER_TI_EMAC_USE_RMII -- 2.39.5