From: Vladimir 'phcoder' Serbinenko Date: Wed, 25 Aug 2010 01:25:18 +0000 (+0200) Subject: Merge mainline into newreloc. For now without boot tests X-Git-Tag: 1.99~629^2~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16bd6cfab2d7e4add19174c85de256ea2f6baf36;p=thirdparty%2Fgrub.git Merge mainline into newreloc. For now without boot tests --- 16bd6cfab2d7e4add19174c85de256ea2f6baf36 diff --cc grub-core/Makefile.am index 000000000,773803544..61a0bb35a mode 000000,100644..100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@@ -1,0 -1,359 +1,331 @@@ + AUTOMAKE_OPTIONS = subdir-objects + + DEPDIR=.deps-core + + include $(top_srcdir)/conf/Makefile.common + + CC=$(TARGET_CC) + CPP=$(TARGET_CC) + CCAS=$(TARGET_CC) + + if COND_GRUB_MKFONT + if COND_HAVE_FONT_SOURCE + TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1 + endif + endif + + AM_CFLAGS = $(TARGET_CFLAGS) + AM_LDFLAGS = $(TARGET_LDFLAGS) + AM_CPPFLAGS = $(TARGET_CPPFLAGS) $(CPPFLAGS_DEFAULT) + AM_CCASFLAGS = $(TARGET_CCASFLAGS) $(CCASFLAGS_DEFAULT) + + CFLAGS_PROGRAM += $(CFLAGS_PLATFORM) + LDFLAGS_PROGRAM += $(LDFLAGS_PLATFORM) + CPPFLAGS_PROGRAM += $(CPPFLAGS_PLATFORM) + CCASFLAGS_PROGRAM += $(CCASFLAGS_PLATFORM) + + CFLAGS_LIBRARY += $(CFLAGS_PLATFORM) -fno-builtin + CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM) + CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM) + + # gentrigtables + gentrigtables: gentrigtables.c + $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) -lm $< + CLEANFILES += gentrigtables + + # trigtables.c + trigtables.c: gentrigtables gentrigtables.c $(top_srcdir)/configure.ac + $(builddir)/gentrigtables > $@ + CLEANFILES += trigtables.c + + # XXX Use Automake's LEX & YACC support + grub_script.tab.h: script/parser.y + $(YACC) -d -p grub_script_yy -b grub_script $< + grub_script.tab.c: grub_script.tab.h + CLEANFILES += grub_script.tab.c grub_script.tab.h + + # For the lexer. + grub_script.yy.h: script/yylex.l + $(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $< + grub_script.yy.c: grub_script.yy.h + CLEANFILES += grub_script.yy.c grub_script.yy.h + + include $(srcdir)/Makefile.core.am + include $(srcdir)/Makefile.gcry.am + + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h - -if COND_i386_pc ++KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h ++ ++if COND_i386_pc + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h + endif + + if COND_i386_efi -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h + endif + + if COND_i386_coreboot -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h -KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h ++KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h + endif + + if COND_i386_multiboot -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h -KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h ++KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h + endif + + if COND_i386_qemu -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h -KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h ++KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h + endif + + if COND_i386_ieee1275 + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h -KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h + endif + + if COND_x86_64_efi -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h -KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h + endif + + if COND_mips_yeeloong -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.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/serial.h + endif + + if COND_powerpc_ieee1275 -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h + endif + + if COND_sparc64_ieee1275 -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h -KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h + endif + + if COND_emu + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h + KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h + if COND_GRUB_EMU_SDL + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h + endif + if COND_GRUB_EMU_USB + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h + endif + if COND_GRUB_EMU_PCI + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h + endif + endif + + symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES) + @list='$^'; \ + for p in $$list; do \ + echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \ + done + CLEANFILES += symlist.h + BUILT_SOURCES += symlist.h + + symlist.c: symlist.h gensymlist.sh + $(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1) + cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1) + rm -f symlist.p + CLEANFILES += symlist.c + BUILT_SOURCES += symlist.c + + noinst_DATA += kernel_syms.lst + kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h + $(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input + if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \ + cat kernel_syms.input | grep -v '^#' | sed -n \ + -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \ + -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \ + | sort -u >$@ + rm -f kernel_syms.input + CLEANFILES += kernel_syms.lst + + if COND_emu + kern/emu/grub_emu-main.$(OBJEXT):grub_emu_init.h + grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h + kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h + grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h + + grub_emu_init.h: genemuinitheader.sh $(MOD_FILES) + rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(NM) > $@ + CLEANFILES += grub_emu_init.h + + grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES) + rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(NM) > $@ + CLEANFILES += grub_emu_init.c + endif + + # .lst files + platform_DATA += moddep.lst + platform_DATA += fs.lst + platform_DATA += command.lst + platform_DATA += partmap.lst + platform_DATA += handler.lst + platform_DATA += terminal.lst + platform_DATA += parttool.lst + platform_DATA += video.lst + platform_DATA += crypto.lst + CLEANFILES += moddep.lst + CLEANFILES += handler.lst + CLEANFILES += terminal.lst + CLEANFILES += parttool.lst + CLEANFILES += video.lst + CLEANFILES += crypto.lst + + fs.lst: $(FS_FILES) + cat $^ /dev/null | sort | uniq > $@ + CLEANFILES += fs.lst + + command.lst: $(COMMAND_FILES) + cat $^ /dev/null | sort | uniq > $@ + CLEANFILES += command.lst + + partmap.lst: $(PARTMAP_FILES) + cat $^ /dev/null | sort | uniq > $@ + CLEANFILES += partmap.lst + + handler.lst: $(HANDLER_FILES) + cat $^ /dev/null | sort | uniq > $@ + CLEANFILES += handler.lst + + terminal.lst: $(TERMINAL_FILES) + cat $^ /dev/null | sort | uniq > $@ + CLEANFILES += terminal.lst + + parttool.lst: $(PARTTOOL_FILES) + cat $^ /dev/null | sort | uniq > $@ + CLEANFILES += parttool.lst + + video.lst: $(VIDEO_FILES) + cat $^ /dev/null | sort | uniq > $@ + CLEANFILES += video.lst + + # but, crypto.lst is simply copied + crypto.lst: $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst + cp $^ $@ + CLEANFILES += crypto.lst + + # generate global module dependencies list + moddep.lst: kernel_syms.lst genmoddep.awk $(DEF_FILES) $(UND_FILES) + cat $(DEF_FILES) kernel_syms.lst /dev/null \ + | $(AWK) -f $(srcdir)/genmoddep.awk $(UND_FILES) > $@ \ + || (rm -f $@; exit 1) + -if COND_i386_pc + if COND_ENABLE_EFIEMU + efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF) + -rm -f $@; \ + if test "x$(TARGET_APPLE_CC)" = x1; then \ + $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF32 -DAPPLE_CC -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \ + $(OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \ + rm -f $@.bin; \ + else \ + $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF32 -m32 -Wall -Werror -nostdlib -O2 -c -o $@ $< || exit 1; \ + if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \ + fi + + efiemu64_c.o: efiemu/runtime/efiemu.c + if test "x$(TARGET_APPLE_CC)" = x1; then \ + $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -DAPPLE_CC=1 -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \ + else \ + $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \ + fi + + efiemu64_s.o: efiemu/runtime/efiemu.S + -rm -f $@ + if test "x$(TARGET_APPLE_CC)" = x1; then \ + $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -DAPPLE_CC=1 -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \ + else \ + $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \ + fi + + efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF) + -rm -f $@; \ + if test "x$(TARGET_APPLE_CC)" = x1; then \ + rm -f $@.bin; \ + $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \ + $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \ + rm -f $@.bin; \ + else \ + $(TARGET_CC) -m64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \ + if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \ + fi + + platform_DATA += efiemu32.o efiemu64.o + CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o + endif -endif - diff --cc grub-core/Makefile.core.def index 000000000,0257bbac4..b91609826 mode 000000,100644..100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@@ -1,0 -1,1405 +1,1415 @@@ + AutoGen definitions Makefile.tpl; + + kernel = { + name = kernel; + + nostrip = emu; + + emu_ldflags = '-Wl,-r,-d'; + x86_efi_ldflags = '-Wl,-r,-d'; + x86_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment'; + + i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)'; + + i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)'; + + i386_coreboot_ldflags = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)'; + i386_multiboot_ldflags = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)'; + i386_ieee1275_ldflags = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)'; + mips_yeeloong_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)'; + powerpc_ieee1275_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)'; + + mips_yeeloong_cppflags = '-DUSE_ASCII_FAILBACK'; + i386_qemu_cppflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)'; + i386_qemu_ccasflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)'; + emu_cflags = '$(CFLAGS_GNULIB)'; + emu_cppflags = '$(CPPFLAGS_GNULIB)'; + + mips_ldadd = '-lgcc'; + powerpc_ldadd = '-lgcc'; + sparc64_ldadd = '-lgcc'; + + i386_pc_startup = kern/i386/pc/startup.S; + i386_efi_startup = kern/i386/efi/startup.S; + x86_64_efi_startup = kern/x86_64/efi/startup.S; + i386_qemu_startup = kern/i386/qemu/startup.S; + i386_ieee1275_startup = kern/i386/ieee1275/startup.S; + i386_coreboot_multiboot_startup = kern/i386/coreboot/startup.S; + mips_yeeloong_startup = kern/mips/startup.S; + sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S; + powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S; + + common = kern/command.c; + common = kern/corecmd.c; + common = kern/device.c; + common = kern/disk.c; + common = kern/dl.c; + common = kern/env.c; + common = kern/err.c; + common = kern/file.c; + common = kern/fs.c; + common = kern/list.c; + common = kern/main.c; + common = kern/misc.c; + common = kern/parser.c; + common = kern/partition.c; + common = kern/rescue_parser.c; + common = kern/rescue_reader.c; + common = kern/term.c; + + noemu = kern/mm.c; + noemu = kern/time.c; + noemu = kern/generic/millisleep.c; + + noemu_nodist = symlist.c; + + noemu_noieee1275 = kern/generic/rtc_get_time_ms.c; + + ieee1275 = disk/ieee1275/ofdisk.c; + ieee1275 = kern/ieee1275/cmain.c; + ieee1275 = kern/ieee1275/ieee1275.c; + ieee1275 = kern/ieee1275/mmap.c; + ieee1275 = kern/ieee1275/openfw.c; + ieee1275 = term/ieee1275/ofconsole.c; + + ieee1275_mips = term/terminfo.c; + ieee1275_mips = term/tparm.c; + + i386 = kern/i386/dl.c; + + i386_coreboot_multiboot_qemu = kern/i386/coreboot/init.c; + i386_coreboot_multiboot_qemu = kern/i386/halt.c; + i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c; + + i386_pc_coreboot_multiboot_qemu = term/i386/vga_common.c; + + i386_noefi = kern/i386/misc.S; + + x86_noieee1275 = kern/i386/pit.c; + + x86_efi = disk/efi/efidisk.c; + x86_efi = kern/efi/efi.c; + x86_efi = kern/efi/init.c; + x86_efi = kern/efi/mm.c; + x86_efi = kern/i386/efi/init.c; + x86_efi = term/efi/console.c; + + i386_efi = kern/i386/tsc.c; + + x86_64_efi = kern/i386/tsc.c; + x86_64_efi = kern/x86_64/dl.c; + x86_64_efi = kern/x86_64/efi/callwrap.S; + + i386_pc = kern/i386/pc/init.c; + i386_pc = kern/i386/pc/mmap.c; + i386_pc = kern/i386/tsc.c; + i386_pc = term/i386/pc/console.c; + + i386_qemu = bus/pci.c; + i386_qemu = kern/i386/qemu/init.c; + i386_qemu = kern/i386/qemu/mmap.c; + i386_qemu = kern/i386/tsc.c; + + i386_coreboot = kern/i386/coreboot/mmap.c; + i386_coreboot = kern/i386/tsc.c; + + i386_multiboot = kern/i386/multiboot_mmap.c; + i386_multiboot = kern/i386/tsc.c; + + i386_ieee1275 = kern/i386/ieee1275/init.c; + i386_ieee1275 = kern/ieee1275/init.c; + + mips_yeeloong = term/ns8250.c; + mips_yeeloong = bus/bonito.c; + mips_yeeloong = bus/cs5536.c; + mips_yeeloong = bus/pci.c; + mips_yeeloong = commands/extcmd.c; + mips_yeeloong = font/font.c; + mips_yeeloong = font/font_cmd.c; + mips_yeeloong = io/bufio.c; + mips_yeeloong = kern/mips/cache.S; + mips_yeeloong = kern/mips/dl.c; + mips_yeeloong = kern/mips/init.c; + mips_yeeloong = kern/mips/yeeloong/init.c; + mips_yeeloong = lib/arg.c; + mips_yeeloong = term/at_keyboard.c; + mips_yeeloong = term/gfxterm.c; + mips_yeeloong = term/serial.c; + mips_yeeloong = video/bitmap.c; + mips_yeeloong = video/bitmap_scale.c; + mips_yeeloong = video/fb/fbblit.c; + mips_yeeloong = video/fb/fbfill.c; + mips_yeeloong = video/fb/fbutil.c; + mips_yeeloong = video/fb/video_fb.c; + mips_yeeloong = video/sm712.c; + mips_yeeloong = video/video.c; + + powerpc_ieee1275 = kern/ieee1275/init.c; + powerpc_ieee1275 = kern/powerpc/cache.S; + powerpc_ieee1275 = kern/powerpc/dl.c; + + sparc64_ieee1275 = kern/sparc64/cache.S; + sparc64_ieee1275 = kern/sparc64/dl.c; + sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c; + sparc64_ieee1275 = kern/sparc64/ieee1275/init.c; + + emu = disk/host.c; + emu = gnulib/progname.c; + emu = kern/emu/console.c; + emu = kern/emu/getroot.c; + emu = kern/emu/hostdisk.c; + emu = kern/emu/hostfs.c; + emu = kern/emu/main.c; + emu = kern/emu/misc.c; + emu = kern/emu/mm.c; + emu = kern/emu/time.c; + + extra_dist = kern/i386/loader.S; + extra_dist = kern/i386/realmode.S; + extra_dist = kern/i386/pc/lzma_decode.S; + }; + + program = { + name = grub-emu; + mansection = 1; + + emu = kern/emu/full.c; + emu_nodist = grub_emu_init.c; + + ldadd = 'kernel.img$(EXEEXT)'; + ldadd = '$(MODULE_FILES)'; + ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)'; + + enable = emu; + }; + + program = { + name = grub-emu-lite; + + emu = kern/emu/lite.c; + emu = kern/emu/cache.S; + emu_nodist = symlist.c; + + ldadd = 'kernel.img$(EXEEXT)'; + ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)'; + + enable = emu; + }; + + image = { + name = boot; + i386_pc = boot/i386/pc/boot.S; + i386_qemu = boot/i386/qemu/boot.S; + sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S; + + i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00'; + + i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_BOOT_MACHINE_LINK_ADDR)'; + i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)'; + + sparc64_ieee1275_objcopyflags = '-O a.out-sunos-big'; + sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000'; + + objcopyflags = '-O binary'; + enable = i386_pc; + enable = i386_qemu; + enable = sparc64_ieee1275; + }; + + image = { + name = cdboot; + i386_pc = boot/i386/pc/cdboot.S; + i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00'; + objcopyflags = '-O binary'; + enable = i386_pc; + }; + + image = { + name = pxeboot; + i386_pc = boot/i386/pc/pxeboot.S; + + i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00'; + + objcopyflags = '-O binary'; + enable = i386_pc; + }; + + image = { + name = diskboot; + i386_pc = boot/i386/pc/diskboot.S; + + i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8000'; + + sparc64_ieee1275 = boot/sparc64/ieee1275/diskboot.S; + sparc64_ieee1275_ldflags = '-Wl,-Ttext=0x4200'; + + objcopyflags = '-O binary'; + + enable = i386_pc; + enable = sparc64_ieee1275; + }; + + image = { + name = lnxboot; + i386_pc = boot/i386/pc/lnxboot.S; + + i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)'; + i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000'; + + objcopyflags = '-O binary'; + enable = i386_pc; + }; + + image = { + name = fwstart; + mips_yeeloong = boot/mips/yeeloong/fwstart.S; + objcopyflags = '-O binary'; + enable = mips_yeeloong; + }; + + module = { + name = trig; + common_nodist = trigtables.c; + extra_dist = gentrigtables.c; + }; + + module = { + name = cs5536; + x86 = bus/cs5536.c; + enable = x86; + }; + + module = { + name = libusb; + emu = bus/usb/emu/usb.c; + enable = emu; + condition = COND_GRUB_EMU_USB; + }; + + module = { + name = lsspd; + mips_yeeloong = commands/mips/yeeloong/lsspd.c; + enable = mips_yeeloong; + }; + + module = { + name = usb; + common = bus/usb/usb.c; + noemu = bus/usb/usbtrans.c; + noemu = bus/usb/usbhub.c; + enable = emu; + enable = i386; + enable = mips_yeeloong; + emu_condition = COND_GRUB_EMU_USB; + }; + + module = { + name = usbserial_common; + common = bus/usb/serial/common.c; + enable = emu; + enable = i386_pc; + enable = mips_yeeloong; + emu_condition = COND_GRUB_EMU_USB; + }; + + module = { + name = usbserial_pl2303; + common = bus/usb/serial/pl2303.c; + enable = emu; + enable = i386_pc; + enable = mips_yeeloong; + emu_condition = COND_GRUB_EMU_USB; + }; + + module = { + name = usbserial_ftdi; + common = bus/usb/serial/ftdi.c; + enable = emu; + enable = i386_pc; + enable = mips_yeeloong; + emu_condition = COND_GRUB_EMU_USB; + }; + + module = { + name = uhci; + common = bus/usb/uhci.c; + enable = i386_pc; + }; + + module = { + name = ohci; + common = bus/usb/ohci.c; + enable = i386_pc; + enable = mips_yeeloong; + }; + + module = { + name = pci; + noemu = bus/pci.c; + emu = bus/emu/pci.c; + emu = commands/lspci.c; + + enable = emu; + enable = i386_pc; + enable = x86_efi; + enable = i386_ieee1275; + enable = i386_coreboot; + emu_condition = COND_GRUB_EMU_PCI; + }; + + library = { + name = libgnulib.a; + common = gnulib/regex.c; + + extra_dist = gnulib/regcomp.c; + extra_dist = gnulib/regexec.c; + extra_dist = gnulib/fnmatch_loop.c; + extra_dist = gnulib/regex_internal.c; + + cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)'; + cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)'; + }; + + module = { + name = cmostest; + i386 = commands/i386/cmostest.c; + enable = i386_pc; + enable = i386_coreboot; + }; + + module = { + name = iorw; + common = commands/iorw.c; + enable = x86; + }; + + module = { + name = regexp; + common = commands/regexp.c; + ldadd = libgnulib.a; + cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)'; + cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)'; + }; + + module = { + name = acpi; + + i386 = commands/acpi.c; + x86_efi = commands/efi/acpi.c; + i386_pc = commands/i386/pc/acpi.c; ++ i386_coreboot = commands/i386/pc/acpi.c; ++ i386_multiboot = commands/i386/pc/acpi.c; + + enable = x86_efi; + enable = i386_pc; ++ enable = i386_coreboot; ++ enable = i386_multiboot; + }; + + module = { + name = blocklist; + common = commands/blocklist.c; + }; + + module = { + name = boot; + common = commands/boot.c; + i386_pc = lib/i386/pc/biosnum.c; + }; + + module = { + name = cat; + common = commands/cat.c; + }; + + module = { + name = cmp; + common = commands/cmp.c; + }; + + module = { + name = configfile; + common = commands/configfile.c; + }; + + module = { + name = cpuid; + x86 = commands/i386/cpuid.c; + enable = x86; + }; + + module = { + name = crc; + common = commands/crc.c; + common = lib/crc.c; + }; + + module = { + name = date; + common = commands/date.c; + }; + + module = { + name = drivemap; + + i386_pc = commands/i386/pc/drivemap.c; + i386_pc = commands/i386/pc/drivemap_int13h.S; + enable = i386_pc; + }; + + module = { + name = echo; + common = commands/echo.c; + }; + + module = { + name = extcmd; + common = commands/extcmd.c; + common = lib/arg.c; + }; + + module = { + name = fixvideo; + x86_efi = commands/efi/fixvideo.c; + enable = x86_efi; + }; + + module = { + name = gptsync; + common = commands/gptsync.c; + }; + + module = { + name = halt; + nopc = commands/halt.c; + i386_pc = commands/i386/pc/halt.c; + }; + + module = { + name = hashsum; + common = commands/hashsum.c; + }; + + module = { + name = hdparm; + common = commands/hdparm.c; + common = lib/hexdump.c; + enable = i386_pc; + }; + + module = { + name = help; + common = commands/help.c; + }; + + module = { + name = hexdump; + common = commands/hexdump.c; + common = lib/hexdump.c; + }; + + module = { + name = keystatus; + common = commands/keystatus.c; + }; + + module = { + name = loadbios; + x86_efi = commands/efi/loadbios.c; + enable = x86_efi; + }; + + module = { + name = loadenv; + common = commands/loadenv.c; + common = lib/envblk.c; + }; + + module = { + name = ls; + common = commands/ls.c; + }; + + module = { + name = lsmmap; + common = commands/lsmmap.c; + }; + + module = { + name = lspci; + common = commands/lspci.c; + + enable = x86; + enable = mips; + }; + + module = { + name = memrw; + common = commands/memrw.c; + }; + + module = { + name = minicmd; + common = commands/minicmd.c; + }; + + module = { + name = parttool; + common = commands/parttool.c; + }; + + module = { + name = password; + common = commands/password.c; + }; + + module = { + name = password_pbkdf2; + common = commands/password_pbkdf2.c; + }; + + module = { + name = play; + x86 = commands/i386/pc/play.c; + enable = x86; + }; + + module = { + name = probe; + common = commands/probe.c; + }; + + module = { + name = pxecmd; + i386_pc = commands/i386/pc/pxecmd.c; + enable = i386_pc; + }; + + module = { + name = read; + common = commands/read.c; + }; + + module = { + name = reboot; + common = commands/reboot.c; + }; + + module = { + name = search; + common = commands/search_wrap.c; + extra_dist = commands/search.c; + }; + + module = { + name = search_fs_file; + common = commands/search_file.c; + }; + + module = { + name = search_fs_uuid; + common = commands/search_uuid.c; + }; + + module = { + name = search_label; + common = commands/search_label.c; + }; + + module = { + name = setpci; + common = commands/setpci.c; + enable = x86; + }; + + module = { + name = sleep; + common = commands/sleep.c; + }; + + module = { + name = suspend; + ieee1275 = commands/ieee1275/suspend.c; + enable = i386_ieee1275; + enable = powerpc_ieee1275; + }; + + module = { + name = terminal; + common = commands/terminal.c; + }; + + module = { + name = test; + common = commands/test.c; + }; + + module = { + name = true; + common = commands/true.c; + }; + + module = { + name = usbtest; + common = commands/usbtest.c; + enable = i386_pc; + enable = mips_yeeloong; + enable = emu; + emu_condition = COND_GRUB_EMU_USB; + }; + + module = { + name = vbeinfo; + i386_pc = commands/i386/pc/vbeinfo.c; + enable = i386_pc; + }; + + module = { + name = vbetest; + i386_pc = commands/i386/pc/vbetest.c; + enable = i386_pc; + }; + + module = { + name = videotest; + common = commands/videotest.c; + }; + + module = { + name = xnu_uuid; + common = commands/xnu_uuid.c; + }; + + module = { + name = dm_nv; + common = disk/dmraid_nvidia.c; + }; + + module = { + name = loopback; + common = disk/loopback.c; + }; + + module = { + name = lvm; + common = disk/lvm.c; + }; + + module = { + name = mdraid; + common = disk/mdraid_linux.c; + }; + + module = { + name = raid; + common = disk/raid.c; + }; + + module = { + name = raid5rec; + common = disk/raid5_recover.c; + }; + + module = { + name = raid6rec; + common = disk/raid6_recover.c; + }; + + module = { + name = scsi; + common = disk/scsi.c; + }; + + module = { + name = memdisk; + common = disk/memdisk.c; + }; + + module = { + name = ata; + common = disk/ata.c; + enable = x86; + enable = mips; + }; + + module = { + name = ata_pthru; + common = disk/ata_pthru.c; + enable = x86; + enable = mips_yeeloong; + }; + + module = { + name = biosdisk; + i386_pc = disk/i386/pc/biosdisk.c; + enable = i386_pc; + }; + + module = { + name = usbms; + common = disk/usbms.c; + enable = i386_pc; + enable = mips_yeeloong; + enable = emu; + emu_condition = COND_GRUB_EMU_USB; + }; + + module = { + name = nand; + ieee1275 = disk/ieee1275/nand.c; + enable = i386_ieee1275; + }; + + module = { + name = efiemu; - i386_pc = efiemu/main.c; - i386_pc = efiemu/i386/loadcore32.c; - i386_pc = efiemu/i386/loadcore64.c; - i386_pc = efiemu/i386/pc/cfgtables.c; - i386_pc = efiemu/mm.c; - i386_pc = efiemu/loadcore_common.c; - i386_pc = efiemu/symbols.c; - i386_pc = efiemu/loadcore32.c; - i386_pc = efiemu/loadcore64.c; - i386_pc = efiemu/prepare32.c; - i386_pc = efiemu/prepare64.c; - i386_pc = efiemu/pnvram.c; - i386_pc = efiemu/i386/coredetect.c; ++ common = efiemu/main.c; ++ common = efiemu/i386/loadcore32.c; ++ common = efiemu/i386/loadcore64.c; ++ common = efiemu/i386/pc/cfgtables.c; ++ common = efiemu/mm.c; ++ common = efiemu/loadcore_common.c; ++ common = efiemu/symbols.c; ++ common = efiemu/loadcore32.c; ++ common = efiemu/loadcore64.c; ++ common = efiemu/prepare32.c; ++ common = efiemu/prepare64.c; ++ common = efiemu/pnvram.c; ++ common = efiemu/i386/coredetect.c; + + extra_dist = efiemu/prepare.c; + extra_dist = efiemu/loadcore.c; + extra_dist = efiemu/runtime/efiemu.S; + extra_dist = efiemu/runtime/efiemu.c; + + enable = i386_pc; ++ enable = i386_coeboot; ++ enable = i386_ieee1275; ++ enable = i386_multiboot; + }; + + module = { + name = font; + common = font/font.c; + common = font/font_cmd.c; + enable = emu; + enable = x86; + enable = sparc64; + enable = powerpc; + }; + + module = { + name = affs; + common = fs/affs.c; + }; + + module = { + name = afs; + common = fs/afs.c; + }; + + module = { + name = afs_be; + common = fs/afs_be.c; + }; + + module = { + name = befs; + common = fs/befs.c; + }; + + module = { + name = befs_be; + common = fs/befs_be.c; + }; + + module = { + name = cpio; + common = fs/cpio.c; + }; + + module = { + name = ext2; + common = fs/ext2.c; + }; + + module = { + name = fat; + common = fs/fat.c; + }; + + module = { + name = fshelp; + common = fs/fshelp.c; + }; + + module = { + name = hfs; + common = fs/hfs.c; + }; + + module = { + name = hfsplus; + common = fs/hfsplus.c; + }; + + module = { + name = iso9660; + common = fs/iso9660.c; + }; + + module = { + name = jfs; + common = fs/jfs.c; + }; + + module = { + name = minix; + common = fs/minix.c; + }; + + module = { + name = nilfs2; + common = fs/nilfs2.c; + }; + + module = { + name = ntfs; + common = fs/ntfs.c; + }; + + module = { + name = ntfscomp; + common = fs/ntfscomp.c; + }; + + module = { + name = reiserfs; + common = fs/reiserfs.c; + }; + + module = { + name = sfs; + common = fs/sfs.c; + }; + + module = { + name = tar; + common = fs/tar.c; + }; + + module = { + name = udf; + common = fs/udf.c; + }; + + module = { + name = ufs1; + common = fs/ufs.c; + }; + + module = { + name = ufs2; + common = fs/ufs2.c; + }; + + module = { + name = xfs; + common = fs/xfs.c; + }; + + module = { + name = pxe; + i386_pc = fs/i386/pc/pxe.c; + enable = i386_pc; + }; + + module = { + name = gettext; + common = gettext/gettext.c; + }; + + module = { + name = gfxmenu; + common = gfxmenu/gfxmenu.c; + common = gfxmenu/model.c; + common = gfxmenu/view.c; + common = gfxmenu/font.c; + common = gfxmenu/icon_manager.c; + common = gfxmenu/theme_loader.c; + common = gfxmenu/widget-box.c; + common = gfxmenu/gui_canvas.c; + common = gfxmenu/gui_circular_progress.c; + common = gfxmenu/gui_box.c; + common = gfxmenu/gui_label.c; + common = gfxmenu/gui_list.c; + common = gfxmenu/gui_image.c; + common = gfxmenu/gui_progress_bar.c; + common = gfxmenu/gui_util.c; + common = gfxmenu/gui_string_util.c; + common = gfxmenu/named_colors.c; + }; + + module = { + name = hello; + common = hello/hello.c; + }; + + module = { + name = gzio; + common = io/gzio.c; + }; + + module = { + name = bufio; + common = io/bufio.c; + enable = emu; + enable = x86; + enable = sparc64; + enable = powerpc; + }; + + module = { + name = elf; + common = kern/elf.c; + }; + + module = { + name = crypto; + common = lib/crypto.c; + + extra_dist = lib/libgcrypt-grub/cipher/crypto.lst; + }; + + module = { + name = pbkdf2; + common = lib/pbkdf2.c; + }; + + module = { + name = relocator; - mips = lib/mips/relocator.c; - mips = lib/mips/relocator_asm.S; ++ common = lib/relocator.c; ++ x86 = lib/i386/relocator16.S; ++ x86 = lib/i386/relocator32.S; ++ x86 = lib/i386/relocator64.S; ++ i386 = lib/i386/relocator_asm.S; ++ x86_64 = lib/x86_64/relocator_asm.S; + x86 = lib/i386/relocator.c; - x86 = lib/i386/relocator_asm.S; - x86 = lib/i386/relocator_backward.S; - extra_dist = lib/relocator.c; ++ ieee1275 = lib/ieee1275/relocator.c; ++ x86_efi = lib/efi/relocator.c; ++ mips = lib/mips/relocator_asm.S; ++ mips = lib/mips/relocator.c; ++ powerpc = lib/powerpc/relocator_asm.S; ++ powerpc = lib/powerpc/relocator.c; ++ + enable = mips; ++ enable = powerpc; + enable = x86; + }; + + module = { + name = datetime; + x86_noefi_mips = lib/cmos_datetime.c; + x86_efi = lib/efi/datetime.c; + sparc64_ieee1275 = lib/ieee1275/datetime.c; + powerpc_ieee1275 = lib/ieee1275/datetime.c; + enable = x86; + enable = mips; + enable = sparc64_ieee1275; + enable = powerpc_ieee1275; + }; + + module = { + name = setjmp; + common = lib/setjmp.S; + extra_dist = lib/i386/setjmp.S; + extra_dist = lib/mips/setjmp.S; + extra_dist = lib/x86_64/setjmp.S; + extra_dist = lib/sparc64/setjmp.S; + extra_dist = lib/powerpc/setjmp.S; + }; + + module = { + name = aout; + common = loader/aout.c; - enable = i386_pc; - enable = i386_qemu; - enable = i386_coreboot; - enable = i386_multiboot; - enable = i386_ieee1275; ++ enable = x86; + }; + + module = { + name = bsd; - i386 = loader/i386/bsd.c; - i386 = loader/i386/bsd32.c; - i386 = loader/i386/bsd64.c; - i386 = loader/i386/bsd_helper.S; - i386 = loader/i386/bsd_trampoline.S; ++ x86 = loader/i386/bsd.c; ++ x86 = loader/i386/bsd32.c; ++ x86 = loader/i386/bsd64.c; + + extra_dist = loader/i386/bsdXX.c; + extra_dist = loader/i386/bsd_pagetable.c; + - enable = i386_pc; - enable = i386_qemu; - enable = i386_coreboot; - enable = i386_multiboot; ++ enable = x86; + }; + + module = { + name = linux16; + i386_pc = loader/i386/pc/linux.c; + enable = i386_pc; + }; + ++module = { ++ name = ntldr; ++ i386_pc = loader/i386/pc/ntldr.c; ++ enable = i386_pc; ++}; ++ + module = { + name = multiboot2; + cppflags = "-DGRUB_USE_MULTIBOOT2"; + + common = loader/multiboot.c; + common = loader/multiboot_mbi2.c; + enable = x86; + enable = mips; + }; + + module = { + name = multiboot; + common = loader/multiboot.c; + x86 = loader/i386/multiboot_mbi.c; + extra_dist = loader/multiboot_elfxx.c; + enable = x86; + }; + + module = { + name = linux; - i386_noefi_noieee1275 = loader/i386/linux.c; - - x86_efi = loader/i386/efi/linux.c; - x86_64_efi = loader/i386/linux_trampoline.S; - i386_ieee1275 = loader/i386/ieee1275/linux.c; ++ x86 = loader/i386/linux.c; + mips = loader/mips/linux.c; + powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c; + sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c; + enable = noemu; + }; + + module = { + name = xnu; - x86_efi_pc = loader/xnu_resume.c; - x86_efi_pc = loader/i386/xnu.c; - x86_efi_pc = loader/macho32.c; - x86_efi_pc = loader/macho64.c; - x86_efi_pc = loader/macho.c; - x86_efi_pc = loader/xnu.c; ++ x86 = loader/xnu_resume.c; ++ x86 = loader/i386/xnu.c; ++ x86 = loader/macho32.c; ++ x86 = loader/macho64.c; ++ x86 = loader/macho.c; ++ x86 = loader/xnu.c; + + extra_dist = loader/machoXX.c; - enable = i386_pc; - enable = x86_efi; ++ enable = x86; + }; + + module = { + name = appleldr; + x86_efi = loader/efi/appleloader.c; + enable = x86_efi; + }; + + module = { + name = chain; + x86_efi = loader/efi/chainloader.c; + i386_pc = loader/i386/pc/chainloader.c; + enable = i386_pc; + enable = x86_efi; + }; + + module = { + name = mmap; + i386_pc = mmap/mmap.c; + i386_pc = mmap/i386/uppermem.c; + i386_pc = mmap/i386/mmap.c; + i386_pc = mmap/i386/pc/mmap.c; + i386_pc = mmap/i386/pc/mmap_helper.S; + + x86_efi = mmap/mmap.c; + x86_efi = mmap/i386/uppermem.c; + x86_efi = mmap/i386/mmap.c; + x86_efi = mmap/efi/mmap.c; + + i386_coreboot = mmap/mmap.c; + i386_coreboot = mmap/i386/uppermem.c; + i386_coreboot = mmap/i386/mmap.c; + + i386_multiboot = mmap/mmap.c; + i386_multiboot = mmap/i386/uppermem.c; + i386_multiboot = mmap/i386/mmap.c; + + i386_qemu = mmap/mmap.c; + i386_qemu = mmap/i386/uppermem.c; + i386_qemu = mmap/i386/mmap.c; + + i386_ieee1275 = mmap/mmap.c; + i386_ieee1275 = mmap/i386/uppermem.c; + i386_ieee1275 = mmap/i386/mmap.c; + + mips_yeeloong = mmap/mmap.c; + mips_yeeloong = mmap/mips/yeeloong/uppermem.c; + + enable = x86; + enable = mips_yeeloong; + }; + + module = { + name = normal; + common = normal/main.c; + common = normal/cmdline.c; + common = normal/dyncmd.c; + common = normal/auth.c; + common = normal/autofs.c; + common = normal/color.c; + common = normal/completion.c; + common = normal/datetime.c; + common = normal/menu.c; + common = normal/menu_entry.c; + common = normal/menu_text.c; + common = normal/misc.c; + common = normal/crypto.c; + common = normal/term.c; + common = normal/context.c; + common = normal/charset.c; + + common = script/main.c; + common = script/script.c; + common = script/execute.c; + common = script/function.c; + common = script/lexer.c; + common = script/argv.c; + + common = unidata.c; + common_nodist = grub_script.tab.c; + common_nodist = grub_script.yy.c; + common_nodist = grub_script.tab.h; + common_nodist = grub_script.yy.h; + + extra_dist = script/yylex.l; + extra_dist = script/parser.y; + + cflags = '$(CFLAGS_POSIX) -Wno-error'; + cppflags = '$(CPPFLAGS_POSIX)'; + }; + + module = { + name = part_acorn; + common = partmap/acorn.c; + }; + + module = { + name = part_amiga; + common = partmap/amiga.c; + }; + + module = { + name = part_apple; + common = partmap/apple.c; + }; + + module = { + name = part_gpt; + common = partmap/gpt.c; + }; + + module = { + name = part_msdos; + common = partmap/msdos.c; + }; + + module = { + name = part_sun; + common = partmap/sun.c; + }; + + module = { + name = part_bsd; + common = partmap/bsdlabel.c; + }; + + module = { + name = part_sunpc; + common = partmap/sunpc.c; + }; + + module = { + name = msdospart; + common = parttool/msdospart.c; + }; + + module = { + name = at_keyboard; + common = term/at_keyboard.c; + enable = x86; + }; + + module = { + name = gfxterm; + common = term/gfxterm.c; + enable = emu; + enable = x86; + enable = sparc64; + enable = powerpc; + }; + + module = { + name = serial; + common = term/serial.c; + x86 = term/ns8250.c; + + enable = emu; + enable = i386; + enable = x86_64_efi; + emu_condition = COND_GRUB_EMU_USB; + }; + + module = { + name = sendkey; + i386_pc = commands/i386/pc/sendkey.c; + enable = i386_pc; + }; + + module = { + name = terminfo; + common = term/terminfo.c; + common = term/tparm.c; + }; + + module = { + name = usb_keyboard; + common = term/usb_keyboard.c; + enable = i386_pc; + enable = mips_yeeloong; + }; + + module = { + name = vga; + i386_pc = video/i386/pc/vga.c; + enable = i386_pc; + }; + + module = { + name = vga_text; - x86 = term/i386/pc/vga_text.c; - x86 = term/i386/vga_common.c; - enable = x86; ++ common = term/i386/pc/vga_text.c; ++ common = term/i386/vga_common.c; ++ enable = i386_pc; ++ enable = i386_coreboot; ++ enable = i386_multiboot; + }; + + module = { + name = video_cirrus; + x86 = video/cirrus.c; + enable = x86; + }; + + module = { + name = video_bochs; + x86 = video/bochs.c; + enable = x86; + }; + + module = { + name = functional_test; + common = tests/lib/functional_test.c; + common = tests/lib/test.c; + }; + + module = { + name = example_functional_test; + common = tests/example_functional_test.c; + cflags = -Wno-format; + }; + + module = { + name = bitmap; + common = video/bitmap.c; + enable = emu; + enable = x86; + enable = sparc64; + enable = powerpc; + }; + + module = { + name = bitmap_scale; + common = video/bitmap_scale.c; + enable = emu; + enable = x86; + enable = sparc64; + enable = powerpc; + }; + + module = { + name = efi_gop; + x86_efi = video/efi_gop.c; + enable = x86_efi; + }; + + module = { + name = efi_uga; + x86_efi = video/efi_uga.c; + enable = x86_efi; + }; + + module = { + name = jpeg; + common = video/readers/jpeg.c; + }; + + module = { + name = png; + common = video/readers/png.c; + }; + + module = { + name = tga; + common = video/readers/tga.c; + }; + + module = { + name = vbe; + i386_pc = video/i386/pc/vbe.c; + enable = i386_pc; + }; + + module = { + name = video_fb; + common = video/fb/video_fb.c; + common = video/fb/fbblit.c; + common = video/fb/fbfill.c; + common = video/fb/fbutil.c; + enable = emu; + enable = x86; + enable = sparc64; + enable = powerpc; + }; + + module = { + name = video; + common = video/video.c; + enable = emu; + enable = x86; + enable = sparc64; + enable = powerpc; + }; + + module = { + name = ieee1275_fb; + ieee1275 = video/ieee1275.c; + enable = powerpc; + enable = sparc64; + }; + + module = { + name = sdl; + emu = video/emu/sdl.c; + enable = emu; + condition = COND_GRUB_EMU_SDL; + }; + + module = { + name = datehook; + common = hook/datehook.c; + }; diff --cc grub-core/kern/efi/efi.c index 4916a0d18,126e40901..e80bc1f19 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@@ -179,8 -180,20 +180,9 @@@ grub_halt (void grub_efi_fini (); efi_call_4 (grub_efi_system_table->runtime_services->reset_system, GRUB_EFI_RESET_SHUTDOWN, GRUB_EFI_SUCCESS, 0, NULL); + for (;;) ; } -int -grub_efi_exit_boot_services (grub_efi_uintn_t map_key) -{ - grub_efi_boot_services_t *b; - grub_efi_status_t status; - - b = grub_efi_system_table->boot_services; - status = efi_call_2 (b->exit_boot_services, grub_efi_image_handle, map_key); - return status == GRUB_EFI_SUCCESS; -} - grub_err_t grub_efi_set_virtual_address_map (grub_efi_uintn_t memory_map_size, grub_efi_uintn_t descriptor_size, diff --cc grub-core/kern/powerpc/cache_flush.S index 1410f78b1,000000000..1410f78b1 mode 100644,000000..100644 --- a/grub-core/kern/powerpc/cache_flush.S +++ b/grub-core/kern/powerpc/cache_flush.S diff --cc grub-core/lib/efi/relocator.c index fc4de834b,000000000..fc4de834b mode 100644,000000..100644 --- a/grub-core/lib/efi/relocator.c +++ b/grub-core/lib/efi/relocator.c diff --cc grub-core/lib/i386/relocator16.S index c3768f4eb,000000000..c3768f4eb mode 100644,000000..100644 --- a/grub-core/lib/i386/relocator16.S +++ b/grub-core/lib/i386/relocator16.S diff --cc grub-core/lib/i386/relocator32.S index b581305a5,000000000..b581305a5 mode 100644,000000..100644 --- a/grub-core/lib/i386/relocator32.S +++ b/grub-core/lib/i386/relocator32.S diff --cc grub-core/lib/i386/relocator64.S index bb086418c,000000000..bb086418c mode 100644,000000..100644 --- a/grub-core/lib/i386/relocator64.S +++ b/grub-core/lib/i386/relocator64.S diff --cc grub-core/lib/i386/relocator_common.S index bd5b53f95,000000000..bd5b53f95 mode 100644,000000..100644 --- a/grub-core/lib/i386/relocator_common.S +++ b/grub-core/lib/i386/relocator_common.S diff --cc grub-core/lib/ieee1275/relocator.c index 947346d46,000000000..947346d46 mode 100644,000000..100644 --- a/grub-core/lib/ieee1275/relocator.c +++ b/grub-core/lib/ieee1275/relocator.c diff --cc grub-core/lib/powerpc/relocator.c index 85dfbeaf3,000000000..85dfbeaf3 mode 100644,000000..100644 --- a/grub-core/lib/powerpc/relocator.c +++ b/grub-core/lib/powerpc/relocator.c diff --cc grub-core/lib/powerpc/relocator_asm.S index 355e9c8b4,000000000..355e9c8b4 mode 100644,000000..100644 --- a/grub-core/lib/powerpc/relocator_asm.S +++ b/grub-core/lib/powerpc/relocator_asm.S diff --cc grub-core/lib/x86_64/relocator_asm.S index 2ab6d8cb7,000000000..2ab6d8cb7 mode 100644,000000..100644 --- a/grub-core/lib/x86_64/relocator_asm.S +++ b/grub-core/lib/x86_64/relocator_asm.S diff --cc grub-core/loader/i386/bsd.c index 26055d5ca,3c7fe2fee..6399cb1e3 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@@ -33,8 -35,6 +33,8 @@@ #include #include #include - #include ++#include + #include #ifdef GRUB_MACHINE_PCBIOS #include @@@ -1508,87 -1056,9 +1508,87 @@@ grub_cmd_netbsd (grub_extcmd_t cmd, in if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE) { - grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 1); + if (is_elf_kernel) + { + grub_file_t file; + + file = grub_gzfile_open (argv[0], 1); + if (! file) + return grub_errno; + + if (is_64bit) + err = grub_netbsd_load_elf_meta64 (relocator, file, &kern_end); + else + err = grub_netbsd_load_elf_meta32 (relocator, file, &kern_end); + if (err) + return err; + } + + { + char bootpath[GRUB_NETBSD_MAX_BOOTPATH_LEN]; + char *name; + name = grub_strrchr (argv[0], '/'); + if (name) + name++; + else + name = argv[0]; + grub_memset (bootpath, 0, sizeof (bootpath)); + grub_strncpy (bootpath, name, sizeof (bootpath) - 1); + grub_bsd_add_meta (NETBSD_BTINFO_BOOTPATH, bootpath, sizeof (bootpath)); + } + if (cmd->state[NETBSD_ROOT_ARG].set) - netbsd_root = grub_strdup (cmd->state[NETBSD_ROOT_ARG].arg); + { + char root[GRUB_NETBSD_MAX_ROOTDEVICE_LEN]; + grub_memset (root, 0, sizeof (root)); + grub_strncpy (root, cmd->state[NETBSD_ROOT_ARG].arg, + sizeof (root) - 1); + grub_bsd_add_meta (NETBSD_BTINFO_ROOTDEVICE, root, sizeof (root)); + } + if (cmd->state[NETBSD_SERIAL_ARG].set) + { + struct grub_netbsd_btinfo_serial serial; + char *ptr; + + grub_memset (&serial, 0, sizeof (serial)); + grub_strcpy (serial.devname, "com"); + + if (cmd->state[NETBSD_SERIAL_ARG].arg) + { + ptr = cmd->state[NETBSD_SERIAL_ARG].arg; + if (grub_memcmp (ptr, "com", sizeof ("com") - 1) == 0) + { + ptr += sizeof ("com") - 1; + serial.addr - = grub_serial_hw_get_port (grub_strtoul (ptr, &ptr, 0)); ++ = grub_ns8250_hw_get_port (grub_strtoul (ptr, &ptr, 0)); + } + else + serial.addr = grub_strtoul (ptr, &ptr, 0); + if (grub_errno) + return grub_errno; + + if (*ptr == ',') + { + ptr++; + serial.speed = grub_strtoul (ptr, &ptr, 0); + if (grub_errno) + return grub_errno; + } + } + + grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &serial, sizeof (serial)); + } + else + { + struct grub_netbsd_btinfo_serial cons; + + grub_memset (&cons, 0, sizeof (cons)); + grub_strcpy (cons.devname, "pc"); + + grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &cons, sizeof (cons)); + } + + grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 0); } return grub_errno; diff --cc grub-core/loader/i386/pc/ntldr.c index 0c33a0680,000000000..0c33a0680 mode 100644,000000..100644 --- a/grub-core/loader/i386/pc/ntldr.c +++ b/grub-core/loader/i386/pc/ntldr.c diff --cc grub-core/loader/multiboot.c index 878f42dac,b4ea8bf21..1de1def86 --- a/grub-core/loader/multiboot.c +++ b/grub-core/loader/multiboot.c @@@ -268,9 -293,19 +268,20 @@@ grub_cmd_module (grub_command_t cmd __a { grub_file_t file = 0; grub_ssize_t size; - char *module = 0; + void *module = NULL; + grub_addr_t target; grub_err_t err; + int nounzip = 0; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified"); + + if (grub_strcmp (argv[0], "--nounzip") == 0) + { + argv++; + argc--; + nounzip = 1; + } if (argc == 0) return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified"); diff --cc grub-core/term/efi/console.c index eac227561,dca002910..6027d0ab3 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c @@@ -85,14 -72,13 +72,16 @@@ map_char (grub_uint32_t c } static void - grub_console_putchar (grub_uint32_t c) + grub_console_putchar (struct grub_term_output *term __attribute__ ((unused)), + const struct grub_unicode_glyph *c) { - grub_efi_char16_t str[2]; + grub_efi_char16_t str[2 + c->ncomb]; grub_efi_simple_text_output_interface_t *o; + unsigned i, j; + if (grub_efi_is_finished) + return; + o = grub_efi_system_table->con_out; /* For now, do not try to use a surrogate pair. */ diff --cc grub-core/term/ns8250.c index 000000000,315d3527f..f3a804d53 mode 000000,100644..100644 --- a/grub-core/term/ns8250.c +++ b/grub-core/term/ns8250.c @@@ -1,0 -1,253 +1,263 @@@ + /* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009,2010 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 . + */ + + #include + #include + #include + #include + #include + #include + #include + #include + + #ifdef GRUB_MACHINE_PCBIOS + static const unsigned short *serial_hw_io_addr = (const unsigned short *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR; + #define GRUB_SERIAL_PORT_NUM 4 + #else + #include + static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS; + #define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr)) + #endif + + /* Convert speed to divisor. */ + static unsigned short + serial_get_divisor (unsigned int speed) + { + unsigned int i; + + /* The structure for speed vs. divisor. */ + struct divisor + { + unsigned int speed; + unsigned short div; + }; + + /* The table which lists common configurations. */ + /* 1843200 / (speed * 16) */ + static struct divisor divisor_tab[] = + { + { 2400, 0x0030 }, + { 4800, 0x0018 }, + { 9600, 0x000C }, + { 19200, 0x0006 }, + { 38400, 0x0003 }, + { 57600, 0x0002 }, + { 115200, 0x0001 } + }; + + /* Set the baud rate. */ + for (i = 0; i < ARRAY_SIZE (divisor_tab); i++) + if (divisor_tab[i].speed == speed) + /* UART in Yeeloong runs twice the usual rate. */ + #ifdef GRUB_MACHINE_MIPS_YEELOONG + return 2 * divisor_tab[i].div; + #else + return divisor_tab[i].div; + #endif + return 0; + } + + static void + do_real_config (struct grub_serial_port *port) + { + int divisor; + unsigned char status = 0; + const unsigned char parities[] = { + [GRUB_SERIAL_PARITY_NONE] = UART_NO_PARITY, + [GRUB_SERIAL_PARITY_ODD] = UART_ODD_PARITY, + [GRUB_SERIAL_PARITY_EVEN] = UART_EVEN_PARITY + }; + const unsigned char stop_bits[] = { + [GRUB_SERIAL_STOP_BITS_1] = UART_1_STOP_BIT, + [GRUB_SERIAL_STOP_BITS_2] = UART_2_STOP_BITS, + }; + + if (port->configured) + return; + + divisor = serial_get_divisor (port->config.speed); + + /* Turn off the interrupt. */ + grub_outb (0, port->port + UART_IER); + + /* Set DLAB. */ + grub_outb (UART_DLAB, port->port + UART_LCR); + + /* Set the baud rate. */ + grub_outb (divisor & 0xFF, port->port + UART_DLL); + grub_outb (divisor >> 8, port->port + UART_DLH); + + /* Set the line status. */ + status |= (parities[port->config.parity] + | (port->config.word_len - 5) + | stop_bits[port->config.stop_bits]); + grub_outb (status, port->port + UART_LCR); + + /* In Yeeloong serial port has only 3 wires. */ + #ifndef GRUB_MACHINE_MIPS_YEELOONG + /* Enable the FIFO. */ + grub_outb (UART_ENABLE_FIFO_TRIGGER1, port->port + UART_FCR); + + /* Turn on DTR and RTS. */ + grub_outb (UART_ENABLE_DTRRTS, port->port + UART_MCR); + #else + /* Enable the FIFO. */ + grub_outb (UART_ENABLE_FIFO_TRIGGER14, port->port + UART_FCR); + + /* Turn on DTR, RTS, and OUT2. */ + grub_outb (UART_ENABLE_DTRRTS | UART_ENABLE_OUT2, port->port + UART_MCR); + #endif + + /* Drain the input buffer. */ + while (grub_inb (port->port + UART_LSR) & UART_DATA_READY) + grub_inb (port->port + UART_RX); + + port->configured = 1; + } + + /* Fetch a key. */ + static int + serial_hw_fetch (struct grub_serial_port *port) + { + do_real_config (port); + if (grub_inb (port->port + UART_LSR) & UART_DATA_READY) + return grub_inb (port->port + UART_RX); + + return -1; + } + + /* Put a character. */ + static void + serial_hw_put (struct grub_serial_port *port, const int c) + { + unsigned int timeout = 100000; + + do_real_config (port); + + /* Wait until the transmitter holding register is empty. */ + while ((grub_inb (port->port + UART_LSR) & UART_EMPTY_TRANSMITTER) == 0) + { + if (--timeout == 0) + /* There is something wrong. But what can I do? */ + return; + } + + grub_outb (c, port->port + UART_TX); + } + + /* Initialize a serial device. PORT is the port number for a serial device. + SPEED is a DTE-DTE speed which must be one of these: 2400, 4800, 9600, + 19200, 38400, 57600 and 115200. WORD_LEN is the word length to be used + for the device. Likewise, PARITY is the type of the parity and + STOP_BIT_LEN is the length of the stop bit. The possible values for + WORD_LEN, PARITY and STOP_BIT_LEN are defined in the header file as + macros. */ + static grub_err_t + serial_hw_configure (struct grub_serial_port *port, + struct grub_serial_config *config) + { + unsigned short divisor; + + divisor = serial_get_divisor (config->speed); + if (divisor == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed"); + + if (config->parity != GRUB_SERIAL_PARITY_NONE + && config->parity != GRUB_SERIAL_PARITY_ODD + && config->parity != GRUB_SERIAL_PARITY_EVEN) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported parity"); + + if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1 + && config->stop_bits != GRUB_SERIAL_STOP_BITS_2) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits"); + + if (config->word_len < 5 || config->word_len > 8) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported word length"); + + port->config = *config; + port->configured = 0; + + /* FIXME: should check if the serial terminal was found. */ + + return GRUB_ERR_NONE; + } + + struct grub_serial_driver grub_ns8250_driver = + { + .configure = serial_hw_configure, + .fetch = serial_hw_fetch, + .put = serial_hw_put + }; + + static char com_names[GRUB_SERIAL_PORT_NUM][20]; + static struct grub_serial_port com_ports[GRUB_SERIAL_PORT_NUM]; + + void + grub_ns8250_init (void) + { + unsigned i; + for (i = 0; i < GRUB_SERIAL_PORT_NUM; i++) + if (serial_hw_io_addr[i]) + { + grub_err_t err; + grub_snprintf (com_names[i], sizeof (com_names[i]), "com%d", i); + com_ports[i].name = com_names[i]; + com_ports[i].driver = &grub_ns8250_driver; + com_ports[i].port = serial_hw_io_addr[i]; + err = grub_serial_config_defaults (&com_ports[i]); + if (err) + grub_print_error (); + + grub_serial_register (&com_ports[i]); + } + } + ++/* Return the port number for the UNITth serial device. */ ++grub_port_t ++grub_ns8250_hw_get_port (const unsigned int unit) ++{ ++ if (unit < GRUB_SERIAL_PORT_NUM) ++ return serial_hw_io_addr[unit]; ++ else ++ return 0; ++} ++ + char * + grub_serial_ns8250_add_port (grub_port_t port) + { + struct grub_serial_port *p; + unsigned i; + for (i = 0; i < GRUB_SERIAL_PORT_NUM; i++) + if (com_ports[i].port == port) + return com_names[i]; + p = grub_malloc (sizeof (*p)); + if (!p) + return NULL; + p->name = grub_xasprintf ("port%lx", (unsigned long) port); + if (!p->name) + { + grub_free (p); + return NULL; + } + p->driver = &grub_ns8250_driver; + grub_serial_config_defaults (p); + p->port = port; + grub_serial_register (p); + + return p->name; + } diff --cc include/grub/ns8250.h index 000000000,f8b9c3a8c..2dcd07f14 mode 000000,100644..100644 --- a/include/grub/ns8250.h +++ b/include/grub/ns8250.h @@@ -1,0 -1,73 +1,78 @@@ + /* serial.h - serial device interface */ + /* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2000,2001,2002,2005,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 . + */ + + #ifndef GRUB_NS8250_HEADER + #define GRUB_NS8250_HEADER 1 + + /* Macros. */ + + /* The offsets of UART registers. */ + #define UART_TX 0 + #define UART_RX 0 + #define UART_DLL 0 + #define UART_IER 1 + #define UART_DLH 1 + #define UART_IIR 2 + #define UART_FCR 2 + #define UART_LCR 3 + #define UART_MCR 4 + #define UART_LSR 5 + #define UART_MSR 6 + #define UART_SR 7 + + /* For LSR bits. */ + #define UART_DATA_READY 0x01 + #define UART_EMPTY_TRANSMITTER 0x20 + + /* The type of parity. */ + #define UART_NO_PARITY 0x00 + #define UART_ODD_PARITY 0x08 + #define UART_EVEN_PARITY 0x18 + + /* The type of word length. */ + #define UART_5BITS_WORD 0x00 + #define UART_6BITS_WORD 0x01 + #define UART_7BITS_WORD 0x02 + #define UART_8BITS_WORD 0x03 + + /* The type of the length of stop bit. */ + #define UART_1_STOP_BIT 0x00 + #define UART_2_STOP_BITS 0x04 + + /* the switch of DLAB. */ + #define UART_DLAB 0x80 + + /* Enable the FIFO. */ + #define UART_ENABLE_FIFO_TRIGGER14 0xC7 + + /* Enable the FIFO. */ + #define UART_ENABLE_FIFO_TRIGGER1 0x07 + + /* Turn on DTR, RTS, and OUT2. */ + #define UART_ENABLE_DTRRTS 0x03 + + /* Turn on DTR, RTS, and OUT2. */ + #define UART_ENABLE_OUT2 0x08 + ++#include ++ ++grub_port_t ++grub_ns8250_hw_get_port (const unsigned int unit); ++ + #endif /* ! GRUB_SERIAL_MACHINE_HEADER */ diff --cc tests/util/grub-shell.in index 86b46cf77,3f25fe7bb..09847db2b --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@@ -134,44 -124,23 +134,44 @@@ hal EOF isofile=`mktemp` - grub-mkrescue --output=${isofile} --override-directory=${builddir} \ -sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \ - --override-directory=${builddir}/grub-core --output=${isofile} \ - boot/grub/grub.cfg=${cfgfile} \ - /boot/grub/testcase.cfg=${source} >/dev/null 2>&1 - -hdafile=`mktemp` -cp ${isofile} ${hdafile} ++sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} --override-directory=${builddir}/grub-core \ + --rom-directory="${rom_directory}" \ + /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \ + ${files} >/dev/null 2>&1 +if [ x$boot = xhd ]; then + device=hda + bootdev="-boot c" +fi +if [ x$boot = xcd ]; then + device=cdrom + bootdev="-boot d" +fi +if [ x$boot = xfd ]; then + device=fda + bootdev="-boot a" +fi -fdafile=`mktemp` -cp ${isofile} ${fdafile} +if [ x$boot = xqemu ]; then + bootdev="-bios ${rom_directory}/qemu.img" + device=cdrom +fi -outfile=`mktemp` -qemu-system-i386 ${qemuopts} -nographic -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile} +if [ x$boot = xcoreboot ]; then + imgfile=`mktemp` + cp "${GRUB_COREBOOT_ROM}" "${imgfile}" + "${GRUB_CBFSTOOL}" "${imgfile}" add-payload "${rom_directory}/coreboot.elf" fallback/payload + bootdev="-bios ${imgfile}" + device=cdrom +fi -cat $outfile +${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | tr -d "\r" +rm -f "${isofile}" "${imgfile}" +rm -rf "${rom_directory}" +if [ x$boot = xcoreboot ]; then + rm -f "${imgfile}" +fi -rm -f ${tmpfile} ${outfile} ${cfgfile} ${isofile} ${hdafile} ${fdafile} +rm -f "${tmpfile}" "${cfgfile}" exit 0