This little series updates the e1000 Ethernet driver to support driver model. It also moves the configuration to Kconfig and adjusts all boards using Masahiro's excellent moveconfig tool.
To avoid a large patch which mixes irrelevant changes this series includes a patch to reorder the defconfig files before changing them. Unfortunately the NETDEVICES config must be enabled also so that E1000 will actually be enabled. Changes in v7: - Remove 'B' from the top of e1000.c - Tidy up socfpga options - Rebase to master - Tidy up UCP1020_defconfig merge conflict Changes in v6: - Drop CONFIG_E1000_FALLBACK_MAC option from README Changes in v5: - Correct compatible string Changes in v4: - Rebase to master - Rebase to master Changes in v3: - Add a comment as to why netdev.h cannot be included - Fix 'nove' typo and nCONFIG_DM_ETH #ifdef style - Drop CONFIG_E1000_FALLBACK_MAC option - Add CONFIG_NETDEVICES where needed - Add required changes to the defconfig files Changes in v2: - Move the Kconfig additions to a new patch - Add new patch to tidy up some defconfig files - Drop changes to aarch64 boards Simon Glass (6): net: e1000: Move #include of common.h to the C files net: e1000: Prepare for driver model conversion net: e1000: Convert to driver model net: e1000: Add Kconfig options Tidy up some defconfig files net: Move CONFIG_E1000 options to Kconfig README | 3 - configs/Ainol_AW1_defconfig | 2 +- configs/Ampe_A76_defconfig | 2 +- configs/B4420QDS_NAND_defconfig | 2 + configs/B4420QDS_SPIFLASH_defconfig | 2 + configs/B4420QDS_defconfig | 2 + configs/B4860QDS_NAND_defconfig | 2 + configs/B4860QDS_SECURE_BOOT_defconfig | 2 + configs/B4860QDS_SPIFLASH_defconfig | 2 + configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 2 + configs/B4860QDS_defconfig | 2 + configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 2 + configs/BSC9132QDS_NAND_DDRCLK100_defconfig | 2 + configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 2 + configs/BSC9132QDS_NAND_DDRCLK133_defconfig | 2 + configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 2 + configs/BSC9132QDS_NOR_DDRCLK100_defconfig | 2 + configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 2 + configs/BSC9132QDS_NOR_DDRCLK133_defconfig | 2 + .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 2 + configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig | 2 + .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 2 + configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig | 2 + .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 2 + configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig | 2 + .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 2 + configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig | 2 + configs/C29XPCIE_NAND_defconfig | 2 + configs/C29XPCIE_NOR_SECBOOT_defconfig | 2 + configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 2 + configs/C29XPCIE_SPIFLASH_defconfig | 2 + configs/C29XPCIE_defconfig | 2 + configs/Chuwi_V7_CW0825_defconfig | 2 +- configs/Et_q8_v1_6_defconfig | 2 +- configs/Hyundai_A7HD_defconfig | 2 +- configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 2 +- configs/Ippo_q8h_v1_2_defconfig | 2 +- configs/Ippo_q8h_v5_defconfig | 2 +- configs/MPC8536DS_36BIT_defconfig | 2 + configs/MPC8536DS_SDCARD_defconfig | 2 + configs/MPC8536DS_SPIFLASH_defconfig | 2 + configs/MPC8536DS_defconfig | 2 + configs/MPC8544DS_defconfig | 2 + configs/MPC8548CDS_36BIT_defconfig | 2 + configs/MPC8548CDS_defconfig | 2 + configs/MPC8548CDS_legacy_defconfig | 2 + configs/MPC8569MDS_ATM_defconfig | 2 + configs/MPC8569MDS_defconfig | 2 + configs/MPC8572DS_36BIT_defconfig | 2 + configs/MPC8572DS_defconfig | 2 + configs/MSI_Primo73_defconfig | 1 - configs/MSI_Primo81_defconfig | 3 +- configs/Merrii_A80_Optimus_defconfig | 1 - configs/Mini-X_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 2 + configs/P1010RDB-PA_36BIT_NAND_defconfig | 2 + configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 2 + configs/P1010RDB-PA_36BIT_NOR_defconfig | 2 + configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 2 + .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 2 + configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 2 + configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 2 + configs/P1010RDB-PA_NAND_defconfig | 2 + configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 2 + configs/P1010RDB-PA_NOR_defconfig | 2 + configs/P1010RDB-PA_SDCARD_defconfig | 2 + configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 2 + configs/P1010RDB-PA_SPIFLASH_defconfig | 2 + configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 2 + configs/P1010RDB-PB_36BIT_NAND_defconfig | 2 + configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 2 + configs/P1010RDB-PB_36BIT_NOR_defconfig | 2 + configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 2 + .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 2 + configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 2 + configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 2 + configs/P1010RDB-PB_NAND_defconfig | 2 + configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 2 + configs/P1010RDB-PB_NOR_defconfig | 2 + configs/P1010RDB-PB_SDCARD_defconfig | 2 + configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 2 + configs/P1010RDB-PB_SPIFLASH_defconfig | 2 + configs/P1020MBG-PC_36BIT_SDCARD_defconfig | 2 + configs/P1020MBG-PC_36BIT_defconfig | 2 + configs/P1020MBG-PC_SDCARD_defconfig | 2 + configs/P1020MBG-PC_defconfig | 2 + configs/P1020RDB-PC_36BIT_NAND_defconfig | 2 + configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 2 + configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 2 + configs/P1020RDB-PC_36BIT_defconfig | 2 + configs/P1020RDB-PC_NAND_defconfig | 2 + configs/P1020RDB-PC_SDCARD_defconfig | 2 + configs/P1020RDB-PC_SPIFLASH_defconfig | 2 + configs/P1020RDB-PC_defconfig | 2 + configs/P1020RDB-PD_NAND_defconfig | 2 + configs/P1020RDB-PD_SDCARD_defconfig | 2 + configs/P1020RDB-PD_SPIFLASH_defconfig | 2 + configs/P1020RDB-PD_defconfig | 2 + configs/P1020UTM-PC_36BIT_SDCARD_defconfig | 2 + configs/P1020UTM-PC_36BIT_defconfig | 2 + configs/P1020UTM-PC_SDCARD_defconfig | 2 + configs/P1020UTM-PC_defconfig | 2 + configs/P1021RDB-PC_36BIT_NAND_defconfig | 2 + configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 2 + configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 2 + configs/P1021RDB-PC_36BIT_defconfig | 2 + configs/P1021RDB-PC_NAND_defconfig | 2 + configs/P1021RDB-PC_SDCARD_defconfig | 2 + configs/P1021RDB-PC_SPIFLASH_defconfig | 2 + configs/P1021RDB-PC_defconfig | 2 + configs/P1022DS_36BIT_NAND_defconfig | 2 + configs/P1022DS_36BIT_SDCARD_defconfig | 2 + configs/P1022DS_36BIT_SPIFLASH_defconfig | 2 + configs/P1022DS_36BIT_defconfig | 2 + configs/P1022DS_NAND_defconfig | 2 + configs/P1022DS_SDCARD_defconfig | 2 + configs/P1022DS_SPIFLASH_defconfig | 2 + configs/P1022DS_defconfig | 2 + configs/P1023RDB_defconfig | 2 + configs/P1024RDB_36BIT_defconfig | 2 + configs/P1024RDB_NAND_defconfig | 2 + configs/P1024RDB_SDCARD_defconfig | 2 + configs/P1024RDB_SPIFLASH_defconfig | 2 + configs/P1024RDB_defconfig | 2 + configs/P1025RDB_36BIT_defconfig | 2 + configs/P1025RDB_NAND_defconfig | 2 + configs/P1025RDB_SDCARD_defconfig | 2 + configs/P1025RDB_SPIFLASH_defconfig | 2 + configs/P1025RDB_defconfig | 2 + configs/P2020RDB-PC_36BIT_NAND_defconfig | 2 + configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 2 + configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 2 + configs/P2020RDB-PC_36BIT_defconfig | 2 + configs/P2020RDB-PC_NAND_defconfig | 2 + configs/P2020RDB-PC_SDCARD_defconfig | 2 + configs/P2020RDB-PC_SPIFLASH_defconfig | 2 + configs/P2020RDB-PC_defconfig | 2 + configs/P2041RDB_NAND_defconfig | 2 + configs/P2041RDB_SDCARD_defconfig | 2 + configs/P2041RDB_SECURE_BOOT_defconfig | 2 + configs/P2041RDB_SPIFLASH_defconfig | 2 + configs/P2041RDB_SRIO_PCIE_BOOT_defconfig | 2 + configs/P2041RDB_defconfig | 2 + configs/P3041DS_NAND_SECURE_BOOT_defconfig | 4 +- configs/P3041DS_NAND_defconfig | 2 + configs/P3041DS_SDCARD_defconfig | 2 + configs/P3041DS_SECURE_BOOT_defconfig | 2 + configs/P3041DS_SPIFLASH_defconfig | 2 + configs/P3041DS_SRIO_PCIE_BOOT_defconfig | 2 + configs/P3041DS_defconfig | 2 + configs/P4080DS_SDCARD_defconfig | 2 + configs/P4080DS_SECURE_BOOT_defconfig | 2 + configs/P4080DS_SPIFLASH_defconfig | 2 + configs/P4080DS_SRIO_PCIE_BOOT_defconfig | 2 + configs/P4080DS_defconfig | 2 + configs/P5020DS_NAND_SECURE_BOOT_defconfig | 4 +- configs/P5020DS_NAND_defconfig | 2 + configs/P5020DS_SDCARD_defconfig | 2 + configs/P5020DS_SECURE_BOOT_defconfig | 2 + configs/P5020DS_SPIFLASH_defconfig | 2 + configs/P5020DS_SRIO_PCIE_BOOT_defconfig | 2 + configs/P5020DS_defconfig | 2 + configs/P5040DS_NAND_SECURE_BOOT_defconfig | 4 +- configs/P5040DS_NAND_defconfig | 2 + configs/P5040DS_SDCARD_defconfig | 2 + configs/P5040DS_SECURE_BOOT_defconfig | 2 + configs/P5040DS_SPIFLASH_defconfig | 2 + configs/P5040DS_defconfig | 2 + configs/T1023RDB_NAND_defconfig | 2 + configs/T1023RDB_SDCARD_defconfig | 2 + configs/T1023RDB_SECURE_BOOT_defconfig | 2 + configs/T1023RDB_SPIFLASH_defconfig | 2 + configs/T1023RDB_defconfig | 2 + configs/T1024QDS_D4_SECURE_BOOT_defconfig | 2 + configs/T1024QDS_NAND_defconfig | 2 + configs/T1024QDS_SDCARD_defconfig | 2 + configs/T1024QDS_SECURE_BOOT_defconfig | 2 + configs/T1024QDS_SPIFLASH_defconfig | 2 + configs/T1024QDS_defconfig | 2 + configs/T1024RDB_NAND_defconfig | 2 + configs/T1024RDB_SDCARD_defconfig | 2 + configs/T1024RDB_SECURE_BOOT_defconfig | 2 + configs/T1024RDB_SPIFLASH_defconfig | 2 + configs/T1024RDB_defconfig | 2 + configs/T1040D4RDB_NAND_defconfig | 6 +- configs/T1040D4RDB_SDCARD_defconfig | 6 +- configs/T1040D4RDB_SECURE_BOOT_defconfig | 4 +- configs/T1040D4RDB_SPIFLASH_defconfig | 6 +- configs/T1040D4RDB_defconfig | 4 +- configs/T1040QDS_D4_defconfig | 2 + configs/T1040QDS_SECURE_BOOT_defconfig | 2 + configs/T1040QDS_defconfig | 2 + configs/T1040RDB_NAND_defconfig | 2 + configs/T1040RDB_SDCARD_defconfig | 2 + configs/T1040RDB_SECURE_BOOT_defconfig | 2 + configs/T1040RDB_SPIFLASH_defconfig | 2 + configs/T1040RDB_defconfig | 2 + configs/T1042D4RDB_NAND_defconfig | 6 +- configs/T1042D4RDB_SDCARD_defconfig | 6 +- configs/T1042D4RDB_SECURE_BOOT_defconfig | 4 +- configs/T1042D4RDB_SPIFLASH_defconfig | 6 +- configs/T1042D4RDB_defconfig | 4 +- configs/T1042RDB_PI_NAND_defconfig | 2 + configs/T1042RDB_PI_SDCARD_defconfig | 2 + configs/T1042RDB_PI_SPIFLASH_defconfig | 2 + configs/T1042RDB_PI_defconfig | 2 + configs/T1042RDB_SECURE_BOOT_defconfig | 2 + configs/T1042RDB_defconfig | 2 + configs/T2080QDS_NAND_defconfig | 2 + configs/T2080QDS_SDCARD_defconfig | 2 + configs/T2080QDS_SECURE_BOOT_defconfig | 2 + configs/T2080QDS_SPIFLASH_defconfig | 2 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 2 + configs/T2080QDS_defconfig | 2 + configs/T2080RDB_NAND_defconfig | 2 + configs/T2080RDB_SDCARD_defconfig | 2 + configs/T2080RDB_SECURE_BOOT_defconfig | 2 + configs/T2080RDB_SPIFLASH_defconfig | 2 + configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 2 + configs/T2080RDB_defconfig | 2 + configs/T2081QDS_NAND_defconfig | 2 + configs/T2081QDS_SDCARD_defconfig | 2 + configs/T2081QDS_SPIFLASH_defconfig | 2 + configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 2 + configs/T2081QDS_defconfig | 2 + configs/T4160QDS_NAND_defconfig | 2 + configs/T4160QDS_SDCARD_defconfig | 2 + configs/T4160QDS_SECURE_BOOT_defconfig | 2 + configs/T4160QDS_defconfig | 2 + configs/T4160RDB_defconfig | 2 + configs/T4240QDS_NAND_defconfig | 2 + configs/T4240QDS_SDCARD_defconfig | 2 + configs/T4240QDS_SECURE_BOOT_defconfig | 2 + configs/T4240QDS_SRIO_PCIE_BOOT_defconfig | 2 + configs/T4240QDS_defconfig | 2 + configs/T4240RDB_SDCARD_defconfig | 2 + configs/T4240RDB_defconfig | 2 + configs/TWR-P1025_defconfig | 2 + configs/TZX-Q8-713B7_defconfig | 2 +- configs/UCP1020_SPIFLASH_defconfig | 2 + configs/UCP1020_defconfig | 2 + configs/UTOO_P66_defconfig | 2 +- configs/Yones_Toptech_BD1078_defconfig | 2 +- configs/am43xx_evm_defconfig | 2 +- configs/apalis_t30_defconfig | 2 + configs/arndale_defconfig | 4 +- configs/ba10_tv_box_defconfig | 2 +- configs/bayleybay_defconfig | 2 + configs/caddy2_defconfig | 2 + configs/cgtqmx6qeval_defconfig | 5 +- configs/cm_fx6_defconfig | 7 +- configs/coreboot-x86_defconfig | 2 + configs/crownbay_defconfig | 2 + configs/dalmore_defconfig | 2 +- configs/db-88f6820-gp_defconfig | 2 +- configs/e2220-1170_defconfig | 2 +- configs/forfun_q88db_defconfig | 2 +- configs/ga10h_v1_1_defconfig | 2 +- configs/gwventana_defconfig | 2 + configs/iNet_3F_defconfig | 2 +- configs/iNet_3W_defconfig | 2 +- configs/iNet_86VS_defconfig | 2 +- configs/jetson-tk1_defconfig | 2 +- configs/kmcoge4_defconfig | 2 + configs/kmlion1_defconfig | 2 + configs/ls1021aqds_ddr4_nor_defconfig | 2 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 2 + configs/ls1021aqds_nand_defconfig | 2 + configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 + configs/ls1021aqds_nor_defconfig | 2 + configs/ls1021aqds_nor_lpuart_defconfig | 2 + configs/ls1021aqds_qspi_defconfig | 6 +- configs/ls1021aqds_sdcard_defconfig | 2 + configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 + configs/ls1021atwr_nor_defconfig | 2 + configs/ls1021atwr_nor_lpuart_defconfig | 2 + configs/ls1021atwr_qspi_defconfig | 6 +- configs/ls1021atwr_sdcard_defconfig | 2 + configs/ls2085aqds_defconfig | 2 + configs/ls2085aqds_nand_defconfig | 2 + configs/ls2085ardb_defconfig | 2 + configs/ls2085ardb_nand_defconfig | 2 + configs/mx6ul_14x14_evk_defconfig | 2 +- configs/nyan-big_defconfig | 2 +- configs/odroid-xu3_defconfig | 5 +- configs/p2371-0000_defconfig | 2 +- configs/p2571_defconfig | 2 +- configs/peach-pi_defconfig | 28 +- configs/peach-pit_defconfig | 28 +- configs/qemu-ppce500_defconfig | 2 + configs/qemu-x86_defconfig | 2 + configs/sandbox_defconfig | 22 +- configs/smdk5250_defconfig | 18 +- configs/smdk5420_defconfig | 5 +- configs/snow_defconfig | 42 +- configs/socfpga_arria5_defconfig | 14 +- configs/socfpga_cyclone5_defconfig | 12 +- configs/socfpga_socrates_defconfig | 12 +- configs/spring_defconfig | 42 +- configs/stv0991_defconfig | 2 +- configs/tqma6s_wru4_mmc_defconfig | 4 +- configs/venice2_defconfig | 2 +- configs/xilinx_zynqmp_ep_defconfig | 3 +- drivers/net/Kconfig | 32 ++ drivers/net/e1000.c | 587 +++++++++++++-------- drivers/net/e1000.h | 7 +- drivers/net/e1000_spi.c | 1 + include/configs/B4860QDS.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P1023RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/bayleybay.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/crownbay.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/km/kmp204x-common.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls2085aqds.h | 1 - include/configs/ls2085ardb.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/qemu-ppce500.h | 1 - include/configs/qemu-x86.h | 1 - include/configs/t4qds.h | 1 - include/configs/vme8349.h | 1 - 343 files changed, 1094 insertions(+), 440 deletions(-) -- 2.5.0.276.gf5e568e _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
