diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6fd3fa471259bae444c6b69de6f44256dd747881..5e80c136f0d399f28b2284fda454c0b28b220668 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -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 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4a12ac8ca3747a761b0dff66d6e60cce42197f1c..bde69c1e798079d7a46a8579b97e73dc3fc7f4c8 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -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 diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 30abafc0ae513ac83ef2e7e40098c35d13844f6a..f7351f70a9c37424c2967883567f18d91ac11019 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -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 diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h index 7a4751451558ff5eb5408d0b4922506c97eb9eab..e9823fda05705728889186494ab79061122cd9fb 100644 --- a/include/configs/aristainetos2b.h +++ b/include/configs/aristainetos2b.h @@ -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 diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index ddbaf327d8ce92c9af791b8f9c34c32cc3324d1c..b4d49926c8990409f6e6c92129e936de3e862208 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -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 diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index a4c103503fc31550dcb2eb37efd7d1cfeeb3a821..7e449541e01bcfa8ed764ceab65c77a29d8898a9 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -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 \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index aa007e2819b5e45b8b7cfce407e4d62260ea0d98..31776917476e7896ad0a33e3b291e5162f19335d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -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 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index a1a0cdaf2e6244769bc60abc5d5307c21e2c19f9..124ef9dedd1e09224bd0331388e939705fa11801 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -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 diff --git a/include/configs/novena.h b/include/configs/novena.h index 2bba741ac376769fb45c19ce24094fcbcaa891e2..5ed8d6f7c48f88e766bf4fd41cc3c09ca2019985 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -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 diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index e3a84ed06123548252def70264be2dff2e99d48f..ea878c2f49cc490f68ea23ea50f8ef8dee6fc56d 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -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 diff --git a/include/configs/pepper.h b/include/configs/pepper.h index ff3cd74ac314a8fa4b1c3739b84ad0441d3fc6a4..ebc8b4ea993f6dc444d25b69b622218571f0cca2 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -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 */ diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h index ccb6441871b08a618a472a648d125f15f2baefcb..5e739a5ea0800088bd366d3357ac0db56f124b52 100644 --- a/include/configs/platinum_titanium.h +++ b/include/configs/platinum_titanium.h @@ -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 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 83b527c0de5c28d636fa1fe15258c72036515f1a..7ccce38db59b71ebd9b4c9c8594768782bba8189 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -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 */ diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index c90626fa23f22d1a495c606f1e85da515718b973..ec982407c2ef472cc796d2bdaa7be051df00c280 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -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" \ diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 55850bd1b39c81ef70277fb28212c152ae4d62fc..e368fbb2df09c99da22a40a142624b1057d58491 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -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 /* diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 9f83858bd18079d0f13956eba11c82b94db5539d..c5232c3bb3c045afc47726d68a8670cac75b6ba6 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -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 */ diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 86b4a9dfb80e117a57c12fbb55b563a25c2e589b..c0a284b68a0cee347c88ade365f6f95a7860c58d 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -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 */ diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 6516c45acf1870be603f18e8fa072bdd6fab4d05..79590a680cc86a58333ca5ab526185bfd11f2246 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -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 */ diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h index 04be2b1689c7f746bf0ebd2bfaccf11859bbbb8b..95e48ff91dbc9cd3e614411dbb71685561bbe007 100644 --- a/include/configs/socfpga_de10_nano.h +++ b/include/configs/socfpga_de10_nano.h @@ -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 */ diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 9405083b3e028fcda07288b9fe568cd267465c7f..59b529b2e01395ed1a46bc6ac6355d8ff09ae21d 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -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 */ diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index febb8f7fcc35487714a7147574e97d492114f7c8..83b171ece093d9ec3367b306eebaeb2232ee2467 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -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 */ diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 57de60ecfa8cf4199c7f21f14f8e0f6b1e6948e6..e0c6d4585f7ca066e887f4ae9e85a9e9bdfb028f 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -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 */ diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index 6b6cb6aa14f63d32523ec61ea431fa677c715580..ebd74a00904d7611cb0b120c8abf78087f9b87d6 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -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 */ diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index a86043f339e39e838ec688da27a688e6aa69a4ee..a0ba50c145b1c9384a776d65cf394587067b28b3 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -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 */ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 606da4a8543b869ca05c66ab72d27d7b7fd9b3c3..70daef7816d17effc0268d3849fa45f3f96d0fd9 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -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 diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index 69e907933954bf820ef41f457d0748d172db8ea9..c949b18cbce6f40198319416c1b076b7b57cf250 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -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" diff --git a/include/configs/udoo.h b/include/configs/udoo.h index d3fa5d71c19b91470f052ab43836a3b05ab7060d..9a2a84a50447834e8ec22f0949a1e30fdc68844e 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -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) diff --git a/include/configs/x600.h b/include/configs/x600.h index a8435d8b0147d8bb9bf950b5dd618d512196270c..62a1829efc7aec79d1cbc14318f65fbe7d574d90 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -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