X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=Makefile;h=bff8ffe82cd738716cedf233702b5f89ad9f7452;hp=4c35c6758111650976534d149e67210da48fa205;hb=038b8b3919c801b7065a9ec3f5aee5ea9653b5d9;hpb=a01ba048668c5a7e5efa2aa41eeb0a3ed374a63a

diff --git a/Makefile b/Makefile
index 4c35c67..bff8ffe 100644
--- 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
@@ -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.
@@ -35,8 +34,8 @@ OBJCOPY		:= $(CROSS)objcopy
 
 # The flags for the yaboot binary.
 #
-YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -m32 -print-file-name=include` -fsigned-char
-YBCFLAGS += -DVERSION=\"${VERSION}${VERSIONEXTRA}\"	#"
+YBCFLAGS = -Os -m32 $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -m32 -print-file-name=include` -fsigned-char
+YBCFLAGS += -DVERSION="\"${VERSION}${VERSIONEXTRA}\""
 YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
 YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)
 YBCFLAGS += -DKERNELADDR=$(KERNELADDR)
@@ -85,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)