2 files changed, 12 insertions(+), 1 deletions(-)

M Makefile.am
M grub-core/Makefile.core.def

@@ 425,7 425,7 @@ if COND_i386_coreboot
 FS_PAYLOAD_MODULES ?= $(shell cat grub-core/fs.lst)
 default_payload.elf: grub-mkstandalone grub-mkimage FORCE
 	test -f $@ && rm $@ || true
-	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(FS_PAYLOAD_MODULES) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
+	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux mezzano search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(FS_PAYLOAD_MODULES) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
 endif
 
 endif

@@ 1594,6 1594,17 @@ module = {
 };
 
 module = {
+  name = mezzano;
+  common = mezzano/loader/mezzano.c;
+  common = mezzano/kboot-grub.c;
+  x86 = mezzano/arch/x86/loader/mezzano.c;
+  x86 = mezzano/arch/x86/loader/mezzano_enter.S;
+  x86 = mezzano/arch/x86/descriptor.c;
+  x86 = mezzano/arch/x86/mmu.c;
+  x86_cppflags = '-Wno-error=unused-parameter -include $(srcdir)/mezzano/kboot-grub.h -I$(srcdir)/mezzano/arch/x86/include -I$(srcdir)/mezzano/include';
+};
+
+module = {
   name = gzio;
   common = io/gzio.c;
 };