diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/dc2114x.c | 1 | ||||
-rw-r--r-- | drivers/net/fec_mxc.c | 2 | ||||
-rw-r--r-- | drivers/net/fm/b4860.c | 1 | ||||
-rw-r--r-- | drivers/net/fm/fdt.c | 1 | ||||
-rw-r--r-- | drivers/net/fm/fm.c | 2 | ||||
-rw-r--r-- | drivers/net/fsl-mc/mc.c | 1 | ||||
-rw-r--r-- | drivers/net/fsl_mcdmafec.c | 2 | ||||
-rw-r--r-- | drivers/net/ftmac100.c | 1 | ||||
-rw-r--r-- | drivers/net/lan91c96.c | 1 | ||||
-rw-r--r-- | drivers/net/mcffec.c | 2 | ||||
-rw-r--r-- | drivers/net/ne2000_base.c | 12 | ||||
-rw-r--r-- | drivers/net/netconsole.c | 5 | ||||
-rw-r--r-- | drivers/net/phy/micrel_ksz90x1.c | 1 | ||||
-rw-r--r-- | drivers/net/sandbox-raw.c | 1 | ||||
-rw-r--r-- | drivers/net/sh_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/ti/cpsw-common.c | 1 |
16 files changed, 17 insertions, 19 deletions
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index e3c403c13f..43c2253f10 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ #include <common.h> +#include <env.h> #include <malloc.h> #include <net.h> #include <netdev.h> diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 96e3ad9a1a..080dbcf7db 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -9,7 +9,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <malloc.h> #include <memalign.h> #include <miiphy.h> diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index 1e20685803..5be0ad2ab3 100644 --- a/drivers/net/fm/b4860.c +++ b/drivers/net/fm/b4860.c @@ -4,6 +4,7 @@ * Roy Zang <tie-fei.zang@freescale.com> */ #include <common.h> +#include <env.h> #include <phy.h> #include <fm_eth.h> #include <asm/io.h> diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c index 6125797125..72d1294751 100644 --- a/drivers/net/fm/fdt.c +++ b/drivers/net/fm/fdt.c @@ -3,6 +3,7 @@ * Copyright 2016 Freescale Semiconductor, Inc. */ #include <asm/io.h> +#include <env.h> #include <fsl_qe.h> /* For struct qe_firmware */ #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 0a43dfe74e..4c9dce8dc5 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -4,6 +4,7 @@ * Dave Liu <daveliu@freescale.com> */ #include <common.h> +#include <env.h> #include <malloc.h> #include <asm/io.h> #include <linux/errno.h> @@ -14,7 +15,6 @@ #include <nand.h> #include <spi_flash.h> #include <mmc.h> -#include <environment.h> #ifdef CONFIG_ARM64 #include <asm/armv8/mmu.h> diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index cc59b21f9f..1d96e4bdc2 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -5,6 +5,7 @@ * Copyright 2017-2018 NXP */ #include <common.h> +#include <env.h> #include <errno.h> #include <linux/bug.h> #include <asm/io.h> diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index 88309b186c..e66fb16de8 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <malloc.h> #include <command.h> #include <config.h> diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index c08889c4b1..d8f1dde657 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -8,6 +8,7 @@ #include <config.h> #include <common.h> +#include <env.h> #include <malloc.h> #include <net.h> #include <linux/io.h> diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c index f2489aaf82..c08bd21f95 100644 --- a/drivers/net/lan91c96.c +++ b/drivers/net/lan91c96.c @@ -46,6 +46,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <malloc.h> #include "lan91c96.h" #include <net.h> diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 2b54e3a549..fb93041256 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <malloc.h> #include <command.h> diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c index 421aa20ea6..a240d06ad4 100644 --- a/drivers/net/ne2000_base.c +++ b/drivers/net/ne2000_base.c @@ -74,7 +74,7 @@ Add SNMP #include <common.h> #include <command.h> -#include <environment.h> +#include <env.h> #include <net.h> #include <malloc.h> #include <linux/compiler.h> @@ -693,16 +693,6 @@ static int ne2k_setup_driver(struct eth_device *dev) } } -#ifdef CONFIG_DRIVER_NE2000_CCR - { - vu_char *p = (vu_char *) CONFIG_DRIVER_NE2000_CCR; - - PRINTK("CCR before is %x\n", *p); - *p = CONFIG_DRIVER_NE2000_VAL; - PRINTK("CCR after is %x\n", *p); - } -#endif - nic.base = (u8 *) CONFIG_DRIVER_NE2000_BASE; nic.data = nic.base + DP_DATA; diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index ce5a15ef57..73005ff94d 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <stdio_dev.h> #include <net.h> @@ -55,7 +56,7 @@ static int is_broadcast(struct in_addr ip) static struct in_addr netmask; static struct in_addr our_ip; static int env_changed_id; - int env_id = get_env_id(); + int env_id = env_get_id(); /* update only when the environment has changed */ if (env_changed_id != env_id) { @@ -75,7 +76,7 @@ static int refresh_settings_from_env(void) { const char *p; static int env_changed_id; - int env_id = get_env_id(); + int env_id = env_get_id(); /* update only when the environment has changed */ if (env_changed_id != env_id) { diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c index f18e40a2fe..0105fc5af1 100644 --- a/drivers/net/phy/micrel_ksz90x1.c +++ b/drivers/net/phy/micrel_ksz90x1.c @@ -10,6 +10,7 @@ */ #include <common.h> #include <dm.h> +#include <env.h> #include <errno.h> #include <micrel.h> #include <phy.h> diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c index 7e6625d020..3707ee35eb 100644 --- a/drivers/net/sandbox-raw.c +++ b/drivers/net/sandbox-raw.c @@ -9,6 +9,7 @@ #include <asm/eth-raw-os.h> #include <common.h> #include <dm.h> +#include <env.h> #include <malloc.h> #include <net.h> diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 2d5c97062f..749f651920 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -10,7 +10,7 @@ #include <config.h> #include <common.h> -#include <environment.h> +#include <env.h> #include <malloc.h> #include <net.h> #include <netdev.h> diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c index ac12cfe9b8..21b8bbda3d 100644 --- a/drivers/net/ti/cpsw-common.c +++ b/drivers/net/ti/cpsw-common.c @@ -7,7 +7,6 @@ #include <common.h> #include <dm.h> -#include <environment.h> #include <fdt_support.h> #include <asm/io.h> #include <cpsw.h> |