Convert CONFIG_E1000_NO_NVM to Kconfig

This converts the following to Kconfig:
   CONFIG_E1000_NO_NVM

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

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 2d9c0ae..0915bca 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -58,6 +58,7 @@ CONFIG_SYS_I2C_TEGRA=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_TEGRA124_MMC_DISABLE_EXT_LOOPBACK=y
 CONFIG_E1000=y
+CONFIG_E1000_NO_NVM=y
 CONFIG_PCI=y
 CONFIG_PCI_TEGRA=y
 CONFIG_DM_PMIC=y

diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index 2a8d3c6..f5d9586 100644 (file)
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -50,6 +50,7 @@ CONFIG_TFTP_TSIZE=y
 CONFIG_SPL_DM=y
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_E1000=y
+CONFIG_E1000_NO_NVM=y
 CONFIG_PCI=y
 CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 84d859c..56f9416 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -239,6 +239,10 @@ config E1000
 
          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
 
+config E1000_NO_NVM
+       bool "Intel PRO/1000 has no NVMEM / EEPROM"
+       depends on E1000
+
 config E1000_SPI_GENERIC
        bool "Allow access to the Intel 8257x SPI bus"
        depends on E1000

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 19e6a1e..a362282 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -22,9 +22,6 @@
 /* PCI host support */
 #undef CONFIG_PCI_SCAN_SHOW
 
-/* PCI networking support */
-#define CONFIG_E1000_NO_NVM
-
 /*
  * Custom Distro Boot configuration:
  * 1. 8bit SD port (MMC1)

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 104c413..84bd88f 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -23,9 +23,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
-/* PCI networking support */
-#define CONFIG_E1000_NO_NVM
-
 #define UBOOT_UPDATE \
        "uboot_hwpart=1\0" \
        "uboot_blk=0\0" \