Allocate kernel and ramdisk as low as possible

[yaboot.git] / Makefile

diff --git a/Makefile b/Makefile
index fe2f2fd38ad5174f35b1280a746455b3412e78bf..e8f62ad34a7da4419463dc22a4317478a3ca3638 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
-VERSION = 1.3.14
+VERSION = 1.3.16
 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars
@@ -17,10 +17,9 @@ GETROOT = fakeroot
 
 # Load the bootstrap at 2Mb
 TEXTADDR       = 0x200000
-# Malloc block at 3Mb -> 4Mb
-MALLOCADDR     = 0x300000
+# Malloc block of 1MB
 MALLOCSIZE     = 0x100000
-# Load kernel and ramdisk at real-base.  If there is overlap, will retry until find open space
+# Load kernel and ramdisk at as low as possible
 KERNELADDR     = 0x00000000
 
 # Set this to the prefix of your cross-compiler, if you have one.
@@ -83,7 +82,8 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/include
 
 OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \
        second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \
-       second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
+       second/fs_of.o second/fs_ext2.o second/fs_iso.o second/fs_swap.o \
+       second/iso_util.o \
        lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
 
 ifeq ($(USE_MD5_PASSWORDS),y)