X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=Makefile;h=78184a0ccc6b701c537fbe4f258cdb2df1b150dd;hp=bcc221049eebf52568db26a8265455661d697e45;hb=b5f28817d6d68c2cb2a3e5eaefe4633b085557b6;hpb=5a103124cb1e8a2e503663e55f6fe7da4a398d24 diff --git a/Makefile b/Makefile index bcc2210..78184a0 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 @@ -17,8 +17,7 @@ GETROOT = fakeroot # Load the bootstrap at 2Mb TEXTADDR = 0x200000 -# Malloc block at 3Mb -> 4Mb -MALLOCADDR = 0x300000 +# 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 @@ -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)