Remove loader.h

diff --git a/conf/common.rmk b/conf/common.rmk
index e1d1489872761395fe2770201e2dbf7caecfbc6f..a8c881276647ee7df31ff61795516a68ee176cb2 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -118,7 +118,7 @@ kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        list.h handler.h command.h i18n.h env_private.h libgcc.h mm_private.h
 
 ifneq ($(platform), emu)
-kernel_img_HEADERS += machine/memory.h machine/loader.h
+kernel_img_HEADERS += machine/memory.h
 endif
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 66d2447ad058abb6c43faa3eb5daa3b050f36067..d403d19f1ad24806758d5a379a20a776e183ce74 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -53,7 +53,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
        term/i386/pc/console.c term/i386/vga_common.c \
        symlist.c
 kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
-       machine/pxe.h i386/pit.h machine/kernel.h
+       machine/pxe.h i386/pit.h machine/kernel.h machine/loader.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8200 $(COMMON_CFLAGS)

diff --git a/include/grub/i386/coreboot/loader.h b/include/grub/i386/coreboot/loader.h
deleted file mode 100644 (file)
index d3f36bb..0000000
--- a/include/grub/i386/coreboot/loader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/cpu/loader.h>

diff --git a/include/grub/i386/efi/loader.h b/include/grub/i386/efi/loader.h
deleted file mode 100644 (file)
index 222dae8..0000000
--- a/include/grub/i386/efi/loader.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2004,2006,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/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER     1
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */

diff --git a/include/grub/i386/ieee1275/loader.h b/include/grub/i386/ieee1275/loader.h
deleted file mode 100644 (file)
index 20df2e1..0000000
--- a/include/grub/i386/ieee1275/loader.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2004,2007,2008  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/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER     1
-
-#include <grub/types.h>
-#include <grub/symbol.h>
-#include <grub/multiboot.h>
-
-void grub_rescue_cmd_linux (int argc, char *argv[]);
-void grub_rescue_cmd_initrd (int argc, char *argv[]);
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */

diff --git a/include/grub/mips/yeeloong/loader.h b/include/grub/mips/yeeloong/loader.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/include/grub/powerpc/ieee1275/loader.h b/include/grub/powerpc/ieee1275/loader.h
deleted file mode 100644 (file)
index 606bfcd..0000000
--- a/include/grub/powerpc/ieee1275/loader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,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/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER     1
-
-/* The symbol shared between the normal mode and rescue mode
-   loader.  */
-void grub_rescue_cmd_linux (int argc, char *argv[]);
-void grub_rescue_cmd_initrd (int argc, char *argv[]);
-
-void grub_linux_init (void);
-void grub_linux_fini (void);
-void grub_linux_normal_init (void);
-void grub_linux_normal_fini (void);
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */

diff --git a/include/grub/sparc64/ieee1275/loader.h b/include/grub/sparc64/ieee1275/loader.h
deleted file mode 100644 (file)
index 12bb2a6..0000000
--- a/include/grub/sparc64/ieee1275/loader.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER     1
-
-/* The symbol shared between the normal mode and rescue mode
-   loader.  */
-void grub_rescue_cmd_linux (int argc, char *argv[]);
-void grub_rescue_cmd_initrd (int argc, char *argv[]);
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */