Vladimir 'phcoder' Serbinenko
4dff488793
merge mainline into intwrap
2010-05-04 15:57:37 +02:00
Vladimir 'phcoder' Serbinenko
d0fd0a359f
remove references to kern/i386/ieee1275/init.c
2010-05-04 15:57:18 +02:00
Vladimir 'phcoder' Serbinenko
c3a4565068
Don't access NULL in dprintf
2010-05-04 11:32:10 +02:00
Vladimir 'phcoder' Serbinenko
0a58eb2e3a
move fwstart.S to boot/
2010-05-04 10:56:52 +02:00
BVK Chaitanya
725396942e
replace --enable-grub-emu-modules with grub-emu-lite
2010-05-04 09:47:48 +05:30
BVK Chaitanya
a06157aa05
pull in emu-reorg branch
2010-05-04 09:18:33 +05:30
BVK Chaitanya
81827e248c
merge with mainline
2010-05-04 09:09:03 +05:30
Vladimir 'phcoder' Serbinenko
04d050152f
Move geode init to bus/cs5536.c
2010-05-04 00:05:23 +02:00
Vladimir 'phcoder' Serbinenko
bcfd0cf0fa
Pause before returning to menu editor
2010-05-03 23:14:23 +02:00
Vladimir 'phcoder' Serbinenko
0cb0344d11
Fix overflow and add more dprintfs
2010-05-03 23:02:18 +02:00
Vladimir 'phcoder' Serbinenko
cfdcef121f
Fix efiemu compilation condition
2010-05-03 23:00:49 +02:00
Vladimir 'phcoder' Serbinenko
f34c08dac5
merge merge-mkimage into newreloc
2010-05-03 22:59:30 +02:00
Vladimir 'phcoder' Serbinenko
ee0b981c20
Fix BSD tests. Move BSD bootchecks to i386.rmk in hope to enable them one day everywhere
2010-05-03 22:58:27 +02:00
Vladimir 'phcoder' Serbinenko
a1a5c86985
Fix default mkimage path determination
2010-05-03 22:54:46 +02:00
Vladimir 'phcoder' Serbinenko
a57c242287
Add missing token
2010-05-03 22:53:51 +02:00
Vladimir 'phcoder' Serbinenko
265d68cd10
* commands/parttool.c (grub_cmd_parttool): Fix #if !GRUB_NO_MODULES
...
condition.
2010-05-03 13:17:12 +02:00
Vladimir 'phcoder' Serbinenko
7dd5a111ba
* kern/mm.c (grub_real_malloc): Put magic and size assignment in common
...
part.
2010-05-03 13:12:55 +02:00
Vladimir 'phcoder' Serbinenko
9b058d5291
* kern/mm.c (grub_mm_init_region): Check for region size after aligning
...
pointers.
2010-05-03 13:07:31 +02:00
Vladimir 'phcoder' Serbinenko
2589383147
* kern/mm.c (grub_real_malloc): Fix size calculation when extra == 0.
2010-05-03 12:53:32 +02:00
Vladimir 'phcoder' Serbinenko
86fbf9798a
Fix makefile problem due to compression
2010-05-03 01:46:43 +02:00
Vladimir 'phcoder' Serbinenko
7f5320b319
Compress miniroot and decrease timeout
2010-05-02 23:09:45 +02:00
Vladimir 'phcoder' Serbinenko
05f602fc51
enable xnu on all platforms
2010-05-02 22:06:44 +02:00
Vladimir 'phcoder' Serbinenko
db292d391f
Support elfsyms on mb2
2010-05-02 19:39:46 +02:00
Vladimir 'phcoder' Serbinenko
6f030865da
Add missing memory.h
2010-05-02 19:39:35 +02:00
Vladimir 'phcoder' Serbinenko
32bf9244dc
Remove reference to loader.h
2010-05-02 19:39:07 +02:00
Vladimir 'phcoder' Serbinenko
4fc5ff74f2
USe more low memory on i386-qemu
2010-05-02 16:27:22 +02:00
Vladimir 'phcoder' Serbinenko
92517362b2
Split a memory chunk spanning accross 1MiB mark for openbsd
2010-05-02 16:26:00 +02:00
Christian Franke
d1b61374ed
* util/grub-mkconfig_lib.in (make_system_path_relative_to_its_root):
...
Remove broken Cygwin path conversion.
* util/misc.c: [__CYGWIN__] Add include and define.
[__CYGWIN__] (get_win32_path): Copy function from getroot.c, modify
for Cygwin 1.7.
(make_system_path_relative_to_its_root): Simplify loop, replace early
return by break.
[__CYGWIN__] Add conversion to win32 path.
Include "/" case in trailing slash removal.
2010-05-01 21:39:32 +02:00
Vladimir 'phcoder' Serbinenko
3558c6e93c
* kern/main.c (grub_load_config): Fix copy-pasted comment.
...
Reported by: Seth Goldberg
2010-05-01 21:32:23 +02:00
Vladimir 'phcoder' Serbinenko
f5f3ff9326
* commands/help.c (grub_cmd_help): Fix a typo.
...
Reported by: Seth Goldberg
2010-05-01 21:31:45 +02:00
Vladimir 'phcoder' Serbinenko
d8b5cd4011
* commands/hashsum.c (GRUB_MOD_INIT): Remove duplication of command
...
name and add N_.
* commands/i386/pc/drivemap.c (GRUB_MOD_INIT): Likewise.
* commands/iorw.c (GRUB_MOD_INIT): Likewise.
* commands/password_pbkdf2.c (GRUB_MOD_INIT): Likewise.
* commands/regexp.c (GRUB_MOD_INIT): Likewise.
* commands/setpci.c (GRUB_MOD_INIT): Likewise.
* commands/terminal.c (GRUB_MOD_INIT): Likewise.
* efiemu/main.c (GRUB_MOD_INIT): Likewise.
* font/font_cmd.c (GRUB_MOD_INIT): Likewise.
* kern/corecmd.c (GRUB_MOD_INIT): Likewise.
* mmap/mmap.c (GRUB_MOD_INIT): Likewise.
* normal/context.c (GRUB_MOD_INIT): Likewise.
* normal/main.c (GRUB_MOD_INIT): Likewise.
* term/gfxterm.c (GRUB_MOD_INIT): Likewise.
* term/serial.c (GRUB_MOD_INIT): Likewise.
* term/terminfo.c (GRUB_MOD_INIT): Likewise.
2010-05-01 20:28:07 +02:00
Vladimir 'phcoder' Serbinenko
88c14915f8
* kern/mm.c (grub_real_malloc): Satisfy alignment requirement when
...
extra == 0.
2010-05-01 19:39:32 +02:00
Vladimir 'phcoder' Serbinenko
165134bcc1
* commands/iorw.c: New file.
...
* conf/i386.rmk (pkglib_MODULES): Add iorw.mod.
(iorw_mod_SOURCES): New variable.
(iorw_mod_CFLAGS): Likewise.
(iorw_mod_LDFLAGS): Likewise.
2010-05-01 19:37:04 +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
32fa4348a3
merge mainline into newreloc
2010-05-01 16:38:58 +02:00
Vladimir 'phcoder' Serbinenko
6d971470fa
REmove memory map altering for FreeBSD
2010-05-01 16:38:10 +02:00
Vladimir 'phcoder' Serbinenko
ce60689c68
* kern/i386/coreboot/init.c (grub_machine_init): Call
...
grub_machine_mmap_init on qemu.
2010-05-01 16:35:15 +02:00
Vladimir 'phcoder' Serbinenko
aa8d7b2647
coreboot and qemu rescue disks and bootchecks
2010-05-01 16:33:22 +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
0359d00628
* boot/i386/qemu/boot.S: Add a missing .code16.
2010-05-01 14:38:09 +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
3080f7a7bd
* kern/parser.c (grub_parser_execute): Cope with read-only config.
2010-05-01 13:27:13 +02:00
Vladimir 'phcoder' Serbinenko
421e8a5591
Fix ppc compilation problems
2010-05-01 13:23:19 +02:00
Vladimir 'phcoder' Serbinenko
6f8aaf68be
Merge handling of input and output terminals. Fix a hang.
...
* commands/terminal.c (abstract_terminal): New struct.
(handle_command): New function. Based on grub_cmd_terminal_input.
(grub_cmd_terminal_input): Use handle_command.
(grub_cmd_terminal_output): Use handle_command.
2010-05-01 13:20:07 +02:00
BVK Chaitanya
a8ebb84111
Fix comment handling.
...
* tests/grub_script_comments.in: New testcase.
* conf/tests.rmk: Rules for new testcase.
* script/yylex.l: Updated flex rules.
2010-05-01 15:49:43 +05:30
BVK Chaitanya
c548018b7c
added few more test cases
2010-05-01 15:39:59 +05:30
BVK Chaitanya
6fdda85ae6
fix comment and brace handling
2010-04-30 13:50:41 +05:30
Vladimir 'phcoder' Serbinenko
6406a79dff
switch off manually on linux x86_64
2010-04-29 13:36:53 +02:00