diff options
| author | Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com> | 2016-07-20 17:33:07 +0300 |
|---|---|---|
| committer | Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> | 2016-07-20 22:57:55 +0000 |
| commit | f93771a25cf2bf119605a3a9588d641d7726bd29 (patch) | |
| tree | f5dbbf59a46ee53cb448e32e54dc439cfaf26e35 | |
| parent | df72692fb65c10db814a9e33e9d530b59bc4ef15 (diff) | |
Revert "net: Restructured Ethernet driver menu"
This reverts commit 6de5643eb17e6f88aed346ea7ddc426aa1543a44.
Patch breaks applications running over Ethernet.
Jira: ZEP-565
Change-Id: Id147b7089f175c769c42c4e3dfb95408ee17ba9e
Signed-off-by: Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com>
| -rw-r--r-- | drivers/ethernet/Kconfig | 32 | ||||
| -rw-r--r-- | drivers/ethernet/eth_dw.c | 2 | ||||
| -rw-r--r-- | net/ip/Kconfig | 4 |
3 files changed, 14 insertions, 24 deletions
diff --git a/drivers/ethernet/Kconfig b/drivers/ethernet/Kconfig index 079a2a6e2..a6fa5f482 100644 --- a/drivers/ethernet/Kconfig +++ b/drivers/ethernet/Kconfig @@ -15,32 +15,23 @@ # See the License for the specific language governing permissions and # limitations under the License. # -menuconfig ETH_DRIVERS - bool - prompt "Ethernet drivers" - depends on ETHERNET - default n - help - Enable Ethernet drivers and debugging. - -if ETH_DRIVERS -config SYS_LOG_ETHERNET_DRIVER_LEVEL +config SYS_LOG_ETHERNET_LEVEL int - prompt "Ethernet driver debug level" - depends on SYS_LOG && ETH_DRIVERS + prompt "Grove Log level" + depends on SYS_LOG && ETHERNET default 0 range 0 4 help - Sets log level for Ethernet Device Drivers. - Levels are: - 0 OFF, do not print anything - 1 ERROR, only print SYS_LOG_ERR - 2 WARNING, print SYS_LOG_WRN in addition to previous level - 3 INFO, print SYS_LOG_INF in addition to previous levels - 4 DEBUG, print SYS_LOG_DBG in addition to previous levels + Sets log level for Ethernet Device Drivers. + Levels are: + 0 OFF, do not write + 1 ERROR, only write SYS_LOG_ERR + 2 WARNING, write SYS_LOG_WRN in adition to previous level + 3 INFO, write SYS_LOG_INF in adition to previous levels + 4 DEBUG, write SYS_LOG_DBG in adition to previous levels -config ETH_DW +menuconfig ETH_DW bool prompt "Synopsys DesignWare Ethernet driver" depends on ETHERNET @@ -100,4 +91,3 @@ config ETH_DW_0_IRQ_PRI IRQ priority endif # ETH_DW -endif # ETH_DRIVERS diff --git a/drivers/ethernet/eth_dw.c b/drivers/ethernet/eth_dw.c index ea5997e53..366cc1ac0 100644 --- a/drivers/ethernet/eth_dw.c +++ b/drivers/ethernet/eth_dw.c @@ -30,7 +30,7 @@ #endif #define SYS_LOG_DOMAIN "ETH DW" -#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ETHERNET_DRIVER_LEVEL +#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ETHERNET_LEVEL #include <misc/sys_log.h> static inline uint32_t eth_read(uint32_t base_addr, uint32_t offset) diff --git a/net/ip/Kconfig b/net/ip/Kconfig index 375732cdc..34b2fa86f 100644 --- a/net/ip/Kconfig +++ b/net/ip/Kconfig @@ -300,11 +300,11 @@ config NETWORKING_DEBUG_UART config ETHERNET_DEBUG bool - prompt "Network Ethernet debug" + prompt "Network Ethernet driver debug" depends on NETWORKING_WITH_LOGGING && ETHERNET default n help - This option enables debug support for Ethernet. + This option enables debug support for Ethernet drivers. config L2_BUFFERS bool |