Changeset bc73be3 in mainline for kernel/arch/sparc64/src/console.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• kernel/arch/sparc64/src/console.c (modified) (2 diffs)

kernel/arch/sparc64/src/console.c

@@ -37 +37 @@
 #include <arch/drivers/scr.h>
 #include <arch/drivers/kbd.h>
+#include <arch/drivers/tty.h>
 #include <genarch/srln/srln.h>
 #include <console/chardev.h>
@@ -84 +85 @@
         kbd_init(keyboard);
 #endif
+
+#ifdef CONFIG_SUN_TTY
+        ofw_tree_property_t *prop_tty = ofw_tree_getprop(aliases, "ttya");
+        if (prop_tty && prop_tty->value) {
+                ofw_tree_node_t *tty = ofw_tree_lookup(prop_tty->value);
+                if (tty)
+                        tty_init(tty);
+        }
+#endif
 }