Changeset 8a9a41e in mainline for kernel/arch/arm64/src/machine_func.c

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (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.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• kernel/arch/arm64/src/machine_func.c (modified) (3 diffs)

kernel/arch/arm64/src/machine_func.c

@@ -37 +37 @@
 
 #include <arch/machine_func.h>
+#include <arch/mach/hikey960/hikey960.h>
 #include <arch/mach/virt/virt.h>
 
@@ -47 +48 @@
 #if defined(MACHINE_virt)
         machine_ops = &virt_machine_ops;
+#elif defined(MACHINE_hikey960)
+        machine_ops = &hikey960_machine_ops;
 #else
 #error Machine type not defined.
@@ -98 +101 @@
 }
 
+/** Early debugging output. */
+void machine_early_uart_output(char32_t c)
+{
+        if (machine_ops->machine_early_uart_output != NULL)
+                machine_ops->machine_early_uart_output(c);
+}
+
 /** @}
  */