X-Git-Url: https://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=Makefile;h=c5e751b105fd0529b58d4dbaafa89db16fee7c5d;hp=13d101ce154780815300aae9cd81e9cfb2d1b900;hb=752525a7feb16e02b759ca7811fc9a0276712c3d;hpb=216a58f46680540da482f6fc5499b283f2e5830d

diff --git a/Makefile b/Makefile
index 13d101c..c5e751b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
-VERSION = 1.3.13
+VERSION = 1.3.14
 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars
@@ -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)