X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=Makefile;h=f3b46a5f02ddebc2e0141445425ddfe54ae9dea3;hp=c5e751b105fd0529b58d4dbaafa89db16fee7c5d;hb=HEAD;hpb=752525a7feb16e02b759ca7811fc9a0276712c3d

diff --git a/Makefile b/Makefile
index c5e751b..f3b46a5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
-VERSION = 1.3.14
+VERSION = 1.3.17
 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars
@@ -15,12 +15,11 @@ 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
+# Load kernel and ramdisk at as low as possible
 KERNELADDR	= 0x00000000
 
 # Set this to the prefix of your cross-compiler, if you have one.
@@ -35,12 +34,14 @@ 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}${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)
+YBCFLAGS += -Werror -fdiagnostics-show-option
 YBCFLAGS += -I ./include
+YBCFLAGS += -fno-strict-aliasing
 
 ifeq ($(CONFIG_COLOR_TEXT),y)
 YBCFLAGS += -DCONFIG_COLOR_TEXT
@@ -64,7 +65,7 @@ endif
 
 # Link flags
 #
-LFLAGS = -Ttext $(TEXTADDR) -Bstatic
+LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
 
 # Libraries
 #
@@ -73,6 +74,7 @@ LLIBS = -lext2fs
 # For compiling userland utils
 #
 UCFLAGS = -Os $(CFLAGS) -Wall -I/usr/include
+UCFLAGS += -Werror -fdiagnostics-show-option
 
 # For compiling build-tools that run on the host.
 #
@@ -83,7 +85,9 @@ 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/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)
@@ -99,7 +103,7 @@ OBJS += second/fs_reiserfs.o
 endif
 
 # compilation
-lgcc = `$(CC) -print-libgcc-file-name`
+lgcc = `$(CC) -m32 -print-libgcc-file-name`
 
 all: yaboot addnote mkofboot