vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3298 commits 7 branches 0 tags 144 MiB
Commit graph

754 commits

Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko
a3df209041 Fix libusb compilation 2010-02-09 21:16:17 +01:00
Vladimir 'phcoder' Serbinenko
ca3112ba2d merge cleanbuild into emu-modload 2010-02-08 00:21:55 +01:00
Vladimir 'phcoder' Serbinenko
ec0be08d40 Clean building system 2010-02-07 23:49:49 +01:00
Vladimir 'phcoder' Serbinenko
b359aa1373 Merge ofwclock into cleanbuild 2010-02-07 23:01:41 +01:00
Vladimir 'phcoder' Serbinenko
f84dc56090 Initial implementation of ofwclock 2010-02-07 22:56:25 +01:00
Vladimir 'phcoder' Serbinenko
b77ab1aaa9 Merge emu-mod into emu-modload 2010-02-07 17:52:11 +01:00
Vladimir 'phcoder' Serbinenko
b4674703a1 Add fno-builtin 2010-02-07 17:39:52 +01:00
Vladimir 'phcoder' Serbinenko
a1a8d38a58 Use nostdinc 2010-02-07 17:30:16 +01:00
Vladimir 'phcoder' Serbinenko
ac307b2ae4 Cleanup 2010-02-07 16:47:50 +01:00
Vladimir 'phcoder' Serbinenko
3dca5319c6 module support in grub-emu 2010-02-07 16:13:59 +01:00
Vladimir 'phcoder' Serbinenko
f38873b80b Build system support for grub-emu modules 2010-02-07 15:17:26 +01:00
Vladimir 'phcoder' Serbinenko
c3e6233987 REmove the need for disable-werror 2010-02-07 04:50:30 +01:00
Vladimir 'phcoder' Serbinenko
19987ffa02 Remove the need for explicit make grub-emu 2010-02-07 04:45:54 +01:00
Vladimir 'phcoder' Serbinenko
2083672af1 Remove -DGRUB_UTIL when compiling grub-emu 2010-02-07 04:23:44 +01:00
Vladimir 'phcoder' Serbinenko
1eebb21608 Add missing dependency 2010-02-07 04:01:22 +01:00
Vladimir 'phcoder' Serbinenko
285505d3fc Eliminate blacklist of modules w/o init 2010-02-07 03:58:14 +01:00
Vladimir 'phcoder' Serbinenko
ebe841ad55 Don't try to generate moddep.lst on any-emu.rmk 2010-02-07 03:48:38 +01:00
Vladimir 'phcoder' Serbinenko
c5160d75c4 Don't strip on any-emu 2010-02-07 03:43:07 +01:00
Vladimir 'phcoder' Serbinenko
dcb3f497be Rename main.mod to kernel.img 2010-02-07 03:29:59 +01:00
Vladimir 'phcoder' Serbinenko
19a9fb834b merge mainline into emu-mod 2010-02-07 03:06:33 +01:00
Vladimir 'phcoder' Serbinenko
909301af11 First try at generating grub-emu from modules 2010-02-07 02:07:35 +01:00
Vladimir 'phcoder' Serbinenko
05d4e36ff6 reimport sunpc 2010-02-06 21:36:24 +01:00
Vladimir 'phcoder' Serbinenko
f3e309ad7d Use (hd0,msdos1) syntax. Eliminate partmap_iterate 2010-02-06 21:00:53 +01:00
Vladimir 'phcoder' Serbinenko
bc6fcf0931 merge mainline into nestpart 2010-02-06 18:47:17 +01:00
Vladimir 'phcoder' Serbinenko
15cb7d433f Reimport nestpart 2010-02-06 18:43:37 +01:00
Vladimir 'phcoder' Serbinenko
e190e3d2cc merge mainline into ofwfb 2010-02-06 15:54:01 +01:00
Yves Blusseau
911df80c54 2010-02-06 Yves Blusseau <blusseau@zetam.org> 
* conf/common.rmk (grub_script_check_SOURCES): add missing dependencies.
    (grub_mkpasswd_pbkdf2_SOURCES): Likewise.
 2010-02-06 15:37:23 +01:00
Vladimir 'phcoder' Serbinenko
d1de6ed1dc First compiling newreloc for ppc (not yet tested) 2010-02-06 00:33:20 +01:00
Vladimir 'phcoder' Serbinenko
98f5714739 Fix mips compilation 2010-02-03 01:34:55 +01:00
Vladimir 'phcoder' Serbinenko
1f534b6908 Merge mainline into gfxmenu 2010-02-03 01:24:07 +01:00
Vladimir 'phcoder' Serbinenko
fbab7b0794 Framebuffer on PowerPC-based macs 2010-01-31 01:57:17 +01:00
Vladimir 'phcoder' Serbinenko
6e308bd942 merge mainline into newreloc 2010-01-30 16:46:16 +01:00
BVK Chaitanya
3342306cec several fixes in return value handling 2010-01-26 12:32:24 +05:30
Vladimir 'phcoder' Serbinenko
7d8c9ec63d newreloc on yeeloong 2010-01-23 13:30:24 +01:00
BVK Chaitanya
4e6a305be4 for loop support to grub script 2010-01-23 11:03:41 +05:30
BVK Chaitanya
547e494f1b lexer-rewrite rebase commit 2010-01-22 19:07:27 +05:30
Vladimir 'phcoder' Serbinenko
de69d952cf Merge mainline into boottest 2010-01-20 22:23:00 +01:00
Vladimir 'phcoder' Serbinenko
a9ed4ff36f 2010-01-20 Vladimir Serbinenko <phcoder@gmail.com> 
* conf/mips.rmk (kernel_img_HEADERS): Add env_private.h
 2010-01-20 22:21:08 +01:00
Vladimir 'phcoder' Serbinenko
61c501a941 merge mainline into newenv 2010-01-20 21:31:39 +01:00
Vladimir 'phcoder' Serbinenko
5b47ee8044 merge mainline into setpci 2010-01-20 20:51:00 +01:00
Vladimir 'phcoder' Serbinenko
00308ecfe8 2010-01-20 Vladimir Serbinenko <phcoder@gmail.com> 
* conf/common.rmk (font/font.c_DEPENDENCIES): Condition on FONT_SOURCE.
 2010-01-20 15:43:21 +01:00
Vladimir 'phcoder' Serbinenko
cbca0ada62 2010-01-20 Vladimir Serbinenko <phcoder@gmail.com> 
Fix any-emu compilation.

	* conf/any-emu.rmk (bin_UTILITIES): Add grub-bin2h.
	* grub_bin2h_SOURCES: New variable.
 2010-01-20 15:26:31 +01:00
Vladimir 'phcoder' Serbinenko
3c83bc50db merge bootcheck and mainline into newreloc 2010-01-20 11:48:36 +01:00
Vladimir 'phcoder' Serbinenko
9f2b45cbb9 merge mainline into bootcheck 2010-01-20 11:13:21 +01:00
Vladimir 'phcoder' Serbinenko
327dbcd7b9 2010-01-20 Vladimir Serbinenko <phcoder@gmail.com> 
Don't try to generate lists for kernel.img.

	* conf/i386-efi.rmk (pkglib_PROGRAMS): New variable.
	(pkglib_MODULES): Remove kernel.img.
	(kernel_img_EXPORTS): Removed.
	(kernel_img_RELOCATABLE): New variable.
	* conf/x86_64-efi.rmk: Likewise.
	* genmk.rb: Remove *_EXPORTS support and add *_RELOCATABLE support.
 2010-01-20 10:59:15 +01:00
Vladimir 'phcoder' Serbinenko
f80927cadb 2010-01-20 Vladimir Serbinenko <phcoder@gmail.com> 
* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
 2010-01-20 08:04:01 +01:00
Robert Millan
e3538adaea 2009-12-20 Robert Millan <rmh.grub@aybabtu.com> 
* kern/mips/yeeloong/init.c (grub_video_sm712_init)
	(grub_video_video_init, grub_video_bitmap_init)
	(grub_font_manager_init, grub_term_gfxterm_init)
	(grub_at_keyboard_init): New extern declarations.
	(grub_machine_init): Initialize gfxterm and at_keyboard.
	
	* kern/main.c (grub_main): Revert grub_printf delay kludge.
	
	* util/grub-install.in: Revert embed of `at_keyboard.mod' and
	`gfxterm.mod' into core image.
	
	* conf/mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): Copy to ...
	
	* conf/mips-qemu-mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): ... here, and ...
	
	* conf/mips-yeeloong.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): ... here.
	
	(kernel_img_SOURCES): Add files necessary for output (gfxterm)
	and input (at_keyboard) terminals in kernel.
	(kernel_img_CFLAGS): Add `-DUSE_ASCII_FAILBACK'.
	
	(pkglib_MODULES): Remove `pci.mod'.
	(pci_mod_SOURCES, pci_mod_CFLAGS, pci_mod_LDFLAGS)
	(sm712_mod_SOURCES, sm712_mod_CFLAGS, sm712_mod_LDFLAGS)
	(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
	(at_keyboard_mod_LDFLAGS): Remove variables.
 2010-01-20 01:19:53 +00:00
Robert Millan
ca2a220a74 Resync 2010-01-20 00:47:55 +00:00
Vladimir 'phcoder' Serbinenko
2b9885e16b bootcheck-kfreebsd-x86_64 2010-01-19 09:17:23 +01:00
Vladimir 'phcoder' Serbinenko
96bdd17579 merge mainline into newreloc 2010-01-18 22:38:25 +01:00
Vladimir 'phcoder' Serbinenko
5a6ff7ad4a kfreebsd-i386 bootcheck 2010-01-18 22:29:25 +01:00
Robert Millan
e022a2d667 Sync with trunk 2010-01-18 20:51:35 +00:00
Robert Millan
41f683d456 2010-01-18 Robert Millan <rmh.grub@aybabtu.com> 
* include/grub/term.h (grub_term_register_input,
	grub_term_register_output): Check return of terminal init()
	routines, and abort if errors are raised.
	
	* commands/terminal.c: Update copyright year.
 2010-01-18 20:20:34 +00:00
Robert Millan
3d8b4e4e26 Resync with trunk 2010-01-18 19:34:26 +00:00
Vladimir 'phcoder' Serbinenko
6b9e2c181f merge bootcheck into newreloc 2010-01-18 12:40:33 +01:00
BVK Chaitanya
d8d4217e3c merge trunk 2010-01-18 16:58:03 +05:30
Vladimir 'phcoder' Serbinenko
c5545cf8ba Fix linux-x86_64 bootchecks 2010-01-18 12:00:00 +01:00
Vladimir 'phcoder' Serbinenko
0db3ae3ce6 Add bootcheck for kfreebsd-x86_64 2010-01-18 11:38:28 +01:00
Vladimir 'phcoder' Serbinenko
5d615a77ce kfreebsd-i386 boot test support 2010-01-18 11:14:04 +01:00
Vladimir 'phcoder' Serbinenko
ad8e99ec20 bootcheck support 2010-01-17 23:36:45 +01:00
Vladimir 'phcoder' Serbinenko
b14620812f Enable serial on all i386.rmk 2010-01-17 19:22:36 +01:00
Vladimir 'phcoder' Serbinenko
5408044f4c Multiboot 2 tags support 2010-01-16 16:25:43 +01:00
Vladimir 'phcoder' Serbinenko
262355247f merge mainline into newreloc 2010-01-16 00:05:33 +01:00
Vladimir 'phcoder' Serbinenko
a0b766fc9b 2010-01-15 Vladimir Serbinenko <phcoder@gmail.com> 
Enable multiboot on non-pc.

	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (pkglib_MODULES): Move
	multiboot.mod and multiboot2.mod to ...
	* conf/i386.rmk (pkglib_MODULES): ... here.
	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_SOURCES):
	Moved to ...
	* conf/i386.rmk (multiboot_mod_SOURCES): .. here.
	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_CFLAGS):
	Moved to ...
	* conf/i386.rmk (multiboot_mod_CFLAGS): .. here.
	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_ASFLAGS):
	Moved to ...
	* conf/i386.rmk (multiboot_mod_ASFLAGS): .. here.
	* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_LDFLAGS):
	Moved to ...
	* conf/i386.rmk (multiboot_mod_LDFLAGS): .. here.
	* conf/x86_64-efi.rmk (pkglib_MODULES): Remove ata.mod and
	relocator.mod.
	(ata_mod_SOURCES): Removed.
	(ata_mod_CFLAGS): Likewise.
	(ata_mod_LDFLAGS): Likewise.
	(relocator_mod_SOURCES): Removed.
	(relocator_mod_CFLAGS): Likewise.
	(relocator_mod_ASFLAGS): Likewise.
	(relocator_mod_LDFLAGS): Likewise.
	Include i386.mk.
	* include/grub/x86_64/multiboot.h: New file.
	* loader/i386/multiboot.c (grub_multiboot_boot) [GRUB_MACHINE_EFI]:
	Terminate EFI.
 2010-01-15 21:11:51 +01:00
Robert Millan
885d1a8d90 Support --help and --version in grub-bin2h. 2010-01-14 20:33:10 +00:00
Colin Watson
7d1468e4b6 merge from trunk 2010-01-14 14:04:44 +00:00
BVK Chaitanya
96f60752d1 merge trunk 2010-01-14 18:45:19 +05:30
Vladimir 'phcoder' Serbinenko
0c31c22bda Remove leftover aout.mod 2010-01-13 21:06:49 +01:00
Vladimir 'phcoder' Serbinenko
8874cbbded Initial multi-i386 support for *BSD 2010-01-13 21:04:19 +01:00
Vladimir 'phcoder' Serbinenko
c34a120a01 Move linux.mod to conf/i386.rmk 2010-01-13 20:55:34 +01:00
Vladimir 'phcoder' Serbinenko
9efe142861 Use linux.c on i386-ieee1275 2010-01-13 17:27:45 +01:00
Vladimir 'phcoder' Serbinenko
d1b3ffe8ce merge efigfx into newreloc 2010-01-13 14:12:24 +01:00
Vladimir 'phcoder' Serbinenko
4d27140f7f Removed efi linux loader (now it's in i386/linux.c) 2010-01-13 14:05:39 +01:00
Vladimir 'phcoder' Serbinenko
19eb83d486 Include i386.rmk into x86_64-efi.rmk 2010-01-13 14:02:32 +01:00
Vladimir 'phcoder' Serbinenko
73f6ce4ab2 x86_64 support for relocator 2010-01-12 23:30:52 +01:00
Vladimir 'phcoder' Serbinenko
11aadbadfb fix compilation on coreboot 2010-01-12 23:03:56 +01:00
Vladimir 'phcoder' Serbinenko
cdab631686 Relocator16 support 2010-01-12 22:15:50 +01:00
Vladimir 'phcoder' Serbinenko
611f8f0eb9 Remove unused BSD helpers 2010-01-12 17:57:04 +01:00
Vladimir 'phcoder' Serbinenko
14933205d1 Relocator64 support 2010-01-12 17:48:51 +01:00
BVK Chaitanya
4d362fde58 build only functional tests on make 2010-01-12 15:49:40 +05:30
BVK Chaitanya
528aeaeabb merge trunk 2010-01-12 11:02:49 +05:30
BVK Chaitanya
c5431d4029 build tests on make, but run on make check 2010-01-12 10:16:17 +05:30
Vladimir 'phcoder' Serbinenko
cb1b2ad7e0 Reenable XNU 2010-01-11 13:43:44 +01:00
Vladimir 'phcoder' Serbinenko
5c8e58b0cb merge abstractmbi into newreloc 2010-01-11 11:29:52 +01:00
Robert Millan
0b4de51491 2010-01-10 Robert Millan <rmh.grub@aybabtu.com> 
* conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
        (grub_bin2h_SOURCES): New variable.
        * util/bin2h.c: New file.
 2010-01-10 23:13:53 +01:00
Vladimir 'phcoder' Serbinenko
cd0514794a MAnipulate mbi in abstract way 2010-01-10 18:58:18 +01:00
Vladimir 'phcoder' Serbinenko
14e43c6e02 First working newreloc 2010-01-10 15:06:17 +01:00
Vladimir 'phcoder' Serbinenko
85a2cf749f merge mainline into mips 2010-01-10 13:34:48 +01:00
Vladimir 'phcoder' Serbinenko
6b60576149 merge mainline into newreloc 2010-01-10 01:56:47 +01:00
Robert Millan
cdec4d3193 2010-01-09 Robert Millan <rmh.grub@aybabtu.com> 
Fix grub-emu build.
	
	* conf/any-emu.rmk (grub_emu_SOURCES): Remove `kern/reader.c'.
 2010-01-10 00:47:19 +00:00
Vladimir 'phcoder' Serbinenko
95c7fc3f55 First compileable newreloc 2010-01-10 00:30:33 +01:00
Robert Millan
75cc5b682e Merge from trunk 2010-01-09 23:22:48 +01:00
BVK Chaitanya
58ad6b39c4 added changelog file 2010-01-09 20:31:33 +05:30
BVK Chaitanya
21a99f5804 added grub-script-check tool 2010-01-09 20:27:58 +05:30
BVK Chaitanya
169b1cd2d8 added functional tests to make-check 2010-01-08 16:35:32 +05:30
BVK Chaitanya
6fc804ffbb unit testing framework 2010-01-08 15:19:10 +05:30
Vladimir 'phcoder' Serbinenko
fc054c9cb8 Various cleanups 2010-01-07 22:18:59 +01:00
Robert Millan
bc8b32b3ec 2010-01-07 Robert Millan <rmh.grub@aybabtu.com> 
Reset Multiboot 2 support.  New loader implements the draft in
	/branches/multiboot2 and shares as much code as possible with the
	production Multiboot 1 implementation.
	
	* loader/ieee1275/multiboot2.c: Remove file.  Update all users.
	* loader/multiboot2.c: Likewise.
	* loader/i386/multiboot_helper.S: Likewise.
	* include/multiboot2.h: Replace with latest version from the draft
	in /branches/multiboot2.
	
	* conf/i386-coreboot.rmk (multiboot_mod_SOURCES): Remove
	`loader/i386/multiboot_helper.S', `loader/i386/pc/multiboot2.c'
	and `loader/multiboot2.c'.
	(pkglib_MODULES): Add `multiboot2.mod'.
	(multiboot2_mod_SOURCES): New variable.
	(multiboot2_mod_LDFLAGS): Likewise.
	(multiboot2_mod_CFLAGS): Likewise.  Define `GRUB_USE_MULTIBOOT2'.
	
	* conf/i386-pc.rmk: Likewise.
	
	* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Remove `multiboot.mod'.
	(multiboot_mod_SOURCES): Remove variable.
	(multiboot_mod_LDFLAGS): Likewise.
	(multiboot_mod_CFLAGS): Likewise.
	
	* include/grub/multiboot.h [GRUB_USE_MULTIBOOT2]: Include
	`<multiboot2.h>' instead of `<multiboot.h>'.
	[GRUB_USE_MULTIBOOT2] (MULTIBOOT_BOOTLOADER_MAGIC)
	(MULTIBOOT_HEADER_MAGIC): New macros.
	
	* loader/multiboot_loader.c (module_version_status): Remove variable.
	(find_multi_boot2_header): Remove function.
	(grub_cmd_multiboot_loader): Remove Multiboot 2 / Multiboot 1 selection
	logic.  Always check for the Multiboot version we're compiling for.
	(grub_cmd_module_loader): Likewise.
	[GRUB_USE_MULTIBOOT2] (GRUB_MOD_INIT(multiboot)): Register `multiboot2'
	command instead of `multiboot'.
 2010-01-07 21:05:25 +00:00
Vladimir 'phcoder' Serbinenko
607a3701db 2010-01-07 Vladimir Serbinenko <phcoder@gmail.com> 
Merge crypto branch.

	* Makefile.in (pkglib_DATA):  Add crypto.lst.
	(crypto.lst): New target.
	* commands/hashsum.c: New file.
	* commands/password.c (check_password): Use grub_crypto_memcmp.
	* commands/password_pbkdf2.c: New file.
	* commands/xnu_uuid.c: Remove MD5. Use GRUB_MD_MD5.
	* conf/any-emu.rmk (grub_emu_SOURCES): Add lib/crypto.c,
	normal/crypto.c and lib/libgcrypt-grub/cipher/md5.c.
	(grub_emu_CFLAGS): Add -Wno-missing-field-initializers -Wno-error
	-I$(srcdir)/lib/libgcrypt_wrap.
	* conf/common.rmk (normal_mod_SOURCES): Add normal/crypto.c.
	(pkglib_MODULES): Add crypto.mod, hashsum.mod, pbkdf2.mod and
	password_pbkdf2.mod.
	(crypto_mod_SOURCES): New variable.
	(crypto_mod_CFLAGS): Likewise.
	(crypto_mod_LDFLAGS): Likewise.
	(hashsum_mod_SOURCES): New variable.
	(hashsum_mod_CFLAGS): Likewise.
	(hashsum_mod_LDFLAGS): Likewise.
	(pbkdf2_mod_SOURCES): New variable.
	(pbkdf2_mod_CFLAGS): Likewise.
	(pbkdf2_mod_LDFLAGS): Likewise.
	(password_pbkdf2_mod_SOURCES): New variable.
	(password_pbkdf2_mod_CFLAGS): Likewise.
	(password_pbkdf2_mod_LDFLAGS): Likewise.
	(bin_UTILITIES): Add grub-mkpasswd-pbkdf2.
	(grub_mkpasswd_pbkdf2_SOURCES): New variable.
	(grub_mkpasswd_pbkdf2_CFLAGS): Likewise.
	Include conf/gcry.rmk.
	* include/grub/auth.h: Rewritten.
	* include/grub/crypto.h: New file.
	* include/grub/disk.h (grub_disk_dev_id): Add GRUB_DISK_DEVICE_LUKS_ID.
	* include/grub/normal.h (read_crypto_list): New prototype.
	* lib/crypto.c: New file.
	* lib/libgcrypt_wrap/cipher_wrap.h: Likewise.
	* lib/pbkdf2.c: Likewise.
	* normal/auth.c (grub_auth_strcmp): Removed.
	(grub_iswordseparator): Likewise.
	(grub_auth_strword): Likewise.
	(is_authenticated): Use grub_strword.
	(grub_auth_check_authentication): Use grub_strcmp, grub_password_get
	and grub_strword. Pass entered password to authentication callback.
	* normal/crypto.c: New file.
	* normal/main.c: Call read_crypto_list.
	* util/grub-mkpasswd-pbkdf2.c: New file.
	* util/import_gcry.py: Generate crypto.lst. Add hash blocklen.
 2010-01-07 01:13:01 +01:00
Vladimir 'phcoder' Serbinenko
e6e86df1de Merge multiterm into gfxmenu+multiterm 2010-01-05 16:34:10 +01:00
Vladimir 'phcoder' Serbinenko
519634516f Merge mainline into multiterm 2010-01-05 16:27:41 +01:00
Colin Watson
bc11fee9f5 merge from trunk 2010-01-05 10:53:03 +00:00
Robert Millan
7c30297857 2010-01-05 Robert Millan <rmh.grub@aybabtu.com> 
Remove grub-mkfloppy.  Images produced by grub-mkrescue are valid
	floppy images now.
	
	* util/i386/pc/grub-mkfloppy.in: Remove.  Update all users.
 2010-01-05 00:31:07 +00:00
Vladimir 'phcoder' Serbinenko
98ff6a54de 2010-01-04 Vladimir Serbinenko <phcoder@gmail.com> 
* loader/efi/appleloader.c: Restored. Update all users.
 2010-01-04 14:53:15 +01:00
Robert Millan
ab0eeb0c33 2010-01-03 Robert Millan <rmh.grub@aybabtu.com> 
* loader/efi/appleloader.c: Remove.  Update all users.
 2010-01-03 22:15:44 +00:00
Vladimir 'phcoder' Serbinenko
ba2d24dc11 Add missing -ffreestanding on mips 2009-12-30 15:31:45 +01:00
Vladimir 'phcoder' Serbinenko
ac0289ba92 grub-mkrescue for EFI (untested) 2009-12-29 11:24:13 +01:00
Vladimir 'phcoder' Serbinenko
aa2209101c Fix i386-qemu compilation 2009-12-28 22:23:28 +01:00
Vladimir 'phcoder' Serbinenko
742e1f7e72 merge mainline into mips 2009-12-28 01:05:47 +01:00
Vladimir 'phcoder' Serbinenko
7f1f423cda merge multiterm gfxmenu+multiterm 2009-12-27 22:38:22 +01:00
Vladimir 'phcoder' Serbinenko
13d1f24696 Fix grub-emu compilation 2009-12-27 22:36:09 +01:00
Vladimir 'phcoder' Serbinenko
3251f0f88b Regexp support 2009-12-27 16:37:18 +01:00
Vladimir 'phcoder' Serbinenko
bee140683a Initial effort for gfxmenu on multiterm branch 2009-12-26 01:49:57 +01:00
Robert Millan
d94000ed13 Merge from trunk 2009-12-25 22:29:47 +00:00
Vladimir 'phcoder' Serbinenko
9c288be27a 2009-12-25 Vladimir Serbinenko <phcoder@gmail.com> 
Use search command for preliminar UUID search.

	* commands/search.c: Split into ...
	* commands/search_wrap.c: ...this
	* commands/search.c: ...and this.
	* commands/search_file.c: New file.
	* commands/search_label.c: New file.
	* commands/search_uuid.c: New file.
	* conf/any-emu.rmk (grub_emu_SOURCES): Remove commands/search.c.
	Add commands/search_wrap.c, commands/search_file.c,
	commands/search_label.c and commands/search_uuid.c.
	* conf/common.rmk (pkglib_MODULES): Remove fs_uuid.mod and fs_file.mod.
	(search_mod_SOURCES): Set to commands/search_wrap.c.
	(pkglib_MODULES): Add search_fs_file.mod, search_fs_uuid.mod and
	search_label.mod.
	(search_fs_file_mod_SOURCES): New variable.
	(search_fs_file_mod_CFLAGS): Likewise.
	(search_fs_file_mod_LDFLAGS): Likewise.
	(search_label_mod_SOURCES): Likewise.
	(search_label_mod_CFLAGS): Likewise.
	(search_label_mod_LDFLAGS): Likewise.
	(search_fs_uuid_mod_SOURCES): New variable.
	(search_fs_uuid_mod_CFLAGS): Likewise.
	(search_fs_uuid_mod_LDFLAGS): Likewise.
	(fs_file_mod_SOURCES): Removed.
	(fs_file_mod_CFLAGS): Likewise.
	(fs_file_mod_LDFLAGS): Likewise.
	(fs_uuid_mod_SOURCES): Removed.
	(fs_uuid_mod_CFLAGS): Likewise.
	(fs_uuid_mod_LDFLAGS): Likewise.
	* conf/sparc64-ieee1275.rmk (grub_install_SOURCES):
	Set to util/grub-install.in.
	* disk/fs_file.c: Removed.
	* disk/fs_uuid.c: Likewise.
	* include/grub/search.h: New file.
	* util/grub-install.in: Handle sparc64.
	Create and use load.cfg.
	* util/sparc64/ieee1275/grub-install.in: Removed.
 2009-12-25 23:06:52 +01:00
Vladimir 'phcoder' Serbinenko
9f293ab0df merge mainline into gfxmenu 2009-12-25 21:32:46 +01:00
Vladimir 'phcoder' Serbinenko
bf2ebfbe02 Lost hunk 2009-12-25 03:36:42 +01:00
Vladimir 'phcoder' Serbinenko
e48625a306 merge crypto into multiout 2009-12-24 00:38:41 +01:00
Vladimir 'phcoder' Serbinenko
f4c623e170 Work on multi-out terminal 2009-12-24 00:37:11 +01:00
Vladimir 'phcoder' Serbinenko
a2e77ce455 merge mainline into crypto 2009-12-23 20:34:26 +01:00
Vladimir 'phcoder' Serbinenko
a7a095c71a hashsum support 2009-12-23 20:31:12 +01:00
Felix Zielcke
a2c1332b70 2009-12-23 Felix Zielcke <fzielcke@z-51.de> 
* commands/i386/pc/drivemap.c: Remove all trailing whitespace.
	* commands/lspci.c: Likewise.
	* commands/probe.c: Likewise.
	* commands/xnu_uuid.c: Likewise.
	* conf/i386-coreboot.rmk: Likewise.
	* conf/i386-efi.rmk: Likewise.
	* conf/i386-ieee1275.rmk: Likewise.
	* conf/i386-pc.rmk: Likewise.
	* conf/powerpc-ieee1275.rmk: Likewise.
	* conf/sparc64-ieee1275.rmk: Likewise.
	* conf/x86_64-efi.rmk: Likewise.
	* fs/i386/pc/pxe.c: Likewise.
	* gettext/gettext.c: Likewise.
	* include/grub/efi/graphics_output.h: Likewise.
	* include/grub/i386/pc/memory.h: Likewise.
	* kern/env.c: Likewise.
	* kern/i386/qemu/startup.S: Likewise.
	* lib/i386/pc/biosnum.c: Likewise.
	* lib/i386/relocator.c: Likewise.
	* lib/i386/relocator_asm.S: Likewise.
	* lib/relocator.c: Likewise.
	* loader/i386/bsd.c: Likewise.
	* loader/i386/multiboot.c: Likewise.
	* loader/i386/pc/chainloader.c: Likewise.
	* loader/i386/xnu.c: Likewise.
	* loader/xnu.c: Likewise.
	* normal/main.c: Likewise.
	* normal/menu_text.c: Likewise.
	* util/getroot.c: Likewise.
	* util/grub-mkconfig_lib.in: Likewise.
	* util/grub.d/00_header.in: Likewise.
	* util/i386/pc/grub-mkimage.c: Likewise.
	* util/mkisofs/eltorito.c: Likewise.
	* util/mkisofs/exclude.h: Likewise.
	* util/mkisofs/hash.c: Likewise.
	* util/mkisofs/iso9660.h: Likewise.
	* util/mkisofs/joliet.c: Likewise.
	* util/mkisofs/mkisofs.c: Likewise.
	* util/mkisofs/mkisofs.h: Likewise.
	* util/mkisofs/multi.c: Likewise.
	* util/mkisofs/name.c: Likewise.
	* util/mkisofs/rock.c: Likewise.
	* util/mkisofs/tree.c: Likewise.
	* util/mkisofs/write.c: Likewise.
	* video/efi_gop.c: Likewise.
 2009-12-23 17:41:32 +01:00
Vladimir 'phcoder' Serbinenko
7316783f35 Crypto module autoloading 2009-12-23 17:33:35 +01:00
Vladimir 'phcoder' Serbinenko
adc89895e0 setpci implementation 2009-12-22 16:42:45 +01:00
Vladimir 'phcoder' Serbinenko
ba136b293a merge mainline into crypto 2009-12-22 14:28:39 +01:00
Vladimir 'phcoder' Serbinenko
2a2869b584 merge mainline into efigfx 2009-12-22 13:34:01 +01:00
Vladimir 'phcoder' Serbinenko
2fbcbbc389 Save 314 bytes on not handling contexts in core 2009-12-20 02:52:39 +01:00
Vladimir 'phcoder' Serbinenko
7ea73643f5 merge mtrunk into xnu 2009-12-18 03:57:32 +01:00
Vladimir 'phcoder' Serbinenko
b044bf0351 use video subsystem on EFI 2009-12-16 19:04:58 +01:00
Vladimir 'phcoder' Serbinenko
4d902d3715 merge from trunk 2009-12-12 02:38:30 +01:00
Robert Millan
03157a273d util/sparc64/ieee1275/grub-install.in was meant to be removed 2009-12-12 00:10:38 +00:00
Robert Millan
37ba589a4e Merge from trunk 2009-12-12 00:07:45 +00:00
Robert Millan
dfec2d96f9 Merge from trunk 2009-12-11 21:20:00 +00:00
Robert Millan
838114b687 Merge from trunk 2009-12-11 21:15:58 +00:00
Vladimir 'phcoder' Serbinenko
d4af2a73dc datetime for yeeloong 2009-12-11 22:14:09 +01:00
Robert Millan
2a3aa4d570 Merge pciaccess branch 2009-12-11 21:12:57 +00:00
Vladimir 'phcoder' Serbinenko
546d060783 grub-install for yeeloong 2009-12-09 19:39:21 +01:00
Robert Millan
7c7b610626 2009-12-08 Robert Millan <rmh.grub@aybabtu.com> 
* conf/common.rmk [sparc64-ieee1275] (grub_mkdevicemap_SOURCES): Use
        `util/ieee1275/ofpath.c' and `util/ieee1275/devicemap.c' instead of
        `util/devicemap.c'.
 2009-12-08 16:00:52 +00:00
Colin Watson
e8b2988803 merge from trunk 2009-12-08 00:55:17 +00:00
Vladimir 'phcoder' Serbinenko
0f355bc6b3 add memory routines 2009-12-07 16:16:10 +01:00
Vladimir 'phcoder' Serbinenko
b391bdb2f2 Use dedicated simple password retriever for size of future crypto disks modules and simplify entering passwords routines 2009-12-06 20:11:50 +01:00
Vladimir 'phcoder' Serbinenko
c0a6bd447e fix *-emu build 2009-12-05 20:45:32 +01:00
Vladimir 'phcoder' Serbinenko
fd39f820fd fix mismerge with trunk (progname) 2009-12-05 18:59:36 +01:00
Vladimir 'phcoder' Serbinenko
bef393d4b3 fix qemu and coreboot ports 2009-12-05 18:46:28 +01:00
Vladimir 'phcoder' Serbinenko
df2e3593f3 merge mainline into mips 2009-12-05 18:37:15 +01:00
Vladimir 'phcoder' Serbinenko
b283f10857 2009-12-05 Vladimir Serbinenko <phcoder@gmail.com> 
Rename kernel.mod to kernel.img.

	* conf/i386-efi.rmk (pkglib_MODULES): Change kernel.mod to kernel.img.
	(kernel_mod_EXPORTS): Rename to ...
	(kernel_img_EXPORTS): ... this.
	(kernel_mod_SOURCES): Rename to ...
	(kernel_img_SOURCES): ... this.
	(kernel_mod_HEADERS): Rename to ...
	(kernel_img_HEADERS): ... this. All users updated.
	(kernel_mod_CFLAGS): Rename to ...
	(kernel_img_CFLAGS): ... this.
	(kernel_mod_ASFLAGS): Rename to ...
	(kernel_img_ASFLAGS): ... this.
	(kernel_mod_LDFLAGS): Rename to ...
	(kernel_img_LDFLAGS): ... this.
	* conf/x86_64-efi.rmk: Likewise.
	* util/i386/efi/grub-mkimage.c (read_kernel_module): Rename to ...
	(read_kernel_image): ... this. All users updated.
	(read_kernel_image): Read "kernel.img" instead of "kernel.mod".
 2009-12-05 17:10:36 +01:00
Vladimir 'phcoder' Serbinenko
7d624c2949 merge mainline into crypto 2009-12-05 16:34:27 +01:00
Vladimir 'phcoder' Serbinenko
9d1fafb96e Move include/grub/cipher_wrap.h to lib/libgcrypt_wrap/cipher_wrap.h 2009-12-05 16:33:39 +01:00
Robert Millan
69ac6c405a Merge from trunk 2009-12-04 00:04:41 +00:00
Robert Millan
6b8474f8e8 2009-12-04 Robert Millan <rmh.grub@aybabtu.com> 
* commands/halt.c: Replace misc arch-specific headers with
        `<grub/misc.h>'.
        * commands/reboot.c: Likewise.
        * commands/i386/pc/halt.c: Replace `<grub/machine/init.h>' with
        `<grub/misc.h>'.
        * conf/i386-coreboot.rmk (kernel_img_HEADERS): Remove `cpu/reboot.h'.
        (halt_mod_SOURCES): Move `kern/i386/halt.c' from here ...
        (kernel_img_SOURCES): ... to here.

        * include/grub/efi/efi.h (grub_reboot, grub_halt): Remove prototypes.
        * include/grub/i386/pc/init.h: Likewise.
        * include/grub/powerpc/ieee1275/kernel.h: Likewise.
        * include/grub/sparc64/ieee1275/kernel.h: Likewise.

        * include/grub/misc.h (grub_reboot, grub_halt): New prototypes.

        * include/grub/i386/halt.h: Remove.
        * include/grub/i386/reboot.h: Likewise.

        * kern/i386/halt.c: Remove `<grub/cpu/halt.h>'.
 2009-12-03 23:07:29 +00:00