projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: musb-new: CONFIG_MUSB prefix replacement with CONFIG_USB_MUSB
[platform/kernel/u-boot.git]
/
board
/
siemens
/
pxm2
/
board.c
diff --git
a/board/siemens/pxm2/board.c
b/board/siemens/pxm2/board.c
index
264ba02
..
750f338
100644
(file)
--- a/
board/siemens/pxm2/board.c
+++ b/
board/siemens/pxm2/board.c
@@
-213,7
+213,7
@@
static struct cpsw_platform_data cpsw_data = {
#endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
#if defined(CONFIG_DRIVER_TI_CPSW) || \
#endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
#if defined(CONFIG_DRIVER_TI_CPSW) || \
- (defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET))
+ (defined(CONFIG_USB_ETHER) && defined(CONFIG_
USB_
MUSB_GADGET))
int board_eth_init(bd_t *bis)
{
int n = 0;
int board_eth_init(bd_t *bis)
{
int n = 0;
@@
-222,7
+222,7
@@
int board_eth_init(bd_t *bis)
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
#ifdef CONFIG_FACTORYSET
int rv;
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
#ifdef CONFIG_FACTORYSET
int rv;
- if (!is_valid_eth
er_
addr(factory_dat.mac))
+ if (!is_valid_ethaddr(factory_dat.mac))
printf("Error: no valid mac address\n");
else
eth_setenv_enetaddr("ethaddr", factory_dat.mac);
printf("Error: no valid mac address\n");
else
eth_setenv_enetaddr("ethaddr", factory_dat.mac);