From fb92bc88523004a62805d4428bb12ddb9be3efe4 Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Fri, 7 Jul 2017 11:36:58 -0700 Subject: 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 Acked-by: Joe Hershberger diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6fd3fa4..5e80c13 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 4a12ac8..bde69c1 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 30abafc..f7351f7 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 7a47514..e9823fd 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 ddbaf32..b4d4992 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 a4c1035..7e44954 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 aa007e2..3177691 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 a1a0cda..124ef9d 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 2bba741..5ed8d6f 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 e3a84ed..ea878c2 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 ff3cd74..ebc8b4e 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 ccb6441..5e739a5 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 83b527c..7ccce38 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 c90626f..ec98240 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 55850bd..e368fbb 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 9f83858..c5232c3 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 86b4a9d..c0a284b 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 6516c45..79590a6 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 04be2b1..95e48ff 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 9405083b..59b529b 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 febb8f7..83b171e 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 57de60e..e0c6d45 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 6b6cb6a..ebd74a0 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 a86043f..a0ba50c 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 606da4a..70daef7 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 69e9079..c949b18 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 d3fa5d7..9a2a84a 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 a8435d8..62a1829 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 -- cgit v0.10.2