grunt: Adjust serial config

Adjust the coreboot serial config so that grunt works correctly. Since
grunt is the only board supporting U-Boot we can do this globally for now.

BUG=chromium:837018
BRANCH=grunt
TEST=FW_NAME=grunt USE="altfw u-boot tianocore -cb_legacy_tianocore em100-mode" \
	emerge-grunt --nodeps -q u-boot depthcharge chromeos-bootimage
See that we can boot into U-Boot from the menu and the display and UART
work.

Change-Id: I2cd3e79e22c94fa2e61927272e71ff17125708f7
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1273930
Reviewed-by: Raul E Rangel <rrangel@chromium.org>
diff --git a/arch/x86/dts/serial.dtsi b/arch/x86/dts/serial.dtsi
index 22f7b54..8f0e2d7 100644
--- a/arch/x86/dts/serial.dtsi
+++ b/arch/x86/dts/serial.dtsi
@@ -2,9 +2,9 @@
 	serial: serial {
 		u-boot,dm-pre-reloc;
 		compatible = "ns16550";
-		reg = <0x3f8 8>;
-		reg-shift = <0>;
-		clock-frequency = <1843200>;
+		reg = <0xfedc6000 8>;
+		reg-shift = <2>;
+		clock-frequency = <48000000>;
 		current-speed = <115200>;
 	};
 };
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index f0b027e..7b7a24e 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -49,7 +49,7 @@
  */
 #define CONFIG_SYS_BAUDRATE_TABLE	{300, 600, 1200, 2400, 4800, \
 					 9600, 19200, 38400, 115200}
-#define CONFIG_SYS_NS16550_PORT_MAPPED
+#define CONFIG_SYS_NS16550_MEM32
 
 /*-----------------------------------------------------------------------
  * Command line configuration.