Merge remote-tracking branch 'genec/diag-mbr-fix-for-hpa'

diff --git a/diag/mbr/README b/diag/mbr/README
index fb7a7dd..96b67c6 100644 (file)
--- a/diag/mbr/README
+++ b/diag/mbr/README
@@ -5,11 +5,13 @@ handoff.bin   Show the data that the BIOS/MBR hands off to an MBR/VBR.
 
   +++ USAGE +++
 
+NOTE: in the examples, mbr.bin, /dev/hda and /dev/hda1 are used as generic representations.
+
 Writing out an MBR is straight forward (it is assumed below that /dev/hda is the target raw device and /dev/hda1 is the target partition):
 
   dd conv=notrunc bs=440 count=1 if=mbr.bin of=/dev/hda
 
-Writing a VBR to match Syslinux requires more work as it must have a jump and be offset into the partition:
+Writing a VBR to match Syslinux requires more work as it must have a jump and be offset into the partition (and as a result the code must be compaible with this offset):
 
   echo -en "\0353\0130\0220" |dd conv=notrunc bs=1 count=3 of=/dev/hda1
   dd conv=notrunc bs=2 count=210 seek=45 if=mbr.bin of=/dev/hda1

diff --git a/diag/mbr/handoff.S b/diag/mbr/handoff.S
index 7af3fde..ab8582b 100644 (file)
--- a/diag/mbr/handoff.S
+++ b/diag/mbr/handoff.S
@@ -43,11 +43,11 @@
  * Install instructions (assuming your target is /dev/dev; file or block device):
  *
  * MBR:
- * dd conv=notrunc bs=440 count=1 if=mbr_ho.bin of=/dev/dev
+ * dd conv=notrunc bs=440 count=1 if=handoff.bin of=/dev/dev
  *
  * VBR/PBR (should work for FAT12/16/32, ext[234]fs, btrfs):
  * echo -en "\0353\0130\0220" |dd conv=notrunc bs=1 count=3 of=/dev/dev
- * dd conv=notrunc bs=2 count=210 seek=45 if=mbr_ho.bin of=/dev/dev
+ * dd conv=notrunc bs=2 count=210 seek=45 if=handoff.bin of=/dev/dev
  */
 
 // #define DEBUG_MARKER1       /* Insert markers in binary */