[U-Boot] [PATCH 6/6] net: Move CONFIG_E1000 options to Kconfig

[Bin Meng]

Hi Simon,

On Fri, Jul 31, 2015 at 3:40 AM, Simon Glass <sjg at chromium.org> wrote:
> Move config for the E1000 Ethernet driver to Kconfig and tidy up affected
> boards.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>  README                              | 19 ------------------
>  configs/CSQ_CS908_defconfig         |  2 +-
>  configs/Mele_A1000G_quad_defconfig  |  2 +-
>  configs/Mini-X_defconfig            |  4 ++--
>  configs/UTOO_P66_defconfig          |  1 -
>  configs/am43xx_evm_defconfig        |  2 +-
>  configs/ba10_tv_box_defconfig       |  4 ++--
>  configs/db-88f6820-gp_defconfig     |  2 +-
>  configs/ls1021aqds_qspi_defconfig   |  4 ++--
>  configs/ls1021atwr_qspi_defconfig   |  4 ++--
>  configs/sandbox_defconfig           | 20 +++++++++----------
>  configs/stv0991_defconfig           |  2 +-
>  configs/xilinx_zynqmp_ep_defconfig  |  2 +-
>  drivers/net/Kconfig                 | 39 +++++++++++++++++++++++++++++++++++++
>  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        |  2 --
>  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 -
>  49 files changed, 63 insertions(+), 80 deletions(-)
>

I see board config files are updated to remove CONFIG_E1000, but board
defconfig files are not updated to add CONFIG_E1000=y.

> diff --git a/README b/README
> index 1bcb63c..6cb63ce 100644
> --- a/README
> +++ b/README
> @@ -1365,25 +1365,6 @@ 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_CMD_E1000
> -               Management command for E1000 devices.  When used on devices
> -               with SPI support you can reprogram the EEPROM from U-Boot.
> -
> -               CONFIG_E1000_FALLBACK_MAC
> -               default MAC for empty EEPROM after production.
> -
>                 CONFIG_EEPRO100
>                 Support for Intel 82557/82559/82559ER chips.
>                 Optional CONFIG_EEPRO100_SROM_WRITE enables EEPROM

[snip]

> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index ce76a02..6c70d19 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -20,6 +20,45 @@ menuconfig NETDEVICES
>
>  if NETDEVICES
>
> +config E1000
> +        bool "Intel PRO/1000 Gigabit Ethernet support"

Nits: bool is not indented correctly.

> +       help
> +         This driver supports Intel(R) PRO/1000 gigabit ethernet family of
> +         adapters.  For more information on how to identify your adapter, go
> +         to the Adapter & Driver ID Guide at:
> +
> +         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
> +
> +config E1000_SPI_GENERIC
> +       bool "Allow access to the Intel 8257x SPI bus"
> +       depends on E1000
> +       help
> +         Allow generic access to the SPI bus on the Intel 8257x, for
> +         example with the "sspi" command.
> +
> +config E1000_SPI
> +       bool "Enable SPI bus utility code"
> +       depends on E1000
> +       help
> +         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_FALLBACK_MAC
> +       bool "Default MAC address for empty EEPROM after production"
> +       depends on E1000
> +       help
> +         Use this to define a fallback MAC address for when none is available
> +         in the device EEPROM or U-Boot environment variables.
> +
> +config CMD_E1000
> +       bool "Enable the e1000 command"
> +       depends on E1000
> +       help
> +         This enables the 'e1000' management command for E1000 devices. When
> +         used on devices with SPI support you can reprogram the EEPROM from
> +         U-Boot.
> +
>  config ETH_SANDBOX
>         depends on DM_ETH && SANDBOX
>         default y

[snip]

Regards,
Bin