summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-10 07:49:20 -0600
committerSimon Glass <sjg@chromium.org>2014-10-23 19:45:45 -0600
commite98a03ca68ca0edd08c260126aacc8c0f550804a (patch)
treefdfa45d062d384369bc0271b4671028043a5faa9 /arch
parentd1259c9f5fec24294344ebe5a66ec52376b3d46b (diff)
downloadblackbird-obmc-uboot-e98a03ca68ca0edd08c260126aacc8c0f550804a.tar.gz
blackbird-obmc-uboot-e98a03ca68ca0edd08c260126aacc8c0f550804a.zip
dm: x86: Convert coreboot serial to use driver model
This makes use of the existing device tree node to use driver model for the serial console. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/dts/coreboot.dtsi4
-rw-r--r--arch/x86/include/asm/ibmpc.h10
2 files changed, 2 insertions, 12 deletions
diff --git a/arch/x86/dts/coreboot.dtsi b/arch/x86/dts/coreboot.dtsi
index c989152887..c8dc4cec3c 100644
--- a/arch/x86/dts/coreboot.dtsi
+++ b/arch/x86/dts/coreboot.dtsi
@@ -1,8 +1,8 @@
/include/ "skeleton.dtsi"
/ {
- aliases {
- console = "/serial";
+ chosen {
+ stdout-path = "/serial";
};
serial {
diff --git a/arch/x86/include/asm/ibmpc.h b/arch/x86/include/asm/ibmpc.h
index 0f9665f549..e6d183b479 100644
--- a/arch/x86/include/asm/ibmpc.h
+++ b/arch/x86/include/asm/ibmpc.h
@@ -18,14 +18,4 @@
#define SYSCTLA 0x92
#define SLAVE_PIC 0xa0
-#if 1
-#define UART0_BASE 0x3f8
-#define UART1_BASE 0x2f8
-#else
-/* FixMe: uarts swapped */
-#define UART0_BASE 0x2f8
-#define UART1_BASE 0x3f8
-#endif
-
-
#endif
OpenPOWER on IntegriCloud