Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: Remove all calls to net_random_ethaddr()

Browse Source 
Remove the calls to net_random_ethaddr() that some boards and some
drivers are calling. This is now implemented inside of net/eth.c

Enable the feature for all boards that previously enabled it.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-By: Michael Walle <michael@walle.cc> (for the lsxl board part)

Series-changes: 2
-Fixed bfin build errors
master
Joe Hershberger 10 years ago
parent 92ac520821
commit 76ec988b06
41 changed files with 64 additions and 294 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      board/bct-brettl2/bct-brettl2.c
  2. 28
      board/bf518f-ezbrd/bf518f-ezbrd.c
  3. 28
      board/bf526-ezbrd/bf526-ezbrd.c
  4. 11
      board/bf527-ezkit/bf527-ezkit.c
  5. 18
      board/bf537-minotaur/bf537-minotaur.c
  6. 18
      board/bf537-pnav/bf537-pnav.c
  7. 18
      board/bf537-srv1/bf537-srv1.c
  8. 28
      board/bf537-stamp/bf537-stamp.c
  9. 10
      board/buffalo/lsxl/lsxl.c
  10. 11
      board/cm-bf527/cm-bf527.c
  11. 15
      board/cm-bf537e/cm-bf537e.c
  12. 15
      board/cm-bf537u/cm-bf537u.c
  13. 28
      board/dnp5370/dnp5370.c
  14. 12
      board/ip04/ip04.c
  15. 40
      board/tcm-bf518/tcm-bf518.c
  16. 15
      board/tcm-bf537/tcm-bf537.c
  17. 3
      configs/bct-brettl2_defconfig
  18. 2
      configs/bf518f-ezbrd_defconfig
  19. 2
      configs/bf526-ezbrd_defconfig
  20. 2
      configs/bf527-ezkit_defconfig
  21. 2
      configs/bf537-minotaur_defconfig
  22. 2
      configs/bf537-pnav_defconfig
  23. 2
      configs/bf537-srv1_defconfig
  24. 2
      configs/bf537-stamp_defconfig
  25. 2
      configs/cm-bf527_defconfig
  26. 2
      configs/cm-bf537e_defconfig
  27. 2
      configs/cm-bf537u_defconfig
  28. 2
      configs/dnp5370_defconfig
  29. 2
      configs/ip04_defconfig
  30. 2
      configs/lschlv2_defconfig
  31. 2
      configs/lsxhl_defconfig
  32. 2
      configs/tcm-bf518_defconfig
  33. 2
      configs/tcm-bf537_defconfig
  34. 6
      drivers/net/dm9000x.c
  35. 3
      drivers/net/ftmac110.c
  36. 1
      include/configs/bf537-minotaur.h
  37. 1
      include/configs/bf537-pnav.h
  38. 1
      include/configs/bf537-srv1.h
  39. 1
      include/configs/ip04.h
  40. 1
      include/configs/lsxl.h
  41. 1
      include/configs/tcm-bf518.h

13
board/bct-brettl2/bct-brettl2.c
Unescape View File

@ -29,13 +29,6 @@ int checkboard(void)
} }
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr)
{
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
eth_setenv_enetaddr("ethaddr", mac_addr);
}
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
int retry = 3; int retry = 3;
@ -107,12 +100,6 @@ static void turn_leds_off(void)
/* miscellaneous platform dependent initialisations */ /* miscellaneous platform dependent initialisations */
int misc_init_r(void) int misc_init_r(void)
{ {
#ifdef CONFIG_BFIN_MAC
uchar enetaddr[6];
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
board_init_enetaddr(enetaddr);
#endif
gpio_cfi_flash_init(); gpio_cfi_flash_init();
init_tlv320aic31(); init_tlv320aic31();
init_mute_pin(); init_mute_pin();

28
board/bf518f-ezbrd/bf518f-ezbrd.c
Unescape View File

@ -29,28 +29,14 @@ int checkboard(void)
#if defined(CONFIG_BFIN_MAC) #if defined(CONFIG_BFIN_MAC)
static void board_init_enetaddr(uchar *mac_addr) static void board_init_enetaddr(uchar *mac_addr)
{ {
#ifdef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
# define USE_MAC_IN_FLASH 0 /* we cram the MAC in the last flash sector */
#else uchar *board_mac_addr = (uchar *)0x203F0096;
# define USE_MAC_IN_FLASH 1 if (is_valid_ethaddr(board_mac_addr)) {
#endif memcpy(mac_addr, board_mac_addr, 6);
bool valid_mac = false; eth_setenv_enetaddr("ethaddr", mac_addr);
if (USE_MAC_IN_FLASH) {
/* we cram the MAC in the last flash sector */
uchar *board_mac_addr = (uchar *)0x203F0096;
if (is_valid_ethaddr(board_mac_addr)) {
memcpy(mac_addr, board_mac_addr, 6);
valid_mac = true;
}
}
if (!valid_mac) {
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
} }
#endif
eth_setenv_enetaddr("ethaddr", mac_addr);
} }
/* Only the first run of boards had a KSZ switch */ /* Only the first run of boards had a KSZ switch */

28
board/bf526-ezbrd/bf526-ezbrd.c
Unescape View File

@ -26,28 +26,14 @@ int checkboard(void)
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr) static void board_init_enetaddr(uchar *mac_addr)
{ {
#ifdef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
# define USE_MAC_IN_FLASH 0 /* we cram the MAC in the last flash sector */
#else uchar *board_mac_addr = (uchar *)0x203F0096;
# define USE_MAC_IN_FLASH 1 if (is_valid_ethaddr(board_mac_addr)) {
#endif memcpy(mac_addr, board_mac_addr, 6);
bool valid_mac = false; eth_setenv_enetaddr("ethaddr", mac_addr);
if (USE_MAC_IN_FLASH) {
/* we cram the MAC in the last flash sector */
uchar *board_mac_addr = (uchar *)0x203F0096;
if (is_valid_ethaddr(board_mac_addr)) {
memcpy(mac_addr, board_mac_addr, 6);
valid_mac = true;
}
}
if (!valid_mac) {
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
} }
#endif
eth_setenv_enetaddr("ethaddr", mac_addr);
} }
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)

11
board/bf527-ezkit/bf527-ezkit.c
Unescape View File

@ -27,8 +27,6 @@ int checkboard(void)
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr) static void board_init_enetaddr(uchar *mac_addr)
{ {
bool valid_mac = false;
/* the MAC is stored in OTP memory page 0xDF */ /* the MAC is stored in OTP memory page 0xDF */
uint32_t ret; uint32_t ret;
uint64_t otp_mac; uint64_t otp_mac;
@ -41,15 +39,8 @@ static void board_init_enetaddr(uchar *mac_addr)
mac_addr[ret] = otp_mac_p[5 - ret]; mac_addr[ret] = otp_mac_p[5 - ret];
if (is_valid_ethaddr(mac_addr)) if (is_valid_ethaddr(mac_addr))
valid_mac = true; eth_setenv_enetaddr("ethaddr", mac_addr);
}
if (!valid_mac) {
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
} }
eth_setenv_enetaddr("ethaddr", mac_addr);
} }
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)

18
board/bf537-minotaur/bf537-minotaur.c
Unescape View File

@ -23,26 +23,8 @@ int checkboard(void)
} }
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr)
{
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
eth_setenv_enetaddr("ethaddr", mac_addr);
}
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
return bfin_EMAC_initialize(bis); return bfin_EMAC_initialize(bis);
} }
#endif #endif
int misc_init_r(void)
{
#ifdef CONFIG_BFIN_MAC
uchar enetaddr[6];
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
board_init_enetaddr(enetaddr);
#endif
return 0;
}

18
board/bf537-pnav/bf537-pnav.c
Unescape View File

@ -23,26 +23,8 @@ int checkboard(void)
} }
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr)
{
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
eth_setenv_enetaddr("ethaddr", mac_addr);
}
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
return bfin_EMAC_initialize(bis); return bfin_EMAC_initialize(bis);
} }
#endif #endif
int misc_init_r(void)
{
#ifdef CONFIG_BFIN_MAC
uchar enetaddr[6];
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
board_init_enetaddr(enetaddr);
#endif
return 0;
}

18
board/bf537-srv1/bf537-srv1.c
Unescape View File

@ -23,26 +23,8 @@ int checkboard(void)
} }
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr)
{
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
eth_setenv_enetaddr("ethaddr", mac_addr);
}
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
return bfin_EMAC_initialize(bis); return bfin_EMAC_initialize(bis);
} }
#endif #endif
int misc_init_r(void)
{
#ifdef CONFIG_BFIN_MAC
uchar enetaddr[6];
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
board_init_enetaddr(enetaddr);
#endif
return 0;
}

28
board/bf537-stamp/bf537-stamp.c
Unescape View File

@ -29,28 +29,14 @@ int checkboard(void)
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr) static void board_init_enetaddr(uchar *mac_addr)
{ {
#ifdef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
# define USE_MAC_IN_FLASH 0 /* we cram the MAC in the last flash sector */
#else uchar *board_mac_addr = (uchar *)0x203F0000;
# define USE_MAC_IN_FLASH 1 if (is_valid_ethaddr(board_mac_addr)) {
#endif memcpy(mac_addr, board_mac_addr, 6);
bool valid_mac = false; eth_setenv_enetaddr("ethaddr", mac_addr);
if (USE_MAC_IN_FLASH) {
/* we cram the MAC in the last flash sector */
uchar *board_mac_addr = (uchar *)0x203F0000;
if (is_valid_ethaddr(board_mac_addr)) {
memcpy(mac_addr, board_mac_addr, 6);
valid_mac = true;
}
}
if (!valid_mac) {
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
} }
#endif
eth_setenv_enetaddr("ethaddr", mac_addr);
} }
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)

10
board/buffalo/lsxl/lsxl.c
Unescape View File

@ -230,16 +230,6 @@ static void rescue_mode(void)
uchar enetaddr[6]; uchar enetaddr[6];
printf("Entering rescue mode..\n"); printf("Entering rescue mode..\n");
#ifdef CONFIG_RANDOM_MACADDR
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
net_random_ethaddr(enetaddr);
if (eth_setenv_enetaddr("ethaddr", enetaddr)) {
printf("Failed to set ethernet address\n");
set_led(LED_ALARM_BLINKING);
return;
}
}
#endif
setenv("bootsource", "rescue"); setenv("bootsource", "rescue");
} }

11
board/cm-bf527/cm-bf527.c
Unescape View File

@ -26,8 +26,6 @@ int checkboard(void)
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr) static void board_init_enetaddr(uchar *mac_addr)
{ {
bool valid_mac = false;
/* the MAC is stored in OTP memory page 0xDF */ /* the MAC is stored in OTP memory page 0xDF */
uint32_t ret; uint32_t ret;
uint64_t otp_mac; uint64_t otp_mac;
@ -40,15 +38,8 @@ static void board_init_enetaddr(uchar *mac_addr)
mac_addr[ret] = otp_mac_p[5 - ret]; mac_addr[ret] = otp_mac_p[5 - ret];
if (is_valid_ethaddr(mac_addr)) if (is_valid_ethaddr(mac_addr))
valid_mac = true; eth_setenv_enetaddr("ethaddr", mac_addr);
}
if (!valid_mac) {
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
} }
eth_setenv_enetaddr("ethaddr", mac_addr);
} }
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)

15
board/cm-bf537e/cm-bf537e.c
Unescape View File

@ -23,18 +23,6 @@ int checkboard(void)
return 0; return 0;
} }
static void board_init_enetaddr(char *var)
{
uchar enetaddr[6];
if (eth_getenv_enetaddr(var, enetaddr))
return;
printf("Warning: %s: generating 'random' MAC address\n", var);
net_random_ethaddr(enetaddr);
eth_setenv_enetaddr(var, enetaddr);
}
#ifndef CONFIG_BFIN_MAC #ifndef CONFIG_BFIN_MAC
# define bfin_EMAC_initialize(x) 1 # define bfin_EMAC_initialize(x) 1
#endif #endif
@ -50,9 +38,6 @@ int board_eth_init(bd_t *bis)
int misc_init_r(void) int misc_init_r(void)
{ {
board_init_enetaddr("ethaddr");
board_init_enetaddr("eth1addr");
gpio_cfi_flash_init(); gpio_cfi_flash_init();
return 0; return 0;

15
board/cm-bf537u/cm-bf537u.c
Unescape View File

@ -23,18 +23,6 @@ int checkboard(void)
return 0; return 0;
} }
static void board_init_enetaddr(char *var)
{
uchar enetaddr[6];
if (eth_getenv_enetaddr(var, enetaddr))
return;
printf("Warning: %s: generating 'random' MAC address\n", var);
net_random_ethaddr(enetaddr);
eth_setenv_enetaddr(var, enetaddr);
}
#ifndef CONFIG_BFIN_MAC #ifndef CONFIG_BFIN_MAC
# define bfin_EMAC_initialize(x) 1 # define bfin_EMAC_initialize(x) 1
#endif #endif
@ -50,9 +38,6 @@ int board_eth_init(bd_t *bis)
int misc_init_r(void) int misc_init_r(void)
{ {
board_init_enetaddr("ethaddr");
board_init_enetaddr("eth1addr");
gpio_cfi_flash_init(); gpio_cfi_flash_init();
return 0; return 0;

28
board/dnp5370/dnp5370.c
Unescape View File

@ -36,28 +36,14 @@ int checkboard(void)
#ifdef CONFIG_BFIN_MAC #ifdef CONFIG_BFIN_MAC
static void board_init_enetaddr(uchar *mac_addr) static void board_init_enetaddr(uchar *mac_addr)
{ {
#ifdef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
# define USE_MAC_IN_FLASH 0 /* we cram the MAC in the last flash sector */
#else uchar *board_mac_addr = (uchar *)0x202F0000;
# define USE_MAC_IN_FLASH 1 if (is_valid_ethaddr(board_mac_addr)) {
#endif memcpy(mac_addr, board_mac_addr, 6);
bool valid_mac = false; eth_setenv_enetaddr("ethaddr", mac_addr);
if (USE_MAC_IN_FLASH) {
/* we cram the MAC in the last flash sector */
uchar *board_mac_addr = (uchar *)0x202F0000;
if (is_valid_ethaddr(board_mac_addr)) {
memcpy(mac_addr, board_mac_addr, 6);
valid_mac = true;
}
}
if (!valid_mac) {
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
} }
#endif
eth_setenv_enetaddr("ethaddr", mac_addr);
} }
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)

12
board/ip04/ip04.c
Unescape View File

@ -26,16 +26,4 @@ int board_eth_init(bd_t *bis)
{ {
return dm9000_initialize(bis); return dm9000_initialize(bis);
} }
int misc_init_r(void)
{
uchar enetaddr[6];
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(enetaddr);
eth_setenv_enetaddr("ethaddr", enetaddr);
}
return 0;
}
#endif #endif

40
board/tcm-bf518/tcm-bf518.c
Unescape View File

@ -23,52 +23,12 @@ int checkboard(void)
} }
#if defined(CONFIG_BFIN_MAC) #if defined(CONFIG_BFIN_MAC)
static void board_init_enetaddr(uchar *mac_addr)
{
bool valid_mac = false;
#if 0
/* the MAC is stored in OTP memory page 0xDF */
uint32_t ret;
uint64_t otp_mac;
ret = bfrom_OtpRead(0xDF, OTP_LOWER_HALF, &otp_mac);
if (!(ret & OTP_MASTER_ERROR)) {
uchar *otp_mac_p = (uchar *)&otp_mac;
for (ret = 0; ret < 6; ++ret)
mac_addr[ret] = otp_mac_p[5 - ret];
if (is_valid_ethaddr(mac_addr))
valid_mac = true;
}
#endif
if (!valid_mac) {
puts("Warning: Generating 'random' MAC address\n");
net_random_ethaddr(mac_addr);
}
eth_setenv_enetaddr("ethaddr", mac_addr);
}
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
return bfin_EMAC_initialize(bis); return bfin_EMAC_initialize(bis);
} }
#endif #endif
int misc_init_r(void)
{
#ifdef CONFIG_BFIN_MAC
uchar enetaddr[6];
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
board_init_enetaddr(enetaddr);
#endif
return 0;
}
#ifdef CONFIG_BFIN_SDH #ifdef CONFIG_BFIN_SDH
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {

15
board/tcm-bf537/tcm-bf537.c
Unescape View File

@ -23,18 +23,6 @@ int checkboard(void)
return 0; return 0;
} }
static void board_init_enetaddr(char *var)
{
uchar enetaddr[6];
if (eth_getenv_enetaddr(var, enetaddr))
return;
printf("Warning: %s: generating 'random' MAC address\n", var);
net_random_ethaddr(enetaddr);
eth_setenv_enetaddr(var, enetaddr);
}
#ifndef CONFIG_BFIN_MAC #ifndef CONFIG_BFIN_MAC
# define bfin_EMAC_initialize(x) 1 # define bfin_EMAC_initialize(x) 1
#endif #endif
@ -50,9 +38,6 @@ int board_eth_init(bd_t *bis)
int misc_init_r(void) int misc_init_r(void)
{ {
board_init_enetaddr("ethaddr");
board_init_enetaddr("eth1addr");
gpio_cfi_flash_init(); gpio_cfi_flash_init();
return 0; return 0;

3
configs/bct-brettl2_defconfig
Unescape View File

@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_TARGET_BCT_BRETTL2=y CONFIG_NET=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/bf518f-ezbrd_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_BF518F_EZBRD=y CONFIG_TARGET_BF518F_EZBRD=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/bf526-ezbrd_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_BF526_EZBRD=y CONFIG_TARGET_BF526_EZBRD=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/bf527-ezkit_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_BF527_EZKIT=y CONFIG_TARGET_BF527_EZKIT=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/bf537-minotaur_defconfig
Unescape View File

@ -1,2 +1,4 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_BF537_MINOTAUR=y CONFIG_TARGET_BF537_MINOTAUR=y
CONFIG_NET_RANDOM_ETHADDR=y

2
configs/bf537-pnav_defconfig
Unescape View File

@ -1,2 +1,4 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_BF537_PNAV=y CONFIG_TARGET_BF537_PNAV=y
CONFIG_NET_RANDOM_ETHADDR=y

2
configs/bf537-srv1_defconfig
Unescape View File

@ -1,2 +1,4 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_BF537_SRV1=y CONFIG_TARGET_BF537_SRV1=y
CONFIG_NET_RANDOM_ETHADDR=y

2
configs/bf537-stamp_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_BF537_STAMP=y CONFIG_TARGET_BF537_STAMP=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/cm-bf527_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_CM_BF527=y CONFIG_TARGET_CM_BF527=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/cm-bf537e_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_CM_BF537E=y CONFIG_TARGET_CM_BF537E=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/cm-bf537u_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_CM_BF537U=y CONFIG_TARGET_CM_BF537U=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/dnp5370_defconfig
Unescape View File

@ -1,2 +1,4 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_DNP5370=y CONFIG_TARGET_DNP5370=y
CONFIG_NET_RANDOM_ETHADDR=y

2
configs/ip04_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_IP04=y CONFIG_TARGET_IP04=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/lschlv2_defconfig
Unescape View File

@ -1,4 +1,6 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_KIRKWOOD=y CONFIG_KIRKWOOD=y
CONFIG_TARGET_LSXL=y CONFIG_TARGET_LSXL=y
CONFIG_NET=y
CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2" CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
CONFIG_NET_RANDOM_ETHADDR=y

2
configs/lsxhl_defconfig
Unescape View File

@ -1,4 +1,6 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_KIRKWOOD=y CONFIG_KIRKWOOD=y
CONFIG_TARGET_LSXL=y CONFIG_TARGET_LSXL=y
CONFIG_NET=y
CONFIG_SYS_EXTRA_OPTIONS="LSXHL" CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
CONFIG_NET_RANDOM_ETHADDR=y

2
configs/tcm-bf518_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_TCM_BF518=y CONFIG_TARGET_TCM_BF518=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

2
configs/tcm-bf537_defconfig
Unescape View File

@ -1,3 +1,5 @@
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_TARGET_TCM_BF537=y CONFIG_TARGET_TCM_BF537=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y

6
drivers/net/dm9000x.c
Unescape View File

@ -343,13 +343,7 @@ static int dm9000_init(struct eth_device *dev, bd_t *bd)
printf("MAC: %pM\n", dev->enetaddr); printf("MAC: %pM\n", dev->enetaddr);
if (!is_valid_ethaddr(dev->enetaddr)) { if (!is_valid_ethaddr(dev->enetaddr)) {
#ifdef CONFIG_RANDOM_MACADDR
printf("Bad MAC address (uninitialized EEPROM?), randomizing\n");
net_random_ethaddr(dev->enetaddr);
printf("MAC: %pM\n", dev->enetaddr);
#else
printf("WARNING: Bad MAC address (uninitialized EEPROM?)\n"); printf("WARNING: Bad MAC address (uninitialized EEPROM?)\n");
#endif
} }
/* fill device MAC address registers */ /* fill device MAC address registers */

3
drivers/net/ftmac110.c
Unescape View File

@ -424,9 +424,6 @@ int ftmac110_initialize(bd_t *bis)
dev->send = ftmac110_send; dev->send = ftmac110_send;
dev->recv = ftmac110_recv; dev->recv = ftmac110_recv;
if (!eth_getenv_enetaddr_by_index("eth", card_nr, dev->enetaddr))
net_random_ethaddr(dev->enetaddr);
/* allocate tx descriptors (it must be 16 bytes aligned) */ /* allocate tx descriptors (it must be 16 bytes aligned) */
chip->txd = dma_alloc_coherent( chip->txd = dma_alloc_coherent(
sizeof(struct ftmac110_desc) * CFG_TXDES_NUM, &chip->txd_dma); sizeof(struct ftmac110_desc) * CFG_TXDES_NUM, &chip->txd_dma);

1
include/configs/bf537-minotaur.h
Unescape View File

@ -131,7 +131,6 @@
#define CONFIG_SYS_LONGHELP 1 #define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_CMDLINE_EDITING 1
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
#define CONFIG_MISC_INIT_R
#define CONFIG_BAUDRATE 57600 #define CONFIG_BAUDRATE 57600
#define CONFIG_UART_CONSOLE 0 #define CONFIG_UART_CONSOLE 0

1
include/configs/bf537-pnav.h
Unescape View File

@ -148,7 +148,6 @@
* Misc Settings * Misc Settings
*/ */
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN #define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0 #define CONFIG_UART_CONSOLE 0

1
include/configs/bf537-srv1.h
Unescape View File

@ -130,7 +130,6 @@
#define CONFIG_SYS_LONGHELP 1 #define CONFIG_SYS_LONGHELP 1
#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_CMDLINE_EDITING 1
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
#define CONFIG_MISC_INIT_R
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_UART_CONSOLE 0 #define CONFIG_UART_CONSOLE 0

1
include/configs/ip04.h
Unescape View File

@ -131,7 +131,6 @@
* Misc Settings * Misc Settings
*/ */
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_MISC_INIT_R /* needed for MAC address */
#define CONFIG_UART_CONSOLE 0 #define CONFIG_UART_CONSOLE 0
#undef CONFIG_SHOW_BOOT_PROGRESS #undef CONFIG_SHOW_BOOT_PROGRESS

1
include/configs/lsxl.h
Unescape View File

@ -37,7 +37,6 @@
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R
#define CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_RANDOM_MACADDR
#define CONFIG_LIB_RAND #define CONFIG_LIB_RAND
#define CONFIG_KIRKWOOD_GPIO #define CONFIG_KIRKWOOD_GPIO
#define CONFIG_OF_LIBFDT #define CONFIG_OF_LIBFDT

1
include/configs/tcm-bf518.h
Unescape View File

@ -109,7 +109,6 @@
* Misc Settings * Misc Settings
*/ */
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN #define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0 #define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot" #define CONFIG_BOOTCOMMAND "run flashboot"

Write Preview
Loading…
Cancel
Save