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 2d9c0ae18e370e4b536bc0feaa84c1ed96d8b6ff..0915bca642149b36577ecc35fac8f8a88e86af64 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 2a8d3c6e0a35daca6cd07c32e53569cc33331fc2..f5d958646fa7792194f74b2a8a2a0f9858f6a134 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 84d859c21eb8c2cd1781064d80ec31b77e017e99..56f9416a48db1924590a6bfb916c70e1902498b2 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 19e6a1e04eeb69b4195ecadcf441d4d91f77c10d..a362282a291eb1e478308b85419ad0ca6863f25d 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 104c4135e284ef02327c6d953d40026d086d0b91..84bd88f835ae62f2153f61caaa5bcec7e5f37773 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" \