net: dc2114x: Add Kconfig entries

Add Kconfig entries for the dc2114x driver and convert various boards. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Ramon Fried <rfried.dev@gmail.com>
2020-06-20 17:43:29 +02:00 · 2020-06-20 17:43:29 +02:00 · a410f13dfe
commit a410f13dfe
parent 777aa71531
26 changed files with 10 additions and 23 deletions
--- a/3
+++ b/3
@ -871,9 +871,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_TULIP
-		Support for Digital 2114x chips.
-
 		CONFIG_NATSEMI
 		Support for National dp83815 chips.

--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@ -25,6 +25,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_EEPRO100=y
+CONFIG_TULIP=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@ -25,6 +25,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_EEPRO100=y
+CONFIG_TULIP=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@ -25,6 +25,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_EEPRO100=y
+CONFIG_TULIP=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@ -25,6 +25,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_EEPRO100=y
+CONFIG_TULIP=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@ -491,6 +491,12 @@ config SH_ETHER

 source "drivers/net/ti/Kconfig"

+config TULIP
+	bool "DEC Tulip DC2114x Ethernet support"
+	depends on (DM_ETH && DM_PCI) || !DM_ETH
+	help
+	  This driver supports DEC DC2114x Fast ethernet chips.
+
 config XILINX_AXIEMAC
 	depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
 	select PHYLIB
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@ -220,7 +220,6 @@

 #define CONFIG_83XX_PCI_STREAMING

-#undef CONFIG_TULIP

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

 #define CONFIG_83XX_PCI_STREAMING

-#undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@ -234,7 +234,6 @@
 #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */

 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP

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

 #define CONFIG_MPC85XX_PCI2

-#undef CONFIG_TULIP

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

-#undef CONFIG_TULIP

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

 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP

 #if !defined(CONFIG_DM_PCI)
 #define CONFIG_FSL_PCI_INIT		1	/* Use common FSL init code */
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@ -278,7 +278,6 @@ extern unsigned long get_clock_freq(void);

 #define CONFIG_MPC85XX_PCI2

-#undef CONFIG_TULIP

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

 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP

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

 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP

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

 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP

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

--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@ -436,7 +436,6 @@
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
 #endif

-#undef CONFIG_TULIP

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

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

-#undef CONFIG_TULIP

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

-#undef CONFIG_TULIP

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

 #if defined(CONFIG_PCI)

-#undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@ -34,7 +34,6 @@
 * PCI definitions
 */

-#define CONFIG_TULIP
 #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_TULIP

 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@ -432,7 +432,6 @@
 #endif

 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP

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

--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@ -274,7 +274,6 @@

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

-#undef CONFIG_TULIP

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

 #if defined(CONFIG_PCI)

-#undef CONFIG_TULIP

 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -4022,7 +4022,6 @@ CONFIG_TSECV2
 CONFIG_TSECV2_1
 CONFIG_TSEC_TBI
 CONFIG_TSEC_TBICR_SETTINGS
-CONFIG_TULIP
 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_POWER
 CONFIG_TWR