summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Walle <bwalle@suse.de>2008-05-09 18:43:55 +0200
committerSimon Horman <horms@verge.net.au>2008-05-21 16:02:26 +1000
commit1864bbbed1909d67420eb6bf45e46b651056936d (patch)
treefa9383556cba9143c097530b409a6cf8ee828c44
parenteaf01a039a1e00e9da52329ac337b00bb9c7f95d (diff)
Update 32 bit boot protocol
This patch updates the boot protocol to match with the kernel. See Documentation/i386/zero-page.txt in kernel. The number of E820 map entries have been increased from 32 to 128. The update is necessary for the next patch that implements EDD support for kexec. when using the default 32 bit mode. Signed-off-by: Bernhard Walle <bwalle@suse.de> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--doc/linux-i386-zero-page.txt3
-rw-r--r--include/x86/x86-linux.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/linux-i386-zero-page.txt b/doc/linux-i386-zero-page.txt
index bbdf726..e2582a6 100644
--- a/doc/linux-i386-zero-page.txt
+++ b/doc/linux-i386-zero-page.txt
@@ -75,5 +75,4 @@ Offset Type Description
0x224 unsigned short setup.S heap end pointer
0x290 - 0x2cf EDD_MBR_SIG_BUFFER (edd.S)
0x2d0 - 0x600 E820MAP
-0x600 - 0x7ff EDDBUF (edd.S) for disk signature read sector
-0x600 - 0x7eb EDDBUF (edd.S) for edd data
+0xd00 - 0xeec EDDBUF (edd.S) for edd data
diff --git a/include/x86/x86-linux.h b/include/x86/x86-linux.h
index 0669c8c..fc44195 100644
--- a/include/x86/x86-linux.h
+++ b/include/x86/x86-linux.h
@@ -4,7 +4,7 @@
#define TENATIVE 0 /* Code that is tenatively correct but hasn't yet been officially accepted */
#define E820MAP 0x2d0 /* our map */
-#define E820MAX 32 /* number of entries in E820MAP */
+#define E820MAX 128 /* number of entries in E820MAP */
#define E820NR 0x1e8 /* # entries in E820MAP */
#ifndef ASSEMBLY