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
Robert Millan
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
Vladimir 'phcoder' Serbinenko
f0299c60d4
Fix handling of >32K relocations
2009-12-02 21:01:02 +01:00
Vladimir 'phcoder' Serbinenko
035a008c13
Remove leftover
2009-12-02 11:44:29 +01:00
Vladimir 'phcoder' Serbinenko
7b5f334bc0
Rename qemu-r4k to qemu-mips
2009-12-02 08:49:36 +01:00
Vladimir 'phcoder' Serbinenko
e6b9873356
Remove qemu-mipssim
2009-12-02 08:40:51 +01:00
Vladimir 'phcoder' Serbinenko
3e5c7dc3d8
Fix qemu-r4k
2009-12-02 08:39:17 +01:00
Vladimir 'phcoder' Serbinenko
adbba2a4ef
Remove debug serial console with hardcoded address
2009-12-02 08:37:43 +01:00
Vladimir 'phcoder' Serbinenko
3c68ed3d80
Deduplicated cache handling. Fixed jump hatch being filled with random stuff
2009-11-28 23:34:48 +01:00
Vladimir 'phcoder' Serbinenko
bde358ac91
merged with mainline
2009-11-25 23:17:32 +01:00
Carles Pina i Estany
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
Carles Pina i Estany
b58fc33c4f
Merging with trunk
2009-11-23 20:34:42 +00:00
Robert Millan
f84b481b35
Cheery-pick grub-emu split from experimental (rev 1361)
...
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
* configure.ac: Detect all `emu' platforms. Define
GRUB_MACHINE_* macros in TARGET_CFLAGS. Remove
--enable-grub-emu logic. Disable include/grub/machine
symlink on `emu' platforms.
* genkernsyms.sh.in: Use @TARGET_CFLAGS@ during symbol generation.
* gensymlist.sh.in: Likewise.
* include/grub/i386/coreboot/machine.h: Remove file.
* include/grub/i386/efi/machine.h: Likewise.
* include/grub/i386/ieee1275/machine.h: Likewise.
* include/grub/i386/pc/machine.h: Likewise.
* include/grub/i386/qemu/machine.h: Likewise.
* include/grub/powerpc/ieee1275/machine.h: Likewise.
* include/grub/sparc64/ieee1275/machine.h: Likewise.
* include/grub/x86_64/efi/machine.h: Likewise.
* commands/acpi.c: Remove `<grub/machine/machine.h>'.
* commands/halt.c: Likewise.
* commands/reboot.c: Likewise.
* include/grub/autoefi.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/kernel.h: Likewise.
* include/grub/i386/loader.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* kern/dl.c: Likewise.
* kern/i386/coreboot/init.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/usb_keyboard.c: Likewise.
* include/grub/time.h [!GRUB_MACHINE_EMU]: Remove
`<grub/machine/machine.h>'
[!GRUB_MACHINE_EMU] (GRUB_TICKS_PER_SECOND): New macro.
* util/misc.c: Remove `<grub/machine/machine.h>' and
`<grub/machine/time.h>'.
* Makefile.in (enable_grub_emu): Remove variable.
Include $(srcdir)/conf/any-emu.mk for the `emu' platform.
* conf/any-emu.rmk: New file.
* conf/common.rmk (grub_emu_init.lst, grub_emu_init.h)
(grub_emu_init.c): Move from here ...
* conf/any-emu.rmk: ... to here.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-emu'.
(grub_emu_SOURCES, grub_emu_LDFLAGS): Move from here ...
* conf/any-emu.rmk: ... to here.
2009-11-23 15:31:54 +00:00
Vladimir 'phcoder' Serbinenko
1c805a5a3e
Fixed cache invalidating
2009-11-23 00:16:49 +01:00
Carles Pina i Estany
e5fb78c684
This commit is the same than gettext08.patch (see mailing list)
2009-11-22 12:50:46 +00:00
Carles Pina i Estany
0648f857ea
Different changes following Robert's email 20091121230904.GA29740@thorin
2009-11-22 11:49:54 +00:00
Vladimir 'phcoder' Serbinenko
42810eb1a0
Improved cache handling
2009-11-22 02:56:49 +01:00
Vladimir 'phcoder' Serbinenko
5afcd00788
merge mainstream into mips
2009-11-21 21:45:32 +01:00
Vladimir 'phcoder' Serbinenko
6abdf8e20d
Fix for native miscompilation
2009-11-21 17:33:52 +01:00
Carles Pina i Estany
203ffbfa31
Adds gettext support in Grub. Building system needs to be improved and maybe userland utilites improved.
...
YYYY-MM-DD Carles Pina i Estany <carles@pina.cat>
* Makefile.in: Add uptrans target to help to update .pot file
* conf/common.rmk: Add grub-gettext_lib target, dependency and SOURCES, CFLAGS, LDFLAGS
* kern/misc.c: Define grub_gettext symbol and add implement grub_gettext_dummy function
* po/TODO: Temporary file with instructions of what Makefile.in will do
* po/ca.po: Catalan translation stub
* include/grub/misc.h: Define macro _(char *s). Declare grub_gettext_dummy and grub_gettext
* gettext/gettext.c: New file with gettext implementation
* normal/menu.c (print_message): add _( ) to some strings
* util/grub.d/10_linux.in: include grub-gettext_lib file. For the Linux menuentry, call eval_gettext
* util/grub.d/00_header.in: add locale_prefix and gettext locale detection and setting up the access to the mo directory
* util/grub-mkconfig_lib.in: add get_locale_lang
* util/grub-gettext_lib.in: new file
2009-11-13 20:39:33 +00:00
Robert Millan
8d0edf4abd
2009-11-13 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/multiboot.h (struct grub_multiboot_header): Move
from here ...
* include/multiboot.h (struct multiboot_header): ... to here. Update
all users.
* include/grub/multiboot.h (struct grub_multiboot_info): Move
from here ...
* include/multiboot.h (struct multiboot_info): ... to here. Update
all users.
* include/grub/multiboot.h (struct grub_multiboot_mmap_entry): Move
from here ...
* include/multiboot.h (struct multiboot_mmap_entry): ... to here.
Update all users.
* include/grub/multiboot.h (struct grub_mod_list): Move
from here ...
* include/multiboot.h (struct multiboot_mod_list): ... to here.
Update all users.
2009-11-13 13:34:51 +00:00
Vladimir 'phcoder' Serbinenko
da547ac323
merged with mainstream
2009-11-09 21:16:25 +01:00
Robert Millan
ac451143b2
2009-11-09 Robert Millan <rmh.grub@aybabtu.com>
...
Misc cleanup.
* kern/command.c (grub_register_command_prio): Use
grub_zalloc() instead of explicitly zeroing data.
* kern/list.c: Include `<grub/mm.h>'.
(grub_named_list_find): Replace `0' with `NULL'.
* normal/autofs.c (struct grub_fs_module_list): Remove ad-hoc type.
(fs_module_list): Change type to `grub_named_list_t'. Update all
users.
* normal/dyncmd.c (read_command_list): Add space between function
call and parenthesis.
* normal/handler.c (read_handler_list): Likewise.
2009-11-09 14:45:28 +00:00
Robert Millan
b97b7b914b
2009-11-08 Robert Millan <rmh.grub@aybabtu.com>
...
* kern/i386/multiboot_mmap.c (grub_machine_mmap_init): Improve
error message for excessively large memory map.
2009-11-08 20:02:16 +00:00
Robert Millan
e4eb23732d
2009-11-08 Robert Millan <rmh.grub@aybabtu.com>
...
* kern/i386/multiboot_mmap.c (grub_machine_mmap_init): Improve error
message for coreboot users.
2009-11-08 16:23:23 +00:00
Vladimir 'phcoder' Serbinenko
02602a7002
Cleaned __gnu_local_gp handling
2009-11-06 17:37:31 +01:00
Vladimir 'phcoder' Serbinenko
6174923799
merged with upstream
2009-11-02 23:29:51 +01:00
robertmh
a50569e135
2009-11-01 Robert Millan <rmh.grub@aybabtu.com>
...
Based on patch from BVK Chaitanya <bvk.groups@gmail.com>
* kern/misc.c (grub_strchr, grub_strrchr): Fix to handle c == '\0'
case.
2009-11-01 23:03:09 +00:00
robertmh
2ed19dfded
2009-10-28 Robert Millan <rmh.grub@aybabtu.com>
...
* kern/i386/coreboot/init.c (grub_exit): Reimplement in a way that
doesn't cause an infinite call loop.
2009-10-28 22:02:54 +00:00
phcoder
1a5c44303c
load modules before saying welcome
2009-10-24 12:45:04 +02:00
phcoder
e6efd24fa0
working but suboptimal cache flusher
2009-10-24 10:58:20 +02:00
phcoder
1e1ddb6cb9
init fixes
2009-10-24 10:56:21 +02:00
phcoder
e95fcb5379
move common init function to kern/mips/init.c
2009-10-24 10:44:00 +02:00
phcoder
81d1980198
changed rate of pseudo-clockk to avoid USB stalls
2009-10-19 18:09:13 +02:00
phcoder
65aa1698d3
use $t9 instead of $ra as a base register
2009-10-19 12:58:52 +02:00
phcoder
19f9e339c3
revert changes to kern/main.c
2009-10-18 16:15:04 +02:00
phcoder
877128fa45
copy modules backwards
2009-10-18 16:10:42 +02:00
phcoder
3dc648f724
missing file
2009-10-18 15:07:22 +02:00
phcoder
a9a6948ac3
grub as flash for qemu-gdium
2009-10-18 15:04:14 +02:00
phcoder
ad17a401d6
new image format for mips. Asm part
2009-10-18 14:10:31 +02:00
phcoder
8adc0f0060
unified startup.S
2009-10-18 12:08:52 +02:00
phcoder
be320b471f
cache handling
2009-10-18 00:23:00 +02:00
phcoder
81a642e8e2
linux.c
2009-10-16 17:40:59 +02:00
phcoder
023593d766
relocator dor mips
2009-10-11 23:00:22 +02:00
phcoder
6cb9ffbd75
Merge branch 'relocator' into mips
2009-10-11 22:21:28 +02:00
phcoder
1540a08402
various fixes. MIPSsim support
2009-10-11 18:18:18 +02:00
phcoder
50739170db
seems to work now. A lot is still missing though
2009-10-11 14:18:58 +02:00
phcoder
ffa9860a86
various fixes
2009-10-11 02:07:52 +02:00
phcoder
3f9f11b6d2
time & reloc
2009-10-10 20:52:15 +02:00