]>
git.ipfire.org Git - thirdparty/grub.git/log
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 14:26:05 +0000 (16:26 +0200)]
Remove useless prototypes
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 14:25:39 +0000 (16:25 +0200)]
Add missing noreturn
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 14:25:14 +0000 (16:25 +0200)]
Fix alignment and add explicit assert for td and ed size
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 13:13:38 +0000 (15:13 +0200)]
Dimplify tags and enable USB on more platforms
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 01:26:09 +0000 (03:26 +0200)]
merge mainline into intwrap
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 00:01:59 +0000 (02:01 +0200)]
Add missing Reported by
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 23:56:35 +0000 (01:56 +0200)]
* docs/grub.texi (Network): Fix reference to pxe_blksize.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 23:14:07 +0000 (01:14 +0200)]
* grub-core/normal/menu.c (grub_wait_after_message): Add a 10 second
timeout to avoid indefinite boot stalling.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 23:12:37 +0000 (01:12 +0200)]
* grub-core/normal/color.c (grub_env_write_color_normal): Fix a warning.
(grub_env_write_color_highlight): Likewise.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 23:11:12 +0000 (01:11 +0200)]
* grub-core/normal/term.c (print_more): Return to normal and not
to standard state after printing "---MORE---".
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 23:09:28 +0000 (01:09 +0200)]
* grub-core/term/i386/vga_common.c (grub_console_setcolorstate):
Mask out the bit 0x80 since it has other meaning that specifiing color.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 22:54:15 +0000 (00:54 +0200)]
Add missing emu/halt.c
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 21:21:21 +0000 (23:21 +0200)]
merge mainline into intwrap
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 21:08:33 +0000 (23:08 +0200)]
New relocator. Allows for more kernel support and more straightforward
loader writing.
* Makefile.am (BOOTTARGET): New variable.
(QEMU32): Likewise.
(linux.init.x86_64): New target.
(linux.init.i386): Likewise.
(multiboot.elf): Likewise.
(kfreebsd.elf): Likewise.
(kfreebsd.aout): Likewise.
(pc-chainloader.elf): Likewise.
(pc-chainloader.bin): Likewise.
(ntldr.elf): Likewise.
(ntldr.bin): Likewise.
(multiboot2.elf): Likewise.
(kfreebsd.init.x86_64): Likewise.
(kfreebsd.init.i386): Likewise.
(knetbsd.init.i386): Likewise.
(kopenbsd.init.i386): Likewise.
(knetbsd.init.x86_64): Likewise.
(kopenbsd.init.x86_64): Likewise.
(linux-initramfs.i386): Likewise.
(linux-initramfs.x86_64): Likewise.
(kfreebsd-mfsroot.i386.img): Likewise.
(knetbsd.image.i386): Likewise.
(kopenbsd.image.i386): Likewise.
(kopenbsd.image.x86_64): Likewise.
(knetbsd.miniroot-image.i386.img): Likewise.
(kfreebsd-mfsroot.x86_64.img): Likewise.
(knetbsd.image.x86_64): Likewise.
(knetbsd.miniroot-image.x86_64.img): Likewise.
(kfreebsd-mfsroot.i386.gz): Likewise.
(bootcheck-kfreebsd-i386): Likewise.
(kfreebsd-mfsroot.x86_64.gz): Likewise.
(bootcheck-kfreebsd-x86_64): Likewise.
(knetbsd.miniroot-image.i386.gz): Likewise.
(bootcheck-knetbsd-i386): Likewise.
(bootcheck-kopenbsd-i386): Likewise.
(bootcheck-kopenbsd-x86_64): Likewise.
(knetbsd.miniroot-image.x86_64.gz): Likewise.
(bootcheck-knetbsd-x86_64): Likewise.
(bootcheck-linux-i386): Likewise.
(bootcheck-linux-x86_64): Likewise.
(bootcheck-linux16-i386): Likewise.
(bootcheck-linux16-x86_64): Likewise.
(bootcheck-multiboot): Likewise.
(bootcheck-multiboot2): Likewise.
(bootcheck-kfreebsd-aout): Likewise.
(bootcheck-pc-chainloader): Likewise.
(bootcheck-ntldr): Likewise.
(CLEANFILES): Add new targets.
(BOOTCHECKS): New variable.
(.PHONY): Add bootchecks.
(SUCCESSFUL_BOOT_STRING): New variable.
(BOOTCHECK_TIMEOUT): Likewise.
(bootcheck): New target
* Makefile.util.def (grub-mkrescue): Enable on i386-multiboot.
* configure.ac: Correct efiemu excuse.
* docs/grub.texi (Supported kernels): New chapter.
* grub-core/Makefile.am (KERNEL_HEADER_FILES): Add
include/grub/mm_private.h. Simplify inclusion of
include/grub/boot.h, include/grub/loader.h
and include/grub/msdos_partition.h
(KERNEL_HEADER_FILES) [i386_coreboot]:
Remove include/grub/machine/loader.h. Add include/grub/i386/pit.h.
(KERNEL_HEADER_FILES) [i386_multiboot]: Likewise.
(KERNEL_HEADER_FILES) [i386_qemu]: Likewise.
(KERNEL_HEADER_FILES) [i386_ieee1275]: Remove
include/grub/machine/loader.h.
(KERNEL_HEADER_FILES) [x86_64-efi]: Likewise.
* grub-core/Makefile.core.def (kernel): Remove kern/i386/loader.S from
extra_dist.
(pci.mod): Enable on i386-multiboot.
(acpi.mod): Enable on i386-multiboot and i386-coreboot.
(efiemu.mod): Enable on i386-coreboot, i386-ieee1275, i386-multiboot and
i386-qemu.
(relocator.mod): Rewritten.
(aout.mod): Enable on all x86.
(bsd.mod): Likewise.
(ntldr.mod): New module.
(linux.mod): Use loader/i386/linux.c on all x86.
(xnu.mod): Enable on all x86.
(vga_text.mod): disable on EFI and QEMU.
* grub-core/efiemu/i386/coredetect.c: Remove useless include.
* grub-core/efiemu/i386/pc/cfgtables.c: Likewise.
* grub-core/efiemu/loadcore.c: Likewise.
* grub-core/efiemu/main.c: Likewise.
(grub_efiemu_exit_boot_services): Removed.
(grub_efiemu_finish_boot_services): Likewise.
* grub-core/efiemu/mm.c (grub_efiemu_finish_boot_services): New
function.
* grub-core/efiemu/i386/nocfgtables.c: New file.
* grub-core/kern/dl.c (grub_dl_unload_all): Removed.
* grub-core/kern/efi/efi.c (grub_efi_exit_boot_services): Removed.
(grub_efi_finish_boot_services): Moved from here ...
* grub-core/kern/efi/mm.c (grub_efi_finish_boot_services): ...here.
Fille finish memory map and related data.
(finish_mmap_buf): New variable.
(grub_efi_uintn_t finish_mmap_size): Likewise.
(grub_efi_uintn_t finish_key): Likewise.
(grub_efi_uintn_t finish_desc_size): Likewise.
(grub_efi_uint32_t finish_desc_version): Likewise.
(grub_efi_is_finished): Likewise.
(grub_efi_get_memory_map): Use saved memory map if EFI is already
finished.
* grub-core/kern/elf.c (grub_elf32_phdr_iterate): Make global.
(grub_elf64_phdr_iterate): Likewise.
* grub-core/kern/i386/coreboot/init.c (grub_os_area_addr): Removed.
(grub_os_area_size): Likewise.
(grub_machine_init): Don't reserve os area.
* grub-core/kern/i386/coreboot/startup.S: Don't include loader.S.
* grub-core/kern/i386/ieee1275/startup.S: Likewise.
* grub-core/kern/i386/loader.S: Removed.
* grub-core/kern/i386/pc/init.c (grub_os_area_addr): Removed.
(grub_os_area_size): Likewise.
(grub_machine_init): Don't reserve os area.
* grub-core/kern/i386/pc/startup.S (grub_chainloader_real_boot):
Don't call grub_dl_unload_all.
Don't include loader.S.
* grub-core/kern/i386/qemu/mmap.c (grub_machine_mmap_iterate):
Declare the memory after _end as available.
* grub-core/kern/mm.c (GRUB_MM_FREE_MAGIC): Moved from here...
* include/grub/mm_private.h (GRUB_MM_FREE_MAGIC): ... here.
(GRUB_MM_ALLOC_MAGIC): Moved from here...
* include/grub/mm_private.h (GRUB_MM_ALLOC_MAGIC): ... here.
* grub-core/kern/mm.c (grub_mm_header): Moved from here...
* include/grub/mm_private.h (grub_mm_header): ... here.
* grub-core/kern/mm.c (GRUB_MM_ALIGN): Moved from here...
* include/grub/mm_private.h (GRUB_MM_ALIGN): ... here.
* grub-core/kern/mm.c (grub_mm_region): Moved from here ...
(grub_mm_region): ..here. Removed addr. Added pre_size.
All users updated.
* grub-core/kern/mm.c (base): Renamed to ...
(grub_mm_base): ... this. Made global.
(grub_real_malloc): Alloc from end of region.
(grub_memalign): Don't attempt to malloc if grub_mm_base is NULL.
* grub-core/kern/powerpc/cache.S (grub_arch_sync_caches): Move to ...
* grub-core/kern/powerpc/cache_flush.S: ... here.
* grub-core/lib/efi/relocator.c: New file.
* grub-core/lib/i386/relocator.c: Rewritten.
* grub-core/lib/i386/relocator16.S: New file.
* grub-core/lib/i386/relocator32.S: Likewise.
* grub-core/lib/i386/relocator64.S: Likewise.
* grub-core/lib/i386/relocator_asm.S: Rewritten.
* grub-core/lib/i386/relocator_common.S: New file.
* grub-core/lib/ieee1275/relocator.c: Likewise.
* grub-core/lib/mips/relocator.c: Rewritten.
* grub-core/lib/mips/relocator_asm.S: Renamed variables and minor
stylistic adjustments.
* grub-core/lib/powerpc/relocator.c: New file.
* grub-core/lib/powerpc/relocator_asm.S: Likewise.
* grub-core/lib/relocator.c: Rewritten.
* grub-core/lib/x86_64/relocator_asm.S: New file.
* grub-core/loader/aout.c (grub_aout_load): Make load_addr a void *.
* grub-core/loader/i386/bsd.c (NETBSD_DEFAULT_VIDEO_MODE): New const.
(bsd_tag): New struct.
(tags): New variable.
(tags_last): Likewise.
(netbsd_module): New struct.
(netbsd_mods): New variable.
(netbsd_mods_last): Likewise.
(openbsd_opts): New parameter "serial".
(OPENBSD_SERIAL_ARG): New definition.
(netbsd_opts): New parameter "serial".
(NETBSD_SERIAL_ARG): New definition.
(grub_freebsd_add_meta): Reorganised into ...
(grub_bsd_add_meta): ...this. All users updated.
(grub_freebsd_add_mmap): Reorganised into ...
(generate_e820_mmap): ...this...
(grub_bsd_add_mmap): ...and this. All users updated.
(grub_freebsd_list_modules): Use tags.
(grub_netbsd_add_meta_module): New function.
(grub_netbsd_list_modules): Likewise.
(grub_freebsd_boot): Use relocator and finish EFI.
(grub_openbsd_boot): Likewise.
(grub_netbsd_setup_video): New function.
(grub_netbsd_add_modules): Likewise.
(grub_netbsd_boot): Use grub_netbsd_add_modules, relocator, netbsd_tags
and finish EFI.
(grub_bsd_unload): Unload tags.
(grub_bsd_load_aout): Use relocator.
(grub_bsd_elf32_size_hook): New function.
(grub_bsd_elf32_hook): Use relocator.
(grub_bsd_elf64_size_hook): New function.
(grub_bsd_elf64_hook): Use relocator.
(grub_bsd_load_elf): Use relocator and call grub_openbsd_find_ramdisk.
(grub_bsd_load): Zero-out openbsd_ramdisk.
(grub_bsd_load): Use relocator.
(grub_cmd_openbsd): Support serial.
(grub_cmd_netbsd): Support modules.
(grub_cmd_freebsd_module): Use relocator.
(grub_netbsd_module_load): New function.
(grub_cmd_netbsd_module): Likewise.
(grub_cmd_openbsd_ramdisk): Likewise.
(GRUB_MOD_INIT): Register knetbsd_module, knetbsd_module_elf and
kopenbsd_ramdisk.
(GRUB_MOD_FINI): Unregister new commands.
* grub-core/loader/i386/bsdXX.c (load): Remove useless checks.
(grub_freebsd_load_elfmodule_obj): Use relocator.
(grub_freebsd_load_elfmodule): Likewise.
(grub_freebsd_load_elf_meta): Likewise.
(grub_netbsd_load_elf_meta): New function.
(grub_openbsd_find_ramdisk): Likewise.
* grub-core/loader/i386/bsd_helper.S: Removed.
* grub-core/loader/i386/bsd_pagetable.c: Support relocator.
* grub-core/loader/i386/bsd_trampoline.S: Removed.
* grub-core/loader/i386/efi/linux.c: Likewise.
* grub-core/loader/i386/ieee1275/linux.c: Likewise.
* grub-core/loader/i386/linux.c (HAS_VGA_TEXT): New const.
(DEFAULT_VIDEO_MODE): Likewise.
(real_mode_target): New variable.
(prot_mode_target): Likewise.
(initrd_mem_target): Likewise.
(relocator): Likewise.
(efi_mmap_buf): Likewise.
(efi_mmap_size): Likewise.
(find_efi_mmap_size): Moved from grub-core/loader/i386/efi/linux.c.
(free_pages): Use relocator.
(allocate_pages): Account for efi_mmap and use relocator. Return error.
(grub_linux_setup_video): Return error.
(grub_linux_trampoline_start): Removed.
(grub_linux_trampoline_end): Likewise.
(grub_linux_boot): Use relocator and DEFAULT_VIDEO_MODE. Pass console
andd video parameters depending on firmware.
[GRUB_MACHINE_IEEE1275]: Pass OFW parameters.
[GRUB_MACHINE_EFI]: Pass EFI parameters.
(grub_cmd_linux) [GRUB_MACHINE_EFI]: Likewise.
(grub_cmd_initrd): Use relocator.
* grub-core/loader/i386/linux_trampoline.S: Removed.
* grub-core/loader/i386/multiboot_mbi.c (elf_sec_num): New variable.
(elf_sec_entsize): Likewise.
(elf_sec_shstrndx): Likewise.
(elf_sections): Likewise.
(grub_multiboot_load): Use relocator.
(grub_multiboot_get_mbi_size): Account for sections.
(grub_multiboot_make_mbi): Use relocator and support sections.
(grub_multiboot_add_elfsyms): New function.
(grub_multiboot_free_mbi): Free sections.
* grub-core/loader/i386/pc/linux.c (relocator): New variable.
(grub_linux_real_target): Likewise.
(grub_linux_real_chunk): Likewise.
(grub_linux16_prot_size): Likewise.
(grub_linux16_boot): Use relocator.
(grub_linux_unload): Unload relocator.
(grub_cmd_linux): Use relocator.
(grub_cmd_initrd): Likewise.
* grub-core/loader/i386/pc/ntldr.c: New file.
* grub-core/loader/i386/xnu.c (guessfsb) [GRUB_MACHINE_IEEE1275]:
Don't try to guess CPU frequency.
(grub_xnu_set_video): Stretch bitmap.
(grub_xnu_boot): Use relocator.
* grub-core/loader/mips/linux.c (grub_linux_boot): Use relocator.
(grub_linux_unload): Free relocator.
(grub_linux_load32): Use relocator.
(grub_linux_load64): Likewise.
(grub_cmd_initrd): Likewise.
* grub-core/loader/multiboot.c (grub_multiboot_boot): Use relocator.
(grub_multiboot_unload): Unload relocator.
(grub_cmd_multiboot): Use relocator.
(grub_cmd_module): Likewise.
* grub-core/loader/multiboot_elfxx.c (grub_multiboot_load_elfXX):
Use relocator and support sections.
* grub-core/loader/multiboot_mbi2.c(elf_sec_num): New variable.
(elf_sec_entsize): Likewise.
(elf_sec_shstrndx): Likewise.
(elf_sections): Likewise.
(grub_multiboot_load): Use relocator.
(grub_multiboot_get_mbi_size): Account for sections.
(grub_multiboot_make_mbi): Use relocator and support sections.
(grub_multiboot_add_elfsyms): New function.
* grub-core/loader/powerpc/ieee1275/linux.c: Remove useless include.
* grub-core/loader/sparc64/ieee1275/linux.c: Likewise.
* grub-core/loader/xnu.c (grub_xnu_heap_malloc): Use relocator.
Prototype changed. All users updated.
(grub_xnu_align_heap): Simplified.
(grub_xnu_writetree_toheap): Likewise.
(grub_xnu_unload): Unload relocator.
(grub_cmd_xnu_kernel): Use relocator.
(grub_cmd_xnu_kernel64): Likewise.
(grub_xnu_register_memory): Simplified.
* grub-core/loader/xnu_resume.c (grub_xnu_resume): Use relocator.
* grub-core/term/efi/console.c (grub_console_putchar): Abort if
EFI is finished.
(grub_console_checkkey): Likewise.
(grub_console_getkey): Likewise.
(grub_console_getwh): Likewise.
(grub_console_getxy): Likewise.
(grub_console_gotoxy): Likewise.
(grub_console_cls): Likewise.
(grub_console_setcolorstate): Likewise.
(grub_console_setcursor): Likewise.
* grub-core/term/ns8250.c (grub_ns8250_hw_get_port): New function.
* grub-core/tests/boot/kbsd.init-i386.S: New file.
* grub-core/tests/boot/kbsd.init-x86_64.S: Likewise.
* grub-core/tests/boot/kbsd.spec.txt: Likewise.
* grub-core/tests/boot/kernel-8086.S: Likewise.
* grub-core/tests/boot/kernel-i386.S: Likewise.
* grub-core/tests/boot/kfreebsd-aout.cfg: Likewise.
* grub-core/tests/boot/kfreebsd.cfg: Likewise.
* grub-core/tests/boot/kfreebsd.init-i386.S: Likewise.
* grub-core/tests/boot/kfreebsd.init-x86_64.S: Likewise.
* grub-core/tests/boot/knetbsd.cfg: Likewise.
* grub-core/tests/boot/kopenbsd.cfg: Likewise.
* grub-core/tests/boot/kopenbsdlabel.txt: Likewise.
* grub-core/tests/boot/linux.cfg: Likewise.
* grub-core/tests/boot/linux.init-i386.S: Likewise.
* grub-core/tests/boot/linux.init-x86_64.S: Likewise.
* grub-core/tests/boot/linux16.cfg: Likewise.
* grub-core/tests/boot/multiboot.cfg: Likewise.
* grub-core/tests/boot/multiboot2.cfg: Likewise.
* grub-core/tests/boot/ntldr.cfg: Likewise.
* grub-core/tests/boot/pc-chainloader.cfg: Likewise.
* include/grub/aout.h (grub_aout_load): Make load_addr a void *.
* include/grub/autoefi.h (grub_autoefi_finish_boot_services):
New definition.
* include/grub/dl.h (grub_dl_unload_all): Removed.
* include/grub/efi/efi.h (grub_efi_exit_boot_services): Likewise.
(grub_efi_finish_boot_services): Change prototype.
(grub_efi_is_finished): New variable.
* include/grub/efiemu/efiemu.h (grub_efiemu_finish_boot_services):
Changed prototype.
(grub_efiemu_finish_boot_services): Removed.
(grub_machine_efiemu_init_tables): New prototype.
* include/grub/elfload.h (grub_elf32_phdr_iterate): Likewise.
(grub_elf64_phdr_iterate): Likewise.
* include/grub/i386/bsd.h: Include relocator.h.
(freebsd_tag_header): New struct.
(grub_openbsd_bios_mmap): Removed.
(grub_unix_real_boot): Removed.
(grub_freebsd_load_elfmodule32): Changed prototype.
(grub_freebsd_load_elfmodule_obj64): Likewise.
(grub_freebsd_load_elf_meta32): Likewise.
(grub_freebsd_load_elf_meta64): Likewise.
(grub_freebsd_add_meta): Removed.
(grub_netbsd_load_elf_meta32): New prototype.
(grub_netbsd_load_elf_meta64): Likewise.
(grub_bsd_add_meta): Likewise.
(grub_openbsd_ramdisk_descriptor): New struct.
(grub_openbsd_find_ramdisk32): New prototype.
(grub_openbsd_find_ramdisk64): Likewise.
* include/grub/i386/coreboot/loader.h: Removed.
* include/grub/i386/efi/loader.h: Likewise.
* include/grub/i386/ieee1275/loader.h: Likewise.
* include/grub/i386/linux.h (linux_kernel_header): Change void *
to grub_uint32_t.
* include/grub/i386/loader.h: Removed.
* include/grub/i386/memory.h (GRUB_MEMORY_CPU_CR4_PAE_ON): Correct the
value.
(GRUB_MEMORY_CPU_CR4_PSE_ON): New definition.
(grub_phys_addr_t): New type.
(grub_vtop): New inline function.
(grub_map_memory): Likewise.
(grub_unmap_memory): Likewise.
* include/grub/i386/multiboot/loader.h: Removed.
* include/grub/i386/netbsd_bootinfo.h (NETBSD_BTINFO_BOOTDISK): Removed.
(NETBSD_BTINFO_CONSOLE): New definition.
(NETBSD_BTINFO_SYMTAB): Likewise.
(NETBSD_BTINFO_MODULES): Likewise.
(NETBSD_BTINFO_FRAMEBUF): Likewise.
(grub_netbsd_bootinfo): New struct.
(grub_netbsd_btinfo_common): Use explicit bitsize.
(grub_netbsd_btinfo_mmap_entry): Removed.
(GRUB_NETBSD_MAX_BOOTPATH_LEN): New definition.
(grub_netbsd_btinfo_bootdisk): New struct.
(grub_netbsd_btinfo_symtab): Likewise.
(grub_netbsd_btinfo_serial): Likewise.
(grub_netbsd_btinfo_modules): Likewise.
(grub_netbsd_btinfo_framebuf): Likewise.
(GRUB_NETBSD_MAX_ROOTDEVICE_LEN): New definition.
* include/grub/i386/openbsd_bootarg.h (OPENBSD_BOOTARG_CONSOLE):
Likewise.
(grub_openbsd_bootargs): Use explicit bitsize.
(grub_openbsd_bootarg_console): New struct.
(GRUB_OPENBSD_COM_MAJOR): New definition.
(GRUB_OPENBSD_VGA_MAJOR): Likewise.
* include/grub/i386/pc/efiemu.h: Removed.
* include/grub/i386/pc/loader.h: Don't include cpu/loader.h.
* include/grub/i386/qemu/loader.h: Removed.
* include/grub/i386/relocator.h: Rewritten.
* include/grub/i386/xnu.h (grub_xnu_heap_will_be_at): Removed.
* include/grub/mips/memory.h: New file.
* include/grub/mips/multiboot.h: Rewritten.
* include/grub/mips/relocator.h: Rewritten.
* include/grub/mips/yeeloong/memory.h (grub_phys_addr_t): New type.
(grub_vtop): New function.
(grub_map_memory): Likewise.
(grub_unmap_memory): Likewise.
* include/grub/misc.h (ALIGN_DOWN): New definition.
* include/grub/mm.h (grub_mm_check_real): New proto.
(GRUB_MM_CHECK): New definition.
* include/grub/mm_private.h: New file.
* include/grub/multiboot.h (grub_multiboot_relocator): New variable.
(grub_multiboot_get_mbi_size): Removed.
(grub_multiboot_make_mbi): Change prottype.
(grub_multiboot_set_accepts_video): New proto.
(grub_multiboot_add_elfsyms): Likewise.
(grub_multiboot_payload_eip): New variable.
* include/grub/ns8250.h (grub_ns8250_hw_get_port) [!ASM_FILE]:
New prototype.
* include/grub/offsets.h (GRUB_KERNEL_I386_MULTIBOOT_PREFIX):
New definition.
(GRUB_KERNEL_I386_MULTIBOOT_DATA_END): Likewise.
(GRUB_KERNEL_I386_MULTIBOOT_MOD_ALIGN): Likewise.
* include/grub/powerpc/ieee1275/loader.h: Removed.
* include/grub/powerpc/memory.h: New file.
* include/grub/powerpc/relocator.h: Likewise.
* include/grub/relocator.h: Likewise.
* include/grub/relocator_private.h: Likewise.
* include/grub/sparc64/ieee1275/loader.h: Removed.
* include/grub/x86_64/memory.h: New file.
* include/grub/xnu.h (grub_xnu_writetree_toheap): Changed prototype.
(grub_xnu_heap_malloc): Likewise.
(grub_xnu_heap_real_start): Removed.
(grub_xnu_heap_start): Likewise.
(grub_xnu_relocator): New variable.
(grub_xnu_heap_target_start): Likewise.
* tests/util/grub-shell.in: Support non-pc.
* util/grub-mkimage.c (image_targets): Fix multiboot target.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 21:08:06 +0000 (23:08 +0200)]
Finish Changelog
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 21:07:44 +0000 (23:07 +0200)]
Add missing newlines
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 20:05:46 +0000 (22:05 +0200)]
Merge mainline into newreloc
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 20:03:28 +0000 (22:03 +0200)]
First part of ChangeLog
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 19:58:58 +0000 (21:58 +0200)]
make tags variables statis as intended
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 19:57:37 +0000 (21:57 +0200)]
* grub-core/normal/charset.c (grub_utf8_to_ucs4_alloc): Avoid deadloop
on malloc error.
(grub_bidi_logical_to_visual): Check that malloc succeded.
* grub-core/normal/term.c (grub_puts_terminal): Fix fallback to dumb
puts.
(grub_xputs_normal): Likewise.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 16:54:50 +0000 (18:54 +0200)]
merge mainline into newreloc
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 16:54:33 +0000 (18:54 +0200)]
Fix failing make dist
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 16:53:56 +0000 (18:53 +0200)]
* grub-core/Makefile.core.def (kernel): Add kern/mips/cache_flush.S to
extra_dist.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 16:52:04 +0000 (18:52 +0200)]
* grub-core/efiemu/runtime/efiemu.sh: Removed.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 15:54:03 +0000 (17:54 +0200)]
merge mainline into newreloc
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 15:49:37 +0000 (17:49 +0200)]
* Makefile.util.def (grub-ofpathname): Add missing ldadd.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 15:24:00 +0000 (17:24 +0200)]
merge mainline into newreloc
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 15:17:52 +0000 (17:17 +0200)]
* grub-core/kern/misc.c (grub_real_dprintf): Always refresh after
dprintf.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 13:45:21 +0000 (15:45 +0200)]
Use kseg0 entry address on mips
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 11:45:36 +0000 (13:45 +0200)]
Fix compilation on yeeloong
BVK Chaitanya [Sun, 29 Aug 2010 04:03:13 +0000 (09:33 +0530)]
Use ldadd instead of ldflags for libraries
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 00:29:14 +0000 (02:29 +0200)]
newreloc documentation upgrade
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 00:29:01 +0000 (02:29 +0200)]
Disable kfreebsd bootcheck on qemu and multiboot
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 00:28:15 +0000 (02:28 +0200)]
Fix x86_64-efi compilation error
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 23:26:48 +0000 (01:26 +0200)]
enable grub-mkrescue on i386-multiboot
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 22:53:09 +0000 (00:53 +0200)]
Fix qemu compilation
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 22:46:36 +0000 (00:46 +0200)]
fix multiboot compilation
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 22:21:16 +0000 (00:21 +0200)]
Document newreloc
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 22:21:02 +0000 (00:21 +0200)]
Disable some bootcheck on some platforms
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 22:20:22 +0000 (00:20 +0200)]
Adjust kfreebsd.cfg for EFI
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 22:19:13 +0000 (00:19 +0200)]
Fix a bug in memory allocation
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 19:27:10 +0000 (21:27 +0200)]
Add safety checks in relocator and add a GRUB_MM_CHECK macro
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 19:25:35 +0000 (21:25 +0200)]
Don't allocate relocator twice when loading aout
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 17:27:30 +0000 (19:27 +0200)]
Remove leftover _printf
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 15:33:32 +0000 (17:33 +0200)]
simplify normal/term.c and fix mismerge
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 14:51:36 +0000 (16:51 +0200)]
Rename test kernels
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 14:21:45 +0000 (16:21 +0200)]
kfreebsd-aout bootchecks
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 14:05:20 +0000 (16:05 +0200)]
ntldr bootcheck
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 14:04:32 +0000 (16:04 +0200)]
merge mainline into newreloc
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 13:39:34 +0000 (15:39 +0200)]
* grub-core/normal/term.c (print_more): Fix a memory leak.
(grub_puts_terminal): Revert to dumb puts if memory allocation fails.
(grub_xputs_normal): Likewise.
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 13:35:43 +0000 (15:35 +0200)]
* grub-core/script/lexer.c (grub_script_lexer_init): Don't look before
the begining of the string
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 13:34:29 +0000 (15:34 +0200)]
* grub-core/script/script.c (grub_script_parse): Free parsed on
failure.
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 13:31:21 +0000 (15:31 +0200)]
* grub-core/normal/completion.c (grub_normal_do_completion): Free argv
on failure.
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 13:29:44 +0000 (15:29 +0200)]
* grub-core/normal/cmdline.c (grub_cmdline_get): Free cl_terms on
return.
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 13:28:08 +0000 (15:28 +0200)]
* grub-core/term/gfxterm.c (grub_gfxterm_term_fini): Free the text buffer.
(scroll_up): Fix a memory leak.
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 13:25:12 +0000 (15:25 +0200)]
* grub-core/fs/nilfs2.c (grub_nilfs2_load_sb): Handle grub_disk_read
errors.
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 13:05:26 +0000 (15:05 +0200)]
OpenBSD64 bootcheck
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 12:52:25 +0000 (14:52 +0200)]
fix grub-emu compilation
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 12:51:54 +0000 (14:51 +0200)]
kOpenBSD bootcheck
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 09:35:02 +0000 (11:35 +0200)]
Fallback to dumb printf if malloc failes
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 09:34:33 +0000 (11:34 +0200)]
Add DEBUG_RELOCATOR parts
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 09:34:05 +0000 (11:34 +0200)]
Prevent deadloop in term.c in case of out-of-memory
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 09:32:49 +0000 (11:32 +0200)]
Don't try to malloc if grub_mm_base is 0
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 01:17:59 +0000 (03:17 +0200)]
Simplify knetbsd bootcheck by using specfile
Vladimir 'phcoder' Serbinenko [Sat, 28 Aug 2010 01:17:07 +0000 (03:17 +0200)]
REmove leftover declaration
Vladimir 'phcoder' Serbinenko [Fri, 27 Aug 2010 01:44:55 +0000 (03:44 +0200)]
Handle USB pendrives exposed as floppies.
* grub-core/boot/i386/pc/boot.S: Check LBA even on what appears to be
floppy.
* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_open): Likewise.
Check for partitions on all devices.
Vladimir 'phcoder' Serbinenko [Thu, 26 Aug 2010 00:46:30 +0000 (02:46 +0200)]
openbsd ramdisk support
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 21:39:42 +0000 (23:39 +0200)]
MErge mainline into intwrap
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 20:34:59 +0000 (22:34 +0200)]
merge mainline into newreloc
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 20:34:15 +0000 (22:34 +0200)]
Fix efiemu compilation on ieee1275
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 20:32:17 +0000 (22:32 +0200)]
* grub-core/term/ieee1275/ofconsole.c (put): Correct prototype.
(readkey): Likewise.
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 19:55:48 +0000 (21:55 +0200)]
pc-chainloader bootcheck
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 19:19:45 +0000 (21:19 +0200)]
Remove grub_dl_unload_all. It's unnecessary and causes trouble
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 18:34:07 +0000 (20:34 +0200)]
multiboot and multiboot2 bootchecks
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 14:59:11 +0000 (16:59 +0200)]
Enable boottests
BVK Chaitanya [Wed, 25 Aug 2010 13:20:41 +0000 (18:50 +0530)]
Multiple variable names support to "export" command.
* normal/context.c (grub_cmd_export): "export" command supports
multiple variable names.
BVK Chaitanya [Wed, 25 Aug 2010 13:09:00 +0000 (18:39 +0530)]
review comment fixes
BVK Chaitanya [Wed, 25 Aug 2010 13:04:20 +0000 (18:34 +0530)]
add changelog
BVK Chaitanya [Wed, 25 Aug 2010 08:35:05 +0000 (14:05 +0530)]
merge with mainline
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 01:25:18 +0000 (03:25 +0200)]
Merge mainline into newreloc. For now without boot tests
Vladimir 'phcoder' Serbinenko [Wed, 25 Aug 2010 00:15:21 +0000 (02:15 +0200)]
Add mips multiboot2 mbi address calculation
Vladimir 'phcoder' Serbinenko [Tue, 24 Aug 2010 17:33:08 +0000 (19:33 +0200)]
Fix non-loading of BSS
Vladimir 'phcoder' Serbinenko [Tue, 24 Aug 2010 06:57:53 +0000 (08:57 +0200)]
fix multiboot compilation
Vladimir 'phcoder' Serbinenko [Tue, 24 Aug 2010 06:57:18 +0000 (08:57 +0200)]
Unify and macroify some code in x86 relocators
Samuel Thibault [Mon, 23 Aug 2010 20:41:14 +0000 (22:41 +0200)]
2010-08-23 Samuel Thibault <samuel.thibault@ens-lyon.org>
* util/grub.d/30_os-prober.in: Fix conversion from grub-probe
--target=drive output to Mach device name.
BVK Chaitanya [Mon, 23 Aug 2010 17:56:24 +0000 (23:26 +0530)]
automake based build system for grub
BVK Chaitanya [Mon, 23 Aug 2010 17:36:29 +0000 (23:06 +0530)]
Replace --enable-grub-emu-modules with grub-emu-lite.
* kern/emu/cache.S: New file. Wrapper for $target_cpu specific
cache.S.
* include/grub/emu/misc.h (grub_emu_init): New prototype.
* kern/emu/full.c: New file. For grub-emu specific initialization.
* kern/emu/lite.c: New file. For grub-emu-lite initialization.
* kern/emu/main.c: Call initialization function grub_emu_init.
* Makefile.in: Include grub-emu-lite in install.
* commands/parttool.c: Use grub_no_autoload to differentiate
between grub-emu and grub-emu-lite.
* include/grub/misc.h: New variable grub_no_autoload.
* conf/any-emu.rmk: New rules for grub-emu-lite.
* configure.ac: Remove --enable-grub-emu-modules.
* genmk.rb: Cleanup unnecessary rules.
* include/grub/dl.h: Remove GRUB_NO_MODULES macro.
* normal/main.c: Don't load list files on grub-emu-lite.
* util/misc.c (grub_arch_sync_caches): Removed.
BVK Chaitanya [Mon, 23 Aug 2010 16:20:38 +0000 (21:50 +0530)]
merge with mainline
BVK Chaitanya [Mon, 23 Aug 2010 15:53:39 +0000 (21:23 +0530)]
fix x86_64-efi build
Colin Watson [Mon, 23 Aug 2010 11:55:47 +0000 (12:55 +0100)]
* kern/mips/startup.S (grub_prefix): Update comment to refer to
grub-mkimage rather than grub-mkelfimage.
* kern/powerpc/ieee1275/startup.S (grub_prefix): Likewise.
BVK Chaitanya [Mon, 23 Aug 2010 08:37:29 +0000 (14:07 +0530)]
force bash for autogen.sh
BVK Chaitanya [Mon, 23 Aug 2010 08:02:59 +0000 (13:32 +0530)]
fix exit 1 in autogen.sh
BVK Chaitanya [Mon, 23 Aug 2010 07:53:56 +0000 (13:23 +0530)]
final touches
BVK Chaitanya [Mon, 23 Aug 2010 05:01:08 +0000 (10:31 +0530)]
fix emu build
BVK Chaitanya [Sun, 22 Aug 2010 15:30:22 +0000 (21:00 +0530)]
merge with mainline
Vladimir 'phcoder' Serbinenko [Sun, 22 Aug 2010 15:10:39 +0000 (17:10 +0200)]
* term/at_keyboard.c (grub_at_keyboard_getkey_noblock): Don't discard
a key after CapsLock or NumLock. It's just a qemu bug.
BVK Chaitanya [Sat, 21 Aug 2010 15:53:42 +0000 (21:23 +0530)]
remove wrong extension
BVK Chaitanya [Sat, 21 Aug 2010 15:33:26 +0000 (21:03 +0530)]
picks 10_${host_kernel} script
BVK Chaitanya [Sat, 21 Aug 2010 11:52:19 +0000 (17:22 +0530)]
fix x86_64_efi build
BVK Chaitanya [Sat, 21 Aug 2010 11:41:40 +0000 (17:11 +0530)]
build fixes for mips and ieee1275 platforms