840b61d8f0
reorganized grub-emu sources to suite upcoming automake build system
2010-04-27 10:50:28 +05:30
8ea6ecb36d
Some cleanups
2010-04-26 21:11:16 +02:00
bb3208158a
Fill info for remaining platforms. Make efi image identical to image of previous grub-mkimage
2010-04-26 17:19:15 +02:00
0253aeb7a1
Unified grub-mkimage achieved
2010-04-26 13:11:43 +02:00
7576adef7c
Remove grub-mkelfimage
2010-04-25 23:04:29 +02:00
2296410ffb
initial support for ppc in grub-mkimage (bugs for now)
2010-04-25 22:26:29 +02:00
2fa6a5dd44
rename grub-mkrawimage to grub-mkimage
2010-04-25 19:41:51 +02:00
d31bc9964c
migrate kernel.img to elf
2010-04-25 01:54:46 +02:00
f67dc308f6
Nilfs2 support.
...
* conf/common.rmk (grub_probe_SOURCES): Add fs/nilfs2.c.
(grub_fstest_SOURCES): Likewise.
(pkglib_MODULES): Add nilfs2.mod.
(nilfs2_mod_SOURCES): New variable.
(nilfs2_mod_CFLAGS): Likewise.
(nilfs2_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add fs/nilfs2.c.
* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Add fs/nilfs2.c.
* fs/nilfs2.c: New file.
2010-04-24 22:09:08 +02:00
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
454c3001f2
fix emu build with grub-emu-pci and grub-emu-modules
2010-04-19 15:15:59 +05:30
7428eb2cf6
Revert useless and wrong parts
2010-04-18 20:38:40 +02:00
d0faf8a1b3
Correct path to grub-ofpathname
2010-04-18 16:31:27 +02:00
6e86896ed8
Use ofpathname in grub-setup on sparc
2010-04-18 14:02:13 +02:00
1989170fd5
merge mainline into rescue-efi
2010-04-17 02:32:05 +02:00
9130433353
Enable USB compilation on Yeeloong
2010-04-16 19:46:22 +02:00
4e6da157dd
fix and testcase for \$ in grub script dquote strings
2010-04-13 20:58:12 +05:30
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
20072d3ad5
merged with mainline
2010-04-10 18:09:56 +05:30
b3d0fa12af
Fix usb support
2010-04-10 01:56:51 +02:00
a29e902132
Merge mainline into emu-modload
2010-04-10 01:25:46 +02:00
e2d15128a5
Fix grub-setup on sparc compilation
2010-04-09 23:16:08 +02:00
4a55d631d7
Merge mainline into for_macros
2010-04-09 22:35:32 +02:00
a87add6d17
merge mainline into bidi
2010-04-09 19:40:31 +02:00
9e71201f48
merge mainline into bidi
2010-04-09 19:31:43 +02:00
68b31b54f5
merged with mainline
2010-04-09 22:32:58 +05:30
c41c00eab6
merged with mainline
2010-04-09 21:44:59 +05:30
9705115b22
merged with mainline
2010-04-09 20:53:57 +05:30
4ee717e12b
fix freebsd build
2010-04-06 14:39:11 +05:30
daf892b3d4
POSIX header file wrappers.
...
* lib/posix_wrap/assert.h: New file. Wrapper for its POSIX
equivalents.
* lib/posix_wrap/ctype.h: Likewise.
* lib/posix_wrap/errno.h: Likewise.
* lib/posix_wrap/langinfo.h: Likewise.
* lib/posix_wrap/limits.h: Likewise.
* lib/posix_wrap/localcharset.h: Likewise.
* lib/posix_wrap/stdint.h: Likewise.
* lib/posix_wrap/stdio.h: Likewise.
* lib/posix_wrap/stdlib.h: Likewise.
* lib/posix_wrap/string.h: Likewise.
* lib/posix_wrap/sys/types.h: Likewise.
* lib/posix_wrap/unistd.h: Likewise.
* lib/posix_wrap/wchar.h: Likewise.
* lib/posix_wrap/wctype.h: Likewise.
* conf/common.rmk (grub_script.yy.c): Remove #include elimination.
(grub_script.yy.h): Likewise.
* script/yylex.l: Remove POSIX emulation #defines.
* Makefile.in (POSIX_CFLAGS): New variable.
(GNULIB_UTIL_CFLAGS): Likewise.
Regexp support.
* conf/common.rmk (pkglib_MODULES): Add regexp.mod.
(regexp_mod_SOURCES): New variable.
(regexp_mod_CFLAGS): Likewise.
(regexp_mod_LDFLAGS): Likewise.
* commands/regexp.c: New file.
* gnulib/regcomp.c: New file. Imported from gnulib.
* gnulib/regex.c: Likewise.
* gnulib/regex_internal.c: Likewise.
* gnulib/regex_internal.h: Likewise.
* gnulib/regexec.c: Likewise.
* gnulib/regex.h: Likewise.
2010-04-06 01:17:32 +05:30
a6132b9f3f
Merge mainline into yeeloongfw
2010-04-05 17:35:03 +02:00
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
a9cd257a87
Move files to appropriate places
2010-04-03 14:29:11 +02:00
8c46a785e3
mips multiboot2 support
2010-04-03 14:14:48 +02:00
f651947b58
Merge mainline into bidi
2010-03-30 11:24:28 +02:00
3f11c7131e
Generate shaping table based on unicode if source font has none
2010-03-29 02:06:40 +02:00
66bf23d2e7
Use posix wrappers in lexer
2010-03-28 22:20:32 +02:00
a64b15feed
resynced with gnulib. Cleaned up wrapping layer
2010-03-28 21:43:42 +02:00
bbdb72a1f4
merged mainline into regexp
2010-03-28 18:31:40 +02:00
df32be8cc1
Merge mainline into mbtag
2010-03-27 22:14:41 +01:00
3506b90b0d
Resync with gnulib.
...
* Makefile.in (GNULIB_CFLAGS): New variable.
* conf/common.rmk (grub_mkisofs_CFLAGS): Add GNULIB_CFLAGS.
(grub_script_check_CFLAGS): New variable.
* gnulib/alloca.h: Resync with gnulib.
* gnulib/error.c: Likewise.
* gnulib/error.h: Likewise.
* gnulib/fnmatch.c: Likewise.
* gnulib/fnmatch_loop.c: Likewise.
* gnulib/getdelim.c: Likewise.
* gnulib/getline.c: Likewise.
* gnulib/getopt.c: Likewise.
* gnulib/getopt1.c: Likewise.
* gnulib/getopt_int.h: Likewise.
* gnulib/gettext.h: Likewise.
* gnulib/progname.c: Likewise.
* gnulib/progname.h: Likewise.
2010-03-27 12:53:40 +01:00
d56a6ac7f6
Remove handlers
2010-03-27 00:19:42 +01:00
dae0d05f2d
merged with mainline
2010-03-26 23:49:49 +05:30
03efaf45b2
merged with mainline
2010-03-26 23:36:14 +05:30
baae00df35
merged with mainline
2010-03-26 21:13:06 +05:30
6a5cf6b696
Sunpc partitions support.
...
* conf/common.rmk (grub_probe_SOURCES): Add partmap/sunpc.c.
(grub_fstest_SOURCES): Likewise.
(pkglib_MODULES): Add part_sunpc.mod.
(part_sunpc_mod_SOURCES): New variable.
(part_sunpc_mod_CFLAGS): Likewise.
(part_sunpc_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add partmap/sunpc.c.
* partmap/sunpc.c: New file.
2010-03-26 16:40:41 +01:00
bb8eacef88
Merge mainline into sunpc
2010-03-26 16:35:12 +01:00
c299f3d6fb
merged with mainline
2010-03-26 20:55:07 +05:30
c9ea504d25
merge mainline into nestpart
2010-03-26 15:44:13 +01:00
3e6b777ba7
testcase for the last semicolon behavior
2010-03-22 14:02:48 +05:30
8507a6ccdf
testcase for blanklines in grub script
2010-03-22 13:54:45 +05:30
dd6fee39fa
merged mainline
2010-03-21 11:03:41 +05:30
0f3a3e3ece
added elif patch from Deepak Vankadaru
2010-03-21 10:27:21 +05:30
abe8f24a47
Fix widthspec.h dependency
2010-03-17 08:49:48 +01:00
6c363dfd54
Fix doublewidth character handling
2010-03-16 21:29:15 +01:00
8a99e92a69
merge in mainline
2010-03-16 17:42:27 +05:30
023e3a5ca7
Move charset to normal/
2010-03-15 22:17:26 +01:00
53c648d2eb
Break few dependencies on normal
2010-03-15 22:12:34 +01:00
7f837ea536
Fixed circular dependency
2010-03-15 21:34:50 +01:00
0a239a8211
bidi works in terminal in grub-emu
2010-03-15 21:14:11 +01:00
53f312c1cf
Merge mainline into bidi
2010-03-15 10:28:09 +01:00
0cdc2a095b
2010-03-14 BVK Chaitanya <bvk.groups@gmail.com>
...
GRUB shell lexer and parser improvements.
* conf/any-emu.rmk: Build rule updates.
* conf/common.rmk: 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/x86_64-efi.rmk: Likewise.
* configure.ac: Configure check for flex.
* include/grub/script_sh.h (grub_script_arg_type_t): More argument
types.
(grub_lexer_param): Struct member updates.
(grub_parser_param): Likewise.
(GRUB_LEXER_TOKEN_MAX): Maximum token size.
(GRUB_LEXER_RECORD_INCREMENT): Memory increments' size.
(grub_script_lexer_init): Prototype update.
(grub_script_lexer_record_start): Likewise.
(grub_script_lexer_record_stop): Likewise.
(grub_script_lexer_yywrap): New function prototype.
(grub_script_lexer_fini): Likewise.
(grub_script_execute_argument_to_string): Removed by...
(grub_script_execute_argument_to_argv): ...better version.
* script/execute.c (ROUND_UPTO): New macro.
(grub_script_execute_cmdline): Out of memory fixes.
(grub_script_execute_menuentry): Likewise.
(grub_script_execute_argument_to_string): Removed. Update all
users by...
(grub_script_execute_argument_to_argv): ...better version.
* script/function.c (grub_script_function_create): Use
grub_script_execute_argument_to_argv instead of
grub_script_execute_argument_to_string.
* script/lexer.c (check_varstate): Removed.
(check_textstate): Removed.
(grub_script_lexer_record_start): Likewise.
(grub_script_lexer_record_stop): Likewise.
(recordchar): Replaced with...
(grub_script_lexer_record): ...new function.
(nextchar): Removed.
(grub_script_lexer_init): Rewritten.
(grub_script_yylex): Rewritten.
(append_newline): New function.
(grub_script_lexer_yywrap): New function.
(grub_script_lexer_fini): New function.
(grub_script_yyerror): Sets error flag.
* script/yylex.l: New file.
(grub_lexer_yyfree): Wrapper for flex yyffre.
(grub_lexer_yyalloc): Likewise.
(grub_lexer_yyrealloc): Likewise.
* script/parser.y: Refactored.
* script/script.c (grub_script_arg_add): Out of memory fixes.
(grub_script_add_arglist): Likewise.
(grub_script_create_cmdline): Likewise.
(grub_script_create_cmdmenu): Likewise.
(grub_script_add_cmd): Likewise.
(grub_script_parse): Use grub_script_lexer_fini to deallocated.
* util/grub-script-check.c (grub_script_execute_menuentry): Remove
unnecessary code.
* tests/grub_script_echo1.in: New testcase.
* tests/grub_script_vars1.in: New testcase.
* tests/grub_script_echo_keywords.in: New testcase.
2010-03-14 22:37:17 +05:30
8622549153
merged in mainline
2010-03-14 22:20:55 +05:30
1d63a066e2
Remove some redundancy in build system.
...
* Makefile.in (TARGET_CFLAGS): Add -ffreestanding.
(TARGET_ASFLAGS): Add -nostdinc -fno-builtin.
(TARGET_LDFLAGS): Add -nostdlib.
(TARGET_IMG_LDFLAGS): Likewise.
* commands/lsmmap.c (grub_cmd_lsmmap) [GRUB_MACHINE_EMU]: Don't do
anything since mmap isn't available.
* conf/any-emu.rmk (kernel_img_SOURCES): Remove commands/boot.c.
Add util/time.c.
(pkglib_MODULES): Remove reboot.mod.
(reboot_mod_SOURCES): Removed.
(reboot_mod_CFLAGS): Likewise.
(reboot_mod_LDFLAGS): Likewise.
* conf/common.rmk (script/lexer.c_DEPENDENCIES): New variable.
(MOSTLYCLEANFILES): Add symlist.c kernel_syms.lst.
(DEFSYMFILES): Add kernel_syms.lst.
(kernel_img_HEADERS): Add common headers.
(symlist.c): New target.
(kernel_syms.lst): Likewise.
(pkglib_MODULES): Add memdisk.mod.
(memdisk_mod_SOURCES): New variable.
(memdisk_mod_CFLAGS): Likewise.
(memdisk_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add reboot.mod.
(reboot_mod_SOURCES): New variable.
(reboot_mod_CFLAGS): Likewise.
(reboot_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add date.mod.
(date_mod_SOURCES): New variable.
(date_mod_CFLAGS): Likewise.
(date_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add datehook.mod.
(datehook_mod_SOURCES): New variable.
(datehook_mod_CFLAGS): Likewise.
(datehook_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add lsmmap.mod.
(lsmmap_mod_SOURCES): New variable.
(lsmmap_mod_CFLAGS): Likewise.
(lsmmap_mod_LDFLAGS): Likewise.
(pkglib_MODULES): Add boot.mod.
(boot_mod_SOURCES): New variable.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Removed redundant parts.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/mips-yeeloong.rmk: Likewise.
* conf/mips.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* conf/i386-coreboot.rmk: Moved qemu parts ..
* conf/i386-qemu.rmk: ... here
* conf/i386-efi.rmk: Moved common parts to...
* conf/x86-efi.rmk: ... here.
* conf/i386.rmk: Added modules common to all x86 variants.
* configure.ac: Add -m32/-m64 to TARGET_ASFLAGS.
* disk/memdisk.c: Remove grub/machine/kernel.h.
* gensymlist.sh.in: Include symbol.h.
* hook/datehook.c: Correct module name.
* include/grub/datetime.h (grub_get_datetime) [GRUB_MACHINE_EMU]: Export.
(grub_set_datetime) [GRUB_MACHINE_EMU]: Likewise.
* include/grub/i386/efi/serial.h: New file.
* include/grub/x86_64/efi/serial.h: Likewise.
* util/time.c: Likewise.
* video/ieee1275.c (grub_video_ieee1275_setup): Handle 64-bit void *.
2010-03-14 17:17:49 +01:00
8d7f2981d0
Remove leftover date*.mo on sparc64
2010-03-14 16:55:51 +01:00
120cc3eebc
Merge mainline into cleanbuild
2010-03-14 16:41:57 +01:00
08e46ededa
Speed up consecutive hostdisk operations on the same device.
...
* util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
(grub_util_biosdisk_open): Initialise disk->data.
(struct linux_partition_cache): New structure.
(linux_find_partition): Cache partition start positions; these are
expensive to compute on every read and write.
(open_device): Cache open file descriptor in disk->data, so that we
don't have to reopen it and flush the buffer cache for consecutive
operations on the same device.
(grub_util_biosdisk_close): New function.
(grub_util_biosdisk_dev): Set `close' member.
* conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
* conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
2010-03-14 15:39:14 +00:00
dae79b6b05
Merge mainline into emu-mod
2010-03-14 16:27:54 +01:00
016a671b51
Merge mainline into cleanbuild
2010-03-14 16:01:31 +01:00
eb46c85c07
Merge mainline into ofwclock
2010-03-14 15:41:30 +01:00
313df2f552
Merge mainline into sparc-mkimage
2010-03-14 15:21:04 +01:00
f9ef05770a
Shutdown and reboot on yeeloong
2010-03-12 14:07:33 +01:00
b1f6f35ae9
Preparation for mbh tag
2010-03-08 15:40:57 +01:00
c28e2d120b
merge mainline into yeeloongfw
2010-03-07 23:21:09 +01:00
3f5a90c616
merge mainline into mbtag
2010-03-07 13:01:43 +01:00
b54d93ac1b
2010-03-04 Vladimir Serbinenko <phcoder@gmail.com>
...
Disable linux.mod on qemu-mips since it's not functional and leads
to compilation failure.
* conf/mips.rmk (pkglib_MODULES): Remove linux.mod.
* conf/mips-yeeloong.rmk (pkglib_MODULES): Add linux.mod.
* conf/mips.rmk (linux_mod_SOURCES): Move from here ...
* conf/mips-yeeloong.rmk (linux_mod_SOURCES): ... here
* conf/mips.rmk (linux_mod_CFLAGS): Move from here ...
* conf/mips-yeeloong.rmk (linux_mod_CFLAGS): ... here
* conf/mips.rmk (linux_mod_ASFLAGS): Move from here ...
* conf/mips-yeeloong.rmk (linux_mod_ASFLAGS): ... here
* conf/mips.rmk (linux_mod_LDFLAGS): Move from here ...
* conf/mips-yeeloong.rmk (linux_mod_LDFLAGS): ... here
Reported by: BVK Chaitanya
2010-03-04 17:03:43 +01:00
22d7b6137a
2010-03-03 Colin Watson <cjwatson@ubuntu.com>
...
* util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
(grub_util_biosdisk_open): Initialise disk->data.
(struct linux_partition_cache): New structure.
(linux_find_partition): Cache partition start positions; these are
expensive to compute on every read and write.
(open_device): Cache open file descriptor in disk->data, so that we
don't have to reopen it and flush the buffer cache for consecutive
operations on the same device.
(grub_util_biosdisk_close): New function.
(grub_util_biosdisk_dev): Set `close' member.
* conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
* conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
2010-03-03 10:44:12 +00:00
14532662ee
merge mainline into sparc-mkimage
2010-03-03 11:24:36 +01:00
c140a18037
2010-02-25 Vladimir Serbinenko <phcoder@gmail.com>
...
Don't compile video modules on yeeloong since video subsystem is part
of kernel.
* conf/common.rmk (pkglib_MODULES) [yeeloong]: Remove video.mod,
video_fb.mod, bitmap.mod, font.mod, gfxterm.mod and bufio.mod
* conf/mips-yeeloong.rmk (kernel_img_HEADERS): Add bitmap.h,
video.h, gfxterm.h, font.h, bitmap_scale.h and bufio.h.
* conf/mips.rmk (kernel_img_HEADERS): Add values instead of overwriting.
* include/grub/bitmap.h: Add EXPORT_FUNC and EXPORT_VAR.
* include/grub/bitmap_scale.h: Likewise.
* include/grub/bufio.h: Likewise.
* include/grub/font.h: Likewise.
* include/grub/gfxterm.h: Likewise.
* include/grub/video.h: Likewise.
* include/grub/vbe.h: Don't include video_fb.h.
* video/i386/pc/vbe.c: Include video_fb.h.
* commands/i386/pc/vbetest.c: Include video.h.
2010-02-25 15:10:18 +01:00
7517048135
Working SPD reading in fwstart.img
2010-02-17 21:10:58 +01:00
232f7e29c9
SMBus on CS5536 support
2010-02-16 22:39:59 +01:00
a49217cff7
aout image support
2010-02-13 16:26:50 +01:00
6bea3f8983
merge sparc grub-mkimage into grub-mkrawimage
2010-02-12 20:08:56 +01:00
abac2bf4db
merge cleanbuild int emu-modload
2010-02-10 02:03:04 +01:00
67443b0d68
Remove useless efi grub-setup
2010-02-10 01:51:02 +01:00
52d45a32d3
Add missing tailing newline
2010-02-10 01:50:40 +01:00
9a31b3a797
Fix yeeloong compilation
2010-02-10 01:49:47 +01:00
5c2ee77128
Share common compilation flags
2010-02-10 01:39:23 +01:00
c395ad834e
Remove leftover __ASSEMBLY__
2010-02-10 01:10:09 +01:00
428b0b2edd
Unify lexer.c_DEPENDENCIES
2010-02-10 01:09:23 +01:00
efca454179
Merge kernel_img_HEADERS
2010-02-10 01:05:40 +01:00
ed4e9b07a4
unify symlist.c
2010-02-10 00:16:28 +01:00
38c95667d6
Unify efi rmk
2010-02-10 00:05:19 +01:00
a3df209041
Fix libusb compilation
2010-02-09 21:16:17 +01:00
ca3112ba2d
merge cleanbuild into emu-modload
2010-02-08 00:21:55 +01:00
ec0be08d40
Clean building system
2010-02-07 23:49:49 +01:00
b359aa1373
Merge ofwclock into cleanbuild
2010-02-07 23:01:41 +01:00
f84dc56090
Initial implementation of ofwclock
2010-02-07 22:56:25 +01:00
b77ab1aaa9
Merge emu-mod into emu-modload
2010-02-07 17:52:11 +01:00
b4674703a1
Add fno-builtin
2010-02-07 17:39:52 +01:00
a1a8d38a58
Use nostdinc
2010-02-07 17:30:16 +01:00
ac307b2ae4
Cleanup
2010-02-07 16:47:50 +01:00
3dca5319c6
module support in grub-emu
2010-02-07 16:13:59 +01:00
f38873b80b
Build system support for grub-emu modules
2010-02-07 15:17:26 +01:00
c3e6233987
REmove the need for disable-werror
2010-02-07 04:50:30 +01:00
19987ffa02
Remove the need for explicit make grub-emu
2010-02-07 04:45:54 +01:00
2083672af1
Remove -DGRUB_UTIL when compiling grub-emu
2010-02-07 04:23:44 +01:00
1eebb21608
Add missing dependency
2010-02-07 04:01:22 +01:00
285505d3fc
Eliminate blacklist of modules w/o init
2010-02-07 03:58:14 +01:00
ebe841ad55
Don't try to generate moddep.lst on any-emu.rmk
2010-02-07 03:48:38 +01:00
c5160d75c4
Don't strip on any-emu
2010-02-07 03:43:07 +01:00
dcb3f497be
Rename main.mod to kernel.img
2010-02-07 03:29:59 +01:00
19a9fb834b
merge mainline into emu-mod
2010-02-07 03:06:33 +01:00
909301af11
First try at generating grub-emu from modules
2010-02-07 02:07:35 +01:00
05d4e36ff6
reimport sunpc
2010-02-06 21:36:24 +01:00
f3e309ad7d
Use (hd0,msdos1) syntax. Eliminate partmap_iterate
2010-02-06 21:00:53 +01:00
bc6fcf0931
merge mainline into nestpart
2010-02-06 18:47:17 +01:00
15cb7d433f
Reimport nestpart
2010-02-06 18:43:37 +01:00
e190e3d2cc
merge mainline into ofwfb
2010-02-06 15:54:01 +01:00
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
98f5714739
Fix mips compilation
2010-02-03 01:34:55 +01:00
1f534b6908
Merge mainline into gfxmenu
2010-02-03 01:24:07 +01:00
fbab7b0794
Framebuffer on PowerPC-based macs
2010-01-31 01:57:17 +01:00
b769a37b6e
2010-01-26 Colin Watson <cjwatson@ubuntu.com>
...
* conf/common.rmk (grub_mkdevicemap_SOURCES): Add kern/env.c,
kern/err.c, kern/list.c, and kern/misc.c.
* util/deviceiter.c [__linux__]: Define MINOR.
(grub_util_iterate_devices): Add support for DM-RAID disk devices.
* util/mkdevicemap.c (grub_putchar): New function.
(grub_getkey): New function.
(grub_refresh): New function.
(main): Set debug=all if -v -v is used.
2010-01-26 14:26:16 +00:00
3342306cec
several fixes in return value handling
2010-01-26 12:32:24 +05:30
4e6a305be4
for loop support to grub script
2010-01-23 11:03:41 +05:30
547e494f1b
lexer-rewrite rebase commit
2010-01-22 19:07:27 +05:30
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
61c501a941
merge mainline into newenv
2010-01-20 21:31:39 +01:00
5b47ee8044
merge mainline into setpci
2010-01-20 20:51:00 +01:00
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
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
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
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
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
ca2a220a74
Resync
2010-01-20 00:47:55 +00:00
e022a2d667
Sync with trunk
2010-01-18 20:51:35 +00:00
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
3d8b4e4e26
Resync with trunk
2010-01-18 19:34:26 +00:00
d8d4217e3c
merge trunk
2010-01-18 16:58:03 +05:30
5408044f4c
Multiboot 2 tags support
2010-01-16 16:25:43 +01:00
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
885d1a8d90
Support --help and --version in grub-bin2h.
2010-01-14 20:33:10 +00:00
7d1468e4b6
merge from trunk
2010-01-14 14:04:44 +00:00
96f60752d1
merge trunk
2010-01-14 18:45:19 +05:30
4d362fde58
build only functional tests on make
2010-01-12 15:49:40 +05:30
528aeaeabb
merge trunk
2010-01-12 11:02:49 +05:30
c5431d4029
build tests on make, but run on make check
2010-01-12 10:16:17 +05:30
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
cd0514794a
MAnipulate mbi in abstract way
2010-01-10 18:58:18 +01:00
85a2cf749f
merge mainline into mips
2010-01-10 13:34:48 +01:00
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
75cc5b682e
Merge from trunk
2010-01-09 23:22:48 +01:00
58ad6b39c4
added changelog file
2010-01-09 20:31:33 +05:30
21a99f5804
added grub-script-check tool
2010-01-09 20:27:58 +05:30
169b1cd2d8
added functional tests to make-check
2010-01-08 16:35:32 +05:30
6fc804ffbb
unit testing framework
2010-01-08 15:19:10 +05:30
fc054c9cb8
Various cleanups
2010-01-07 22:18:59 +01:00
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
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
f0cfb703b8
Initial bidi support for gfxmenu
2010-01-06 20:37:16 +01:00
e6e86df1de
Merge multiterm into gfxmenu+multiterm
2010-01-05 16:34:10 +01:00
519634516f
Merge mainline into multiterm
2010-01-05 16:27:41 +01:00
bc11fee9f5
merge from trunk
2010-01-05 10:53:03 +00:00
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
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
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
ba2d24dc11
Add missing -ffreestanding on mips
2009-12-30 15:31:45 +01:00
ac0289ba92
grub-mkrescue for EFI (untested)
2009-12-29 11:24:13 +01:00
aa2209101c
Fix i386-qemu compilation
2009-12-28 22:23:28 +01:00
742e1f7e72
merge mainline into mips
2009-12-28 01:05:47 +01:00
7f1f423cda
merge multiterm gfxmenu+multiterm
2009-12-27 22:38:22 +01:00
13d1f24696
Fix grub-emu compilation
2009-12-27 22:36:09 +01:00
3251f0f88b
Regexp support
2009-12-27 16:37:18 +01:00
bee140683a
Initial effort for gfxmenu on multiterm branch
2009-12-26 01:49:57 +01:00
d94000ed13
Merge from trunk
2009-12-25 22:29:47 +00:00
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
9f293ab0df
merge mainline into gfxmenu
2009-12-25 21:32:46 +01:00
bf2ebfbe02
Lost hunk
2009-12-25 03:36:42 +01:00
e48625a306
merge crypto into multiout
2009-12-24 00:38:41 +01:00
f4c623e170
Work on multi-out terminal
2009-12-24 00:37:11 +01:00
a2e77ce455
merge mainline into crypto
2009-12-23 20:34:26 +01:00
a7a095c71a
hashsum support
2009-12-23 20:31:12 +01:00
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
7316783f35
Crypto module autoloading
2009-12-23 17:33:35 +01:00
e2a101ab76
I/O rw support
2009-12-22 17:18:48 +01:00
adc89895e0
setpci implementation
2009-12-22 16:42:45 +01:00
ba136b293a
merge mainline into crypto
2009-12-22 14:28:39 +01:00
2a2869b584
merge mainline into efigfx
2009-12-22 13:34:01 +01:00
2fbcbbc389
Save 314 bytes on not handling contexts in core
2009-12-20 02:52:39 +01:00
7ea73643f5
merge mtrunk into xnu
2009-12-18 03:57:32 +01:00
b044bf0351
use video subsystem on EFI
2009-12-16 19:04:58 +01:00
4d902d3715
merge from trunk
2009-12-12 02:38:30 +01:00
03157a273d
util/sparc64/ieee1275/grub-install.in was meant to be removed
2009-12-12 00:10:38 +00:00
37ba589a4e
Merge from trunk
2009-12-12 00:07:45 +00:00
dfec2d96f9
Merge from trunk
2009-12-11 21:20:00 +00:00
838114b687
Merge from trunk
2009-12-11 21:15:58 +00:00
d4af2a73dc
datetime for yeeloong
2009-12-11 22:14:09 +01:00
2a3aa4d570
Merge pciaccess branch
2009-12-11 21:12:57 +00:00
acdf01cd1b
cmostest command
2009-12-11 21:28:27 +01:00
546d060783
grub-install for yeeloong
2009-12-09 19:39:21 +01:00
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
e8b2988803
merge from trunk
2009-12-08 00:55:17 +00:00
0f355bc6b3
add memory routines
2009-12-07 16:16:10 +01:00
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
c0a6bd447e
fix *-emu build
2009-12-05 20:45:32 +01:00
fd39f820fd
fix mismerge with trunk (progname)
2009-12-05 18:59:36 +01:00
bef393d4b3
fix qemu and coreboot ports
2009-12-05 18:46:28 +01:00
df2e3593f3
merge mainline into mips
2009-12-05 18:37:15 +01:00
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
7d624c2949
merge mainline into crypto
2009-12-05 16:34:27 +01:00
9d1fafb96e
Move include/grub/cipher_wrap.h to lib/libgcrypt_wrap/cipher_wrap.h
2009-12-05 16:33:39 +01:00
69ac6c405a
Merge from trunk
2009-12-04 00:04:41 +00:00
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
4b2e6ca2b6
2009-12-03 David S. Miller <davem@sunset.davemloft.net>
...
* conf/sparc64-ieee1275.rmk (grub_mkimage_SOURCES,
grub_setup_SOURCES, grub_ofpathname_SOURCES): Add gnulib/progname.c
* util/sparc64/ieee1275/grub-mkimage.c: Include <grub/i18n.h> and
"progname.h"
* util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
(usage): Add missing comma in printf.
2009-12-03 12:18:56 +01:00
5239348f18
2009-12-02 Robert Millan <rmh.grub@aybabtu.com>
...
Use the same reboot approach on i386 coreboot and qemu as we do on
BIOS.
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add `cpu/reboot.h'.
(reboot_mod_SOURCES): Remove `kern/i386/reboot.c'.
* kern/i386/reboot.c: Remove.
* include/grub/i386/reboot.h (grub_reboot): Export function.
* kern/i386/pc/startup.S (grub_reboot): Move from here ...
* kern/i386/realmode.S (grub_reboot): ... to here. Jump to
0xf000:0xfff0 instead of 0xffff:0x0000.
[!GRUB_MACHINE_PCBIOS] (prot_to_real): Do not restore interrupts.
* kern/i386/qemu/startup.S: Include `"../realmode.S"'.
2009-12-02 22:48:02 +00:00
c8dea671ff
2009-12-02 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-02 17:13:45 +01:00
d065a04ae4
Fix lexer.c name in mips.rmk
2009-12-02 14:28:11 +01:00
1c7926d823
Remove leftover in mips.rmk
2009-12-02 14:02:37 +01:00
0ee6924f69
Revert USB-related MIPS changes
2009-12-02 10:00:54 +01:00
537ee0a5f1
Merge relocators into mips
2009-12-02 09:55:04 +01:00
4f41a23d4e
merge mainline into mips
2009-12-02 09:51:36 +01:00
7b5f334bc0
Rename qemu-r4k to qemu-mips
2009-12-02 08:49:36 +01:00
e6b9873356
Remove qemu-mipssim
2009-12-02 08:40:51 +01:00
3e5c7dc3d8
Fix qemu-r4k
2009-12-02 08:39:17 +01:00
e45f7848e6
merged mainline into pci
2009-11-30 16:39:59 +01:00
9ec25583a9
Merge bmpidx into gfxmenu
2009-11-29 15:25:13 +01:00
c85184ad3d
2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>
...
GOP support. Based on patch from Bean
(http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00384.html )
* video/efi_gop.c: New file.
* include/grub/efi/graphics_output.h: Likewise.
* conf/i386-efi.rmk (pkglib_MODULES): Add `efi_gop.mod'.
(efi_fb_mod_SOURCES, efi_fb_mod_CFLAGS, efi_fb_mod_LDFLAGS): New
variables.
* conf/x86_64-efi.rmk: Likewise.
2009-11-28 00:24:57 +01:00
1708050b6f
GOP support
...
Also-By: Bean Lee <>
2009-11-28 00:15:04 +01:00
8a4c48d86f
2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>
...
Rename efi_fb to efi_uga.
* conf/i386-efi.rmk (pkglib_MODULES): Rename 'efi_fb.mod' to
'efi_uga.mod'.
(efi_fb_mod_SOURCES): Rename this ...
(efi_uga_mod_SOURCES): ... to this.
(efi_fb_mod_CFLAGS): Rename this ...
(efi_uga_mod_CFLAGS): ... to this.
(efi_fb_mod_LDFLAGS): Rename this ...
(efi_uga_mod_LDFLAGS): ... to this.
* conf/x86_64-efi.rmk (pkglib_MODULES): Rename 'efi_fb.mod' to
'efi_uga.mod'.
(efi_fb_mod_SOURCES): Rename this ...
(efi_uga_mod_SOURCES): ... to this.
(efi_fb_mod_CFLAGS): Rename this ...
(efi_uga_mod_CFLAGS): ... to this.
(efi_fb_mod_LDFLAGS): Rename this ...
(efi_uga_mod_LDFLAGS): ... to this.
* video/efi_fb.c: Move this ...
* video/efi_uga.c: ... to this. Change prefix to 'grub_video_uga_'.
2009-11-28 00:13:51 +01:00
dc63338117
Rename efi_fb to efi_uga
2009-11-27 16:33:22 +01:00
3d1933fb20
Fix compilation on x86_64-efi
2009-11-27 10:57:52 +01:00
159194989d
Ported xnu to relocator framework
2009-11-27 09:42:50 +01:00
3df1f5113a
Merge from trunk.
2009-11-27 00:03:09 +00:00
84c6b0863f
renamed grub-pbkdf2 into grub-mkpasswd-pbkdf2
2009-11-26 17:34:22 +01:00
e30dd39296
2009-11-26 Felix Zielcke <fzielcke@z-51.de>
...
* conf/i386-efi.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
* conf/x86_64-efi.rmk (grub_mkimage_SOURCES): Likewise.
2009-11-26 16:29:06 +01:00
7656de4f5b
2009-11-26 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/i386-coreboot.rmk: Cleanup stale filenames from my previous
commit.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
2009-11-26 00:45:53 +00:00
db77c4d43c
2009-11-26 Felix Zielcke <fzielcke@z-51.de>
...
* conf/any-emu.rmk (grub_emu_SOURCES): Add `gnulib/progname.c'.
2009-11-26 01:08:42 +01:00
a755bb0437
2009-11-26 Felix Zielcke <fzielcke@z-51.de>
...
* conf/any-emu.rmk (grub_mkfont_SOURCES): Add `gnulib/progname.c'.
2009-11-26 00:52:55 +01:00
8a4c07fd6a
2009-11-26 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (sbin_UTILITIES): Add `grub-mkdevicemap'.
(grub_mkdevicemap_SOURCES): New variable.
(grub_probe_SOURCES, grub_fstest_SOURCES, grub_mkfont_SOURCES)
(grub_mkrelpath_SOURCES, grub_editenv_SOURCES)
(grub_pe2elf_SOURCES): Add `gnulib/progname.c'.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-mkdevicemap'.
(grub_mkdevicemap_SOURCES): Remove.
* 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.
* util/elf/grub-mkimage.c: Include `<grub/i18n.h>' and `"progname.h"'.
(usage): Fix strings to use `program_name'.
(main): Initialize gettext.
* util/grub-editenv.c: Likewise.
* util/grub-emu.c: Likewise.
* util/grub-fstest.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-mkfont.c: Likewise.
* util/grub-mkrelpath.c: Likewise.
* util/grub-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
* util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
* util/misc.c: Include `"progname.h"'.
(progname): Remove variable.
(grub_util_warn, grub_util_info, grub_util_error): Use `program_name'.
2009-11-25 23:10:02 +00:00
53e08cc54c
Merged mainstream into newuuid
2009-11-25 23:50:54 +01:00
636813f768
Split relocators from mips branch
2009-11-25 23:39:59 +01:00
bde358ac91
merged with mainline
2009-11-25 23:17:32 +01:00
e4612999e6
Merge from trunk.
2009-11-25 21:34:53 +00:00
0e8489094a
mainstream merged into pci
2009-11-25 15:15:30 +01:00
4a8572e9d8
2009-11-24 Carles Pina i Estany <carles@pina.cat>
...
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add i18n.h.
* 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.
* gettext/gettex.c: Include <grub/i18n.h>.
* include/grub/misc.h (grub_gettext_dummy, grub_gettext): Move from
here ...
* include/grub/i18n.h: ... to here
* include/grub/i18n.h: ... to here.
* kern/misc.c: Include <grub/i18n.h>
(grub_gettext_dummy): Move above user.
2009-11-24 21:42:14 +00:00
fefa1b7deb
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* conf/i386-coreboot.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
2009-11-24 15:47:48 +01:00
4501250b6c
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrelpath.c: New file.
* conf/common.rmk (bin_UTILITIES): Add grub-mkrelpath.
(grub_mkrelpath_SOURCES): New variable.
* include/grub/util/misc.h: New function prototype.
* util/misc.c (make_system_path_relative_to_its_root): New function.
* util/grub-mkconfig_lib.in (bindir): New variable.
(grub_mkrelpath): Likewise.
(make_system_path_relative_to_its_root): Use grub-mkrelpath.
* util/probe.c (probe): Make the file path relative to its root.
Change a info message to use the GRUB path. Enable again the
check if we can read the file with GRUB facilities.
* util/i386/pc/grub-setup.c (setup): Make core.img path relative
to its root.
2009-11-24 15:00:25 +01:00
a5c894bcd9
Enable gfxmenu on grub-emu
2009-11-24 04:19:33 +01:00
59f746dc5f
merged mainstream into crypto
2009-11-24 02:54:35 +01:00
BVK Chaitanya