GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

configs: Replace deprecated Micrel defines with PHY_MICREL_KSZ90X1

Browse source 
These boards will now use the ksz90x1 driver instead of the mess in
ksz8xxx. This change is needed before the two drivers can be fully
separated.

Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Alexandru Gagniuc 2017-07-07 11:36:58 -07:00 • committed by Joe Hershberger
parent d397f7c45b
commit fb92bc8852
28 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/configs/UCP1020.h
View file

@ -479,10 +479,8 @@
#if defined(CONFIG_TSEC_ENET)
#if defined(CONFIG_UCP1020_REV_1_2)
#define CONFIG_PHY_MICREL_KSZ9021
#elif defined(CONFIG_UCP1020_REV_1_3)
#define CONFIG_PHY_MICREL_KSZ9031
#if defined(CONFIG_UCP1020_REV_1_2) || defined(CONFIG_UCP1020_REV_1_3)
#define CONFIG_PHY_MICREL_KSZ90X1
#else
#error "UCP1020 module revision is not defined !!!"
#endif

2
include/configs/apalis_imx6.h
View file

@ -88,7 +88,7 @@
#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_IP_DEFRAG
#define CONFIG_TFTP_BLOCKSIZE 4096
#define CONFIG_TFTP_TSIZE

2
include/configs/aristainetos2.h
View file

@ -20,7 +20,7 @@
#define CONSOLE_DEV "ttymxc1"
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_SF_DEFAULT_BUS 3
#define CONFIG_SF_DEFAULT_CS 1

2
include/configs/aristainetos2b.h
View file

@ -20,7 +20,7 @@
#define CONSOLE_DEV "ttymxc1"
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0

2
include/configs/cyrus.h
View file

@ -367,7 +367,7 @@
#ifdef CONFIG_SYS_DPAA_FMAN
#define CONFIG_FMAN_ENET
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
#ifdef CONFIG_PCI

2
include/configs/mccmon6.h
View file

@ -110,7 +110,7 @@
#define CONFIG_FEC_MXC_PHYADDR 1
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/microblaze-generic.h
View file

@ -246,7 +246,7 @@
# define CONFIG_PHY_LXT 1
# define CONFIG_PHY_MARVELL 1
# define CONFIG_PHY_MICREL 1
# define CONFIG_PHY_MICREL_KSZ9021
# define CONFIG_PHY_MICREL_KSZ90X1
# define CONFIG_PHY_NATSEMI 1
# define CONFIG_PHY_REALTEK 1
# define CONFIG_PHY_VITESSE 1

2
include/configs/nitrogen6x.h
View file

@ -67,7 +67,7 @@
#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
/* USB Configs */
#define CONFIG_USB_HOST_ETHER

2
include/configs/novena.h
View file

@ -74,7 +74,7 @@
#define CONFIG_FEC_MXC_PHYADDR 0x7
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_ARP_TIMEOUT 200UL
#endif

2
include/configs/pcm058.h
View file

@ -45,7 +45,7 @@
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
/* SPI Flash */
#define CONFIG_MXC_SPI

2
include/configs/pepper.h
View file

@ -81,7 +81,7 @@
#define CONFIG_PHYLIB
#define CONFIG_PHY_ADDR 0
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_PHY_RESET_DELAY 1000
/* SPL */

2
include/configs/platinum_titanium.h
View file

@ -21,7 +21,7 @@
#define CONFIG_FEC_MXC_PHYADDR 4
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_PHY_RESET_DELAY 1000
#define CONFIG_HOSTNAME titanium

2
include/configs/sama5d3xek.h
View file

@ -85,7 +85,7 @@
#define CONFIG_PMECC_CAP 4
#define CONFIG_PMECC_SECTOR_SIZE 512
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
/* USB */

1
include/configs/secomx6quq7.h
View file

@ -35,6 +35,7 @@
#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \

2
include/configs/socfpga_arria10_socdk.h
View file

@ -27,7 +27,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/*

2
include/configs/socfpga_arria5_socdk.h
View file

@ -20,7 +20,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* The rest of the configuration is shared */

2
include/configs/socfpga_cyclone5_socdk.h
View file

@ -20,7 +20,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* The rest of the configuration is shared */

2
include/configs/socfpga_de0_nano_soc.h
View file

@ -20,7 +20,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* The rest of the configuration is shared */

2
include/configs/socfpga_de10_nano.h
View file

@ -20,7 +20,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* The rest of the configuration is shared */

2
include/configs/socfpga_de1_soc.h
View file

@ -20,7 +20,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* The rest of the configuration is shared */

2
include/configs/socfpga_is1.h
View file

@ -26,7 +26,7 @@
/* PHY */
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* The rest of the configuration is shared */

2
include/configs/socfpga_sockit.h
View file

@ -20,7 +20,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* The rest of the configuration is shared */

2
include/configs/socfpga_socrates.h
View file

@ -20,7 +20,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* The rest of the configuration is shared */

2
include/configs/socfpga_vining_fpga.h
View file

@ -42,7 +42,7 @@
#define CONFIG_BOOTP_SEND_HOSTNAME
/* PHY */
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
#endif
/* Extra Environment */

2
include/configs/titanium.h
View file

@ -47,7 +47,7 @@
#define CONFIG_FEC_MXC_PHYADDR 4
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_PHY_MICREL_KSZ90X1
/* USB Configs */
#define CONFIG_MXC_USB_PORT 1

2
include/configs/tqma6_mba6.h
View file

@ -15,7 +15,7 @@
#define CONFIG_FEC_MXC_PHYADDR 0x03
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CONSOLE_DEV "ttymxc1"

2
include/configs/udoo.h
View file

@ -43,7 +43,7 @@
#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)

2
include/configs/x600.h
View file

@ -76,7 +76,7 @@
#define CONFIG_PHY_ADDR 0 /* PHY address */
#define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */
#define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9031
#define CONFIG_PHY_MICREL_KSZ90X1
#define CONFIG_SPEAR_GPIO