grml...

[seabios.git] / vgasrc / vgaentry.S

diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S
index 7802bdb52765896b8a50a3d5f446768e1b0eb780..785d91f5fcd41345986acdd1429e09de5b1d3730 100644 (file)
--- a/vgasrc/vgaentry.S
+++ b/vgasrc/vgaentry.S
@@ -10,8 +10,9 @@
  ****************************************************************/
 
         .code16gcc
-.include "out/vgaccode.16.s"
+#include "vgaccode.16.s"
 
+#include "config.h" // CONFIG_*
 #include "entryfuncs.S" // ENTRY_*
 
 
@@ -28,13 +29,32 @@ _rom_header_size:
 _rom_header_entry:
         jmp _optionrom_entry
 _rom_header_checksum:
-        .space 22
+        .byte 0
+_rom_header_other:
+        .space 17
+_rom_header_pcidata:
+#if CONFIG_VGA_PCI == 1
+        .word rom_pci_data
+#else
+        .word 0
+#endif
+_rom_header_pnpdata:
+        .word 0
+_rom_header_other2:
+        .word 0
+_rom_header_signature:
+        .asciz "IBM"
 
 
 /****************************************************************
  * Entry points
  ****************************************************************/
 
+        DECLFUNC entry_104f05
+entry_104f05:
+        ENTRY_ARG vbe_104f05
+        lretw
+
         DECLFUNC _optionrom_entry
 _optionrom_entry:
         ENTRY_ARG vga_post