Index: stand/efi/loader/efiserialio.c
===================================================================
--- stand/efi/loader/efiserialio.c
+++ stand/efi/loader/efiserialio.c
@@ -40,10 +40,6 @@
 
 #define	COMC_TXWAIT	0x40000		/* transmit timeout */
 
-#ifndef	COMSPEED
-#define	COMSPEED	9600
-#endif
-
 #define	PNP0501		0x501		/* 16550A-compatible COM port */
 
 struct serial {
@@ -261,11 +257,14 @@
 		if (comc_port == NULL)
 			return;
 	}
-	comc_port->baudrate = COMSPEED;
-	comc_port->ioaddr = 0;			/* default port */
-	comc_port->databits = 8;		/* 8,n,1 */
-	comc_port->parity = NoParity;		/* 8,n,1 */
-	comc_port->stopbits = OneStopBit;	/* 8,n,1 */
+	/*
+	 * setting default values from firmware
+	 */
+	comc_port->baudrate = 0;
+	comc_port->ioaddr = 0;
+	comc_port->databits = 0;
+	comc_port->parity = DefaultParity;
+	comc_port->stopbits = DefaultStopBits;
 	comc_port->ignore_cd = 1;		/* ignore cd */
 	comc_port->rtsdtr_off = 0;		/* rts-dtr is on */
 	comc_port->sio = NULL;