Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Allow selection of different BIOSes for the PC hardware class
[palacios.git] / palacios / src / palacios / vmm_binaries.S
index b834952..cca75ef 100644 (file)
@@ -29,20 +29,33 @@ v3_vmxassist_start:
 v3_vmxassist_end:
 #endif
 
-
+#if V3_CONFIG_SEABIOS || V3_CONFIG_BOCHSBIOS
 .globl v3_vgabios_start
 v3_vgabios_start:
-.incbin V3_CONFIG_VGABIOS_PATH
+#if V3_CONFIG_SEABIOS
+.incbin V3_CONFIG_SEABIOSVGA_PATH
+#endif
+#if V3_CONFIG_BOCHSBIOS
+.incbin V3_CONFIG_BOCHSBIOSVGA_PATH
+#endif
 .global v3_vgabios_end
 v3_vgabios_end:
+#endif
 
 .globl v3_rombios_start
 v3_rombios_start:
-.incbin V3_CONFIG_ROMBIOS_PATH
+#if V3_CONFIG_SEABIOS
+.incbin V3_CONFIG_SEABIOS_PATH
+#endif
+#if V3_CONFIG_ROMBIOS
+.incbin V3_CONFIG_BOCHBIOS_PATH
+#endif
+#if V3_CONFIG_OTHERBIOS
+.incbin V3_CONFIG_OTHERBIOS_PATH
+#endif
 .globl v3_rombios_end
 v3_rombios_end:
 
-
 #ifdef V3_CONFIG_USE_PXE_BIOS
 .globl pxebios_start
 pxebios_start: