mirror of
https://git.proxmox.com/git/grub2
synced 2025-10-26 03:20:43 +00:00
d70af616c2
3 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
b977bf01b3 |
2006-05-29 Yoshinori K. Okuji <okuji@enbug.org>
* util/powerpc/ieee1275/grub-install.in (host_cpu): Removed.
(target_cpu): New variable.
(pkglibdir): Use target_cpu instead of host_cpu.
* util/i386/pc/grub-install.in (host_cpu): Removed.
(target_cpu): New variable.
(pkglibdir): Use target_cpu instead of host_cpu.
* util/genmoddep.c: Removed.
* kern/efi/mm.c (filter_memory_map): Use GRUB_CPU_SIZEOF_VOID_P
instead of GRUB_HOST_SIZEOF_VOID_P.
* kern/dl.c: Likewise.
* include/grub/i386/types.h (GRUB_HOST_SIZEOF_VOID_P): Renamed to
...
(GRUB_TARGET_SIZEOF_VOID_P): ... this.
(GRUB_HOST_SIZEOF_LONG): Renamed to ...
(GRUB_TARGET_SIZEOF_LONG): ... this.
(GRUB_HOST_WORDS_BIGENDIAN): Renamed to ...
(GRUB_TARGET_WORDS_BIGENDIAN): ... this.
* include/grub/powerpc/types.h (GRUB_HOST_SIZEOF_VOID_P): Renamed
to ...
(GRUB_TARGET_SIZEOF_VOID_P): ... this.
(GRUB_HOST_SIZEOF_LONG): Renamed to ...
(GRUB_TARGET_SIZEOF_LONG): ... this.
(GRUB_HOST_WORDS_BIGENDIAN): Renamed to ...
(GRUB_TARGET_WORDS_BIGENDIAN): ... this.
* include/grub/sparc64/types.h (GRUB_HOST_SIZEOF_VOID_P): Renamed
to ...
(GRUB_TARGET_SIZEOF_VOID_P): ... this.
(GRUB_HOST_SIZEOF_LONG): Renamed to ...
(GRUB_TARGET_SIZEOF_LONG): ... this.
(GRUB_HOST_WORDS_BIGENDIAN): Renamed to ...
(GRUB_TARGET_WORDS_BIGENDIAN): ... this.
* include/grub/types.h [!GRUB_UTIL] (GRUB_CPU_SIZEOF_VOID_P): Use
GRUB_TARGET_SIZEOF_VOID_P instead of GRUB_HOST_SIZEOF_VOID_P.
[!GRUB_UTIL] (GRUB_CPU_SIZEOF_LONG): Use GRUB_TARGET_SIZEOF_LONG
instead of GRUB_HOST_SIZEOF_LONG.
[!GRUB_UTIL]: Refer to GRUB_TARGET_WORDS_BIGENDIAN instead of
GRUB_HOST_WORDS_BIGENDIAN to define or undefine
GRUB_CPU_WORDS_BIGENDIAN.
Refer to SIZEOF_VOID_P instead of GRUB_HOST_SIZEOF_VOID_P to
define grub_host_addr_t, grub_host_off_t, grub_host_size_t and
grub_host_ssize_t.
* conf/i386-efi.rmk (noinst_UTILITIES): Removed.
(genmoddep_SOURCES): Likewise.
* conf/i386-pc.rmk (noinst_UTILITIES): Likewise.
(genmoddep_SOURCES): Likewise.
* conf/conf/powerpc-ieee1275.rmk (noinst_UTILITIES): Likewise.
(genmoddep_SOURCES): Likewise.
* conf/conf/conf/sparc64-ieee1275.rmk (noinst_UTILITIES):
Likewise.
(genmoddep_SOURCES): Likewise.
* genmoddep.awk: New file.
* genmk.rb (Image::rule): Use TARGET_CC, TARGET_CPPFLAGS,
TARGET_CFLAGS, TARGET_ASFLAGS and TARGET_LDFLAGS instead of CC,
CPPFLAGS, CFLAGS, ASFLAGS and LDFLAGS, respectively.
(PModule::rule): Likewise.
(Program::rule): Likewise.
(Utility::rule): Use CC, CPPFLAGS, CFLAGS and LDFLAGS instead of
BUILD_CC, BUILD_CPPFLAGS, BUILD_CFLAGS and BUILD_LDFLAGS,
respectively.
* configure.ac: Rewritten intensively to use host and target
instead of build and host, respectively.
* Makefile.in (pkglibdir): Use target_cpu instead of host_cpu.
(host_cpu): Removed.
(target_cpu): New variable.
(CPPFLAGS): Added @CPPFLAGS@ and -DGRUB_LIBDIR=\"$(pkglibdir)\".
(BUILD_CC): Removed.
(BUILD_CFLAGS): Likewise.
(BUILD_CPPFLAGS): Likewise.
(TARGET_CC): New variable.
(TARGET_CFLAGS): Likewise.
(TARGET_CPPFLAGS): Likewise.
(TARGET_LDFLAGS): Likewise.
(AWK): Likewise.
(include): Use target_cpu instead of host_cpu.
(moddep.lst:): Use genmoddep.awk instead of genmoddep.
* DISTLIST: Added genmoddep.awk. Removed util/genmoddep.c.
|
||
|
|
7f362539b7 |
2006-04-30 Yoshinori K. Okuji <okuji@enbug.org>
Extend the loader so that GRUB can accept a loader which comes
back to GRUB when a loaded image exits. Also, this change adds
support for a chainloader on EFI.
* term/efi/console.c: Include grub/misc.h.
(grub_console_checkkey): Display a scan code on the top for
debugging. This will be removed once the EFI port gets stable.
Correct the scan code mapping.
* kern/efi/mm.c (sort_memory_map): Sort in a descending order to
allocate memory from larger regions, in order to reduce the number
of allocated regions. Otherwise, the MacOSX loader panics.
(filter_memory_map): Avoid less than 1MB for compatibility with
other loaders.
(add_memory_regions): Allocate from the tail of a region, if
possible, to avoid allocating a region near to 1MB, for the MacOSX
loader.
* kern/efi/init.c (grub_efi_set_prefix): Specify
GRUB_EFI_IMAGE_HANDLE to grub_efi_get_loaded_image.
* kern/efi/efi.c (grub_efi_get_loaded_image): Accept a new
argument IMAGE_HANDLE and specify it to get a loaded image.
(grub_arch_modules_addr): Specify GRUB_EFI_IMAGE_HANDLE to
grub_efi_get_loaded_image.
(grub_efi_get_filename): Divide the legnth by the size of
grub_efi_char16_t.
(grub_efi_get_device_path): New function.
(grub_efi_print_device_path): Print End Device Path nodes. Divide
the length by the size of grub_efi_char16_t for a file path device
path node.
* kern/loader.c (grub_loader_noreturn): New variable.
(grub_loader_set): Accept a new argument NORETURN. Set
GRUB_LOADER_NORETURN to NORETURN.
All callers changed.
(grub_loader_boot): If GRUB_LOADER_NORETURN is false, do not call
grub_machine_fini.
* include/grub/efi/efi.h (grub_efi_get_device_path): New
prototype.
(grub_efi_get_loaded_image): Take an argument to specify an image
handle.
* include/grub/loader.h (grub_loader_set): Added one more argument
NORETURN.
* disk/efi/efidisk.c (make_devices): Use grub_efi_get_device_path
instead of grub_efi_open_protocol.
(grub_efidisk_get_device_name): Likewise.
(grub_efidisk_close): Print a newline.
(grub_efidisk_get_device_handle): Fixed to use
GRUB_EFI_DEVICE_PATH_SUBTYPE instead of
GRUB_EFI_DEVICE_PATH_TYPE.
* disk/efi/efidisk.c (device_path_guid): Moved to ...
* kern/efi/efi.c (device_path_guid): ... here.
* conf/i386-efi.rmk (pkgdata_MODULES): Added _chain.mod and
chain.mod.
(kernel_mod_HEADERS): Added efi/disk.h.
(_chain_mod_SOURCES): New variable.
(_chain_mod_CFLAGS): Likewise.
(_chain_mod_LDFLAGS): Likewise.
(chain_mod_SOURCES): Likewise.
(chain_mod_CFLAGS): Likewise.
(chain_mod_LDFLAGS): Likewise.
* DISTLIST: Added include/grub/efi/chainloader.h,
loader/efi/chainloader.c and loader/efi/chainloader_normal.c.
* include/grub/efi/chainloader.h: New file.
* loader/efi/chainloader.c: Likewise.
* loader/efi/chainloader_normal.c: Likewise.
|
||
|
|
976a4ea036 |
2006-04-19 Yoshinori K. Okuji <okuji@enbug.org>
* DISTLIST: Added include/grub/efi/console.h,
include/grub/efi/time.h, include/grub/i386/efi/kernel.h,
kern/efi/init.c, kern/efi/mm.c, and term/efi/console.c.
* include/grub/efi/console.h: New file.
* include/grub/efi/time.h: Likewise.
* include/grub/i386/efi/kernel.h: Likewise.
* kern/efi/init.c: Likewise.
* kern/efi/mm.c: Likewise.
* term/efi/console.c: Likewise.
* kern/i386/efi/init.c: Do not include grub/machine/time.h.
(grub_stop): Removed.
(grub_get_rtc): Likewise.
(grub_machine_init): Simply call grub_efi_init.
(grub_machine_fini): Call grub_efi_fini.
* kern/efi/efi.c: Include grub/machine/time.h and grub/term.h.
(grub_efi_output_string): Removed.
(grub_efi_stall): New function.
(grub_stop): Likewise.
(grub_get_rtc): Likewise.
* include/grub/efi/efi.h (grub_efi_output_string): Removed.
(grub_efi_stall): New prototype.
(grub_efi_allocate_pages): Likewise.
(grub_efi_free_pages): Likewise.
(grub_efi_get_memory_map): Likewise.
(grub_efi_mm_init): Likewise.
(grub_efi_mm_fini): Likewise.
(grub_efi_init): Likewise.
(grub_efi_fini): Likewise.
* include/grub/i386/efi/time.h: Do not include
grub/symbol.h. Include grub/efi/time.h.
(GRUB_TICKS_PER_SECOND): Removed.
(grub_get_rtc): Likewise.
* include/grub/efi/api.h (struct grub_efi_memory_descriptor):
Added padding. The EFI spec is buggy.
(GRUB_EFI_BLACK): New macro.
(GRUB_EFI_BLUE): Likewise.
(GRUB_EFI_GREEN): Likewise.
(GRUB_EFI_CYAN): Likewise.
(GRUB_EFI_RED): Likewise.
(GRUB_EFI_MAGENTA): Likewise.
(GRUB_EFI_BROWN): Likewise.
(GRUB_EFI_LIGHTGRAY): Likewise.
(GRUB_EFI_BRIGHT): Likewise.
(GRUB_EFI_DARKGRAY): Likewise.
(GRUB_EFI_LIGHTBLUE): Likewise.
(GRUB_EFI_LIGHTGREEN): Likewise.
(GRUB_EFI_LIGHTCYAN): Likewise.
(GRUB_EFI_LIGHTRED): Likewise.
(GRUB_EFI_LIGHTMAGENTA): Likewise.
(GRUB_EFI_YELLOW): Likewise.
(GRUB_EFI_WHITE): Likewise.
(GRUB_EFI_BACKGROUND_BLACK): Likewise.
(GRUB_EFI_BACKGROUND_BLUE): Likewise.
(GRUB_EFI_BACKGROUND_GREEN): Likewise.
(GRUB_EFI_BACKGROUND_CYAN): Likewise.
(GRUB_EFI_BACKGROUND_RED): Likewise.
(GRUB_EFI_BACKGROUND_MAGENTA): Likewise.
(GRUB_EFI_BACKGROUND_BROWN): Likewise.
(GRUB_EFI_BACKGROUND_LIGHTGRAY): Likewise.
(GRUB_EFI_TEXT_ATTR): Likewise.
* conf/i386-efi.rmk (kernel_mod_SOURCES): Added kern/efi/efi.c,
kern/efi/init.c, kern/efi/mm.c, and term/efi/console.c.
(kernel_mod_HEADERS): Added efi/time.h.
|