e5dfe7775a
for powerpc & i386-pc. This patch was more so started by Hollis Blanchard getting multiboot 2 working for powerpc and I added to it and cleaned it up. One of the ideas with this patch is to keep everything under one command for the user. So instead of having a "multiboot2" & "module2" command, I created a proxy like mechanism so that you have only one command for both multiboot 1 & 2 ... "multiboot". This is where "loader/multiboot_loader.c" comes from. I could have integrated things more but I figure the current approach will less likely break anything. So if your OS is multiboot 2 capable, the user would do the following to load it up from a grub prompt: grub> multiboot <location of kernel> <kernel args> grub> module <some image> <multiboot tag> <image arguments> grub> module <isome mage> <multiboot tag> <image arguments> grub ..... The other thing that this patch does is it begins to make the multiboot 1 code a bit more architecture agnostic so IF someone wanted to implement it on another architecture they can. A bit of file moving around and definition renaming is also apart of this patch. I have also taken the time to make sure that it does not break multiboot 1 loading on i386-pc. But mulitboot 2 may still need a little more testing and work for i386-pc. Powerpc multiboot 2 has been heavily tested and does work.
61 lines
2 KiB
C
61 lines
2 KiB
C
/* multiboot_loader_normal.c - boot another boot loader */
|
|
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2007 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <grub/err.h>
|
|
#include <grub/normal.h>
|
|
#include <grub/dl.h>
|
|
#include <grub/multiboot_loader.h>
|
|
|
|
static grub_err_t
|
|
grub_normal_cmd_multiboot (struct grub_arg_list *state __attribute__ ((unused)),
|
|
int argc, char **args)
|
|
{
|
|
grub_rescue_cmd_multiboot_loader (argc, args);
|
|
return grub_errno;
|
|
}
|
|
|
|
static grub_err_t
|
|
grub_normal_cmd_module (struct grub_arg_list *state __attribute__ ((unused)),
|
|
int argc, char **args)
|
|
{
|
|
grub_rescue_cmd_module_loader (argc, args);
|
|
return grub_errno;
|
|
}
|
|
|
|
GRUB_MOD_INIT(multiboot_loader_normal)
|
|
{
|
|
(void) mod; /* To stop warning. */
|
|
grub_register_command ("multiboot", grub_normal_cmd_multiboot,
|
|
GRUB_COMMAND_FLAG_BOTH
|
|
| GRUB_COMMAND_FLAG_NO_ARG_PARSE,
|
|
"multiboot FILE [ARGS...]",
|
|
"Load a Multiboot kernel.", 0);
|
|
|
|
grub_register_command ("module", grub_normal_cmd_module,
|
|
GRUB_COMMAND_FLAG_BOTH
|
|
| GRUB_COMMAND_FLAG_NO_ARG_PARSE,
|
|
"module FILE [ARGS...]",
|
|
"Load a Multiboot module.", 0);
|
|
}
|
|
|
|
GRUB_MOD_FINI(multiboot_loader_normal)
|
|
{
|
|
grub_unregister_command ("multiboot");
|
|
grub_unregister_command ("module");
|
|
}
|