Changeset 69c31ab in mainline

Timestamp:

2019-04-06T13:06:40Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46e886f

Parents:

3d0fd0d

Message:

Enable malta user console on com1

Still a WiP as proper arbitration with the kernel console does not work
yet.

Files:

• boot/arch/mips32/Makefile.inc (modified) (1 diff)
• kernel/arch/mips32/src/mach/malta/malta.c (modified) (3 diffs)

boot/arch/mips32/Makefile.inc

@@ -54 +54 @@
         RD_DRVS_ESSENTIAL += \
                 platform/malta \
+                intctl/i8259 \
                 block/ata_bd \
                 bus/pci/pciintel \
                 bus/isa \
                 char/i8042 \
+                char/ns8250 \
                 hid/ps2mouse \
                 hid/xtkbd

kernel/arch/mips32/src/mach/malta/malta.c

@@ -44 +44 @@
 #include <stdbool.h>
 #include <byteorder.h>
+#include <sysinfo/sysinfo.h>
 #include <log.h>
+#include <str.h>
 
 static void malta_init(void);
@@ -100 +102 @@
 
         i8259_init((i8259_t *) PIC0_BASE, (i8259_t *) PIC1_BASE, 0);
+        sysinfo_set_item_val("i8259", NULL, true);
 
         int_handler[INT_HW0] = malta_isa_irq_handler;
@@ -113 +116 @@
             NULL, NULL, tty_out_ptr);
 #endif
+
+        const char *args = "console=devices/\\hw\\pci0\\00:0a.0\\com1\\a";
+        str_ncpy(bargs, CONFIG_BOOT_ARGUMENTS_BUFLEN, args, str_length(args));
 }