projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-tegra
[oweals/u-boot.git]
/
board
/
siemens
/
rut
/
board.c
diff --git
a/board/siemens/rut/board.c
b/board/siemens/rut/board.c
index fb840f7ed2263ad2f96107280d17d759b2aa107f..2a97414bafa508d4a59137d35ef04426676b3521 100644
(file)
--- a/
board/siemens/rut/board.c
+++ b/
board/siemens/rut/board.c
@@
-174,7
+174,7
@@
static struct cpsw_platform_data cpsw_data = {
};
#if defined(CONFIG_DRIVER_TI_CPSW) || \
};
#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)
{
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
int board_eth_init(bd_t *bis)
{
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
@@
-182,7
+182,7
@@
int board_eth_init(bd_t *bis)
int rv;
#ifndef CONFIG_SPL_BUILD
int rv;
#ifndef CONFIG_SPL_BUILD
- factoryset_
setenv
();
+ factoryset_
env_set
();
#endif
/* Set rgmii mode and enable rmii clock to be sourced from chip */
#endif
/* Set rgmii mode and enable rmii clock to be sourced from chip */
@@
-480,9
+480,9
@@
int board_late_init(void)
sprintf(tmp, "%s_%s", factory_dat.asn,
factory_dat.comp_version);
else
sprintf(tmp, "%s_%s", factory_dat.asn,
factory_dat.comp_version);
else
- s
printf
(tmp, "QMX7.E38_4.0");
+ s
trcpy
(tmp, "QMX7.E38_4.0");
- ret =
setenv
("boardid", tmp);
+ ret =
env_set
("boardid", tmp);
if (ret)
printf("error setting board id\n");
if (ret)
printf("error setting board id\n");