From 0c56c1e360ea6bbd56cf39922eb73700ca12aa27 Mon Sep 17 00:00:00 2001
From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Sat, 16 Apr 2016 15:32:39 +0200
Subject: [PATCH] fiasco: bootstrap: Try to launch bootstrap in real mode.
 Gives an error with PIO port 80 on launch.

---
 l4/pkg/bootstrap_custom/server/src/ARCH-x86/crt0.S    | 5 ++---
 l4/pkg/bootstrap_custom/server/src/Makeconf.local     | 5 +++--
 l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

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 6fd455876..37725ee67 100644
--- 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 1251ba110..5056ba838 100644
--- 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 85a1c1529..b0db76712 100644
--- 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 */
-- 
2.39.2