X-Git-Url: https://rtime.felk.cvut.cz/gitweb/l4.git/blobdiff_plain/a7693b3898298fcd31931434cfc4278c979ef631..334cc72b9b4eacba3a46f44d16c63e5dcdb1648a:/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc diff --git a/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc b/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc index 17b24edba..427cdbbfb 100644 --- a/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc +++ b/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc @@ -372,9 +372,9 @@ void __main(l4util_mb_info_t *mbi, unsigned long p2, char const *realmode_si, (void)mbi; (void)p2; _x86_pc_platform.realmode_pointer = realmode_si; - cmdline = _x86_pc_platform.cmdline(); -// if (!cmdline) -// cmdline = _mbi_cmdline; + cmdline = _x86_pc_platform.cmdline(); + if (!cmdline) + cmdline = ""; #else (void)realmode_si; assert(p2 == L4UTIL_MB_VALID); /* we need to be multiboot-booted */ @@ -382,7 +382,7 @@ void __main(l4util_mb_info_t *mbi, unsigned long p2, char const *realmode_si, cmdline = (char const *)(l4_addr_t)mbi->cmdline; #endif _x86_pc_platform.setup_uart(cmdline); - + printf("cmdline:%p, realmode_si=%p\n", cmdline, realmode_si); startup(cmdline); }