[U-Boot] [RFC PATCH v4 13/23] sandbox: eth: Add network support to sandbox
Simon Glass
sjg at chromium.org
Sun Mar 1 19:07:52 CET 2015
Hi Joe,
On 24 February 2015 at 17:02, Joe Hershberger <joe.hershberger at ni.com> wrote:
> Add basic network support to sandbox which includes a network driver.
>
> Signed-off-by: Joe Hershberger <joe.hershberger at ni.com>
> Reviewed-by: Simon Glass <sjg at chromium.org>
>
> ---
>
> Changes in v4:
> -Cleaned up sandbox EXTRA_ENV define
> -Moved config to Kconfig
>
> Changes in v3:
> -Added 2 more ethaddr to sandbox
> -Print which device in the debug write hwaddr
>
> Changes in v2:
> -Change printfs to debug in sandbox driver
> -Remove unused priv struct for sandbox driver
>
> arch/sandbox/Kconfig | 9 +++++
> arch/sandbox/dts/sandbox.dts | 4 +++
> board/sandbox/README.sandbox | 4 +--
> drivers/net/Kconfig | 18 ++++++++++
> drivers/net/Makefile | 1 +
> drivers/net/sandbox.c | 84 ++++++++++++++++++++++++++++++++++++++++++++
> include/configs/sandbox.h | 16 +++++----
> 7 files changed, 128 insertions(+), 8 deletions(-)
> create mode 100644 drivers/net/sandbox.c
>
> diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
> index 2098b9c..186b58d 100644
> --- a/arch/sandbox/Kconfig
> +++ b/arch/sandbox/Kconfig
> @@ -34,4 +34,13 @@ config DM_I2C
> config DM_TEST
> default y
>
> +config NET
> + default y
> +
> +config NETDEVICES
> + default y
> +
> +config DM_ETH
> + default y
> +
> endmenu
> diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
> index 9ce31bf..36b3bd8 100644
> --- a/arch/sandbox/dts/sandbox.dts
> +++ b/arch/sandbox/dts/sandbox.dts
> @@ -181,4 +181,8 @@
> };
> };
>
> + eth at 10002000 {
> + compatible = "sandbox,eth";
> + reg = <0x10002000 0x1000>;
> + };
> };
> diff --git a/board/sandbox/README.sandbox b/board/sandbox/README.sandbox
> index 3c0df17..c1f5f7e 100644
> --- a/board/sandbox/README.sandbox
> +++ b/board/sandbox/README.sandbox
> @@ -173,16 +173,16 @@ U-Boot sandbox supports these emulations:
> - Chrome OS EC
> - GPIO
> - Host filesystem (access files on the host from within U-Boot)
> +- I2C
> - Keyboard (Chrome OS)
> - LCD
> +- Network
> - Serial (for console only)
> - Sound (incomplete - see sandbox_sdl_sound_init() for details)
> - SPI
> - SPI flash
> - TPM (Trusted Platform Module)
>
> -Notable omissions are networking and I2C.
> -
> A wide range of commands is implemented. Filesystems which use a block
> device are supported.
>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index bdd0f05..b08746a 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -3,3 +3,21 @@ config DM_ETH
> depends on DM
> help
> Enable driver model for Ethernet.
> +
> +menuconfig NETDEVICES
> + bool "Network device support"
> + depends on NET
> + help
> + You must select Y to enable any network device support
> + Generally if you have any networking support this is a given
> +
> + If unsure, say Y
> +
> +if NETDEVICES
> +
> +config ETH_SANDBOX
> + depends on DM_ETH && SANDBOX
> + default y
> + bool "Sandbox: Mocked Ethernet driver"
This needs some help.
> +
> +endif # NETDEVICES
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 46c4ac6..15dc431 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -50,6 +50,7 @@ obj-$(CONFIG_NS8382X) += ns8382x.o
> obj-$(CONFIG_PCNET) += pcnet.o
> obj-$(CONFIG_RTL8139) += rtl8139.o
> obj-$(CONFIG_RTL8169) += rtl8169.o
> +obj-$(CONFIG_ETH_SANDBOX) += sandbox.o
> obj-$(CONFIG_SH_ETHER) += sh_eth.o
> obj-$(CONFIG_SMC91111) += smc91111.o
> obj-$(CONFIG_SMC911X) += smc911x.o
> diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
> new file mode 100644
> index 0000000..834e02a
> --- /dev/null
> +++ b/drivers/net/sandbox.c
> @@ -0,0 +1,84 @@
> +/*
> + * Copyright (c) 2015 National Instruments
> + *
> + * (C) Copyright 2015
> + * Joe Hershberger <joe.hershberger at ni.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0
> + */
> +
> +#include <common.h>
> +#include <dm.h>
> +#include <malloc.h>
> +#include <net.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +static int sb_eth_start(struct udevice *dev)
> +{
> + debug("eth_sandbox: Start\n");
> +
> + return 0;
> +}
> +
> +static int sb_eth_send(struct udevice *dev, void *packet, int length)
> +{
> + debug("eth_sandbox: Send packet %d\n", length);
> +
> + return 0;
> +}
> +
> +static int sb_eth_recv(struct udevice *dev)
> +{
> + return 0;
> +}
> +
> +static void sb_eth_stop(struct udevice *dev)
> +{
> + debug("eth_sandbox: Stop\n");
> +}
> +
> +static int sb_eth_write_hwaddr(struct udevice *dev)
> +{
> + struct eth_pdata *pdata = dev_get_platdata(dev);
> +
> + debug("eth_sandbox %s: Write HW ADDR - %pM\n", dev->name,
> + pdata->enetaddr);
> + return 0;
> +}
> +
> +static const struct eth_ops sb_eth_ops = {
> + .start = sb_eth_start,
> + .send = sb_eth_send,
> + .recv = sb_eth_recv,
> + .stop = sb_eth_stop,
> + .write_hwaddr = sb_eth_write_hwaddr,
> +};
> +
> +static int sb_eth_remove(struct udevice *dev)
> +{
> + return 0;
> +}
> +
> +static int sb_eth_ofdata_to_platdata(struct udevice *dev)
> +{
> + struct eth_pdata *pdata = dev_get_platdata(dev);
> +
> + pdata->iobase = dev_get_addr(dev);
> + return 0;
> +}
> +
> +static const struct udevice_id sb_eth_ids[] = {
> + { .compatible = "sandbox,eth" },
> + { }
> +};
> +
> +U_BOOT_DRIVER(eth_sandbox) = {
> + .name = "eth_sandbox",
> + .id = UCLASS_ETH,
> + .of_match = sb_eth_ids,
> + .ofdata_to_platdata = sb_eth_ofdata_to_platdata,
> + .remove = sb_eth_remove,
> + .ops = &sb_eth_ops,
> + .platdata_auto_alloc_size = sizeof(struct eth_pdata),
> +};
> diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
> index febbfb6..664b984 100644
> --- a/include/configs/sandbox.h
> +++ b/include/configs/sandbox.h
> @@ -126,9 +126,6 @@
> /* include default commands */
> #include <config_cmd_default.h>
>
> -/* We don't have networking support yet */
> -#undef CONFIG_CMD_NET
> -#undef CONFIG_CMD_NFS
>
> #define CONFIG_CMD_HASH
> #define CONFIG_HASH_VERIFY
> @@ -165,16 +162,23 @@
>
> #define CONFIG_KEYBOARD
>
> -#define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial,cros-ec-keyb\0" \
> +#define SANDBOX_SERIAL_SETTINGS "stdin=serial,cros-ec-keyb\0" \
> "stdout=serial,lcd\0" \
> "stderr=serial,lcd\0"
> #else
> -
> -#define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial\0" \
> +#define SANDBOX_SERIAL_SETTINGS "stdin=serial\0" \
> "stdout=serial,lcd\0" \
> "stderr=serial,lcd\0"
> #endif
>
> +#define SANDBOX_ETH_SETTINGS "ethaddr=00:00:11:22:33:44\0" \
> + "eth1addr=00:00:11:22:33:45\0" \
> + "eth2addr=00:00:11:22:33:46\0" \
> + "ipaddr=1.2.3.4\0"
> +
> +#define CONFIG_EXTRA_ENV_SETTINGS SANDBOX_SERIAL_SETTINGS \
> + SANDBOX_ETH_SETTINGS
> +
> #define CONFIG_GZIP_COMPRESSED
> #define CONFIG_BZIP2
> #define CONFIG_LZO
> --
> 1.7.11.5
>
Regards,
Simon
More information about the U-Boot
mailing list