X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=Makefile;h=f54997782d5a6ff1189b4177ef4c0eff911ae125;hp=d975e4ed9b2b2f8fe191e433f229d116a684a9c9;hb=f7a364631f2a8975ecca56668a19ee0a66c1ddcd;hpb=1f0f86b8e9cb113674bec055c2d0f182a28a5bd2

diff --git a/Makefile b/Makefile
index d975e4e..f549977 100644
--- a/Makefile
+++ b/Makefile
@@ -15,13 +15,12 @@ GETROOT = fakeroot
 # We use fixed addresses to avoid overlap when relocating
 # and other trouble with initrd
 
-# Load the bootstrap at 2Mb
-TEXTADDR	= 0x200000
-# Malloc block at 3Mb -> 4Mb
-MALLOCADDR	= 0x300000
+# Load the bootstrap at 1Mb
+TEXTADDR	= 0x100000
+# Malloc block of 1MB
 MALLOCSIZE	= 0x100000
-# Load kernel and ramdisk at real-base.  If there is overlap, will retry until find open space
-KERNELADDR	= 0x00C00000
+# Load kernel and ramdisk at as low as possible
+KERNELADDR	= 0x00000000
 
 # Set this to the prefix of your cross-compiler, if you have one.
 # Else leave it empty.
@@ -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)