search for: mboot_make_memmap

...nfo. Signed-off-by: Sebastian Herbszt <herbszt at gmx.de> diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c index 8425e06..76ef7a0 100644 --- a/com32/mboot/mboot.c +++ b/com32/mboot/mboot.c @@ -222,6 +222,13 @@ int main(int argc, char *argv[]) /* Add auxilliary information */ mboot_make_memmap(); mboot_apm(); + + /* Set boot loader name */ + const struct syslinux_version *sv; + sv = syslinux_version(); + mbinfo.boot_loader_name = (uint32_t)sv->version_string; + mbinfo.flags |= MB_INFO_BOOT_LOADER_NAME; + if (opt.solaris) mboot_solaris_dhcp_hack(); diff --g...

...argv[]) mbinfo.flags |= MB_INFO_CMDLINE; } - /* Map auxilliary images */ + /* Map auxiliary images */ if (nmodules > 1) { if (map_modules(modules + 1, nmodules - 1)) return 1; } - /* Add auxilliary information */ + /* Add auxiliary information */ mboot_make_memmap(); mboot_apm(); mboot_syslinux_info(); diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld index 36b1a69..e8d32dd 100644 --- a/core/i386/syslinux.ld +++ b/core/i386/syslinux.ld @@ -207,7 +207,7 @@ SECTIONS xfer_buf_seg = core_xfer_buf >> 4; /* - * The auxilliary data s...

...uint32_t * dosmem) ard[1].BaseAddr = 1 << 20; ard[1].Length = oreg.ecx.w[0] << 10; ard[1].Type = 1; - return 2; + rv = 2; + goto out; } - return 1; /* ... problematic ... */ + rv = 1; /* ... problematic ... */ +out: + lfree(e820buf); + return rv; } void mboot_make_memmap(void) diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 017d6db..8d94cfe 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -28,6 +28,21 @@ MODULES = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ TESTFILES = +LDFLAGS_cpuidtest.o = $(com32)/gpllib/libco...