27c27
< __FBSDID("$FreeBSD: head/sys/boot/i386/libi386/comconsole.c 241300 2012-10-06 20:04:51Z avg $");
---
> __FBSDID("$FreeBSD: head/sys/boot/i386/libi386/comconsole.c 245848 2013-01-23 18:34:21Z jhb $");
53d52
< static void set_hw_console_hint(void);
205c204
< comc_port != port) {
---
> comc_port != port)
207,208d205
< set_hw_console_hint();
< }
215,225d211
< static void
< set_hw_console_hint(void)
< {
< char intbuf[64];
<
< unsetenv("hw.uart.console");
< sprintf(intbuf, "io:%d,br:%d", comc_port, comc_curspeed);
< env_setenv("hw.uart.console", EV_VOLATILE, intbuf,
< env_noset, env_nounset);
< }
<
291d276
< set_hw_console_hint();
320a306
> char intbuf[64];
322a309
> unsetenv("hw.uart.console");
337c324
< if (tries < TRY_COUNT)
---
> if (tries < TRY_COUNT) {
339c326,328
< else
---
> sprintf(intbuf, "io:%d,br:%d", comc_port, comc_curspeed);
> env_setenv("hw.uart.console", EV_VOLATILE, intbuf, NULL, NULL);
> } else