summaryrefslogtreecommitdiffstats
path: root/Documentation/x86
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-12-12 20:28:39 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2012-12-12 20:28:39 -0800
commitcd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a (patch)
treeca7aa7b3967a6e05c00087db558a8606d5619049 /Documentation/x86
parent4bfe24ac1d9d9f06b30b2909f53ea462c72cfe1d (diff)
downloadlinux-cd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a.tar.gz
linux-cd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a.tar.bz2
linux-cd34ab8b16ffaa9753d85adb4fb6cd98e7e1d22a.zip
x86, doc: Document that bootloader ID 4 is used also by iPXE
Etherboot -> gPXE -> iPXE... Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Michael Brown <mbrown@fensystems.co.uk>
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/boot.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index c25a53e69f1b..9a89e01d9bce 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -373,7 +373,7 @@ Protocol: 2.00+
1 Loadlin
2 bootsect-loader (0x20, all other values reserved)
3 Syslinux
- 4 Etherboot/gPXE
+ 4 Etherboot/gPXE/iPXE
5 ELILO
7 GRUB
8 U-Boot