Force yaboot to always build 32-bit.

[yaboot.git] / Makefile

diff --git a/Makefile b/Makefile
index e8f62ad34a7da4419463dc22a4317478a3ca3638..44cec276ae12238a378175bd4be6553b33319125 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ GETROOT = fakeroot
 # We use fixed addresses to avoid overlap when relocating
 # and other trouble with initrd
 
-# Load the bootstrap at 2Mb
-TEXTADDR       = 0x200000
+# Load the bootstrap at 1Mb
+TEXTADDR       = 0x100000
 # Malloc block of 1MB
 MALLOCSIZE     = 0x100000
 # Load kernel and ramdisk at as low as possible
@@ -34,7 +34,7 @@ OBJCOPY               := $(CROSS)objcopy
 
 # The flags for the yaboot binary.
 #
-YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -m32 -print-file-name=include` -fsigned-char
+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)
@@ -84,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)