2009-05-22 Pavel Roskin <proski@gnu.org>

	* include/grub/i386/pc/kernel.h (grub_boot_drive): Change type
	to grub_uint8_t.
	(grub_root_drive): Likewise.
	* kern/i386/pc/startup.S (grub_boot_drive): Change size to byte,
	remove alignment.
	(grub_root_drive): Change size to byte.
	(grub_start_addr): Remove.
	(grub_end_addr): Likewise.
	(grub_apm_bios_info): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 577c82008474bd8ba07ea79527e5bab888de110c..9d1476cd24821064a0e7381040c2527202381600 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-05-22  Pavel Roskin  <proski@gnu.org>
+
+       * include/grub/i386/pc/kernel.h (grub_boot_drive): Change type
+       to grub_uint8_t.
+       (grub_root_drive): Likewise.
+       * kern/i386/pc/startup.S (grub_boot_drive): Change size to byte,
+       remove alignment.
+       (grub_root_drive): Change size to byte.
+       (grub_start_addr): Remove.
+       (grub_end_addr): Likewise.
+       (grub_apm_bios_info): Likewise.
+
 2009-05-21  Felix Zielcke  <fzielcke@z-51.de>
 
        * normal/i386: Remove.

diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
index b6650bc894410fc4d94b4bbe4afb47bfa3bf1eac..5acc883f5d606c98b4151a330e049e6f5832d169 100644 (file)
--- a/include/grub/i386/pc/kernel.h
+++ b/include/grub/i386/pc/kernel.h
@@ -69,13 +69,10 @@ extern grub_int32_t grub_install_bsd_part;
 extern char grub_prefix[];
 
 /* The boot BIOS drive number.  */
-extern grub_int32_t EXPORT_VAR(grub_boot_drive);
+extern grub_uint8_t EXPORT_VAR(grub_boot_drive);
 
 /* The root BIOS drive number.  */
-extern grub_int32_t grub_root_drive;
-
-/* The end address of the kernel.  */
-extern grub_addr_t grub_end_addr;
+extern grub_uint8_t grub_root_drive;
 
 #endif /* ! ASM_FILE */
 

diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 8e8b66135bb3a545fd5b047d0e83191b5113891c..fc83c4c0d2d80fcb98c22fff80cc6da5200e8a4b 100644 (file)
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -273,30 +273,12 @@ codestart:
  *  This is the area for all of the special variables.
  */
 
-       .p2align        2       /* force 4-byte alignment */
-
 VARIABLE(grub_boot_drive)
-       .long   0
+       .byte   0
 
 VARIABLE(grub_root_drive)
-       .long   0
+       .byte   0
 
-VARIABLE(grub_start_addr)
-       .long   _start
-
-VARIABLE(grub_end_addr)
-       .long   END_SYMBOL
-       
-VARIABLE(grub_apm_bios_info)
-       .word   0       /* version */
-       .word   0       /* cseg */
-       .long   0       /* offset */
-       .word   0       /* cseg_16 */
-       .word   0       /* dseg_16 */
-       .word   0       /* cseg_len */
-       .word   0       /* cseg_16_len */
-       .word   0       /* dseg_16_len */
-       
        .p2align        2       /* force 4-byte alignment */
        
 /*