X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=Makefile;h=c5e751b105fd0529b58d4dbaafa89db16fee7c5d;hp=14ee5973034996ad8205367b082c94fb90018b61;hb=66ffb9d32d2acb3613594ef492d341b5bacf02e5;hpb=58096e43b6efd2fb51e81866fff9660b70d5df64

diff --git a/Makefile b/Makefile
index 14ee597..c5e751b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,8 @@ TEXTADDR	= 0x200000
 # Malloc block at 3Mb -> 4Mb
 MALLOCADDR	= 0x300000
 MALLOCSIZE	= 0x100000
-# Load kernel at 20Mb and ramdisk just after
-KERNELADDR	= 0x01400000
+# Load kernel and ramdisk at real-base.  If there is overlap, will retry until find open space
+KERNELADDR	= 0x00000000
 
 # Set this to the prefix of your cross-compiler, if you have one.
 # Else leave it empty.
@@ -36,7 +36,7 @@ OBJCOPY		:= $(CROSS)objcopy
 # The flags for the yaboot binary.
 #
 YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -print-file-name=include` -fsigned-char
-YBCFLAGS += -DVERSION=\"${VERSION}\"	#"
+YBCFLAGS += -DVERSION=\"${VERSION}${VERSIONEXTRA}\"	#"
 YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
 YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)
 YBCFLAGS += -DKERNELADDR=$(KERNELADDR)