public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Alexandru Gagniuc <alex.g@adaptrum.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/5] configs: Replace deprecated Micrel defines with PHY_MICREL_KSZ90X1
Date: Fri,  7 Jul 2017 11:36:58 -0700	[thread overview]
Message-ID: <20170707183703.2190-3-alex.g@adaptrum.com> (raw)
In-Reply-To: <20170707183703.2190-1-alex.g@adaptrum.com>

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>
---
 include/configs/UCP1020.h                | 6 ++----
 include/configs/apalis_imx6.h            | 2 +-
 include/configs/aristainetos2.h          | 2 +-
 include/configs/aristainetos2b.h         | 2 +-
 include/configs/cyrus.h                  | 2 +-
 include/configs/mccmon6.h                | 2 +-
 include/configs/microblaze-generic.h     | 2 +-
 include/configs/nitrogen6x.h             | 2 +-
 include/configs/novena.h                 | 2 +-
 include/configs/pcm058.h                 | 2 +-
 include/configs/pepper.h                 | 2 +-
 include/configs/platinum_titanium.h      | 2 +-
 include/configs/sama5d3xek.h             | 2 +-
 include/configs/secomx6quq7.h            | 1 +
 include/configs/socfpga_arria10_socdk.h  | 2 +-
 include/configs/socfpga_arria5_socdk.h   | 2 +-
 include/configs/socfpga_cyclone5_socdk.h | 2 +-
 include/configs/socfpga_de0_nano_soc.h   | 2 +-
 include/configs/socfpga_de10_nano.h      | 2 +-
 include/configs/socfpga_de1_soc.h        | 2 +-
 include/configs/socfpga_is1.h            | 2 +-
 include/configs/socfpga_sockit.h         | 2 +-
 include/configs/socfpga_socrates.h       | 2 +-
 include/configs/socfpga_vining_fpga.h    | 2 +-
 include/configs/titanium.h               | 2 +-
 include/configs/tqma6_mba6.h             | 2 +-
 include/configs/udoo.h                   | 2 +-
 include/configs/x600.h                   | 2 +-
 28 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 8579290..19d217f 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -485,10 +485,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 8be586b..0a88069 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -92,7 +92,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 a23da19..d380779 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -368,7 +368,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 fca1af9..26f2cb1 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -111,7 +111,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 cc7f819..7cb37c0 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -261,7 +261,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 00b84f7..1343f48 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -71,7 +71,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 1f1bf15..f8f2992 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -78,7 +78,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 39018ac..2082ec8 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 5abeffb..792ecc9 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -82,7 +82,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 891d6a0..56fc226 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -88,7 +88,7 @@
 #define CONFIG_CMD_NAND_TRIMFFS
 #endif
 
-#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 3b59b6a..9be20cb 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 fe40319..cd39357 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
 
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index be56521..a6406b4 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
 
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 320c585..4c08628 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
 
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h
index ef693b0..2dce984 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
 
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h
index 522ac74..62decd5 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
 
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h
index 68403aa..1d38881 100644
--- a/include/configs/socfpga_is1.h
+++ b/include/configs/socfpga_is1.h
@@ -27,7 +27,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 c75acc0..12d4487 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
 
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
index a08fa9f..16a6b0e 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
 
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index e2bdfb1..2426ac4 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 79e37e2..7b70518 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 d84aa16..98120f9 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -44,7 +44,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 c7d32fe..8af8f02 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -79,7 +79,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
 
-- 
2.9.3

  parent reply	other threads:[~2017-07-07 18:36 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-07 18:36 [U-Boot] [PATCH 1/5] net: phy: Remove duplicate Kconfig selection for Micrel KSZ9021 Alexandru Gagniuc
2017-07-07 18:36 ` [U-Boot] [PATCH 2/5] net: phy: micrel: Separate KSZ9000 drivers from KSZ8000 drivers Alexandru Gagniuc
2017-07-07 20:11   ` [U-Boot] [U-Boot, " Philipp Tomsich
2017-07-07 20:13   ` [U-Boot] [PATCH " Marek Vasut
2017-07-07 20:46     ` Tom Rini
2017-07-27 15:27       ` Alex
2017-07-27 22:11   ` Joe Hershberger
2017-08-07 20:32   ` [U-Boot] " Joe Hershberger
2017-07-07 18:36 ` Alexandru Gagniuc [this message]
2017-07-27 22:12   ` [U-Boot] [PATCH 3/5] configs: Replace deprecated Micrel defines with PHY_MICREL_KSZ90X1 Joe Hershberger
2017-07-27 23:07     ` Alex
2017-08-01 16:40       ` Joe Hershberger
2017-08-01 16:50         ` Alexandru Gagniuc
2017-08-02  0:19         ` [U-Boot] [PATCH 1/2] Move PHYLIB to Kconfig Alexandru Gagniuc
2017-08-02  0:20           ` [U-Boot] [PATCH 2/2] Move PHY_MICREL and PHY_MICREL_KSZ90X1 " Alexandru Gagniuc
2017-08-02 14:35             ` Joe Hershberger
2017-08-07 21:08             ` [U-Boot] " Joe Hershberger
2017-08-02 14:35           ` [U-Boot] [PATCH 1/2] Move PHYLIB " Joe Hershberger
2017-08-07 21:08           ` [U-Boot] " Joe Hershberger
2017-08-01 16:41   ` [U-Boot] [PATCH 3/5] configs: Replace deprecated Micrel defines with PHY_MICREL_KSZ90X1 Joe Hershberger
2017-08-07 20:32   ` [U-Boot] " Joe Hershberger
2017-07-07 18:36 ` [U-Boot] [PATCH 4/5] net: phy: micrel: Remove ksz90x1 drivers from micrel_ksz8xxx Alexandru Gagniuc
2017-07-07 20:11   ` [U-Boot] [U-Boot, " Philipp Tomsich
2017-07-27 22:13   ` [U-Boot] [PATCH " Joe Hershberger
2017-08-07 20:32   ` [U-Boot] " Joe Hershberger
2017-07-07 18:37 ` [U-Boot] [PATCH 5/5] net: phy: Hide Micrel KSZ9021 and KSZ9031 Kconfig options Alexandru Gagniuc
2017-07-07 20:11   ` [U-Boot] [U-Boot, " Philipp Tomsich
2017-07-27 22:14   ` [U-Boot] [PATCH " Joe Hershberger
2017-08-07 20:32   ` [U-Boot] " Joe Hershberger
2017-07-07 20:11 ` [U-Boot] [U-Boot, 1/5] net: phy: Remove duplicate Kconfig selection for Micrel KSZ9021 Philipp Tomsich
2017-07-27 22:05 ` [U-Boot] [PATCH " Joe Hershberger
2017-08-07 20:32 ` [U-Boot] " Joe Hershberger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170707183703.2190-3-alex.g@adaptrum.com \
    --to=alex.g@adaptrum.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox