mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +00:00
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings
These boards can have an addon card plugged onto them, so enable support for it. Signed-off-by: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
parent
7ed998f629
commit
fff18bee7e
6 changed files with 76 additions and 48 deletions
|
@ -24,27 +24,37 @@ int checkboard(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BFIN_MAC
|
||||
static void board_init_enetaddr(uchar *mac_addr)
|
||||
static void board_init_enetaddr(char *var)
|
||||
{
|
||||
puts("Warning: Generating 'random' MAC address\n");
|
||||
bfin_gen_rand_mac(mac_addr);
|
||||
eth_setenv_enetaddr("ethaddr", mac_addr);
|
||||
#ifdef CONFIG_NET_MULTI
|
||||
uchar enetaddr[6];
|
||||
|
||||
if (eth_getenv_enetaddr(var, enetaddr))
|
||||
return;
|
||||
|
||||
printf("Warning: %s: generating 'random' MAC address\n", var);
|
||||
bfin_gen_rand_mac(enetaddr);
|
||||
eth_setenv_enetaddr(var, enetaddr);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef CONFIG_BFIN_MAC
|
||||
# define bfin_EMAC_initialize(x) 1
|
||||
#endif
|
||||
#ifndef CONFIG_SMC911X
|
||||
# define smc911x_initialize(n, x) 1
|
||||
#endif
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
return bfin_EMAC_initialize(bis);
|
||||
/* return ok if at least 1 eth device works */
|
||||
return bfin_EMAC_initialize(bis) &
|
||||
smc911x_initialize(0, CONFIG_SMC911X_BASE);
|
||||
}
|
||||
#endif
|
||||
|
||||
int misc_init_r(void)
|
||||
{
|
||||
#ifdef CONFIG_BFIN_MAC
|
||||
uchar enetaddr[6];
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
board_init_enetaddr(enetaddr);
|
||||
#endif
|
||||
board_init_enetaddr("ethaddr");
|
||||
board_init_enetaddr("eth1addr");
|
||||
|
||||
gpio_cfi_flash_init();
|
||||
|
||||
|
|
|
@ -24,34 +24,37 @@ int checkboard(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BFIN_MAC
|
||||
static void board_init_enetaddr(uchar *mac_addr)
|
||||
static void board_init_enetaddr(char *var)
|
||||
{
|
||||
puts("Warning: Generating 'random' MAC address\n");
|
||||
bfin_gen_rand_mac(mac_addr);
|
||||
eth_setenv_enetaddr("ethaddr", mac_addr);
|
||||
#ifdef CONFIG_NET_MULTI
|
||||
uchar enetaddr[6];
|
||||
|
||||
if (eth_getenv_enetaddr(var, enetaddr))
|
||||
return;
|
||||
|
||||
printf("Warning: %s: generating 'random' MAC address\n", var);
|
||||
bfin_gen_rand_mac(enetaddr);
|
||||
eth_setenv_enetaddr(var, enetaddr);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef CONFIG_BFIN_MAC
|
||||
# define bfin_EMAC_initialize(x) 1
|
||||
#endif
|
||||
#ifndef CONFIG_SMC911X
|
||||
# define smc911x_initialize(n, x) 1
|
||||
#endif
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
return bfin_EMAC_initialize(bis);
|
||||
/* return ok if at least 1 eth device works */
|
||||
return bfin_EMAC_initialize(bis) &
|
||||
smc911x_initialize(0, CONFIG_SMC911X_BASE);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SMC911X
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
return smc911x_initialize(0, CONFIG_SMC911X_BASE);
|
||||
}
|
||||
#endif
|
||||
|
||||
int misc_init_r(void)
|
||||
{
|
||||
#ifdef CONFIG_BFIN_MAC
|
||||
uchar enetaddr[6];
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
board_init_enetaddr(enetaddr);
|
||||
#endif
|
||||
board_init_enetaddr("ethaddr");
|
||||
board_init_enetaddr("eth1addr");
|
||||
|
||||
gpio_cfi_flash_init();
|
||||
|
||||
|
|
|
@ -24,27 +24,37 @@ int checkboard(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BFIN_MAC
|
||||
static void board_init_enetaddr(uchar *mac_addr)
|
||||
static void board_init_enetaddr(char *var)
|
||||
{
|
||||
puts("Warning: Generating 'random' MAC address\n");
|
||||
bfin_gen_rand_mac(mac_addr);
|
||||
eth_setenv_enetaddr("ethaddr", mac_addr);
|
||||
#ifdef CONFIG_NET_MULTI
|
||||
uchar enetaddr[6];
|
||||
|
||||
if (eth_getenv_enetaddr(var, enetaddr))
|
||||
return;
|
||||
|
||||
printf("Warning: %s: generating 'random' MAC address\n", var);
|
||||
bfin_gen_rand_mac(enetaddr);
|
||||
eth_setenv_enetaddr(var, enetaddr);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef CONFIG_BFIN_MAC
|
||||
# define bfin_EMAC_initialize(x) 1
|
||||
#endif
|
||||
#ifndef CONFIG_SMC911X
|
||||
# define smc911x_initialize(n, x) 1
|
||||
#endif
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
return bfin_EMAC_initialize(bis);
|
||||
/* return ok if at least 1 eth device works */
|
||||
return bfin_EMAC_initialize(bis) &
|
||||
smc911x_initialize(0, CONFIG_SMC911X_BASE);
|
||||
}
|
||||
#endif
|
||||
|
||||
int misc_init_r(void)
|
||||
{
|
||||
#ifdef CONFIG_BFIN_MAC
|
||||
uchar enetaddr[6];
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
board_init_enetaddr(enetaddr);
|
||||
#endif
|
||||
board_init_enetaddr("ethaddr");
|
||||
board_init_enetaddr("eth1addr");
|
||||
|
||||
gpio_cfi_flash_init();
|
||||
|
||||
|
|
|
@ -65,6 +65,9 @@
|
|||
#ifndef __ADSPBF534__
|
||||
#define ADI_CMDS_NETWORK 1
|
||||
#define CONFIG_BFIN_MAC
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE 0x20308000
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_NETCONSOLE 1
|
||||
#define CONFIG_NET_MULTI 1
|
||||
#endif
|
||||
|
|
|
@ -63,11 +63,11 @@
|
|||
*/
|
||||
#ifndef __ADSPBF534__
|
||||
#define ADI_CMDS_NETWORK 1
|
||||
#define CONFIG_NET_MULTI
|
||||
/* The next 3 lines are for use with SMSC on EXT-BF5xx-USB-ETH2 */
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE 0x24000000
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE 0x20308000
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_NETCONSOLE 1
|
||||
#define CONFIG_NET_MULTI 1
|
||||
#endif
|
||||
#define CONFIG_HOSTNAME cm-bf537u
|
||||
/* Uncomment next line to use fixed MAC address */
|
||||
|
|
|
@ -62,10 +62,12 @@
|
|||
/*
|
||||
* Network Settings
|
||||
*/
|
||||
/* TCM-BF537E has no PHY on it, but EXT-BF5xx-USB/Ethernet board has */
|
||||
#ifndef __ADSPBF534__
|
||||
#define ADI_CMDS_NETWORK 1
|
||||
#define CONFIG_BFIN_MAC
|
||||
#define CONFIG_SMC911X 1
|
||||
#define CONFIG_SMC911X_BASE 0x20308000
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_NETCONSOLE 1
|
||||
#define CONFIG_NET_MULTI 1
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue