afba9f98ec
MErge mainline into intwrap
2010-08-25 23:39:42 +02:00
e8d0a8f85c
Merge mainline into bidi
2010-07-02 19:35:07 +02:00
8e50ec9f05
Merge mainline into cirrus
2010-06-21 02:15:49 +02:00
4d88b9aec7
Init cirrus ourselves instead of calling videobios
2010-06-21 01:02:48 +02:00
934302d00b
merge mainline
2010-06-12 12:17:28 +01:00
8253ee6bd7
merge mainline up to r2075 (videomask merge)
2010-06-12 11:30:11 +01:00
8b1cf5e87f
Dedicated DMA allocation functions. CS5536 OHCI support.
2010-05-31 13:58:18 +02:00
918405fd8c
merge mainline into rescue-efi
2010-05-17 21:26:16 +02:00
3c151d94af
simplify setcolor/getcolor
2010-05-08 01:06:22 +02:00
bf8733749b
merge common serial and ofconsole code into terminfo
2010-05-07 15:44:43 +02:00
58664b94b7
pass pointer to term to term functions
2010-05-07 02:30:44 +02:00
99bfe57386
merge mainline into bidi
2010-05-05 16:28:52 +02:00
8496927478
move grub_halt out of kernel on most platforms
2010-05-04 17:15:36 +02:00
4dff488793
merge mainline into intwrap
2010-05-04 15:57:37 +02:00
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
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
8ea6ecb36d
Some cleanups
2010-04-26 21:11:16 +02:00
debaf23f7c
all images binary identical to the ones from trunk
2010-04-26 19:11:38 +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
94ac790645
Fix various issues created by previous commits
2010-04-26 10:56:12 +02:00
614be3f119
#if-less grub-mkimage
2010-04-26 00:45:21 +02:00
8c5ed46e48
Inline grub_stop_floppy
2010-04-10 19:59:22 +02:00
f632937ab5
intwrap grub_get_mmap_entry
2010-04-10 19:12:04 +02:00
0d06476b05
intwrap get_eisa_map. Fix intwrapping of get_ext_memsize.
2010-04-10 14:45:27 +02:00
c663074e6d
intwrap get_memsize
2010-04-10 14:35:26 +02:00
9e71201f48
merge mainline into bidi
2010-04-09 19:31:43 +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
77356db852
Intwrapped biosdisk
2010-04-04 18:43:26 +02:00
1b8cb8573b
intwrap grub_pxe_scan
2010-04-04 15:49:06 +02:00
65936631e4
intwrap vbe and vga calls
2010-04-04 14:24:50 +02:00
56912f57b6
Merge mainline into intwrap
2010-04-04 14:14:50 +02:00
a8c3b552a7
Remove unused grub_vga_get_font.
...
* kern/i386/pc/startup.S (grub_vga_get_font): Removed.
* include/grub/i386/pc/vga.h (grub_vga_get_font): Likewise.
2010-04-04 14:12:11 +02:00
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
df32be8cc1
Merge mainline into mbtag
2010-03-27 22:14:41 +01:00
34fac099a5
Make grub_console_real_putchar grub_console_putchar
2010-03-17 08:37:48 +01:00
0a239a8211
bidi works in terminal in grub-emu
2010-03-15 21:14:11 +01:00
016a671b51
Merge mainline into cleanbuild
2010-03-14 16:01:31 +01:00
3f5a90c616
merge mainline into mbtag
2010-03-07 13:01:43 +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
ec0be08d40
Clean building system
2010-02-07 23:49:49 +01:00
cc306106b9
Merge mainline into intwrap
2010-02-06 23:49:41 +01:00
3973a59a34
2010-01-26 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_PXE_DL): New macro.
* boot/i386/pc/pxeboot.S: Include `<grub/machine/boot.h>'.
(_start): Macroify `0x7F'.
* kern/i386/pc/init.c: Include `<grub/machine/boot.h>'.
(make_install_device): Use "(pxe)" as fallback prefix when booting
via PXE.
2010-01-26 16:39:37 +00:00
f9ab2e25d3
2010-01-21 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/i386/bsd.h (FREEBSD_N_BIOS_GEOM): Removed.
(grub_freebsd_bootinfo): Rewritten.
* loader/i386/bsd.c (grub_freebsd_boot): Use new grub_freebsd_bootinfo.
2010-01-21 17:35:14 +01:00
e022a2d667
Sync with trunk
2010-01-18 20:51:35 +00:00
6f7db5d676
2010-01-18 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/i386/bsd.h: Fix include pathes.
2010-01-18 19:25:20 +01:00
262bff8d83
2010-01-18 Vladimir Serbinenko <phcoder@gmail.com>
...
Add missing *BSD copyright headers.
* include/grub/aout.h: Add BSD licence.
* include/grub/i386/bsd.h: Parts under different licences moved to ...
* include/grub/i386/freebsd_linker.h: ... here,
* include/grub/i386/freebsd_reboot.h: ... here,
* include/grub/i386/netbsd_bootinfo.h: ... here,
* include/grub/i386/netbsd_reboot.h: ... here,
* include/grub/i386/openbsd_bootarg.h: ... here,
* include/grub/i386/openbsd_reboot.h: ... and here. Added appropriate
licence to each file.
2010-01-18 17:40:23 +01:00
8040619d88
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_TEXT): ... this. Update all users.
(GRUB_VIDEO_TYPE_VLFB): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_VESA): ... this. Update all users.
(GRUB_VIDEO_TYPE_EFI): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_SIMPLE): ... this. Update all users.
2010-01-18 07:49:50 +00:00
7728813a47
merge mainline into intwrap
2010-01-17 21:16:52 +01:00
1453b2ec7f
add extended regs support in bios_interrupt
2010-01-17 21:16:05 +01:00
Vladimir 'phcoder' Serbinenko
Colin Watson
Robert Millan