Boot framework rework (#45)

[lunaix-os.git] / lunaix-os / scripts / qemu.py

diff --git a/lunaix-os/scripts/qemu.py b/lunaix-os/scripts/qemu.py
index f12881afc8360c9a5faaefb1d9f58541fd798702..fca6da9dac4579325e817cc65a5e7bcef7c796ba 100755 (executable)
--- a/lunaix-os/scripts/qemu.py
+++ b/lunaix-os/scripts/qemu.py
@@ -311,11 +311,24 @@ class QEMUExec:
         return cmds
     
     def get_qemu_general_opts(self):
         return cmds
     
     def get_qemu_general_opts(self):

-        return [
+        opts = [

             "-m", get_config(self._opt, "memory", required=True),
             "-smp", str(get_config(self._opt, "ncpu", default=1))
         ]
 
             "-m", get_config(self._opt, "memory", required=True),
             "-smp", str(get_config(self._opt, "ncpu", default=1))
         ]
 

+        kopts = get_config(self._opt, "kernel")
+        if kopts:
+            opts += [
+                "-kernel", get_config(kopts, "bin", required=True),
+                "-append", get_config(kopts, "cmd", required=True)
+            ]
+
+            dtb = get_config(kopts, "dtb")
+            if dtb:
+                opts += [ "-dtb", dtb ]
+
+        return opts
+

     def add_peripheral(self, peripheral):
         self._devices.append(peripheral)
 
     def add_peripheral(self, peripheral):
         self._devices.append(peripheral)
 


@@ -374,7 +387,8 @@ def main():
         opts.update(json.loads(f.read()))
     
     for kv in arg_opt.values:
         opts.update(json.loads(f.read()))
     
     for kv in arg_opt.values:

-        [k, v] = kv.split('=')
+        splits = kv.split('=')
+        k, v = splits[0], "=".join(splits[1:])

         g_lookup[k] = v
 
     arch = get_config(opts, "arch")
         g_lookup[k] = v
 
     arch = get_config(opts, "arch")