Changeset dabaa83 in mainline for kernel

Timestamp:

2019-06-05T06:37:17Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f3f4149

Parents:

77918b0

Message:

Add boot arguments support for Malta

This commit makes it possible to pass console configuration via proper
boot arguemnts instead of having a hardcoded value in the kernel.

Location:

kernel/arch/mips32

Files:

• include/arch/arch.h (modified) (2 diffs)
• src/mach/malta/malta.c (modified) (2 diffs)
• src/mips32.c (modified) (1 diff)

kernel/arch/mips32/include/arch/arch.h

@@ -42 +42 @@
 #define CPUMAP_MAX_RECORDS         32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
+#define BOOTINFO_BOOTARGS_BUFLEN   256
 
 extern size_t cpu_count;
@@ -66 +67 @@
         uint32_t cpumap;
         taskmap_t taskmap;
+        char bootargs[BOOTINFO_BOOTARGS_BUFLEN];
 } bootinfo_t;
 

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

@@ -46 +46 @@
 #include <sysinfo/sysinfo.h>
 #include <log.h>
-#include <str.h>
 
 static void malta_init(void);
@@ -116 +115 @@
             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));
 }
 

kernel/arch/mips32/src/mips32.c

@@ -107 +107 @@
 #endif
 
+        str_cpy(bargs, CONFIG_BOOT_ARGUMENTS_BUFLEN, bootinfo->bootargs);
+
         /* Initialize machine_ops pointer. */
         machine_ops_init();