[U-Boot] [PATCH] da850evm: basic MII EMAC support

Ben Warren
2010-09-13T03:45:41Z

Hi Ben,

On 9/10/2010 1:10 PM, Ben Gardiner wrote:
> The current da850evm support in u-boot/master [1] omits any use of
> the davinci EMAC. This patch adds basic support for the EMAC using
> the MII PHY found on the baseboard of the EVM. The MAC address is
> read from the environment variable 'ethadd'. Note that this is
> different from the da850evm support in the u-boot omapl1 tree
> where the MAC address is read from SPI flash [2].
>
> CC: Sandeep Paulraj<s-paulraj@ti.com>
> CC: Sudhakar Rajashekhara<sudhakar.raj@ti.com>
>
> [1] http://git.denx.de/?p=u-boot.git
> [2] http://arago-project.org/git/projects/?p=u-boot-omapl1.git
>
> ---
>
> I am submitting this patch for inclusion in v2010.12, not v2010.09 since it
> introduces a new feature.
>
> ---
> board/davinci/da8xxevm/da850evm.c | 60 +++++++++++++++++++++++++++++++++++++
> include/configs/da850evm.h | 15 +++++++++
> 2 files changed, 75 insertions(+), 0 deletions(-)
>
> diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
> index eeb456c..30645e5 100644
> --- a/board/davinci/da8xxevm/da850evm.c
> +++ b/board/davinci/da8xxevm/da850evm.c
> @@ -23,7 +23,11 @@
>
> #include<common.h>
> #include<i2c.h>
> +#include<net.h>
> +#include<netdev.h>
> #include<asm/arch/hardware.h>
> +#include<asm/arch/emif_defs.h>
> +#include<asm/arch/emac_defs.h>
> #include<asm/io.h>
> #include "../common/misc.h"
> #include "common.h"
> @@ -48,6 +52,28 @@ static const struct pinmux_config uart_pins[] = {
> { pinmux(4), 2, 5 }
> };
>
> +#ifdef CONFIG_DRIVER_TI_EMAC
> +const struct pinmux_config emac_pins[] = {
> + { pinmux(2), 8, 1 },
> + { pinmux(2), 8, 2 },
> + { pinmux(2), 8, 3 },
> + { pinmux(2), 8, 4 },
> + { pinmux(2), 8, 5 },
> + { pinmux(2), 8, 6 },
> + { pinmux(2), 8, 7 },
> + { pinmux(3), 8, 0 },
> + { pinmux(3), 8, 1 },
> + { pinmux(3), 8, 2 },
> + { pinmux(3), 8, 3 },
> + { pinmux(3), 8, 4 },
> + { pinmux(3), 8, 5 },
> + { pinmux(3), 8, 6 },
> + { pinmux(3), 8, 7 },
> + { pinmux(4), 8, 0 },
> + { pinmux(4), 8, 1 }
> +};
> +#endif /* CONFIG_DRIVER_TI_EMAC */
> +
> /* I2C pin muxer settings */
> static const struct pinmux_config i2c_pins[] = {
> { pinmux(4), 2, 2 },
> @@ -102,6 +128,14 @@ int board_init(void)
> if (davinci_configure_pin_mux_items(pinmuxes, ARRAY_SIZE(pinmuxes)))
> return 1;
>
> +#ifdef CONFIG_DRIVER_TI_EMAC
> + if (davinci_configure_pin_mux(emac_pins, ARRAY_SIZE(emac_pins)) != 0)
> + return 1;
> + /* set cfgchip3 to select MII */
> + writel(readl(&davinci_syscfg_regs->cfgchip3)& ~(1<< 8),
> + &davinci_syscfg_regs->cfgchip3);
> +#endif /* CONFIG_DRIVER_TI_EMAC */
> +
> /* enable the console UART */
> writel((DAVINCI_UART_PWREMU_MGMT_FREE | DAVINCI_UART_PWREMU_MGMT_URRST |
> DAVINCI_UART_PWREMU_MGMT_UTRST),
> @@ -109,3 +143,29 @@ int board_init(void)
>
> return 0;
> }
> +
> +#ifdef CONFIG_DRIVER_TI_EMAC
> +
> +/*
> + * Initializes on-board ethernet controllers.
> + */
> +int board_eth_init(bd_t *bis)
> +{
> + u_int8_t mac_addr[6];
> +
> + /* read the address from env */
> + if (!eth_getenv_enetaddr("ethaddr", mac_addr))
> + return -1;
> +
> + /* provide the resulting addr to the driver */
> + davinci_eth_set_mac_addr(mac_addr);
> +
> + /* finally, initialise the driver */
> + if (!davinci_emac_initialize()) {
> + printf("Error: Ethernet init failed!\n");
> + return -1;
> + }
> +
Please consider doing this differently. If you change the driver to
make 'davinci_eth_set_mac_addr()' meet the signature of
'eth_device->write_hwaddr()', all the environment handling is done
automagically. Let me know if you're confused and I'll provide more
guidance.
> + return 0;
> +}
> +#endif /* CONFIG_DRIVER_TI_EMAC */
> diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
> index 357715d..432c5e6 100644
> --- a/include/configs/da850evm.h
> +++ b/include/configs/da850evm.h
> @@ -26,6 +26,7 @@
> /*
> * Board
> */
> +#define CONFIG_DRIVER_TI_EMAC
>
> /*
> * SoC Configuration
> @@ -79,6 +80,20 @@
> #define CONFIG_SYS_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */
>
> /*
> + * Network& Ethernet Configuration
> + */
> +#ifdef CONFIG_DRIVER_TI_EMAC
> +#define CONFIG_EMAC_MDIO_PHY_NUM 0
> +#define CONFIG_MII
> +#define CONFIG_BOOTP_DEFAULT
> +#define CONFIG_BOOTP_DNS
> +#define CONFIG_BOOTP_DNS2
> +#define CONFIG_BOOTP_SEND_HOSTNAME
> +#define CONFIG_NET_RETRY_COUNT 10
> +#define CONFIG_NET_MULTI
> +#endif
> +
> +/*
> * U-Boot general configuration
> */
> #define CONFIG_BOOTFILE "uImage" /* Boot file name */
regards,
Ben W.