Browse Source

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>
Marek Vasut 4 years ago
parent
commit
a410f13dfe

+ 0 - 3
README

@@ -871,9 +871,6 @@ The following options need to be configured:
 		Allow generic access to the SPI bus on the Intel 8257x, for
 		Allow generic access to the SPI bus on the Intel 8257x, for
 		example with the "sspi" command.
 		example with the "sspi" command.
 
 
-		CONFIG_TULIP
-		Support for Digital 2114x chips.
-
 		CONFIG_NATSEMI
 		CONFIG_NATSEMI
 		Support for National dp83815 chips.
 		Support for National dp83815 chips.
 
 

+ 1 - 0
configs/integratorap_cm720t_defconfig

@@ -25,6 +25,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_EEPRO100=y
 CONFIG_EEPRO100=y
+CONFIG_TULIP=y
 CONFIG_PCI=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/integratorap_cm920t_defconfig

@@ -25,6 +25,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_EEPRO100=y
 CONFIG_EEPRO100=y
+CONFIG_TULIP=y
 CONFIG_PCI=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/integratorap_cm926ejs_defconfig

@@ -25,6 +25,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_EEPRO100=y
 CONFIG_EEPRO100=y
+CONFIG_TULIP=y
 CONFIG_PCI=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/integratorap_cm946es_defconfig

@@ -25,6 +25,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_EEPRO100=y
 CONFIG_EEPRO100=y
+CONFIG_TULIP=y
 CONFIG_PCI=y
 CONFIG_PCI=y
 CONFIG_BAUDRATE=38400
 CONFIG_BAUDRATE=38400
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

+ 6 - 0
drivers/net/Kconfig

@@ -491,6 +491,12 @@ config SH_ETHER
 
 
 source "drivers/net/ti/Kconfig"
 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
 config XILINX_AXIEMAC
 	depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
 	depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
 	select PHYLIB
 	select PHYLIB

+ 0 - 1
include/configs/MPC8349EMDS.h

@@ -220,7 +220,6 @@
 
 
 #define CONFIG_83XX_PCI_STREAMING
 #define CONFIG_83XX_PCI_STREAMING
 
 
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
 	#define PCI_ENET0_IOADDR	0xFIXME

+ 0 - 1
include/configs/MPC8349EMDS_SDRAM.h

@@ -275,7 +275,6 @@
 
 
 #define CONFIG_83XX_PCI_STREAMING
 #define CONFIG_83XX_PCI_STREAMING
 
 
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
 	#define PCI_ENET0_IOADDR	0xFIXME

+ 0 - 1
include/configs/MPC8540ADS.h

@@ -234,7 +234,6 @@
 #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */
 #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
     #define PCI_ENET0_IOADDR	0xe0000000
     #define PCI_ENET0_IOADDR	0xe0000000

+ 0 - 1
include/configs/MPC8541CDS.h

@@ -280,7 +280,6 @@ extern unsigned long get_clock_freq(void);
 
 
 #define CONFIG_MPC85XX_PCI2
 #define CONFIG_MPC85XX_PCI2
 
 
-#undef CONFIG_TULIP
 
 
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057  /* Motorola */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057  /* Motorola */

+ 0 - 1
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
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
 #endif
 #endif
 
 
-#undef CONFIG_TULIP
 
 
 #ifndef CONFIG_PCI_PNP
 #ifndef CONFIG_PCI_PNP
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BUS
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BUS

+ 0 - 1
include/configs/MPC8548CDS.h

@@ -374,7 +374,6 @@ extern unsigned long get_clock_freq(void);
 #endif
 #endif
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_DM_PCI)
 #if !defined(CONFIG_DM_PCI)
 #define CONFIG_FSL_PCI_INIT		1	/* Use common FSL init code */
 #define CONFIG_FSL_PCI_INIT		1	/* Use common FSL init code */

+ 0 - 1
include/configs/MPC8555CDS.h

@@ -278,7 +278,6 @@ extern unsigned long get_clock_freq(void);
 
 
 #define CONFIG_MPC85XX_PCI2
 #define CONFIG_MPC85XX_PCI2
 
 
-#undef CONFIG_TULIP
 
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057  /* Motorola */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057  /* Motorola */

+ 0 - 1
include/configs/MPC8560ADS.h

@@ -231,7 +231,6 @@
 #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */
 #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
     #define PCI_ENET0_IOADDR	0xe0000000
     #define PCI_ENET0_IOADDR	0xe0000000

+ 0 - 1
include/configs/MPC8568MDS.h

@@ -288,7 +288,6 @@ extern unsigned long get_clock_freq(void);
 #endif /* CONFIG_QE */
 #endif /* CONFIG_QE */
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP
 
 
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057  /* Motorola */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057  /* Motorola */

+ 0 - 1
include/configs/MPC8569MDS.h

@@ -394,7 +394,6 @@ extern unsigned long get_clock_freq(void);
 #endif /* CONFIG_QE */
 #endif /* CONFIG_QE */
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP
 
 
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
 

+ 0 - 1
include/configs/MPC8572DS.h

@@ -436,7 +436,6 @@
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
 #endif
 #endif
 
 
-#undef CONFIG_TULIP
 
 
 #ifndef CONFIG_PCI_PNP
 #ifndef CONFIG_PCI_PNP
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCIE3_IO_BUS
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCIE3_IO_BUS

+ 0 - 1
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 */
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
 
-#undef CONFIG_TULIP
 
 
 /************************************************************
 /************************************************************
  * USB support
  * USB support

+ 0 - 1
include/configs/TQM834x.h

@@ -167,7 +167,6 @@
 #define CONFIG_SYS_PCI1_IO_PHYS		CONFIG_SYS_PCI1_IO_BASE
 #define CONFIG_SYS_PCI1_IO_PHYS		CONFIG_SYS_PCI1_IO_BASE
 #define CONFIG_SYS_PCI1_IO_SIZE		0x1000000	/* 16M */
 #define CONFIG_SYS_PCI1_IO_SIZE		0x1000000	/* 16M */
 
 
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BASE
 	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BASE

+ 0 - 1
include/configs/caddy2.h

@@ -155,7 +155,6 @@
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
 
 
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
 	#define PCI_ENET0_IOADDR	0xFIXME

+ 0 - 1
include/configs/integratorap.h

@@ -34,7 +34,6 @@
  * PCI definitions
  * PCI definitions
  */
  */
 
 
-#define CONFIG_TULIP
 #define CONFIG_SYS_RX_ETH_BUFFER	8	/* use 8 rx buffer on eepro100	*/
 #define CONFIG_SYS_RX_ETH_BUFFER	8	/* use 8 rx buffer on eepro100	*/
 
 
 /*-----------------------------------------------------------------------
 /*-----------------------------------------------------------------------

+ 0 - 1
include/configs/sbc8349.h

@@ -180,7 +180,6 @@
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
 
 
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
 	#define PCI_ENET0_IOADDR	0xFIXME

+ 0 - 1
include/configs/sbc8548.h

@@ -432,7 +432,6 @@
 #endif
 #endif
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
-#undef CONFIG_TULIP
 
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
 

+ 0 - 1
include/configs/sbc8641d.h

@@ -274,7 +274,6 @@
 
 
 #define CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup */
 #define CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup */
 
 
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
     #define PCI_ENET0_IOADDR	0xe0000000
     #define PCI_ENET0_IOADDR	0xe0000000

+ 0 - 1
include/configs/vme8349.h

@@ -155,7 +155,6 @@
 
 
 #if defined(CONFIG_PCI)
 #if defined(CONFIG_PCI)
 
 
-#undef CONFIG_TULIP
 
 
 #if !defined(CONFIG_PCI_PNP)
 #if !defined(CONFIG_PCI_PNP)
 	#define PCI_ENET0_IOADDR	0xFIXME
 	#define PCI_ENET0_IOADDR	0xFIXME

+ 0 - 1
scripts/config_whitelist.txt

@@ -4022,7 +4022,6 @@ CONFIG_TSECV2
 CONFIG_TSECV2_1
 CONFIG_TSECV2_1
 CONFIG_TSEC_TBI
 CONFIG_TSEC_TBI
 CONFIG_TSEC_TBICR_SETTINGS
 CONFIG_TSEC_TBICR_SETTINGS
-CONFIG_TULIP
 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_POWER
 CONFIG_TWL6030_POWER
 CONFIG_TWR
 CONFIG_TWR