vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix yeeloong compilation

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-18 13:49:39 +02:00
parent e70a1b9535
commit 685475e596
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
grub-core/Makefile.am
View file

@ -137,6 +137,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
KERNEL_HEADER_FILES += $(top_builddir)/include/grub/serial.h KERNEL_HEADER_FILES += $(top_builddir)/include/grub/serial.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
endif endif
if COND_powerpc_ieee1275 if COND_powerpc_ieee1275

3
grub-core/Makefile.core.def
View file

@ -173,6 +173,8 @@ kernel = {
videoinkernel = video/fb/video_fb.c; videoinkernel = video/fb/video_fb.c;
videoinkernel = video/video.c; videoinkernel = video/video.c;
videoinkernel = commands/boot.c;
extra_dist = kern/i386/realmode.S; extra_dist = kern/i386/realmode.S;
extra_dist = kern/i386/pc/lzma_decode.S; extra_dist = kern/i386/pc/lzma_decode.S;
extra_dist = kern/mips/cache_flush.S; extra_dist = kern/mips/cache_flush.S;
@ -424,6 +426,7 @@ module = {
name = boot; name = boot;
common = commands/boot.c; common = commands/boot.c;
i386_pc = lib/i386/pc/biosnum.c; i386_pc = lib/i386/pc/biosnum.c;
enable = videomodules;
}; };
module = { module = {

8
include/grub/loader.h
View file

@ -26,16 +26,16 @@
#include <grub/types.h> #include <grub/types.h>
/* Check if a loader is loaded. */ /* Check if a loader is loaded. */
int grub_loader_is_loaded (void); int EXPORT_FUNC (grub_loader_is_loaded) (void);
/* Set loader functions. NORETURN must be set to true, if BOOT won't return /* Set loader functions. NORETURN must be set to true, if BOOT won't return
to the original state. */ to the original state. */
void grub_loader_set (grub_err_t (*boot) (void), void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void),
grub_err_t (*unload) (void), grub_err_t (*unload) (void),
int noreturn); int noreturn);
/* Unset current loader, if any. */ /* Unset current loader, if any. */
void grub_loader_unset (void); void EXPORT_FUNC (grub_loader_unset) (void);
/* Call the boot hook in current loader. This may or may not return, /* Call the boot hook in current loader. This may or may not return,
depending on the setting by grub_loader_set. */ depending on the setting by grub_loader_set. */
@ -56,7 +56,7 @@ typedef enum {
} grub_loader_preboot_hook_prio_t; } grub_loader_preboot_hook_prio_t;
/* Register a preboot hook. */ /* Register a preboot hook. */
void *grub_loader_register_preboot_hook (grub_err_t (*preboot_func) (int noret), void *EXPORT_FUNC(grub_loader_register_preboot_hook) (grub_err_t (*preboot_func) (int noret),
grub_err_t (*preboot_rest_func) (void), grub_err_t (*preboot_rest_func) (void),
grub_loader_preboot_hook_prio_t prio); grub_loader_preboot_hook_prio_t prio);