vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge my local branch

Browse source
This commit is contained in:
Robert Millan 2009-12-25 12:43:20 +01:00
commit 427d6aa453
9 changed files with 148 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

45
ChangeLog
View file

@ -1,3 +1,48 @@
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
* util/grub-install.in (host_os): New variable.
* util/i386/efi/grub-install.in (host_os): Likewise.
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
* util/mkisofs/write.c (padblock_write): Abort when given an
excedingly large embed image, instead of silently truncating it.
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
* include/multiboot.h: Indentation fixes.
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
* include/multiboot.h (struct multiboot_aout_symbol_table)
(struct multiboot_elf_section_header_table): New structure
declarations (stolen from GRUB Legacy).
(struct multiboot_info): Replace opaque `syms' with a.out and ELF
table information.
(multiboot_aout_symbol_table_t, multiboot_elf_section_header_table_t)
(multiboot_info_t, multiboot_memory_map_t, multiboot_module_t): New
type aliases.
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
* include/multiboot.h: Make comments src2texi-friendly.
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
For consistency with [multiboot]/docs/boot.S.
* include/multiboot.h (MULTIBOOT_MAGIC): Rename from this ...
(MULTIBOOT_HEADER_MAGIC): ... to this. Update all users.
(MULTIBOOT_MAGIC2): Rename from this ...
(MULTIBOOT_BOOTLOADER_MAGIC): ... to this. Update all users.
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
* include/multiboot.h: Remove `<grub/types.h>'.
(multiboot_uint16_t, multiboot_uint32_t, multiboot_uint64_t): New
types. Update all users.
2009-12-25 Carles Pina i Estany <carles@pina.cat> 2009-12-25 Carles Pina i Estany <carles@pina.cat>
* commands/efi/loadbios.c: Capitalize acronyms, replace `could not' by * commands/efi/loadbios.c: Capitalize acronyms, replace `could not' by

2
boot/i386/pc/lnxboot.S
View file

@ -185,7 +185,7 @@ real_code_2:
call LOCAL(move_memory) call LOCAL(move_memory)
/* Check for multiboot signature. */ /* Check for multiboot signature. */
cmpl $MULTIBOOT_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_DATA_END) cmpl $MULTIBOOT_HEADER_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_DATA_END)
jz 1f jz 1f
movl (ramdisk_image - start), %esi movl (ramdisk_image - start), %esi

162
include/multiboot.h
View file

@ -1,6 +1,5 @@
/* /* multiboot.h - Multiboot header file. */
* multiboot.h - Multiboot header file. /* Copyright (C) 1999,2003,2007,2008,2009 Free Software Foundation, Inc.
* Copyright (C) 2003,2007,2008,2009 Free Software Foundation, Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to * of this software and associated documentation files (the "Software"), to
@ -24,70 +23,66 @@
#define MULTIBOOT_HEADER 1 #define MULTIBOOT_HEADER 1
/* How many bytes from the start of the file we search for the header. */ /* How many bytes from the start of the file we search for the header. */
#define MULTIBOOT_SEARCH 8192 #define MULTIBOOT_SEARCH 8192
/* The magic field should contain this. */ /* The magic field should contain this. */
#define MULTIBOOT_MAGIC 0x1BADB002 #define MULTIBOOT_HEADER_MAGIC 0x1BADB002
/* This should be in %eax. */ /* This should be in %eax. */
#define MULTIBOOT_MAGIC2 0x2BADB002 #define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
/* The bits in the required part of flags field we don't support. */ /* The bits in the required part of flags field we don't support. */
#define MULTIBOOT_UNSUPPORTED 0x0000fffc #define MULTIBOOT_UNSUPPORTED 0x0000fffc
/* Alignment of multiboot modules. */ /* Alignment of multiboot modules. */
#define MULTIBOOT_MOD_ALIGN 0x00001000 #define MULTIBOOT_MOD_ALIGN 0x00001000
/* Alignment of the multiboot info structure. */ /* Alignment of the multiboot info structure. */
#define MULTIBOOT_INFO_ALIGN 0x00000004 #define MULTIBOOT_INFO_ALIGN 0x00000004
/* /* Flags set in the 'flags' member of the multiboot header. */
* Flags set in the 'flags' member of the multiboot header.
*/
/* Align all boot modules on i386 page (4KB) boundaries. */ /* Align all boot modules on i386 page (4KB) boundaries. */
#define MULTIBOOT_PAGE_ALIGN 0x00000001 #define MULTIBOOT_PAGE_ALIGN 0x00000001
/* Must pass memory information to OS. */ /* Must pass memory information to OS. */
#define MULTIBOOT_MEMORY_INFO 0x00000002 #define MULTIBOOT_MEMORY_INFO 0x00000002
/* Must pass video information to OS. */ /* Must pass video information to OS. */
#define MULTIBOOT_VIDEO_MODE 0x00000004 #define MULTIBOOT_VIDEO_MODE 0x00000004
/* This flag indicates the use of the address fields in the header. */ /* This flag indicates the use of the address fields in the header. */
#define MULTIBOOT_AOUT_KLUDGE 0x00010000 #define MULTIBOOT_AOUT_KLUDGE 0x00010000
/* /* Flags to be set in the 'flags' member of the multiboot info structure. */
* Flags to be set in the 'flags' member of the multiboot info structure.
*/
/* is there basic lower/upper memory information? */ /* is there basic lower/upper memory information? */
#define MULTIBOOT_INFO_MEMORY 0x00000001 #define MULTIBOOT_INFO_MEMORY 0x00000001
/* is there a boot device set? */ /* is there a boot device set? */
#define MULTIBOOT_INFO_BOOTDEV 0x00000002 #define MULTIBOOT_INFO_BOOTDEV 0x00000002
/* is the command-line defined? */ /* is the command-line defined? */
#define MULTIBOOT_INFO_CMDLINE 0x00000004 #define MULTIBOOT_INFO_CMDLINE 0x00000004
/* are there modules to do something with? */ /* are there modules to do something with? */
#define MULTIBOOT_INFO_MODS 0x00000008 #define MULTIBOOT_INFO_MODS 0x00000008
/* These next two are mutually exclusive */ /* These next two are mutually exclusive */
/* is there a symbol table loaded? */ /* is there a symbol table loaded? */
#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 #define MULTIBOOT_INFO_AOUT_SYMS 0x00000010
/* is there an ELF section header table? */ /* is there an ELF section header table? */
#define MULTIBOOT_INFO_ELF_SHDR 0x00000020 #define MULTIBOOT_INFO_ELF_SHDR 0X00000020
/* is there a full memory map? */ /* is there a full memory map? */
#define MULTIBOOT_INFO_MEM_MAP 0x00000040 #define MULTIBOOT_INFO_MEM_MAP 0x00000040
/* Is there drive info? */ /* Is there drive info? */
#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 #define MULTIBOOT_INFO_DRIVE_INFO 0x00000080
/* Is there a config table? */ /* Is there a config table? */
#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 #define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100
/* Is there a boot loader name? */ /* Is there a boot loader name? */
#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 #define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200
/* Is there a APM table? */ /* Is there a APM table? */
#define MULTIBOOT_INFO_APM_TABLE 0x00000400 #define MULTIBOOT_INFO_APM_TABLE 0x00000400
@ -97,102 +92,131 @@
#ifndef ASM_FILE #ifndef ASM_FILE
#include <grub/types.h> typedef unsigned short multiboot_uint16_t;
typedef unsigned int multiboot_uint32_t;
typedef unsigned long long multiboot_uint64_t;
struct multiboot_header struct multiboot_header
{ {
/* Must be MULTIBOOT_MAGIC - see above. */ /* Must be MULTIBOOT_MAGIC - see above. */
grub_uint32_t magic; multiboot_uint32_t magic;
/* Feature flags. */ /* Feature flags. */
grub_uint32_t flags; multiboot_uint32_t flags;
/* The above fields plus this one must equal 0 mod 2^32. */ /* The above fields plus this one must equal 0 mod 2^32. */
grub_uint32_t checksum; multiboot_uint32_t checksum;
/* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
grub_uint32_t header_addr; multiboot_uint32_t header_addr;
grub_uint32_t load_addr; multiboot_uint32_t load_addr;
grub_uint32_t load_end_addr; multiboot_uint32_t load_end_addr;
grub_uint32_t bss_end_addr; multiboot_uint32_t bss_end_addr;
grub_uint32_t entry_addr; multiboot_uint32_t entry_addr;
/* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
grub_uint32_t mode_type; multiboot_uint32_t mode_type;
grub_uint32_t width; multiboot_uint32_t width;
grub_uint32_t height; multiboot_uint32_t height;
grub_uint32_t depth; multiboot_uint32_t depth;
}; };
/* The symbol table for a.out. */
struct multiboot_aout_symbol_table
{
multiboot_uint32_t tabsize;
multiboot_uint32_t strsize;
multiboot_uint32_t addr;
multiboot_uint32_t reserved;
};
typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
/* The section header table for ELF. */
struct multiboot_elf_section_header_table
{
multiboot_uint32_t num;
multiboot_uint32_t size;
multiboot_uint32_t addr;
multiboot_uint32_t shndx;
};
typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
struct multiboot_info struct multiboot_info
{ {
/* Multiboot info version number */ /* Multiboot info version number */
grub_uint32_t flags; multiboot_uint32_t flags;
/* Available memory from BIOS */ /* Available memory from BIOS */
grub_uint32_t mem_lower; multiboot_uint32_t mem_lower;
grub_uint32_t mem_upper; multiboot_uint32_t mem_upper;
/* "root" partition */ /* "root" partition */
grub_uint32_t boot_device; multiboot_uint32_t boot_device;
/* Kernel command line */ /* Kernel command line */
grub_uint32_t cmdline; multiboot_uint32_t cmdline;
/* Boot-Module list */ /* Boot-Module list */
grub_uint32_t mods_count; multiboot_uint32_t mods_count;
grub_uint32_t mods_addr; multiboot_uint32_t mods_addr;
grub_uint32_t syms[4]; union
{
multiboot_aout_symbol_table_t aout_sym;
multiboot_elf_section_header_table_t elf_sec;
} u;
/* Memory Mapping buffer */ /* Memory Mapping buffer */
grub_uint32_t mmap_length; multiboot_uint32_t mmap_length;
grub_uint32_t mmap_addr; multiboot_uint32_t mmap_addr;
/* Drive Info buffer */ /* Drive Info buffer */
grub_uint32_t drives_length; multiboot_uint32_t drives_length;
grub_uint32_t drives_addr; multiboot_uint32_t drives_addr;
/* ROM configuration table */ /* ROM configuration table */
grub_uint32_t config_table; multiboot_uint32_t config_table;
/* Boot Loader Name */ /* Boot Loader Name */
grub_uint32_t boot_loader_name; multiboot_uint32_t boot_loader_name;
/* APM table */ /* APM table */
grub_uint32_t apm_table; multiboot_uint32_t apm_table;
/* Video */ /* Video */
grub_uint32_t vbe_control_info; multiboot_uint32_t vbe_control_info;
grub_uint32_t vbe_mode_info; multiboot_uint32_t vbe_mode_info;
grub_uint16_t vbe_mode; multiboot_uint16_t vbe_mode;
grub_uint16_t vbe_interface_seg; multiboot_uint16_t vbe_interface_seg;
grub_uint16_t vbe_interface_off; multiboot_uint16_t vbe_interface_off;
grub_uint16_t vbe_interface_len; multiboot_uint16_t vbe_interface_len;
}; };
typedef struct multiboot_info multiboot_info_t;
struct multiboot_mmap_entry struct multiboot_mmap_entry
{ {
grub_uint32_t size; multiboot_uint32_t size;
grub_uint64_t addr; multiboot_uint64_t addr;
grub_uint64_t len; multiboot_uint64_t len;
#define MULTIBOOT_MEMORY_AVAILABLE 1 #define MULTIBOOT_MEMORY_AVAILABLE 1
#define MULTIBOOT_MEMORY_RESERVED 2 #define MULTIBOOT_MEMORY_RESERVED 2
grub_uint32_t type; multiboot_uint32_t type;
} __attribute__((packed)); } __attribute__((packed));
typedef struct multiboot_mmap_entry multiboot_memory_map_t;
struct multiboot_mod_list struct multiboot_mod_list
{ {
/* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */
grub_uint32_t mod_start; multiboot_uint32_t mod_start;
grub_uint32_t mod_end; multiboot_uint32_t mod_end;
/* Module command line */ /* Module command line */
grub_uint32_t cmdline; multiboot_uint32_t cmdline;
/* padding to take it to 16 bytes (must be zero) */ /* padding to take it to 16 bytes (must be zero) */
grub_uint32_t pad; multiboot_uint32_t pad;
}; };
typedef struct multiboot_mod_list multiboot_module_t;
#endif /* ! ASM_FILE */ #endif /* ! ASM_FILE */

2
kern/i386/coreboot/startup.S
View file

@ -66,7 +66,7 @@ multiboot_header:
.long -0x1BADB002 - MULTIBOOT_MEMORY_INFO .long -0x1BADB002 - MULTIBOOT_MEMORY_INFO
codestart: codestart:
cmpl $MULTIBOOT_MAGIC2, %eax cmpl $MULTIBOOT_BOOTLOADER_MAGIC, %eax
jne 0f jne 0f
movl %ebx, EXT_C(startup_multiboot_info) movl %ebx, EXT_C(startup_multiboot_info)
0: 0:

4
loader/i386/multiboot.c
View file

@ -65,7 +65,7 @@ grub_multiboot_boot (void)
{ {
struct grub_relocator32_state state = struct grub_relocator32_state state =
{ {
.eax = MULTIBOOT_MAGIC2, .eax = MULTIBOOT_BOOTLOADER_MAGIC,
.ebx = PTR_TO_UINT32 (mbi_dest), .ebx = PTR_TO_UINT32 (mbi_dest),
.ecx = 0, .ecx = 0,
.edx = 0, .edx = 0,
@ -250,7 +250,7 @@ grub_multiboot (int argc, char *argv[])
((char *) header <= buffer + len - 12) || (header = 0); ((char *) header <= buffer + len - 12) || (header = 0);
header = (struct multiboot_header *) ((char *) header + 4)) header = (struct multiboot_header *) ((char *) header + 4))
{ {
if (header->magic == MULTIBOOT_MAGIC if (header->magic == MULTIBOOT_HEADER_MAGIC
&& !(header->magic + header->flags + header->checksum)) && !(header->magic + header->flags + header->checksum))
break; break;
} }

2
loader/multiboot_loader.c
View file

@ -58,7 +58,7 @@ find_multi_boot1_header (grub_file_t file)
((char *) header <= buffer + len - 12) || (header = 0); ((char *) header <= buffer + len - 12) || (header = 0);
header = (struct multiboot_header *) ((char *) header + 4)) header = (struct multiboot_header *) ((char *) header + 4))
{ {
if (header->magic == MULTIBOOT_MAGIC if (header->magic == MULTIBOOT_HEADER_MAGIC
&& !(header->magic + header->flags + header->checksum)) && !(header->magic + header->flags + header->checksum))
{ {
found_status = 1; found_status = 1;

1
util/grub-install.in
View file

@ -29,6 +29,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@ target_cpu=@target_cpu@
platform=@platform@ platform=@platform@
host_os=@host_os@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
grub_setup=${sbindir}/`echo grub-setup | sed ${transform}` grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`

1
util/i386/efi/grub-install.in
View file

@ -29,6 +29,7 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@ target_cpu=@target_cpu@
platform=@platform@ platform=@platform@
host_os=@host_os@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`

3
util/mkisofs/write.c
View file

@ -1436,7 +1436,10 @@ static int FDECL1(padblock_write, FILE *, outfile)
FILE *fp = fopen (boot_image_embed, "rb"); FILE *fp = fopen (boot_image_embed, "rb");
if (! fp) if (! fp)
error (1, errno, _("Unable to open %s"), boot_image_embed); error (1, errno, _("Unable to open %s"), boot_image_embed);
fread (buffer, 2048 * PADBLOCK_SIZE, 1, fp); fread (buffer, 2048 * PADBLOCK_SIZE, 1, fp);
if (fgetc (fp) != EOF)
error (1, 0, _("%s is too big for embed area"), boot_image_embed);
} }
if (use_protective_msdos_label) if (use_protective_msdos_label)