diff mbox series

[U-Boot,v2,1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig

Message ID 1522574558-7445-2-git-send-email-alex.kiernan@gmail.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Build AM335x when CONFIG_NET isn't defined | expand

Commit Message

Alex Kiernan April 1, 2018, 9:22 a.m. UTC
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>
---

Changes in v2:
- Move DRIVER_TI_CPSW outside of the NETDEVICES guard
- Don't mark DRIVER_TI_CPSW default if ARCH_OMAP2PLUS to fix mistranslations
  by moveconfig

 configs/am335x_baltos_defconfig            | 4 ++--
 configs/am335x_boneblack_defconfig         | 4 ++--
 configs/am335x_boneblack_vboot_defconfig   | 4 ++--
 configs/am335x_evm_defconfig               | 4 ++--
 configs/am335x_evm_nor_defconfig           | 4 ++--
 configs/am335x_evm_norboot_defconfig       | 2 +-
 configs/am335x_evm_spiboot_defconfig       | 4 ++--
 configs/am335x_evm_usbspl_defconfig        | 4 ++--
 configs/am335x_hs_evm_defconfig            | 4 ++--
 configs/am335x_hs_evm_uart_defconfig       | 4 ++--
 configs/am335x_igep003x_defconfig          | 6 ++----
 configs/am335x_pdu001_defconfig            | 3 ++-
 configs/am335x_shc_defconfig               | 4 ++--
 configs/am335x_shc_ict_defconfig           | 4 ++--
 configs/am335x_shc_netboot_defconfig       | 4 ++--
 configs/am335x_shc_prompt_defconfig        | 4 ++--
 configs/am335x_shc_sdboot_defconfig        | 4 ++--
 configs/am335x_shc_sdboot_prompt_defconfig | 4 ++--
 configs/am335x_sl50_defconfig              | 4 ++--
 configs/am43xx_evm_defconfig               | 4 ++--
 configs/am43xx_evm_ethboot_defconfig       | 4 ++--
 configs/am43xx_evm_qspiboot_defconfig      | 2 +-
 configs/am43xx_evm_usbhost_boot_defconfig  | 4 ++--
 configs/am43xx_hs_evm_defconfig            | 4 ++--
 configs/am57xx_evm_defconfig               | 4 ++--
 configs/am57xx_hs_evm_defconfig            | 4 ++--
 configs/birdland_bav335a_defconfig         | 4 ++--
 configs/birdland_bav335b_defconfig         | 4 ++--
 configs/brppt1_mmc_defconfig               | 4 ++--
 configs/brppt1_nand_defconfig              | 4 ++--
 configs/brppt1_spi_defconfig               | 4 ++--
 configs/brxre1_defconfig                   | 4 ++--
 configs/chiliboard_defconfig               | 4 ++--
 configs/cl-som-am57x_defconfig             | 4 ++--
 configs/cm_t335_defconfig                  | 4 ++--
 configs/cm_t43_defconfig                   | 4 ++--
 configs/dra7xx_evm_defconfig               | 4 ++--
 configs/dra7xx_hs_evm_defconfig            | 4 ++--
 configs/draco_defconfig                    | 4 ++--
 configs/etamin_defconfig                   | 4 ++--
 configs/pcm051_rev1_defconfig              | 4 ++--
 configs/pcm051_rev3_defconfig              | 4 ++--
 configs/pengwyn_defconfig                  | 4 ++--
 configs/pepper_defconfig                   | 4 ++--
 configs/pxm2_defconfig                     | 4 ++--
 configs/rastaban_defconfig                 | 4 ++--
 configs/rut_defconfig                      | 4 ++--
 configs/thuban_defconfig                   | 4 ++--
 configs/ti814x_evm_defconfig               | 4 ++--
 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, 103 insertions(+), 108 deletions(-)

Comments

Felix Brack April 2, 2018, 11:13 a.m. UTC | #1
Hi Alex,

On 01.04.2018 11:22, Alex Kiernan wrote:
> 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>
> ---
> 
> Changes in v2:
> - Move DRIVER_TI_CPSW outside of the NETDEVICES guard
> - Don't mark DRIVER_TI_CPSW default if ARCH_OMAP2PLUS to fix mistranslations
>   by moveconfig
> 

[..]

> diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig
> index cb75ec0..87ae88c 100644
> --- a/configs/am335x_pdu001_defconfig
> +++ b/configs/am335x_pdu001_defconfig
> @@ -9,13 +9,13 @@ CONFIG_SPL_SERIAL_SUPPORT=y
>  CONFIG_SPL_LIBDISK_SUPPORT=y
>  # CONFIG_SPL_NAND_SUPPORT is not set
>  CONFIG_SPL_WATCHDOG_SUPPORT=y
> +CONFIG_SPL=y
>  CONFIG_SPL_FAT_SUPPORT=y
>  CONFIG_DEFAULT_DEVICE_TREE="am335x-pdu001"
>  CONFIG_LOCALVERSION="-EETS-1.0.0"
>  CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_BOOTDELAY=1
>  # CONFIG_USE_BOOTCOMMAND is not set
> -CONFIG_SPL=y
>  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
>  CONFIG_SPL_I2C_SUPPORT=y
>  CONFIG_SPL_YMODEM_SUPPORT=y
> @@ -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

Applying this patch series generates the following warning while
creating the default configuration for board PDU001:

warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
&& RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)

This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
CONFIG_NET disabled.
This board does not require/have network support for U-Boot so there is
no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
file configs/am355x_pdu001_defconfig without any modifications will make
your patch work properly and result in a clean, warning and error free,
build for the PDU001 board.

>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_SINGLE=y
>  CONFIG_DM_PMIC=y

regards, Felix
Alex Kiernan April 2, 2018, 3:43 p.m. UTC | #2
On Mon, Apr 2, 2018 at 12:13 PM, Felix Brack <fb@ltec.ch> wrote:
> Hi Alex,
>
> On 01.04.2018 11:22, Alex Kiernan wrote:
>> 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>
>> ---
>>
>> Changes in v2:
>> - Move DRIVER_TI_CPSW outside of the NETDEVICES guard
>> - Don't mark DRIVER_TI_CPSW default if ARCH_OMAP2PLUS to fix mistranslations
>>   by moveconfig
>>
>
> [..]
>
>> diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig
>> index cb75ec0..87ae88c 100644
>> --- a/configs/am335x_pdu001_defconfig
>> +++ b/configs/am335x_pdu001_defconfig
>> @@ -9,13 +9,13 @@ CONFIG_SPL_SERIAL_SUPPORT=y
>>  CONFIG_SPL_LIBDISK_SUPPORT=y
>>  # CONFIG_SPL_NAND_SUPPORT is not set
>>  CONFIG_SPL_WATCHDOG_SUPPORT=y
>> +CONFIG_SPL=y
>>  CONFIG_SPL_FAT_SUPPORT=y
>>  CONFIG_DEFAULT_DEVICE_TREE="am335x-pdu001"
>>  CONFIG_LOCALVERSION="-EETS-1.0.0"
>>  CONFIG_DISTRO_DEFAULTS=y
>>  CONFIG_BOOTDELAY=1
>>  # CONFIG_USE_BOOTCOMMAND is not set
>> -CONFIG_SPL=y
>>  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
>>  CONFIG_SPL_I2C_SUPPORT=y
>>  CONFIG_SPL_YMODEM_SUPPORT=y
>> @@ -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
>
> Applying this patch series generates the following warning while
> creating the default configuration for board PDU001:
>
> warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
> BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
> AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
> MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
> SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
> && RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)
>
> This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
> CONFIG_NET disabled.
> This board does not require/have network support for U-Boot so there is
> no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
> file configs/am355x_pdu001_defconfig without any modifications will make
> your patch work properly and result in a clean, warning and error free,
> build for the PDU001 board.
>
>>  CONFIG_PINCTRL=y
>>  CONFIG_PINCTRL_SINGLE=y
>>  CONFIG_DM_PMIC=y
>

Oh bother, thanks for trying it. I think in fixing the opposite
problem from v1 I've missed a depends on NET. Is your board covered by
the Travis tests as I did push v2 and got a green build?

Unfortunately my laptop decided to die overnight and I'm away from the
office for a couple of weeks so I'll have to pick it up when I'm back.

Alex
Felix Brack April 2, 2018, 4:11 p.m. UTC | #3
On 02.04.2018 17:43, Alex Kiernan wrote:
> On Mon, Apr 2, 2018 at 12:13 PM, Felix Brack <fb@ltec.ch> wrote:
>> Hi Alex,
>>
>> On 01.04.2018 11:22, Alex Kiernan wrote:
>>> 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>
>>> ---
>>>
>>> Changes in v2:
>>> - Move DRIVER_TI_CPSW outside of the NETDEVICES guard
>>> - Don't mark DRIVER_TI_CPSW default if ARCH_OMAP2PLUS to fix mistranslations
>>>   by moveconfig
>>>
>>
>> [..]
>>
>>> diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig
>>> index cb75ec0..87ae88c 100644
>>> --- a/configs/am335x_pdu001_defconfig
>>> +++ b/configs/am335x_pdu001_defconfig
>>> @@ -9,13 +9,13 @@ CONFIG_SPL_SERIAL_SUPPORT=y
>>>  CONFIG_SPL_LIBDISK_SUPPORT=y
>>>  # CONFIG_SPL_NAND_SUPPORT is not set
>>>  CONFIG_SPL_WATCHDOG_SUPPORT=y
>>> +CONFIG_SPL=y
>>>  CONFIG_SPL_FAT_SUPPORT=y
>>>  CONFIG_DEFAULT_DEVICE_TREE="am335x-pdu001"
>>>  CONFIG_LOCALVERSION="-EETS-1.0.0"
>>>  CONFIG_DISTRO_DEFAULTS=y
>>>  CONFIG_BOOTDELAY=1
>>>  # CONFIG_USE_BOOTCOMMAND is not set
>>> -CONFIG_SPL=y
>>>  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
>>>  CONFIG_SPL_I2C_SUPPORT=y
>>>  CONFIG_SPL_YMODEM_SUPPORT=y
>>> @@ -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
>>
>> Applying this patch series generates the following warning while
>> creating the default configuration for board PDU001:
>>
>> warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
>> BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
>> AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
>> MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
>> SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
>> && RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)
>>
>> This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
>> CONFIG_NET disabled.
>> This board does not require/have network support for U-Boot so there is
>> no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
>> file configs/am355x_pdu001_defconfig without any modifications will make
>> your patch work properly and result in a clean, warning and error free,
>> build for the PDU001 board.
>>
>>>  CONFIG_PINCTRL=y
>>>  CONFIG_PINCTRL_SINGLE=y
>>>  CONFIG_DM_PMIC=y
>>
> 
> Oh bother, thanks for trying it. I think in fixing the opposite
> problem from v1 I've missed a depends on NET. Is your board covered by
> the Travis tests as I did push v2 and got a green build?
> 

From what I can see it is not, but I'm not sure. Using buildman with
am335x would include it. I have verified that.

> Unfortunately my laptop decided to die overnight and I'm away from the
> office for a couple of weeks so I'll have to pick it up when I'm back.
> 
> Alex
> 

regards, Felix
Alex Kiernan April 3, 2018, 6:29 a.m. UTC | #4
On Mon, Apr 2, 2018 at 4:11 PM, Felix Brack <fb@ltec.ch> wrote:
> On 02.04.2018 17:43, Alex Kiernan wrote:
>> On Mon, Apr 2, 2018 at 12:13 PM, Felix Brack <fb@ltec.ch> wrote:
>>> Hi Alex,
>>>
>>> On 01.04.2018 11:22, Alex Kiernan wrote:
>>>> 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>
>>>> ---
>>>>
>>>> Changes in v2:
>>>> - Move DRIVER_TI_CPSW outside of the NETDEVICES guard
>>>> - Don't mark DRIVER_TI_CPSW default if ARCH_OMAP2PLUS to fix mistranslations
>>>>   by moveconfig
>>>>
>>>
>>> [..]
>>>
>>>> diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig
>>>> index cb75ec0..87ae88c 100644
>>>> --- a/configs/am335x_pdu001_defconfig
>>>> +++ b/configs/am335x_pdu001_defconfig
>>>> @@ -9,13 +9,13 @@ CONFIG_SPL_SERIAL_SUPPORT=y
>>>>  CONFIG_SPL_LIBDISK_SUPPORT=y
>>>>  # CONFIG_SPL_NAND_SUPPORT is not set
>>>>  CONFIG_SPL_WATCHDOG_SUPPORT=y
>>>> +CONFIG_SPL=y
>>>>  CONFIG_SPL_FAT_SUPPORT=y
>>>>  CONFIG_DEFAULT_DEVICE_TREE="am335x-pdu001"
>>>>  CONFIG_LOCALVERSION="-EETS-1.0.0"
>>>>  CONFIG_DISTRO_DEFAULTS=y
>>>>  CONFIG_BOOTDELAY=1
>>>>  # CONFIG_USE_BOOTCOMMAND is not set
>>>> -CONFIG_SPL=y
>>>>  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
>>>>  CONFIG_SPL_I2C_SUPPORT=y
>>>>  CONFIG_SPL_YMODEM_SUPPORT=y
>>>> @@ -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
>>>
>>> Applying this patch series generates the following warning while
>>> creating the default configuration for board PDU001:
>>>
>>> warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
>>> BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
>>> AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
>>> MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
>>> SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
>>> && RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)
>>>
>>> This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
>>> CONFIG_NET disabled.
>>> This board does not require/have network support for U-Boot so there is
>>> no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
>>> file configs/am355x_pdu001_defconfig without any modifications will make
>>> your patch work properly and result in a clean, warning and error free,
>>> build for the PDU001 board.
>>>
>>>>  CONFIG_PINCTRL=y
>>>>  CONFIG_PINCTRL_SINGLE=y
>>>>  CONFIG_DM_PMIC=y
>>>
>>
>> Oh bother, thanks for trying it. I think in fixing the opposite
>> problem from v1 I've missed a depends on NET. Is your board covered by
>> the Travis tests as I did push v2 and got a green build?
>>
>
> From what I can see it is not, but I'm not sure. Using buildman with
> am335x would include it. I have verified that.
>
>> Unfortunately my laptop decided to die overnight and I'm away from the
>> office for a couple of weeks so I'll have to pick it up when I'm back.
>>
>> Alex
>>
>
> regards, Felix

It is included, just found it, but looks like it doesn't fail because
of that issue:

https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962

I clearly need to go and understand the Travis build a whole lot better.
Tom Rini April 9, 2018, 3:03 p.m. UTC | #5
On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:

> 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>

Applied to u-boot/master, thanks!
Felix Brack April 10, 2018, 7:21 a.m. UTC | #6
Hi Tom,

On 09.04.2018 17:03, Tom Rini wrote:
> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
> 
>> 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>
> 
> Applied to u-boot/master, thanks!
> 
Why did you apply this patch? It introduces a build warning?

Felix
Alex Kiernan April 10, 2018, 7:47 a.m. UTC | #7
On Tue, Apr 10, 2018 at 7:21 AM, Felix Brack <fb@ltec.ch> wrote:
> Hi Tom,
>
> On 09.04.2018 17:03, Tom Rini wrote:
>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>
>>> 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>
>>
>> Applied to u-boot/master, thanks!
>>
> Why did you apply this patch? It introduces a build warning?
>

Sorry, we probably want to revert this one, or try adding "depends on
NET" to DRIVER_TI_CPSW in drivers/net/Kconfig; I'm stuck without a
laptop until the end of the week so I've not been able to get back to
fix this :(
Felix Brack April 10, 2018, 8:04 a.m. UTC | #8
On 10.04.2018 09:47, Alex Kiernan wrote:
> On Tue, Apr 10, 2018 at 7:21 AM, Felix Brack <fb@ltec.ch> wrote:
>> Hi Tom,
>>
>> On 09.04.2018 17:03, Tom Rini wrote:
>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>>
>>>> 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>
>>>
>>> Applied to u-boot/master, thanks!
>>>
>> Why did you apply this patch? It introduces a build warning?
>>
> 
> Sorry, we probably want to revert this one, or try adding "depends on
> NET" to DRIVER_TI_CPSW in drivers/net/Kconfig; I'm stuck without a
> laptop until the end of the week so I've not been able to get back to
> fix this :(
> 
Please do _not_ add this dependency to "solve" the build problem I
reported. This would just blow up the U-Boot code for the PDU001 board.

As already stated: it is best to remove CONFIG_DRIVER_TI_CPSW=y from
configs/am335x_pdu001_defconfig leaving this file unchanged.

Felix
Alex Kiernan April 10, 2018, 8:09 a.m. UTC | #9
On Tue, Apr 10, 2018 at 8:04 AM, Felix Brack <fb@ltec.ch> wrote:
>
> On 10.04.2018 09:47, Alex Kiernan wrote:
>> On Tue, Apr 10, 2018 at 7:21 AM, Felix Brack <fb@ltec.ch> wrote:
>>> Hi Tom,
>>>
>>> On 09.04.2018 17:03, Tom Rini wrote:
>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>>>
>>>>> 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>
>>>>
>>>> Applied to u-boot/master, thanks!
>>>>
>>> Why did you apply this patch? It introduces a build warning?
>>>
>>
>> Sorry, we probably want to revert this one, or try adding "depends on
>> NET" to DRIVER_TI_CPSW in drivers/net/Kconfig; I'm stuck without a
>> laptop until the end of the week so I've not been able to get back to
>> fix this :(
>>
> Please do _not_ add this dependency to "solve" the build problem I
> reported. This would just blow up the U-Boot code for the PDU001 board.
>
> As already stated: it is best to remove CONFIG_DRIVER_TI_CPSW=y from
> configs/am335x_pdu001_defconfig leaving this file unchanged.
>

That only fixes that one board - agreed, it wants removing from that
config, but there's doubtless others which don't have NET enabled. My
thinking was add the depends and then redo the moveconfig which would
then remove it from all other boards too.

Tom, probably best to revert this one and I'll get a correct patch
done when I'm back (should be early next week).
Felix Brack April 10, 2018, 8:18 a.m. UTC | #10
On 10.04.2018 10:09, Alex Kiernan wrote:
> On Tue, Apr 10, 2018 at 8:04 AM, Felix Brack <fb@ltec.ch> wrote:
>>
>> On 10.04.2018 09:47, Alex Kiernan wrote:
>>> On Tue, Apr 10, 2018 at 7:21 AM, Felix Brack <fb@ltec.ch> wrote:
>>>> Hi Tom,
>>>>
>>>> On 09.04.2018 17:03, Tom Rini wrote:
>>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>>>>
>>>>>> 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>
>>>>>
>>>>> Applied to u-boot/master, thanks!
>>>>>
>>>> Why did you apply this patch? It introduces a build warning?
>>>>
>>>
>>> Sorry, we probably want to revert this one, or try adding "depends on
>>> NET" to DRIVER_TI_CPSW in drivers/net/Kconfig; I'm stuck without a
>>> laptop until the end of the week so I've not been able to get back to
>>> fix this :(
>>>
>> Please do _not_ add this dependency to "solve" the build problem I
>> reported. This would just blow up the U-Boot code for the PDU001 board.
>>
>> As already stated: it is best to remove CONFIG_DRIVER_TI_CPSW=y from
>> configs/am335x_pdu001_defconfig leaving this file unchanged.
>>
> 
> That only fixes that one board - agreed, it wants removing from that
> config, but there's doubtless others which don't have NET enabled. My
> thinking was add the depends and then redo the moveconfig which would
> then remove it from all other boards too.
> 
Okay, I see. As I'm the maintainer of this board, that was my only
focus. My focus was not on the patch as a whole, sorry.

> Tom, probably best to revert this one and I'll get a correct patch
> done when I'm back (should be early next week).
> 
Agreed. However, knowing that it will get fixed, I could also live with
that warning for some weeks ;)

Felix
Tom Rini April 10, 2018, 12:23 p.m. UTC | #11
On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
> Hi Tom,
> 
> On 09.04.2018 17:03, Tom Rini wrote:
> > On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
> > 
> >> 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>
> > 
> > Applied to u-boot/master, thanks!
> 
> Why did you apply this patch? It introduces a build warning?

Wait, where does it introduce a warning?  Thanks!
Felix Brack April 10, 2018, 12:43 p.m. UTC | #12
On 10.04.2018 14:23, Tom Rini wrote:
> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
>> Hi Tom,
>>
>> On 09.04.2018 17:03, Tom Rini wrote:
>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>>
>>>> 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>
>>>
>>> Applied to u-boot/master, thanks!
>>
>> Why did you apply this patch? It introduces a build warning?
> 
> Wait, where does it introduce a warning?  Thanks!
> 
Please see my post from April 2nd on top of this thread in reply to
"[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
It is identical to the warning that shows up in the log provide by
Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.

Felix
Tom Rini April 10, 2018, 12:54 p.m. UTC | #13
On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
> On 10.04.2018 14:23, Tom Rini wrote:
> > On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
> >> Hi Tom,
> >>
> >> On 09.04.2018 17:03, Tom Rini wrote:
> >>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
> >>>
> >>>> 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>
> >>>
> >>> Applied to u-boot/master, thanks!
> >>
> >> Why did you apply this patch? It introduces a build warning?
> > 
> > Wait, where does it introduce a warning?  Thanks!
> > 
> Please see my post from April 2nd on top of this thread in reply to
> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
> It is identical to the warning that shows up in the log provide by
> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.

Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
want NET?  Or am I misunderstanding?  Thanks!
Felix Brack April 10, 2018, 12:59 p.m. UTC | #14
On 10.04.2018 14:54, Tom Rini wrote:
> On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
>> On 10.04.2018 14:23, Tom Rini wrote:
>>> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
>>>> Hi Tom,
>>>>
>>>> On 09.04.2018 17:03, Tom Rini wrote:
>>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>>>>
>>>>>> 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>
>>>>>
>>>>> Applied to u-boot/master, thanks!
>>>>
>>>> Why did you apply this patch? It introduces a build warning?
>>>
>>> Wait, where does it introduce a warning?  Thanks!
>>>
>> Please see my post from April 2nd on top of this thread in reply to
>> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
>> It is identical to the warning that shows up in the log provide by
>> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.
> 
> Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
> my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
> want NET?  Or am I misunderstanding?  Thanks!
> 
Exactly, the board doesn't need NET.

Felix
Tom Rini April 10, 2018, 1:30 p.m. UTC | #15
On Tue, Apr 10, 2018 at 02:59:23PM +0200, Felix Brack wrote:
> On 10.04.2018 14:54, Tom Rini wrote:
> > On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
> >> On 10.04.2018 14:23, Tom Rini wrote:
> >>> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
> >>>> Hi Tom,
> >>>>
> >>>> On 09.04.2018 17:03, Tom Rini wrote:
> >>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
> >>>>>
> >>>>>> 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>
> >>>>>
> >>>>> Applied to u-boot/master, thanks!
> >>>>
> >>>> Why did you apply this patch? It introduces a build warning?
> >>>
> >>> Wait, where does it introduce a warning?  Thanks!
> >>>
> >> Please see my post from April 2nd on top of this thread in reply to
> >> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
> >> It is identical to the warning that shows up in the log provide by
> >> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.
> > 
> > Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
> > my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
> > want NET?  Or am I misunderstanding?  Thanks!
> 
> Exactly, the board doesn't need NET.

But then what are you using the CPSW driver for?
Felix Brack April 10, 2018, 2:11 p.m. UTC | #16
On 10.04.2018 15:30, Tom Rini wrote:
> On Tue, Apr 10, 2018 at 02:59:23PM +0200, Felix Brack wrote:
>> On 10.04.2018 14:54, Tom Rini wrote:
>>> On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
>>>> On 10.04.2018 14:23, Tom Rini wrote:
>>>>> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
>>>>>> Hi Tom,
>>>>>>
>>>>>> On 09.04.2018 17:03, Tom Rini wrote:
>>>>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>>>>>>
>>>>>>>> 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>
>>>>>>>
>>>>>>> Applied to u-boot/master, thanks!
>>>>>>
>>>>>> Why did you apply this patch? It introduces a build warning?
>>>>>
>>>>> Wait, where does it introduce a warning?  Thanks!
>>>>>
>>>> Please see my post from April 2nd on top of this thread in reply to
>>>> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
>>>> It is identical to the warning that shows up in the log provide by
>>>> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.
>>>
>>> Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
>>> my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
>>> want NET?  Or am I misunderstanding?  Thanks!
>>
>> Exactly, the board doesn't need NET.
> 
> But then what are you using the CPSW driver for?
> 
I don't really understand your question. This patch is from Alex, i.e. I
am not the author of the patch. I never asked for CPSW driver support
for the PDU001 board. Here is what I wrote April 2nd:

[quote on]
Applying this patch series generates the following warning while
creating the default configuration for board PDU001:

warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
&& RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)

This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
CONFIG_NET disabled.
This board does not require/have network support for U-Boot so there is
no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
file configs/am355x_pdu001_defconfig without any modifications will make
your patch work properly and result in a clean, warning and error free,
build for the PDU001 board.
[quote off]

So the solution for the PDU001 board warning problem is _not_ to add NET
but to remove CPSW. This leaves the file configs/am355x_pdu001_defconfig
unchanged by this patch and that is what I suggested as solution.
In other words: the PDU001 board (for now) does not provide any network
support in U-Boot.

Felix
Tom Rini April 10, 2018, 2:16 p.m. UTC | #17
On Tue, Apr 10, 2018 at 04:11:09PM +0200, Felix Brack wrote:
> On 10.04.2018 15:30, Tom Rini wrote:
> > On Tue, Apr 10, 2018 at 02:59:23PM +0200, Felix Brack wrote:
> >> On 10.04.2018 14:54, Tom Rini wrote:
> >>> On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
> >>>> On 10.04.2018 14:23, Tom Rini wrote:
> >>>>> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
> >>>>>> Hi Tom,
> >>>>>>
> >>>>>> On 09.04.2018 17:03, Tom Rini wrote:
> >>>>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
> >>>>>>>
> >>>>>>>> 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>
> >>>>>>>
> >>>>>>> Applied to u-boot/master, thanks!
> >>>>>>
> >>>>>> Why did you apply this patch? It introduces a build warning?
> >>>>>
> >>>>> Wait, where does it introduce a warning?  Thanks!
> >>>>>
> >>>> Please see my post from April 2nd on top of this thread in reply to
> >>>> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
> >>>> It is identical to the warning that shows up in the log provide by
> >>>> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.
> >>>
> >>> Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
> >>> my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
> >>> want NET?  Or am I misunderstanding?  Thanks!
> >>
> >> Exactly, the board doesn't need NET.
> > 
> > But then what are you using the CPSW driver for?
> > 
> I don't really understand your question. This patch is from Alex, i.e. I
> am not the author of the patch. I never asked for CPSW driver support
> for the PDU001 board. Here is what I wrote April 2nd:
> 
> [quote on]
> Applying this patch series generates the following warning while
> creating the default configuration for board PDU001:
> 
> warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
> BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
> AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
> MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
> SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
> && RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)
> 
> This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
> CONFIG_NET disabled.
> This board does not require/have network support for U-Boot so there is
> no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
> file configs/am355x_pdu001_defconfig without any modifications will make
> your patch work properly and result in a clean, warning and error free,
> build for the PDU001 board.
> [quote off]
> 
> So the solution for the PDU001 board warning problem is _not_ to add NET
> but to remove CPSW. This leaves the file configs/am355x_pdu001_defconfig
> unchanged by this patch and that is what I suggested as solution.
> In other words: the PDU001 board (for now) does not provide any network
> support in U-Boot.

Ah, OK.  My fault, I'll fixup the config and re-run migration to be sure
nothing else was wrong here.  Thanks!
Tom Rini April 10, 2018, 2:50 p.m. UTC | #18
On Tue, Apr 10, 2018 at 04:11:09PM +0200, Felix Brack wrote:
> On 10.04.2018 15:30, Tom Rini wrote:
> > On Tue, Apr 10, 2018 at 02:59:23PM +0200, Felix Brack wrote:
> >> On 10.04.2018 14:54, Tom Rini wrote:
> >>> On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
> >>>> On 10.04.2018 14:23, Tom Rini wrote:
> >>>>> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
> >>>>>> Hi Tom,
> >>>>>>
> >>>>>> On 09.04.2018 17:03, Tom Rini wrote:
> >>>>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
> >>>>>>>
> >>>>>>>> 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>
> >>>>>>>
> >>>>>>> Applied to u-boot/master, thanks!
> >>>>>>
> >>>>>> Why did you apply this patch? It introduces a build warning?
> >>>>>
> >>>>> Wait, where does it introduce a warning?  Thanks!
> >>>>>
> >>>> Please see my post from April 2nd on top of this thread in reply to
> >>>> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
> >>>> It is identical to the warning that shows up in the log provide by
> >>>> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.
> >>>
> >>> Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
> >>> my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
> >>> want NET?  Or am I misunderstanding?  Thanks!
> >>
> >> Exactly, the board doesn't need NET.
> > 
> > But then what are you using the CPSW driver for?
> > 
> I don't really understand your question. This patch is from Alex, i.e. I
> am not the author of the patch. I never asked for CPSW driver support
> for the PDU001 board. Here is what I wrote April 2nd:
> 
> [quote on]
> Applying this patch series generates the following warning while
> creating the default configuration for board PDU001:
> 
> warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
> BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
> AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
> MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
> SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
> && RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)
> 
> This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
> CONFIG_NET disabled.
> This board does not require/have network support for U-Boot so there is
> no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
> file configs/am355x_pdu001_defconfig without any modifications will make
> your patch work properly and result in a clean, warning and error free,
> build for the PDU001 board.
> [quote off]
> 
> So the solution for the PDU001 board warning problem is _not_ to add NET
> but to remove CPSW. This leaves the file configs/am355x_pdu001_defconfig
> unchanged by this patch and that is what I suggested as solution.
> In other words: the PDU001 board (for now) does not provide any network
> support in U-Boot.

So, ah-ha-ha! At heart, include/configs/pdu001.h grabs
include/configs/ti_am335x_common.h which was always enabling the CPSW
driver.  So the migration picked that up.  But since you're saying your
platform does not want CPSW, we can just drop that now.  Thanks!
Felix Brack April 10, 2018, 3:26 p.m. UTC | #19
On 10.04.2018 16:50, Tom Rini wrote:
> On Tue, Apr 10, 2018 at 04:11:09PM +0200, Felix Brack wrote:
>> On 10.04.2018 15:30, Tom Rini wrote:
>>> On Tue, Apr 10, 2018 at 02:59:23PM +0200, Felix Brack wrote:
>>>> On 10.04.2018 14:54, Tom Rini wrote:
>>>>> On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
>>>>>> On 10.04.2018 14:23, Tom Rini wrote:
>>>>>>> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
>>>>>>>> Hi Tom,
>>>>>>>>
>>>>>>>> On 09.04.2018 17:03, Tom Rini wrote:
>>>>>>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>>>>>>>>
>>>>>>>>>> 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>
>>>>>>>>>
>>>>>>>>> Applied to u-boot/master, thanks!
>>>>>>>>
>>>>>>>> Why did you apply this patch? It introduces a build warning?
>>>>>>>
>>>>>>> Wait, where does it introduce a warning?  Thanks!
>>>>>>>
>>>>>> Please see my post from April 2nd on top of this thread in reply to
>>>>>> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
>>>>>> It is identical to the warning that shows up in the log provide by
>>>>>> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.
>>>>>
>>>>> Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
>>>>> my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
>>>>> want NET?  Or am I misunderstanding?  Thanks!
>>>>
>>>> Exactly, the board doesn't need NET.
>>>
>>> But then what are you using the CPSW driver for?
>>>
>> I don't really understand your question. This patch is from Alex, i.e. I
>> am not the author of the patch. I never asked for CPSW driver support
>> for the PDU001 board. Here is what I wrote April 2nd:
>>
>> [quote on]
>> Applying this patch series generates the following warning while
>> creating the default configuration for board PDU001:
>>
>> warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
>> BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
>> AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
>> MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
>> SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
>> && RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)
>>
>> This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
>> CONFIG_NET disabled.
>> This board does not require/have network support for U-Boot so there is
>> no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
>> file configs/am355x_pdu001_defconfig without any modifications will make
>> your patch work properly and result in a clean, warning and error free,
>> build for the PDU001 board.
>> [quote off]
>>
>> So the solution for the PDU001 board warning problem is _not_ to add NET
>> but to remove CPSW. This leaves the file configs/am355x_pdu001_defconfig
>> unchanged by this patch and that is what I suggested as solution.
>> In other words: the PDU001 board (for now) does not provide any network
>> support in U-Boot.
> 
> So, ah-ha-ha! At heart, include/configs/pdu001.h grabs
> include/configs/ti_am335x_common.h which was always enabling the CPSW
> driver.  So the migration picked that up.  But since you're saying your
> platform does not want CPSW, we can just drop that now.  Thanks!
> 
Ah, so you're going to drop configs/am355x_pdu001_defconfig from the
patch, correct?

Felix
Tom Rini April 10, 2018, 3:30 p.m. UTC | #20
On Tue, Apr 10, 2018 at 05:26:25PM +0200, Felix Brack wrote:
> On 10.04.2018 16:50, Tom Rini wrote:
> > On Tue, Apr 10, 2018 at 04:11:09PM +0200, Felix Brack wrote:
> >> On 10.04.2018 15:30, Tom Rini wrote:
> >>> On Tue, Apr 10, 2018 at 02:59:23PM +0200, Felix Brack wrote:
> >>>> On 10.04.2018 14:54, Tom Rini wrote:
> >>>>> On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
> >>>>>> On 10.04.2018 14:23, Tom Rini wrote:
> >>>>>>> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
> >>>>>>>> Hi Tom,
> >>>>>>>>
> >>>>>>>> On 09.04.2018 17:03, Tom Rini wrote:
> >>>>>>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
> >>>>>>>>>
> >>>>>>>>>> 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>
> >>>>>>>>>
> >>>>>>>>> Applied to u-boot/master, thanks!
> >>>>>>>>
> >>>>>>>> Why did you apply this patch? It introduces a build warning?
> >>>>>>>
> >>>>>>> Wait, where does it introduce a warning?  Thanks!
> >>>>>>>
> >>>>>> Please see my post from April 2nd on top of this thread in reply to
> >>>>>> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
> >>>>>> It is identical to the warning that shows up in the log provide by
> >>>>>> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.
> >>>>>
> >>>>> Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
> >>>>> my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
> >>>>> want NET?  Or am I misunderstanding?  Thanks!
> >>>>
> >>>> Exactly, the board doesn't need NET.
> >>>
> >>> But then what are you using the CPSW driver for?
> >>>
> >> I don't really understand your question. This patch is from Alex, i.e. I
> >> am not the author of the patch. I never asked for CPSW driver support
> >> for the PDU001 board. Here is what I wrote April 2nd:
> >>
> >> [quote on]
> >> Applying this patch series generates the following warning while
> >> creating the default configuration for board PDU001:
> >>
> >> warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
> >> BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
> >> AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
> >> MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
> >> SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
> >> && RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)
> >>
> >> This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
> >> CONFIG_NET disabled.
> >> This board does not require/have network support for U-Boot so there is
> >> no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
> >> file configs/am355x_pdu001_defconfig without any modifications will make
> >> your patch work properly and result in a clean, warning and error free,
> >> build for the PDU001 board.
> >> [quote off]
> >>
> >> So the solution for the PDU001 board warning problem is _not_ to add NET
> >> but to remove CPSW. This leaves the file configs/am355x_pdu001_defconfig
> >> unchanged by this patch and that is what I suggested as solution.
> >> In other words: the PDU001 board (for now) does not provide any network
> >> support in U-Boot.
> > 
> > So, ah-ha-ha! At heart, include/configs/pdu001.h grabs
> > include/configs/ti_am335x_common.h which was always enabling the CPSW
> > driver.  So the migration picked that up.  But since you're saying your
> > platform does not want CPSW, we can just drop that now.  Thanks!
> > 
> Ah, so you're going to drop configs/am355x_pdu001_defconfig from the
> patch, correct?

I'm dropping that hunk out, and a few other small clean-ups
(am43xx_evm_rtconly is out of sync, and there's a few places with
non-applicable CPSW comments blocks now).
Felix Brack April 10, 2018, 3:38 p.m. UTC | #21
On 10.04.2018 17:30, Tom Rini wrote:
> On Tue, Apr 10, 2018 at 05:26:25PM +0200, Felix Brack wrote:
>> On 10.04.2018 16:50, Tom Rini wrote:
>>> On Tue, Apr 10, 2018 at 04:11:09PM +0200, Felix Brack wrote:
>>>> On 10.04.2018 15:30, Tom Rini wrote:
>>>>> On Tue, Apr 10, 2018 at 02:59:23PM +0200, Felix Brack wrote:
>>>>>> On 10.04.2018 14:54, Tom Rini wrote:
>>>>>>> On Tue, Apr 10, 2018 at 02:43:47PM +0200, Felix Brack wrote:
>>>>>>>> On 10.04.2018 14:23, Tom Rini wrote:
>>>>>>>>> On Tue, Apr 10, 2018 at 09:21:06AM +0200, Felix Brack wrote:
>>>>>>>>>> Hi Tom,
>>>>>>>>>>
>>>>>>>>>> On 09.04.2018 17:03, Tom Rini wrote:
>>>>>>>>>>> On Sun, Apr 01, 2018 at 09:22:34AM +0000, Alex Kiernan wrote:
>>>>>>>>>>>
>>>>>>>>>>>> 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>
>>>>>>>>>>>
>>>>>>>>>>> Applied to u-boot/master, thanks!
>>>>>>>>>>
>>>>>>>>>> Why did you apply this patch? It introduces a build warning?
>>>>>>>>>
>>>>>>>>> Wait, where does it introduce a warning?  Thanks!
>>>>>>>>>
>>>>>>>> Please see my post from April 2nd on top of this thread in reply to
>>>>>>>> "[PATCH v2 1/5] Migrate CONFIG_DRIVER_TI_CPSW to Kconfig".
>>>>>>>> It is identical to the warning that shows up in the log provide by
>>>>>>>> Alex's link: https://travis-ci.org/akiernan/u-boot/jobs/360830565#L962.
>>>>>>>
>>>>>>> Ahhh.  Doesn't fail travis and I had a local goof-up and missed it in
>>>>>>> my build logs.  Sorry.  Now, you have the CPSW driver enabled, but don't
>>>>>>> want NET?  Or am I misunderstanding?  Thanks!
>>>>>>
>>>>>> Exactly, the board doesn't need NET.
>>>>>
>>>>> But then what are you using the CPSW driver for?
>>>>>
>>>> I don't really understand your question. This patch is from Alex, i.e. I
>>>> am not the author of the patch. I never asked for CPSW driver support
>>>> for the PDU001 board. Here is what I wrote April 2nd:
>>>>
>>>> [quote on]
>>>> Applying this patch series generates the following warning while
>>>> creating the default configuration for board PDU001:
>>>>
>>>> warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS &&
>>>> BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && DRIVER_TI_CPSW &&
>>>> AG7XXX && ALTERA_TSE && BCM_SF2_ETH && DWC_ETH_QOS && ETH_DESIGNWARE &&
>>>> MVNETA && MVPP2 && MACB && PCH_GBE && SUN4I_EMAC && SUN8I_EMAC &&
>>>> SH_ETHER && XILINX_AXIEMAC && XILINX_EMACLITE && ZYNQ_GEM && PIC32_ETH
>>>> && RENESAS_RAVB) selects PHYLIB which has unmet direct dependencies (NET)
>>>>
>>>> This is due to the patch enabling CONFIG_DRIVER_TI_CPSW while leaving
>>>> CONFIG_NET disabled.
>>>> This board does not require/have network support for U-Boot so there is
>>>> no need or benefit activating CONFIG_DRIVER_TI_CPSW here. Leaving the
>>>> file configs/am355x_pdu001_defconfig without any modifications will make
>>>> your patch work properly and result in a clean, warning and error free,
>>>> build for the PDU001 board.
>>>> [quote off]
>>>>
>>>> So the solution for the PDU001 board warning problem is _not_ to add NET
>>>> but to remove CPSW. This leaves the file configs/am355x_pdu001_defconfig
>>>> unchanged by this patch and that is what I suggested as solution.
>>>> In other words: the PDU001 board (for now) does not provide any network
>>>> support in U-Boot.
>>>
>>> So, ah-ha-ha! At heart, include/configs/pdu001.h grabs
>>> include/configs/ti_am335x_common.h which was always enabling the CPSW
>>> driver.  So the migration picked that up.  But since you're saying your
>>> platform does not want CPSW, we can just drop that now.  Thanks!
>>>
>> Ah, so you're going to drop configs/am355x_pdu001_defconfig from the
>> patch, correct?
> 
> I'm dropping that hunk out, and a few other small clean-ups
> (am43xx_evm_rtconly is out of sync, and there's a few places with
> non-applicable CPSW comments blocks now).
> 
Okay, sounds good. Please CC me for the modified patch.

many thanks, Felix
diff mbox series

Patch

diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index ab7d96d..7206601 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -9,6 +9,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_VERBOSE=y
@@ -17,7 +18,6 @@  CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
@@ -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 f45e409..7039c6b 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -3,13 +3,13 @@  CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_AM33XX=y
 # CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
 CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_AUTOBOOT_KEYED=y
@@ -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 df73f65..3974bd6 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -3,6 +3,7 @@  CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_AM33XX=y
 # CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_SIGNATURE=y
@@ -12,7 +13,6 @@  CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run f
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_AUTOBOOT_KEYED=y
@@ -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 d1c78fa..b94f053 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -2,6 +2,7 @@  CONFIG_ARM=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_AM33XX=y
+CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
@@ -10,7 +11,6 @@  CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run f
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
@@ -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 6598879..172973a 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -3,12 +3,12 @@  CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_AM33XX=y
 CONFIG_NOR=y
+CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
@@ -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 22182f5..176c820 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 079f69d..32620f7 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -5,6 +5,7 @@  CONFIG_AM33XX=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT"
 CONFIG_SPI_BOOT=y
@@ -12,7 +13,6 @@  CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run f
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_FASTBOOT=y
 # CONFIG_CMD_FLASH is not set
@@ -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 e4bf757..9dac414 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -3,13 +3,13 @@  CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_AM33XX=y
 # CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_SPL_NET_SUPPORT=y
 CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
@@ -34,7 +34,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 a8ab3e6..cd0d90e 100644
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -7,6 +7,7 @@  CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_AM33XX=y
 CONFIG_ISW_ENTRY_ADDR=0x40300350
 # CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
@@ -18,7 +19,6 @@  CONFIG_LOGLEVEL=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_FIT_IMAGE_TINY=y
 # CONFIG_SPL_ENV_SUPPORT is not set
 # CONFIG_SPL_EXT_SUPPORT is not set
@@ -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 6971e57..6991179 100644
--- a/configs/am335x_hs_evm_uart_defconfig
+++ b/configs/am335x_hs_evm_uart_defconfig
@@ -7,6 +7,7 @@  CONFIG_ISW_ENTRY_ADDR=0x40301950
 # CONFIG_SPL_MMC_SUPPORT is not set
 # CONFIG_SPL_LIBDISK_SUPPORT is not set
 # CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_SPL=y
 # CONFIG_SPL_FAT_SUPPORT is not set
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
 CONFIG_DISTRO_DEFAULTS=y
@@ -16,7 +17,6 @@  CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 # CONFIG_SPL_ENV_SUPPORT is not set
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_SPL_MTD_SUPPORT=y
@@ -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 be4f112..139f994 100644
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
@@ -17,7 +18,6 @@  CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0033"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
@@ -37,14 +37,12 @@  CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
-CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_UBI=y
-CONFIG_UBIFS_SILENCE_MSG=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 cb75ec0..87ae88c 100644
--- a/configs/am335x_pdu001_defconfig
+++ b/configs/am335x_pdu001_defconfig
@@ -9,13 +9,13 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-pdu001"
 CONFIG_LOCALVERSION="-EETS-1.0.0"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTDELAY=1
 # CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SPL=y
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
@@ -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 fb714da..51488b1 100644
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -10,13 +10,13 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SERIES=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
@@ -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_ict_defconfig b/configs/am335x_shc_ict_defconfig
index 2568e3d..b392717 100644
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SHC_ICT=y
 CONFIG_SERIES=y
@@ -17,7 +18,6 @@  CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
@@ -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_netboot_defconfig b/configs/am335x_shc_netboot_defconfig
index 16071fb..10ea060 100644
--- a/configs/am335x_shc_netboot_defconfig
+++ b/configs/am335x_shc_netboot_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SHC_NETBOOT=y
 CONFIG_SERIES=y
@@ -17,7 +18,6 @@  CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
@@ -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_prompt_defconfig b/configs/am335x_shc_prompt_defconfig
index bbad6dd..37cf9ea 100644
--- a/configs/am335x_shc_prompt_defconfig
+++ b/configs/am335x_shc_prompt_defconfig
@@ -10,13 +10,13 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SERIES=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
@@ -34,7 +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_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 82a61a3..81432b5 100644
--- a/configs/am335x_shc_sdboot_defconfig
+++ b/configs/am335x_shc_sdboot_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y
@@ -17,7 +18,6 @@  CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
@@ -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_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig
index 82a61a3..81432b5 100644
--- a/configs/am335x_shc_sdboot_prompt_defconfig
+++ b/configs/am335x_shc_sdboot_prompt_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y
@@ -17,7 +18,6 @@  CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
@@ -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_sl50_defconfig b/configs/am335x_sl50_defconfig
index cd1b78e..ea70ef4 100644
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -10,12 +10,12 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
@@ -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 172b292..802a8fb 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -3,6 +3,7 @@  CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_AM43XX=y
+CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
@@ -10,7 +11,6 @@  CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_CMD_SPL=y
@@ -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 835a58d..1bb3395 100644
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -1,12 +1,12 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_AM43XX=y
+CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 # CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
@@ -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 2bc302c..77a0450 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -30,7 +30,7 @@  CONFIG_DFU_SF=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 7ca24d5..605c2c7 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -3,6 +3,7 @@  CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_AM43XX=y
 CONFIG_ISW_ENTRY_ADDR=0x40300350
+CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
@@ -10,7 +11,6 @@  CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
@@ -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 b69d855..8d65f03 100644
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -8,6 +8,7 @@  CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
 CONFIG_ISW_ENTRY_ADDR=0x403018e0
+CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
@@ -18,7 +19,6 @@  CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_NET_SUPPORT=y
@@ -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 7ed010f..535a3b4 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -7,6 +7,7 @@  CONFIG_TARGET_AM57XX_EVM=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_ARMV7_LPAE=y
 CONFIG_DEFAULT_DEVICE_TREE="am572x-idk"
 CONFIG_DISTRO_DEFAULTS=y
@@ -18,7 +19,6 @@  CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboo
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DMA_SUPPORT=y
@@ -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 d9fb6ec..034fad5 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -11,6 +11,7 @@  CONFIG_TARGET_AM57XX_EVM=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_ARMV7_LPAE=y
 CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15"
 CONFIG_DISTRO_DEFAULTS=y
@@ -24,7 +25,6 @@  CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboo
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DMA_SUPPORT=y
@@ -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 823fc74..bbfe228 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_BAV_VERSION=1
 CONFIG_DISTRO_DEFAULTS=y
@@ -18,7 +19,6 @@  CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
@@ -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 6d12aba..21fecde 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_BAV_VERSION=2
 CONFIG_DISTRO_DEFAULTS=y
@@ -18,7 +19,6 @@  CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
@@ -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 6de9a78..e202bc3 100644
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -9,6 +9,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 CONFIG_BOOTDELAY=-2
@@ -20,7 +21,6 @@  CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
@@ -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 a1a5590..8adbfa0 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -7,6 +7,7 @@  CONFIG_AM33XX=y
 CONFIG_TARGET_BRPPT1=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_BOOTDELAY=-2
@@ -18,7 +19,6 @@  CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
@@ -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 0052d16..2ab44c3 100644
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -11,6 +11,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 CONFIG_SPI_BOOT=y
@@ -23,7 +24,6 @@  CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
@@ -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 3f37573..45f11d1 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -8,6 +8,7 @@  CONFIG_TARGET_BRXRE1=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_BOOTDELAY=-2
 # CONFIG_CONSOLE_MUX is not set
@@ -18,7 +19,6 @@  CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
@@ -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 b60ded6..344a3a0 100644
--- a/configs/chiliboard_defconfig
+++ b/configs/chiliboard_defconfig
@@ -8,13 +8,13 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTDELAY=1
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_DEFAULT_FDT_FILE="am335x-chiliboard.dtb"
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_CMD_ASKENV=y
@@ -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 3904321..eff22bf 100644
--- a/configs/cl-som-am57x_defconfig
+++ b/configs/cl-som-am57x_defconfig
@@ -3,10 +3,10 @@  CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_CL_SOM_AM57X=y
 # CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_CMD_ASKENV=y
@@ -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 46979b3..c82ce84 100644
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -9,12 +9,12 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
@@ -44,7 +44,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 4e7978c..31da64b 100644
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
@@ -17,7 +18,6 @@  CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x480
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
@@ -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 2b83a0c..56defe1 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -7,6 +7,7 @@  CONFIG_TARGET_DRA7XX_EVM=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_ARMV7_LPAE=y
 CONFIG_DEFAULT_DEVICE_TREE="dra7-evm"
 CONFIG_DISTRO_DEFAULTS=y
@@ -18,7 +19,6 @@  CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS0,115200 androidboo
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DMA_SUPPORT=y
@@ -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 5a8129c..fffcc60 100644
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -11,6 +11,7 @@  CONFIG_TARGET_DRA7XX_EVM=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_ARMV7_LPAE=y
 CONFIG_DEFAULT_DEVICE_TREE="dra7-evm"
 CONFIG_DISTRO_DEFAULTS=y
@@ -24,7 +25,6 @@  CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS0,115200 androidboo
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_SPL=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DMA_SUPPORT=y
@@ -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 985e662..058b94a 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -14,6 +14,7 @@  CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -21,7 +22,6 @@  CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
@@ -64,7 +64,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 dd862bb..c6c724f 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -14,6 +14,7 @@  CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -21,7 +22,6 @@  CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
@@ -64,7 +64,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 a7094a6..871dc2a 100644
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
@@ -17,7 +18,6 @@  CONFIG_SYS_EXTRA_OPTIONS="REV1"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_EXT_SUPPORT=y
@@ -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 ee1165a..8f957e2 100644
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -10,6 +10,7 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
@@ -17,7 +18,6 @@  CONFIG_SYS_EXTRA_OPTIONS="REV3"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_EXT_SUPPORT=y
@@ -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 6218471..4ac03dc 100644
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -9,13 +9,13 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_EXT_SUPPORT=y
@@ -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 a802e57..e175d11 100644
--- a/configs/pepper_defconfig
+++ b/configs/pepper_defconfig
@@ -10,12 +10,12 @@  CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
@@ -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 98edb88..65e13a6 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -14,6 +14,7 @@  CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -23,7 +24,6 @@  CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
@@ -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 e561edc..ada8942 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -14,6 +14,7 @@  CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -21,7 +22,6 @@  CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
@@ -64,7 +64,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 e09f4c5..f4e96fb 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -14,6 +14,7 @@  CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-rut"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -24,7 +25,6 @@  CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_EARLY_INIT_R=y
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
@@ -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 eb7e285..8bf9226 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -14,6 +14,7 @@  CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -21,7 +22,6 @@  CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
@@ -64,7 +64,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 61c3a7a..f26cd52 100644
--- a/configs/ti814x_evm_defconfig
+++ b/configs/ti814x_evm_defconfig
@@ -8,6 +8,7 @@  CONFIG_TARGET_TI814X_EVM=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_BOOTDELAY=1
@@ -15,7 +16,6 @@  CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300
 CONFIG_SPL_YMODEM_SUPPORT=y
@@ -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 f589978..428217b 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 6fa117e..5314aba 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -251,7 +251,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 663f861..c1a6f00 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 c079a3a..7211cde 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 e8abe53..6f4c710 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -29,7 +29,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 596e060..4b2a0c3 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 da78519..07395de 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 e82de2a..13efc3e 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 b23e20a..dfa7114 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 2f9056c..55df77d 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 8251ceb..01002f4 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -36,7 +36,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 0c7db05..79ec1ca 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -411,7 +411,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