From: Tom Rini Date: Mon, 8 Nov 2021 03:59:33 +0000 (-0500) Subject: Convert CONFIG_E1000 to Kconfig X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a8f31121fbf6b244da4bbb4b456130c673826c87;p=u-boot.git Convert CONFIG_E1000 to Kconfig This converts the following to Kconfig: CONFIG_E1000 Signed-off-by: Tom Rini --- diff --git a/README b/README index 0a71933360..c919855c86 100644 --- 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 082ced93d2..6e344c9ce3 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 334d7f2183..039fd8b3dc 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 d9a5759d44..e6168a76a6 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 c8dffe0117..42d7038c5a 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 61cc260203..2aa06f80a0 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 da73dd1cbd..053b2f4c96 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 886f44c903..ac0fdddbd9 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) \