| Message ID | 20200523163837.407592-30-marek.vasut+renesas@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/30] net: eepro100: Remove EEPRO100_SROM_WRITE | expand |
On Sat, May 23, 2020 at 7:45 PM Marek Vasut <marek.vasut at gmail.com> wrote: > > Add Kconfig entries for the eepro100 driver and convert various boards. > > Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com> > --- > README | 3 --- > configs/MPC8315ERDB_defconfig | 1 + > configs/TQM834x_defconfig | 1 + > 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/MPC8315ERDB.h | 1 - > include/configs/MPC8323ERDB.h | 1 - > include/configs/MPC832XEMDS.h | 1 - > include/configs/MPC8349EMDS.h | 1 - > include/configs/MPC8349EMDS_SDRAM.h | 1 - > include/configs/MPC837XEMDS.h | 1 - > include/configs/MPC8536DS.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 | 2 -- > 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 - > 33 files changed, 12 insertions(+), 29 deletions(-) > > diff --git a/README b/README > index c4bb6f3e7b..0e48c2aa7c 100644 > --- a/README > +++ b/README > @@ -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. > > diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig > index bbb79dff2e..d7981e9855 100644 > --- 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 > diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig > index 96ce4de0e6..c29d8a8be1 100644 > --- 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 > diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig > index f5f9cb28b3..1b7d672bcb 100644 > --- 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 > diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig > index 8a0ad1f948..116ac015a0 100644 > --- 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 > diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig > index ab61bf2ef4..9c1a3fa2f5 100644 > --- 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 > diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig > index 7af5433161..ee9c69bce0 100644 > --- 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 > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig > index f7855c92d3..c3e4510fa1 100644 > --- a/drivers/net/Kconfig > +++ b/drivers/net/Kconfig > @@ -192,6 +192,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 > diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h > index 2c35223868..cb4e96e966 100644 > --- 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 */ > > diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h > index ff18d10872..4119ff5861 100644 > --- 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 */ > > diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h > index bfcff2e4f8..7508566710 100644 > --- 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 */ > > diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h > index 0a80a60d30..df02d9ee7a 100644 > --- 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) > diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h > index 79dd956174..5f9d9e10b6 100644 > --- 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) > diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h > index 1254b4fc10..962bc92c5e 100644 > --- 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 */ > diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h > index 340574a985..62da11e4a1 100644 > --- 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 > diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h > index 2ba7322021..c5c6e2d69b 100644 > --- 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) > diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h > index b2a3201072..013bd775dd 100644 > --- 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 */ > diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h > index c9f193fc46..1dd030842a 100644 > --- 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 > diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h > index de2bfd8f2f..e3044f0ae6 100644 > --- 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) > diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h > index d964b4e121..70289f570a 100644 > --- 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 */ > diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h > index 97d8cc48ed..fc4040907a 100644 > --- 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) > diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h > index a0bd5f4d40..60caea4a4c 100644 > --- 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 */ > diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h > index beba848214..4d6a3d0a7d 100644 > --- 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 */ > diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h > index 3243f39df4..bad9142921 100644 > --- 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 > diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h > index edbeeefdd4..78d1dd2c37 100644 > --- 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 > > /************************************************************ > diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h > index 40fe62fdf0..d43d217956 100644 > --- 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) > diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h > index 459712190a..e0449aa848 100644 > --- 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) > diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h > index f15e08f397..0a8e945fa3 100644 > --- a/include/configs/integratorap.h > +++ b/include/configs/integratorap.h > @@ -38,7 +38,6 @@ > */ > > #define CONFIG_TULIP > -#define CONFIG_EEPRO100 > #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 55b9a3c182..9063139a04 100644 > --- 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) > diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h > index 55c4bff28a..503b9b1cb5 100644 > --- 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 */ > diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h > index 4ab364ae9a..66c1f3595b 100644 > --- 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) > diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h > index c11507e550..708b4bd8e1 100644 > --- 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) > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 2dee446dde..720bd92cb7 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -400,7 +400,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 > -- > 2.25.1 > Reviewed-By: Ramon Fried <rfried.dev at gmail.com>
diff --git a/README b/README index c4bb6f3e7b..0e48c2aa7c 100644 --- a/README +++ b/README @@ -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. diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig index bbb79dff2e..d7981e9855 100644 --- 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 diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig index 96ce4de0e6..c29d8a8be1 100644 --- 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 diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig index f5f9cb28b3..1b7d672bcb 100644 --- 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 diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig index 8a0ad1f948..116ac015a0 100644 --- 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 diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig index ab61bf2ef4..9c1a3fa2f5 100644 --- 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 diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig index 7af5433161..ee9c69bce0 100644 --- 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 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f7855c92d3..c3e4510fa1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -192,6 +192,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 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 2c35223868..cb4e96e966 100644 --- 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 */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index ff18d10872..4119ff5861 100644 --- 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 */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index bfcff2e4f8..7508566710 100644 --- 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 */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 0a80a60d30..df02d9ee7a 100644 --- 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) diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index 79dd956174..5f9d9e10b6 100644 --- 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) diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 1254b4fc10..962bc92c5e 100644 --- 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 */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 340574a985..62da11e4a1 100644 --- 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 diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 2ba7322021..c5c6e2d69b 100644 --- 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) diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index b2a3201072..013bd775dd 100644 --- 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 */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index c9f193fc46..1dd030842a 100644 --- 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 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index de2bfd8f2f..e3044f0ae6 100644 --- 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) diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index d964b4e121..70289f570a 100644 --- 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 */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 97d8cc48ed..fc4040907a 100644 --- 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) diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index a0bd5f4d40..60caea4a4c 100644 --- 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 */ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index beba848214..4d6a3d0a7d 100644 --- 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 */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 3243f39df4..bad9142921 100644 --- 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 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index edbeeefdd4..78d1dd2c37 100644 --- 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 /************************************************************ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 40fe62fdf0..d43d217956 100644 --- 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) diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h index 459712190a..e0449aa848 100644 --- 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) diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index f15e08f397..0a8e945fa3 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -38,7 +38,6 @@ */ #define CONFIG_TULIP -#define CONFIG_EEPRO100 #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 55b9a3c182..9063139a04 100644 --- 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) diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 55c4bff28a..503b9b1cb5 100644 --- 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 */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 4ab364ae9a..66c1f3595b 100644 --- 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) diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index c11507e550..708b4bd8e1 100644 --- 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) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2dee446dde..720bd92cb7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -400,7 +400,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
Add Kconfig entries for the eepro100 driver and convert various boards. Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com> --- README | 3 --- configs/MPC8315ERDB_defconfig | 1 + configs/TQM834x_defconfig | 1 + 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/MPC8315ERDB.h | 1 - include/configs/MPC8323ERDB.h | 1 - include/configs/MPC832XEMDS.h | 1 - include/configs/MPC8349EMDS.h | 1 - include/configs/MPC8349EMDS_SDRAM.h | 1 - include/configs/MPC837XEMDS.h | 1 - include/configs/MPC8536DS.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 | 2 -- 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 - 33 files changed, 12 insertions(+), 29 deletions(-)