aboutsummaryrefslogtreecommitdiffstats
path: root/com32/mboot
diff options
context:
space:
mode:
Diffstat (limited to 'com32/mboot')
-rw-r--r--com32/mboot/Makefile5
-rw-r--r--com32/mboot/map.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/com32/mboot/Makefile b/com32/mboot/Makefile
index 6e010b1c..e9164369 100644
--- a/com32/mboot/Makefile
+++ b/com32/mboot/Makefile
@@ -15,11 +15,10 @@
## Multiboot module
##
-topdir = ../..
-MAKEDIR = $(topdir)/mk
+VPATH = $(SRC)
include $(MAKEDIR)/elf.mk
-LNXLIBS = ../libutil/libutil_lnx.a
+LNXLIBS = $(objdir)/com32/libutil/libutil_lnx.a
MODULES = mboot.c32
TESTFILES =
diff --git a/com32/mboot/map.c b/com32/mboot/map.c
index 99add306..84f3b20c 100644
--- a/com32/mboot/map.c
+++ b/com32/mboot/map.c
@@ -53,7 +53,7 @@ addr_t map_data(const void *data, size_t len, size_t align, int flags)
addr_t pad = (flags & MAP_NOPAD) ? 0 : -len & (align - 1);
addr_t xlen = len + pad;
- if (syslinux_memmap_find(amap, SMT_FREE, &start, &xlen, align) ||
+ if (syslinux_memmap_find_type(amap, SMT_FREE, &start, &xlen, align) ||
syslinux_add_memmap(&amap, start, len + pad, SMT_ALLOC) ||
syslinux_add_movelist(&ml, start, (addr_t) data, len) ||
(pad && syslinux_add_memmap(&mmap, start + len, pad, SMT_ZERO))) {