Skip to content

1879vm8ya modify init sequence #4

Open
anton-bondarev wants to merge 1 commit into
base: rcm-develop
Choose a base branch
from
Open

1879vm8ya modify init sequence #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions common/board_r.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,11 +599,20 @@ static int initr_bbmii(void)
static int initr_net(void)
{
puts("Net: ");
eth_initialize();

if (!eth_initialize()) {
#if defined(CONFIG_TARGET_1879VM8YA)
env_set("stdin", "serial");
env_set("stdout", "serial");
env_set("stderr", "serial");
#endif // defined(CONFIG_TARGET_1879VM8YA)
}

#if defined(CONFIG_RESET_PHY_R)
debug("Reset Ethernet PHY\n");
reset_phy();
#endif

return 0;
}
#endif
Expand Down Expand Up @@ -799,7 +808,10 @@ static init_fnc_t init_sequence_r[] = {
#ifdef CONFIG_API
initr_api,
#endif
console_init_r, /* fully init console as a device */
#if !defined(CONFIG_TARGET_1879VM8YA)
/* there is the only netconsole on nm6408 we init it after net init */
console_init_r, /* fully init console as a device */
#endif // !defined(CONFIG_TARGET_1879VM8YA)
#ifdef CONFIG_DISPLAY_BOARDINFO_LATE
console_announce_r,
show_board_info,
Expand Down Expand Up @@ -845,6 +857,10 @@ static init_fnc_t init_sequence_r[] = {
INIT_FUNC_WATCHDOG_RESET
initr_net,
#endif
#if defined(CONFIG_TARGET_1879VM8YA)
/* there is the only netconsole on nm6408 we init it after net init */
console_init_r, /* fully init console as a device */
#endif // !defined(CONFIG_TARGET_1879VM8YA)
#ifdef CONFIG_POST
initr_post,
#endif
Expand Down