diff options
| author | Tom Rini <[email protected]> | 2019-12-03 18:10:17 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-12-03 18:10:17 -0500 |
| commit | 2ae43a26405498fcaaec2132db82a2487ad6747b (patch) | |
| tree | baafe4b77ce234e1d67cf7d4279a782e4058f6bb /drivers/net | |
| parent | 1297989804d66c8db92efbf9fa2e6cc76965a943 (diff) | |
| parent | c9f417b28a2460018206b821baf38217bb1c3211 (diff) | |
Merge branch '2019-12-03-master-imports'
- omapl138_lcdk fixes
- MediaTek MT8518 support
- VxWorks standard DTB support
- Assorted bug fixes
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/Kconfig | 22 | ||||
| -rw-r--r-- | drivers/net/ti/cpsw.c | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 30bd8e76530..bcea8a0c3e6 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -100,6 +100,28 @@ config PHY_BROADCOM config PHY_CORTINA bool "Cortina Ethernet PHYs support" +choice + prompt "Location of the Cortina firmware" + default SYS_CORTINA_FW_IN_NOR + depends on PHY_CORTINA + +config SYS_CORTINA_FW_IN_MMC + bool "Cortina firmware in MMC" + +config SYS_CORTINA_FW_IN_NAND + bool "Cortina firmware in NAND flash" + +config SYS_CORTINA_FW_IN_NOR + bool "Cortina firmware in NOR flash" + +config SYS_CORTINA_FW_IN_REMOTE + bool "Cortina firmware in remote device" + +config SYS_CORTINA_FW_IN_SPIFLASH + bool "Cortina firmware in SPI flash" + +endchoice + config PHY_DAVICOM bool "Davicom Ethernet PHYs support" diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 93d53612b53..57625623c26 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -1224,6 +1224,9 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev) int ret; data = calloc(1, sizeof(struct cpsw_platform_data)); + if (!data) + return -ENOMEM; + pdata->priv_pdata = data; pdata->iobase = dev_read_addr(dev); data->version = CPSW_CTRL_VERSION_2; |