This converts the following to Kconfig: CONFIG_E1000
Signed-off-by: Tom Rini trini@konsulko.com --- README | 7 ------- configs/clearfog_gt_8k_defconfig | 1 + configs/mvebu_crb_cn9130_defconfig | 1 + configs/mvebu_db_armada8k_defconfig | 1 + configs/mvebu_db_cn9130_defconfig | 1 + configs/mvebu_mcbin-88f8040_defconfig | 1 + configs/mvebu_puzzle-m801-88f8040_defconfig | 1 + include/configs/mvebu_armada-8k.h | 3 --- 8 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/README b/README index 0f5288817155..7e91e34f5f3a 100644 --- a/README +++ b/README @@ -824,18 +824,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 082ced93d201..6e344c9ce338 100644 --- 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 334d7f218329..039fd8b3dc3f 100644 --- 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 d9a5759d4415..e6168a76a62d 100644 --- 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 c8dffe0117c9..42d7038c5a17 100644 --- 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 61cc2602031d..2aa06f80a0ec 100644 --- 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 da73dd1cbd5b..053b2f4c9644 100644 --- 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 886f44c90303..ac0fdddbd94d 100644 --- 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) \