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

diff --git a/l4/pkg/bootstrap_custom/server/src/ARCH-x86/crt0.S b/l4/pkg/bootstrap_custom/server/src/ARCH-x86/crt0.S
index 91140542fb43c8c3e6a2b63d2261bbc21aef9f57..3595b3497aa5c6668fa5f34ca5d3ac7dc6abfeff 100644 (file)
--- a/l4/pkg/bootstrap_custom/server/src/ARCH-x86/crt0.S
+++ b/l4/pkg/bootstrap_custom/server/src/ARCH-x86/crt0.S
@@ -93,7 +93,7 @@ _start:
        leal    _stack, %esp
 #endif
        pushl   $0
-       pushl   %esi    /* Pointer to real mode or Xen start_info pointer */
+       pushl   $0      /* No Xen start_info pointer */
        pushl   %eax
        pushl   %ebx
 

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 7a4db08c7dfce80608a84215a18ed66fe5b87d43..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
@@ -65,7 +65,7 @@ struct Platform_x86_1 : Platform_x86
 
   char const *cmdline() const
   {
-    //return 0;
+    return 0;
     l4_uint32_t p = *(l4_uint32_t*)(realmode_pointer + 0x228);
     if (!p)
       return 0;
@@ -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);
 }