Commit graph

832 commits

Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko
6a82c1b2db merge mainline into newreloc 2010-05-04 17:35:44 +02:00
Vladimir 'phcoder' Serbinenko
05f602fc51 enable xnu on all platforms 2010-05-02 22:06:44 +02:00
Vladimir 'phcoder' Serbinenko
6f030865da Add missing memory.h 2010-05-02 19:39:35 +02:00
Vladimir 'phcoder' Serbinenko
c5ac9b32ac Hotkey support
* include/grub/menu.h (grub_menu_entry): New field 'hotkey'.
	* normal/main.c (hotkey_aliases): New variable.
	(grub_normal_add_menu_entry): Parse "--hotkey".
	* normal/menu_text.c (run_menu): Handle hotkeys.
2010-05-01 19:33:17 +02:00
Vladimir 'phcoder' Serbinenko
ef4ffedd46 remove loader.h leftovers 2010-05-01 15:15:38 +02:00
Vladimir 'phcoder' Serbinenko
c6fb51295b merge mainline into newreloc 2010-05-01 15:10:44 +02:00
Vladimir 'phcoder' Serbinenko
7819a4562f Use LBIO on coreboot.
* conf/i386-coreboot.rmk (kernel_img_SOURCES): Change
	kern/i386/multiboot_mmap.c to kern/i386/coreboot/mmap.c.
	* include/grub/i386/coreboot/memory.h (GRUB_LINUXBIOS_MEMBER_LINK):
	New declaration.
	* kern/i386/coreboot/init.c (grub_machine_init): Don't call
	grub_machine_mmap_init on coreboot.
	* kern/i386/coreboot/mmap.c (grub_linuxbios_table_iterate): Handle
	GRUB_LINUXBIOS_MEMBER_LINK.
	(grub_machine_mmap_iterate): Fix declaration.
	* kern/i386/coreboot/startup.S: Don't save mbi location on coreboot.
2010-05-01 14:32:48 +02:00
Vladimir 'phcoder' Serbinenko
7210dca942 Split coreboot and multiboot ports.
* conf/i386-multiboot.rmk: New file.
	* configure.ac: Add multiboot port.
	* include/grub/i386/multiboot/boot.h: New file.
	* include/grub/i386/multiboot/console.h: Likewise.
	* include/grub/i386/multiboot/init.h: Likewise.
	* include/grub/i386/multiboot/kernel.h: Likewise.
	* include/grub/i386/multiboot/loader.h: Likewise.
	* include/grub/i386/multiboot/memory.h: Likewise.
	* include/grub/i386/multiboot/serial.h: Likewise.
	* include/grub/i386/multiboot/time.h: Likewise.
	* include/grub/multiboot.h: Add GRUB_MACHINE_MULTIBOOT to ifdef.
	* loader/multiboot.c: Likewise.
	* loader/multiboot_mbi2.c: Likewise.
	* util/grub-mkrescue.in: Generate multiboot rescue.
2010-05-01 14:06:53 +02:00
Vladimir 'phcoder' Serbinenko
421e8a5591 Fix ppc compilation problems 2010-05-01 13:23:19 +02:00
Vladimir 'phcoder' Serbinenko
ae3c4cd010 Remove loader.h 2010-04-29 13:26:38 +02:00
Vladimir 'phcoder' Serbinenko
6c3d9c2845 merge boottest into newreloc 2010-04-27 13:34:07 +02:00
Vladimir 'phcoder' Serbinenko
8ea6ecb36d Some cleanups 2010-04-26 21:11:16 +02:00
Vladimir 'phcoder' Serbinenko
debaf23f7c all images binary identical to the ones from trunk 2010-04-26 19:11:38 +02:00
Vladimir 'phcoder' Serbinenko
bb3208158a Fill info for remaining platforms. Make efi image identical to image of previous grub-mkimage 2010-04-26 17:19:15 +02:00
Vladimir 'phcoder' Serbinenko
962b15b4c1 Fill info tables for qemu, sparc and mips 2010-04-26 14:42:40 +02:00
Vladimir 'phcoder' Serbinenko
0253aeb7a1 Unified grub-mkimage achieved 2010-04-26 13:11:43 +02:00
Vladimir 'phcoder' Serbinenko
94ac790645 Fix various issues created by previous commits 2010-04-26 10:56:12 +02:00
Christian Franke
460d8402e0 * include/grub/util/getroot.h (grub_get_prefix): Remove prototype.
* util/getroot.c [__CYGWIN__] (get_win32_path): Remove function.
	(grub_get_prefix): Remove function.
	* util/grub-emu.c (main): Replace grub_get_prefix () call by
	make_system_path_relative_to_its_root ().
	* util/sparc64/ieee1275/grub-setup.c (main): Likewise.
2010-04-26 03:35:55 +02:00
Vladimir 'phcoder' Serbinenko
614be3f119 #if-less grub-mkimage 2010-04-26 00:45:21 +02:00
Vladimir 'phcoder' Serbinenko
2296410ffb initial support for ppc in grub-mkimage (bugs for now) 2010-04-25 22:26:29 +02:00
Vladimir 'phcoder' Serbinenko
d31bc9964c migrate kernel.img to elf 2010-04-25 01:54:46 +02:00
Vladimir 'phcoder' Serbinenko
a51df0a1b4 Adjust mips relocator 2010-04-22 02:44:45 +02:00
Vladimir 'phcoder' Serbinenko
4b2ec20b41 Second part of p2v support 2010-04-21 19:13:45 +02:00
Vladimir 'phcoder' Serbinenko
368c17f85d First part of virtual addr support in relocator 2010-04-21 15:25:49 +02:00
Vladimir 'phcoder' Serbinenko
5490ddc18b Fix compilation on i386-pc 2010-04-21 10:01:41 +02:00
Vladimir 'phcoder' Serbinenko
6d6f55c557 Use leftovers 2010-04-21 09:27:57 +02:00
Vladimir 'phcoder' Serbinenko
91b58e6b74 EFI requests support for newreloc 2010-04-20 18:08:26 +02:00
BVK Chaitanya
bc4a2d832b Fix emu build with grub-emu-pci and grub-emu-modules.
* include/grub/util/misc.h: Export grub_util_{info,error,warn}
	functions.
	* include/grub/libpciaccess.h: New file.
	* conf/any-emu.rmk: Update kernel headers for emu build.
2010-04-19 16:04:56 +05:30
BVK Chaitanya
454c3001f2 fix emu build with grub-emu-pci and grub-emu-modules 2010-04-19 15:15:59 +05:30
Vladimir 'phcoder' Serbinenko
b076cdc730 Shave off bytes to compensate boot.img size increase 2010-04-18 18:22:58 +02:00
Vladimir 'phcoder' Serbinenko
ee9056d097 Support cross-disk installs. On non-cross-disk retrieve bootpath from chosen/bootpath 2010-04-18 16:35:08 +02:00
Vladimir 'phcoder' Serbinenko
6e86896ed8 Use ofpathname in grub-setup on sparc 2010-04-18 14:02:13 +02:00
Vladimir 'phcoder' Serbinenko
dae84898b2 Pass %dl to ntldr. Clear other registers. 2010-04-15 02:11:26 +02:00
Vladimir 'phcoder' Serbinenko
298ffd54b0 merge mainline into newreloc 2010-04-11 22:44:31 +02:00
Vladimir 'phcoder' Serbinenko
4b0cd8f813 Fix cygwin compilation.
* configure.ac: Define NEED_REGISTER_FRAME_INFO.
	* include/grub/misc.h (__register_frame_info)
	[NEED_REGISTER_FRAME_INFO && !UTIL]: New export.
	(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
	* kern/misc.c (__register_frame_info)
	[NEED_REGISTER_FRAME_INFO && !UTIL]: New empty function.
	(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
2010-04-11 21:24:21 +02:00
Vladimir 'phcoder' Serbinenko
5d04b11e0e Unify libgcc processing.
* Makefile.in (kernel_img_LDFLAGS): New variable.
	* conf/common.rmk (kernel_img_HEADERS): Add libgcc.h.
	* conf/i386-coreboot.rmk (kernel_img_LDFLAGS): Append instead of
	overwriting.
	* conf/i386-ieee1275.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/i386-pc.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/i386-qemu.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/x86-efi.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/mips-qemu-mips.rmk (kernel_img_LDFLAGS): Append instead of
	overwriting. Remove -lgcc and -static-libgcc
	* conf/mips-yeeloong.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/mips.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
	* conf/powerpc-ieee1275.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
	(kernel_img_LDFLAGS): Append instead of overwriting.
	Remove -lgcc and -static-libgcc
	* conf/sparc64-ieee1275.rmk: Likewise.
	* include/grub/powerpc/libgcc.h: Move to ...
	* include/grub/libgcc.h: .. this.
	* include/grub/libgcc.h: Don't export most of the function on x86.
	(__bswapsi2): New export.
	(__bswapdi2): Likewise.
	* include/grub/mips/libgcc.h: Removed.
	* include/grub/sparc64/libgcc.h: Likewise.
2010-04-11 01:14:31 +02:00
Vladimir 'phcoder' Serbinenko
6734334a53 * include/grub/util/misc.h (canonicalise_file_name): Add missing
prototype.
	Reported by: Seth Goldberg.
2010-04-10 12:46:12 +02:00
Vladimir 'phcoder' Serbinenko
f2fd9d2b2b * include/grub/efi/memory.h (grub_machine_mmap_iterate): Remove
EXPORT_FUNC.
	Reported by: Seth Goldberg.
2010-04-10 02:45:26 +02:00
Vladimir 'phcoder' Serbinenko
b3d0fa12af Fix usb support 2010-04-10 01:56:51 +02:00
Vladimir 'phcoder' Serbinenko
a29e902132 Merge mainline into emu-modload 2010-04-10 01:25:46 +02:00
Vladimir 'phcoder' Serbinenko
027de555e2 * normal/autofs.c (read_fs_list): New parameter 'prefix'.
All users updated.
	* normal/crypto.c (read_crypto_list): Likewise.
	* normal/dyncmd.c (read_command_list): Likewise.
	* normal/term.c (read_terminal_list): Likewise.
	* normal/main.c (read_lists): Use explicit prefix.
	(read_lists_hook): Use read_lists.
	(grub_normal_execute): Likewise.
2010-04-09 21:07:24 +02:00
BVK Chaitanya
c41c00eab6 merged with mainline 2010-04-09 21:44:59 +05:30
Vladimir 'phcoder' Serbinenko
064cb524ec * include/grub/i386/pc/init.h (grub_get_mmap_entry): Don't export.
* conf/i386-pc.rmk (kernel_img_HEADERS): Remove machine/init.h.
2010-04-05 15:57:40 +02:00
Vladimir 'phcoder' Serbinenko
a8c3b552a7 Remove unused grub_vga_get_font.
* kern/i386/pc/startup.S (grub_vga_get_font): Removed.
	* include/grub/i386/pc/vga.h (grub_vga_get_font): Likewise.
2010-04-04 14:12:11 +02:00
Grégoire Sutre
187bbe3d9c * kern/misc.c: Disable the __enable_execute_stack hack for utilities.
* include/grub/misc.h: Likewise.
2010-04-03 21:00:21 +02:00
Vladimir 'phcoder' Serbinenko
f0847685dd Merge mainline into newreloc 2010-04-03 17:47:59 +02:00
Vladimir 'phcoder' Serbinenko
8c46a785e3 mips multiboot2 support 2010-04-03 14:14:48 +02:00
Vladimir 'phcoder' Serbinenko
a60f822cb2 Add missing id field to grub_video_sm712_adapter 2010-04-03 14:12:43 +02:00
Vladimir 'phcoder' Serbinenko
3a5768645c First version of allocation from firmware 2010-04-03 11:53:29 +02:00
Vladimir 'phcoder' Serbinenko
8b0800f66f merge mainline into newreloc 2010-04-01 22:17:26 +02:00