mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
configs: Replace deprecated Micrel defines with PHY_MICREL_KSZ90X1
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:
parent
d397f7c45b
commit
fb92bc8852
28 changed files with 29 additions and 30 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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
|
||||
|
||||
/*
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue