Convert CONFIG_E1000 to Kconfig

This converts the following to Kconfig:
   CONFIG_E1000

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 0a719333606e7867ee71381db35421f61b84ea28..c919855c86acae7e0c832846d04db2dd66544304 100644 (file)
--- a/README
+++ b/README
@@ -825,18 +825,11 @@ The following options need to be configured:
                SCSI devices found during the last scan.
 
 - NETWORK Support (PCI):
-               CONFIG_E1000
-               Support for Intel 8254x/8257x gigabit chips.
-
                CONFIG_E1000_SPI
                Utility code for direct access to the SPI bus on Intel 8257x.
                This does not do anything useful unless you set at least one
                of CONFIG_CMD_E1000 or CONFIG_E1000_SPI_GENERIC.
 
-               CONFIG_E1000_SPI_GENERIC
-               Allow generic access to the SPI bus on the Intel 8257x, for
-               example with the "sspi" command.
-
                CONFIG_NATSEMI
                Support for National dp83815 chips.
 

diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig
index 082ced93d2015d74942bf727abb405ffb2311a57..6e344c9ce3380ea66568a3ea90220c57d52b8dcf 100644 (file)
--- a/configs/clearfog_gt_8k_defconfig
+++ b/configs/clearfog_gt_8k_defconfig
@@ -54,6 +54,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
 CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y

diff --git a/configs/mvebu_crb_cn9130_defconfig b/configs/mvebu_crb_cn9130_defconfig
index 334d7f2183299dea8c5aaa85705dfe5e71e09507..039fd8b3dc3f4d39326babb62d60061ef7647563 100644 (file)
--- a/configs/mvebu_crb_cn9130_defconfig
+++ b/configs/mvebu_crb_cn9130_defconfig
@@ -60,6 +60,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
 CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y

diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig
index d9a5759d4415ff71e5b2baa968e65999a7b93084..e6168a76a62dff638cd419da704dc0a032117153 100644 (file)
--- a/configs/mvebu_db_armada8k_defconfig
+++ b/configs/mvebu_db_armada8k_defconfig
@@ -49,6 +49,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
 CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y

diff --git a/configs/mvebu_db_cn9130_defconfig b/configs/mvebu_db_cn9130_defconfig
index c8dffe0117c96248e6d2638396987fb32fbf7428..42d7038c5a174be8b7bac31e8891eb9d31ec4858 100644 (file)
--- a/configs/mvebu_db_cn9130_defconfig
+++ b/configs/mvebu_db_cn9130_defconfig
@@ -65,6 +65,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH_MTD=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
 CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y

diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig
index 61cc2602031d1c911314545ec8414eef32825f2d..2aa06f80a0eca058ccd799a311ac29f792dd1372 100644 (file)
--- a/configs/mvebu_mcbin-88f8040_defconfig
+++ b/configs/mvebu_mcbin-88f8040_defconfig
@@ -54,6 +54,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
 CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y

diff --git a/configs/mvebu_puzzle-m801-88f8040_defconfig b/configs/mvebu_puzzle-m801-88f8040_defconfig
index da73dd1cbd5b1c060342558f931263e80b12c148..053b2f4c9644cdc4c5f850616de8ce153cb10bfd 100644 (file)
--- a/configs/mvebu_puzzle-m801-88f8040_defconfig
+++ b/configs/mvebu_puzzle-m801-88f8040_defconfig
@@ -58,6 +58,7 @@ CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
 CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 886f44c9030307dc7015b419a7890f3e68a84b2c..ac0fdddbd94d894d00af55a927cb24da9a981fd0 100644 (file)
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -58,9 +58,6 @@
 /*
  * PCI configuration
  */
-#ifdef CONFIG_PCIE_DW_MVEBU
-#define CONFIG_E1000
-#endif
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \