diff -r 3173b5e4fefd tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c	Mon Jan 05 22:57:02 2009 +0900
+++ b/tools/firmware/hvmloader/hvmloader.c	Mon Jan 05 23:24:35 2009 +0900
@@ -401,7 +401,7 @@
         printf(" - Product name: %s\n",
                (char *)rom + pnph->product_name_offset);
 
-    if ( (dest + rom->rom_size * 512 + 1) > 0xe0000u )
+    if ( (dest + rom->rom_size * 512 + 1) > 0xe9000u )
     {
         printf("Option ROM size %x exceeds available space\n",
                rom->rom_size * 512);
diff -r 3173b5e4fefd tools/firmware/rombios/rombios.c
--- a/tools/firmware/rombios/rombios.c	Mon Jan 05 22:57:02 2009 +0900
+++ b/tools/firmware/rombios/rombios.c	Mon Jan 05 23:24:35 2009 +0900
@@ -10444,8 +10444,8 @@
 rom_scan:
   ;; Scan for existence of valid expansion ROMS.
   ;;   Video ROM:   from 0xC0000..0xC7FFF in 2k increments
-  ;;   General ROM: from 0xC8000..0xDFFFF in 2k increments
-  ;;   System  ROM: only 0xE0000
+  ;;   General ROM: from 0xC8000..0xE8FFF in 2k increments
+  ;;   System  ROM: only 0xE9000
   ;;
   ;; Header:
   ;;   Offset    Value
@@ -11021,7 +11021,7 @@
   call _init_boot_vectors
 
   mov  cx, #0xc800  ;; init option roms
-  mov  ax, #0xe000
+  mov  ax, #0xe900
   call rom_scan
 
 #if BX_ELTORITO_BOOT