fiasco: bootstrap: Try to launch bootstrap in real mode. Gives an error with PIO...

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 6fd45587694ea781e08e0783e40253fde62b9d87..37725ee67303fa79de3cf54dfd9e98ee2d678885 100644 (file)
--- a/l4/pkg/bootstrap_custom/server/src/ARCH-x86/crt0.S
+++ b/l4/pkg/bootstrap_custom/server/src/ARCH-x86/crt0.S
@@ -8,8 +8,7 @@
  * Please see the COPYING-GPL-2 file for details.
  */
 #include <l4/sys/compiler.h>
-#define JH
-#ifdef JH
+#ifdef JAILHOUSE
 #include "inmate.h" 
 #define X86_CR0_PE             0x00000001
 
@@ -29,7 +28,7 @@ start16:
     or $X86_CR0_PE,%al
     mov %eax,%cr0
 
-    ljmpl $INMATE_CS32,$_start + FSEGMENT_BASE
+    ljmpl $INMATE_CS32,$_start
 
 .code32
 

diff --git a/l4/pkg/bootstrap_custom/server/src/Makeconf.local b/l4/pkg/bootstrap_custom/server/src/Makeconf.local
index 1251ba110dae4633ef9ed08cd8a1757add49c364..5056ba83824ffa952ca2be02cf77f7a4b43f7cc3 100644 (file)
--- a/l4/pkg/bootstrap_custom/server/src/Makeconf.local
+++ b/l4/pkg/bootstrap_custom/server/src/Makeconf.local
@@ -1,4 +1,5 @@
 #our jailhouse-specific build config
 DEFINES += -DJAILHOUSE
-#DEFINES += -DIMAGE_MODE
-#DEFINES += -DREALMODE_LOADING
+DEFINES += -DIMAGE_MODE
+DEFINES += -DREALMODE_LOADING
+DEFINES += -DRAM_SIZE_MB

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 85a1c15297e4a7a93800147147b62b8c1d1aa3a7..b0db767122d598e1cccc74b055f7ad127fcaef53 100644 (file)
--- a/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc
+++ b/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc
@@ -374,7 +374,7 @@ void __main(l4util_mb_info_t *mbi, unsigned long p2, char const *realmode_si,
   _x86_pc_platform.realmode_pointer = realmode_si;
   cmdline = _x86_pc_platform.cmdline();
   if (!cmdline)
-    cmdline = _mbi_cmdline;
+    cmdline = 0;//_mbi_cmdline;
 #else
   (void)realmode_si;
   assert(p2 == L4UTIL_MB_VALID); /* we need to be multiboot-booted */