[PATCH 03/12] net: dc2114x: Add Kconfig entries

11 Jul 2020

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
---
 README                                  | 3 ---
 configs/integratorap_cm720t_defconfig   | 1 +
 configs/integratorap_cm920t_defconfig   | 1 +
 configs/integratorap_cm926ejs_defconfig | 1 +
 configs/integratorap_cm946es_defconfig  | 1 +
 drivers/net/Kconfig                     | 6 ++++++
 include/configs/MPC8349EMDS.h           | 1 -
 include/configs/MPC8349EMDS_SDRAM.h     | 1 -
 include/configs/MPC8540ADS.h            | 1 -
 include/configs/MPC8541CDS.h            | 1 -
 include/configs/MPC8544DS.h             | 1 -
 include/configs/MPC8548CDS.h            | 1 -
 include/configs/MPC8555CDS.h            | 1 -
 include/configs/MPC8560ADS.h            | 1 -
 include/configs/MPC8568MDS.h            | 1 -
 include/configs/MPC8569MDS.h            | 1 -
 include/configs/MPC8572DS.h             | 1 -
 include/configs/MPC8641HPCN.h           | 1 -
 include/configs/TQM834x.h               | 1 -
 include/configs/caddy2.h                | 1 -
 include/configs/integratorap.h          | 1 -
 include/configs/sbc8349.h               | 1 -
 include/configs/sbc8548.h               | 1 -
 include/configs/sbc8641d.h              | 1 -
 include/configs/vme8349.h               | 1 -
 scripts/config_whitelist.txt            | 1 -
 26 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/README b/README
index 020918a543..d3de7c41c9 100644
--- a/README
+++ b/README
@@ -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.
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index 1b7d672bcb..0d9746b485 100644
--- 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
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index 116ac015a0..7d71648a86 100644
--- 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
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index 9c1a3fa2f5..921a75e326 100644
--- 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
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index ee9c69bce0..4032da97b4 100644
--- 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
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ec3fb49832..15030b8165 100644
--- 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
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 41ef3d80e1..c2f44416b9 100644
--- 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
diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index 4b43ee1d44..618e210e4e 100644
--- 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
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index d2a92619fb..8b7e0da9ca 100644
--- 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
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 834bf7a0ff..d174b27309 100644
--- 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 */
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index b9c57e1f51..e473c0f531 100644
--- 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
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 1cb62ae849..9be5e64fad 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -379,7 +379,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 */
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index c25b04e979..dcb09b056f 100644
--- 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 */
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 4d1a417e42..a9f3029292 100644
--- 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
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 14663644d1..c49f786ee0 100644
--- 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 */
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index dd291aca1e..acb8dec819 100644
--- 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 */
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index b4e5e3b3e2..23c757a71e 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -441,7 +441,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
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index a7f02aef29..0bf6cf41b6 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -332,7 +332,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
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index d43d217956..aa70f01ddd 100644
--- 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
diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h
index a7c667711b..e51398d531 100644
--- 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
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 96c1d53b9b..2f8ac20a76 100644
--- 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	*/
/*-----------------------------------------------------------------------
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index cca596d43a..0561ec2024 100644
--- 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
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index f94683329b..6ac5d7b0c0 100644
--- 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 */
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 5b93ccbda1..27a15eddd3 100644
--- 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
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 52d632ba0a..bd94352179 100644
--- 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
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 747583089b..f9668b2bb3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4032,7 +4032,6 @@ CONFIG_TSECV2
 CONFIG_TSECV2_1
 CONFIG_TSEC_TBI
 CONFIG_TSEC_TBICR_SETTINGS
-CONFIG_TULIP
 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_POWER
 CONFIG_TWR
-- 
2.27.0


    