net: eepro100: Add Kconfig entries

Add Kconfig entries for the eepro100 driver and convert various boards. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
2020-05-23 18:07:53 +02:00 · 2020-05-23 18:07:53 +02:00 · 6463b73e0b
commit 6463b73e0b
parent af8ecdf7e5
33 changed files with 12 additions and 29 deletions
--- a/3
+++ b/3
@ -889,9 +889,6 @@ The following options need to be configured:
 		Allow generic access to the SPI bus on the Intel 8257x, for
 		example with the "sspi" command.

-		CONFIG_EEPRO100
-		Support for Intel 82557/82559/82559ER chips.
-
 		CONFIG_TULIP
 		Support for Digital 2114x chips.

--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@ -147,6 +147,7 @@ CONFIG_PHY_NATSEMI=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_VITESSE=y
+CONFIG_EEPRO100=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_SYS_NS16550=y
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@ -159,6 +159,7 @@ CONFIG_PHY_NATSEMI=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_SMSC=y
 CONFIG_PHY_VITESSE=y
+CONFIG_EEPRO100=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_SYS_NS16550=y
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@ -24,6 +24,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
+CONFIG_EEPRO100=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@ -24,6 +24,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
+CONFIG_EEPRO100=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@ -24,6 +24,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
+CONFIG_EEPRO100=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@ -24,6 +24,7 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
+CONFIG_EEPRO100=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@ -193,6 +193,12 @@ config CMD_E1000
 	  used on devices with SPI support you can reprogram the EEPROM from
 	  U-Boot.

+config EEPRO100
+	bool "Intel PRO/100 82557/82559/82559ER Fast Ethernet support"
+	help
+	  This driver supports Intel(R) PRO/100 82557/82559/82559ER fast
+	  ethernet family of adapters.
+
 config ETH_SANDBOX
 	depends on DM_ETH && SANDBOX
 	default y
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@ -239,7 +239,6 @@
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCIE

-#define CONFIG_EEPRO100
 #undef CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957	/* Freescale */

--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@ -172,7 +172,6 @@
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCI_SKIP_HOST_BRIDGE

-#undef CONFIG_EEPRO100
 #undef CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID	0x1957	/* Freescale */

--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@ -196,7 +196,6 @@

 #define CONFIG_83XX_PCI_STREAMING

-#undef CONFIG_EEPRO100
 #undef CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID	0x1957	/* Freescale */

--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@ -220,7 +220,6 @@

 #define CONFIG_83XX_PCI_STREAMING

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@ -275,7 +275,6 @@

 #define CONFIG_83XX_PCI_STREAMING

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@ -238,7 +238,6 @@ extern int board_pci_host_broken(void);
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

-#undef CONFIG_EEPRO100
 #undef CONFIG_PCI_SCAN_SHOW	/* show pci devices on startup */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957	/* Freescale */
 #endif /* CONFIG_PCI */
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@ -466,7 +466,6 @@
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS CONFIG_SYS_PCIE3_IO_VIRT
 #endif

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #ifndef CONFIG_PCI_PNP
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@ -236,7 +236,6 @@
 #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */

 #if defined(CONFIG_PCI)
-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@ -282,7 +282,6 @@ extern unsigned long get_clock_freq(void);

 #define CONFIG_MPC85XX_PCI2

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@ -258,7 +258,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
 #endif

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #ifndef CONFIG_PCI_PNP
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@ -380,7 +380,6 @@ extern unsigned long get_clock_freq(void);
 #endif

 #if defined(CONFIG_PCI)
-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_DM_PCI)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@ -280,7 +280,6 @@ extern unsigned long get_clock_freq(void);

 #define CONFIG_MPC85XX_PCI2

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@ -233,7 +233,6 @@
 #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */

 #if defined(CONFIG_PCI)
-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@ -290,7 +290,6 @@ extern unsigned long get_clock_freq(void);
 #endif /* CONFIG_QE */

 #if defined(CONFIG_PCI)
-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@ -396,7 +396,6 @@ extern unsigned long get_clock_freq(void);
 #endif /* CONFIG_QE */

 #if defined(CONFIG_PCI)
-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@ -443,7 +443,6 @@
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
 #endif

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #ifndef CONFIG_PCI_PNP
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@ -334,7 +334,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 /************************************************************
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@ -167,8 +167,6 @@
 #define CONFIG_SYS_PCI1_IO_PHYS		CONFIG_SYS_PCI1_IO_BASE
 #define CONFIG_SYS_PCI1_IO_SIZE		0x1000000	/* 16M */

-#undef CONFIG_EEPRO100
-#define CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/include/configs/caddy2.h
+++ b/include/configs/caddy2.h
@ -155,7 +155,6 @@

 #if defined(CONFIG_PCI)

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@ -35,7 +35,6 @@
 */

 #define CONFIG_TULIP
-#define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER	8	/* use 8 rx buffer on eepro100	*/

 /*-----------------------------------------------------------------------
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@ -180,7 +180,6 @@

 #if defined(CONFIG_PCI)

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@ -434,7 +434,6 @@
 #endif

 #if defined(CONFIG_PCI)
-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@ -276,7 +276,6 @@

 #define CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup */

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@ -155,7 +155,6 @@

 #if defined(CONFIG_PCI)

-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -399,7 +399,6 @@ CONFIG_EDB93XX_SDCS0
 CONFIG_EDB93XX_SDCS1
 CONFIG_EDB93XX_SDCS2
 CONFIG_EDB93XX_SDCS3
-CONFIG_EEPRO100
 CONFIG_EFLASH_PROTSECTORS
 CONFIG_EHCI_DESC_BIG_ENDIAN
 CONFIG_EHCI_HCD_INIT_AFTER_RESET