X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=inline;f=Makefile;h=b46165fc08ec6dcfcbc59deff0f5bfcc4b35d14f;hb=57e24de52a1318edb9f253f9c3199772567998b1;hp=78184a0ccc6b701c537fbe4f258cdb2df1b150dd;hpb=b5f28817d6d68c2cb2a3e5eaefe4633b085557b6;p=yaboot.git

diff --git a/Makefile b/Makefile
index 78184a0..b46165f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +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
+# 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.
@@ -84,6 +84,7 @@ 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/fs_swap.o \
 	second/iso_util.o \
+	lib/nonstd.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)