2010-01-12 Vladimir Serbinenko <phcoder@gmail.com>

	* loader/i386/pc/multiboot2.c: Removed stalled file.

diff --git a/ChangeLog b/ChangeLog
index 86deb525fdb8b88985cfe79dc538f8b57c63fb76..e2fd92f68c6bcb1c823b5ea1e2b75fc5e641bd5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * loader/i386/pc/multiboot2.c: Removed stalled file.
+
 2010-01-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkpasswd-pbkdf2.c (main): Use grub_util_init_nls.

diff --git a/loader/i386/pc/multiboot2.c b/loader/i386/pc/multiboot2.c
deleted file mode 100644 (file)
index 005c8a8..0000000
--- a/loader/i386/pc/multiboot2.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* multiboot2.c - boot a multiboot 2 OS image. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007,2008,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/>.
- */
-
-#include <grub/multiboot2.h>
-#include <multiboot2.h>
-#include <grub/elf.h>
-#include <grub/err.h>
-#include <grub/machine/loader.h>
-#include <grub/mm.h>
-#include <grub/multiboot.h>
-#include <grub/cpu/multiboot.h>
-
-grub_err_t
-grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr,
-                         grub_addr_t *addr __attribute__ ((unused)),
-                         int *do_load)
-{
-  Elf32_Addr paddr = phdr->p_paddr;
-
-  if (phdr->p_type != PT_LOAD)
-    {
-      *do_load = 0;
-      return 0;
-    }
-  *do_load = 1;
-
-  if ((paddr < grub_os_area_addr)
-      || (paddr + phdr->p_memsz > grub_os_area_addr + grub_os_area_size))
-    return grub_error(GRUB_ERR_OUT_OF_RANGE,"address 0x%x is out of range",
-                      paddr);
-
-  return GRUB_ERR_NONE;
-}
-
-grub_err_t
-grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr,
-                         grub_addr_t *addr __attribute__ ((unused)),
-                         int *do_load)
-{
-  Elf64_Addr paddr = phdr->p_paddr;
-
-  if (phdr->p_type != PT_LOAD)
-    {
-      *do_load = 0;
-      return 0;
-    }
-  *do_load = 1;
-
-  if ((paddr < grub_os_area_addr)
-      || (paddr + phdr->p_memsz > grub_os_area_addr + grub_os_area_size))
-    return grub_error (GRUB_ERR_OUT_OF_RANGE, "address 0x%x is out of range",
-                      paddr);
-
-  return GRUB_ERR_NONE;
-}
-
-grub_err_t
-grub_mb2_arch_module_alloc (grub_size_t size, grub_addr_t *addr)
-{
-  grub_addr_t modaddr;
-
-  modaddr = (grub_addr_t) grub_memalign (MULTIBOOT2_MOD_ALIGN, size);
-  if (! modaddr)
-    return grub_errno;
-
-  *addr = modaddr;
-  return GRUB_ERR_NONE;
-}
-
-grub_err_t
-grub_mb2_arch_module_free (grub_addr_t addr,
-                          grub_size_t size __attribute__ ((unused)))
-{
-  grub_free((void *) addr);
-  return GRUB_ERR_NONE;
-}
-
-void
-grub_mb2_arch_boot (grub_addr_t entry, void *tags)
-{
-  grub_multiboot2_real_boot (entry, tags);
-}
-
-void
-grub_mb2_arch_unload (struct multiboot2_tag_header *tags)
-{
-   struct multiboot2_tag_header *tag;
-
-   /* Free all module memory in the tag list.  */
-   for_each_tag (tag, tags)
-     {
-       if (tag->key == MULTIBOOT2_TAG_MODULE)
-         {
-           struct multiboot2_tag_module *module =
-              (struct multiboot2_tag_module *) tag;
-           grub_free((void *) module->addr);
-         }
-     }
-}
-
-grub_err_t
-grub_mb2_tags_arch_create (void)
-{
-  /* XXX Create boot device et al. */
-  return GRUB_ERR_NONE;
-}