merge boottest into newreloc

diff --cc conf/common.rmk
index 3fa0f48,683aa2e..0a622ca
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -116,10 -115,10 +115,10 @@@ DEFSYMFILES += kernel_syms.ls
  kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 -      list.h handler.h command.h i18n.h env_private.h libgcc.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 machine/kernel.h
+ kernel_img_HEADERS += machine/memory.h machine/loader.h
  endif
  
  symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh

diff --cc conf/i386-coreboot.rmk
Simple merge

diff --cc conf/i386-pc.rmk
Simple merge

diff --cc conf/i386.rmk
index e04d73d,9cec10a..c18ce96
--- 1/conf/i386.rmk
--- 2/conf/i386.rmk
+++ b/conf/i386.rmk
@@@ -97,70 -80,28 +115,52 @@@ kfreebsd.init.x86_64: $(srcdir)/tests/b
  kfreebsd.init.i386: $(srcdir)/tests/boot/kfreebsd.init-i386.S
        $(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
  
- linux-initramfs.%: linux.init.%
 +knetbsd.init.i386: $(srcdir)/tests/boot/knetbsd.init-i386.S
 +      $(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 +
 +knetbsd.init.x86_64: $(srcdir)/tests/boot/knetbsd.init-x86_64.S
 +      $(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 +
+ linux-initramfs.%: linux.init.% Makefile
        TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
  
- kfreebsd-mfsroot.%: kfreebsd.init.%
-       TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
+ kfreebsd-mfsroot.%: kfreebsd.init.% Makefile
+       TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
  
 +knetbsd.image.%: knetbsd.init.%
 +      TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
 +
 +knetbsd.miniroot-image.i386: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
 +      $(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
 +
 +knetbsd.miniroot-image.x86_64: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64
 +      $(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64 $@
 +
  CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
  
- bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
-       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
- 
- bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
-       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
- 
+ bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+ 
+ bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+ 
 +bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.i386 grub-shell
 +      timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot=knetbsd.miniroot-image.i386 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 +
 +bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.x86_64 grub-shell
 +      timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot=knetbsd.miniroot-image.x86_64 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 +
  bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
-       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
  
  bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
-       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+       timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
  
- BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64 \
+ BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 \
 -      bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
 +      bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
 +      bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
  
  .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
 -      bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
 +      bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
 +      bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
 +
- # For pci.mod
- pkglib_MODULES += pci.mod
- pci_mod_SOURCES = bus/pci.c
- pci_mod_CFLAGS = $(COMMON_CFLAGS)
- pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
- 
- # For lspci.mod
- pkglib_MODULES += lspci.mod
- lspci_mod_SOURCES = commands/lspci.c
- lspci_mod_CFLAGS = $(COMMON_CFLAGS)
- lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
- 
- # For play.mod.
- pkglib_MODULES += play.mod
- play_mod_SOURCES = commands/i386/pc/play.c
- play_mod_CFLAGS = $(COMMON_CFLAGS)
- play_mod_LDFLAGS = $(COMMON_LDFLAGS)
- 

diff --cc conf/mips.rmk
Simple merge

diff --cc conf/x86-efi.rmk
index dab5a02,61d225b..68e1b3c
--- 1/conf/x86-efi.rmk
--- 2/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@@ -14,9 -6,13 +6,12 @@@ sbin_SCRIPTS = grub-instal
  # For grub-install.
  grub_install_SOURCES = util/i386/efi/grub-install.in
  
+ bin_SCRIPTS += grub-mkrescue
+ grub_mkrescue_SOURCES = util/grub-mkrescue.in
+ 
  # Modules.
  pkglib_PROGRAMS = kernel.img
 -pkglib_MODULES = chain.mod appleldr.mod \
 -      linux.mod halt.mod  \
 +pkglib_MODULES = chain.mod appleldr.mod halt.mod  \
        datetime.mod loadbios.mod \
        fixvideo.mod mmap.mod acpi.mod
  

diff --cc include/grub/relocator.h
index 89e7460,0000000..653a00e
mode 100644,000000..100644
--- 1/include/grub/relocator.h
--- /dev/null
+++ b/include/grub/relocator.h
@@@ -1,57 -1,0 +1,58 @@@
 +/*
 + *  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_RELOCATOR_HEADER
 +#define GRUB_RELOCATOR_HEADER 1
 +
 +#include <grub/types.h>
 +#include <grub/err.h>
 +#include <grub/memory.h>
++#include <grub/cpu/memory.h>
 +
 +struct grub_relocator;
 +struct grub_relocator_chunk;
 +typedef const struct grub_relocator_chunk *grub_relocator_chunk_t;
 +
 +struct grub_relocator *grub_relocator_new (void);
 +
 +grub_err_t
 +grub_relocator_alloc_chunk_addr (struct grub_relocator *rel,
 +                               grub_relocator_chunk_t *out,
 +                               grub_phys_addr_t target, grub_size_t size);
 +
 +void *
 +get_virtual_current_address (grub_relocator_chunk_t in);
 +grub_phys_addr_t
 +get_physical_target_address (grub_relocator_chunk_t in);
 +
 +grub_err_t
 +grub_relocator_alloc_chunk_align (struct grub_relocator *rel, 
 +                                grub_relocator_chunk_t *out,
 +                                grub_phys_addr_t min_addr,
 +                                grub_phys_addr_t max_addr,
 +                                grub_size_t size, grub_size_t align,
 +                                int preference);
 +
 +#define GRUB_RELOCATOR_PREFERENCE_NONE 0
 +#define GRUB_RELOCATOR_PREFERENCE_LOW 1
 +#define GRUB_RELOCATOR_PREFERENCE_HIGH 2
 +
 +void
 +grub_relocator_unload (struct grub_relocator *rel);
 +
 +#endif

diff --cc include/grub/x86_64/memory.h
index 0000000,0000000..27fcd25
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/include/grub/x86_64/memory.h
@@@ -1,0 -1,0 +1,1 @@@
++#include <grub/i386/memory.h>

diff --cc kern/i386/coreboot/init.c
Simple merge

diff --cc kern/i386/coreboot/startup.S
Simple merge

diff --cc kern/i386/ieee1275/startup.S
Simple merge

diff --cc loader/i386/bsdXX.c
index 85f4c62,cd5ba85..f053e7e
--- 1/loader/i386/bsdXX.c
--- 2/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@@ -77,11 -80,9 +77,11 @@@ SUFFIX (grub_freebsd_load_elfmodule_obj
  {
    Elf_Ehdr e;
    Elf_Shdr *s;
-   char *shdr;
+   char *shdr = 0;
    grub_addr_t curload, module;
    grub_err_t err;
 +  grub_size_t chunk_size = 0;
 +  void *chunk_src;
  
    err = read_headers (file, &e, &shdr);
    if (err)
@@@ -170,11 -148,9 +170,11 @@@ SUFFIX (grub_freebsd_load_elfmodule) (s
  {
    Elf_Ehdr e;
    Elf_Shdr *s;
-   char *shdr;
+   char *shdr = 0;
    grub_addr_t curload, module;
    grub_err_t err;
 +  grub_size_t chunk_size = 0;
 +  void *chunk_src;
  
    err = read_headers (file, &e, &shdr);
    if (err)
@@@ -270,16 -223,13 +270,16 @@@ SUFFIX (grub_freebsd_load_elf_meta) (st
    grub_err_t err;
    Elf_Ehdr e;
    Elf_Shdr *s;
-   char *shdr;
+   char *shdr = 0;
    unsigned symoff, stroff, symsize, strsize;
 -  grub_addr_t curload;
    grub_freebsd_addr_t symstart, symend, symentsize, dynamic;
    Elf_Sym *sym;
 +  void *sym_chunk;
 +  grub_uint8_t *curload;
 +  grub_freebsd_addr_t symtarget;
    const char *str;
    unsigned i;
 +  grub_size_t chunk_size;
  
    err = read_headers (file, &e, &shdr);
    if (err)