l4: bootstrap_custom: Fix unsupported paging mode error, which was caused by the...

[l4.git] / 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 56f99d6a04f83a8a1810e5b88b59b35aed333726..427cdbbfb863e040db1ee95cdf40c6915c97dbab 100644 (file)
--- 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);
 }