Parse the subnetmask from bootpath and DHCP options

[yaboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 5457dc98d426b628bdba63bff8da32eae37139a9..bcc221049eebf52568db26a8265455661d697e45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ TEXTADDR      = 0x200000
 MALLOCADDR     = 0x300000
 MALLOCSIZE     = 0x100000
 # Load kernel and ramdisk at real-base.  If there is overlap, will retry until find open space
 MALLOCADDR     = 0x300000
 MALLOCSIZE     = 0x100000
 # Load kernel and ramdisk at real-base.  If there is overlap, will retry until find open space

-KERNELADDR     = 0x00000000
+KERNELADDR     = 0x00C00000

 
 # Set this to the prefix of your cross-compiler, if you have one.
 # Else leave it empty.
 
 # Set this to the prefix of your cross-compiler, if you have one.
 # Else leave it empty.


@@ -35,8 +35,8 @@ OBJCOPY               := $(CROSS)objcopy
 
 # The flags for the yaboot binary.
 #
 
 # The flags for the yaboot binary.
 #

-YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -print-file-name=include` -fsigned-char
-YBCFLAGS += -DVERSION=\"${VERSION}\"   #"
+YBCFLAGS = -Os $(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 += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
 YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)
 YBCFLAGS += -DKERNELADDR=$(KERNELADDR)


@@ -64,7 +64,7 @@ endif
 
 # Link flags
 #
 
 # Link flags
 #

-LFLAGS = -Ttext $(TEXTADDR) -Bstatic
+LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux

 
 # Libraries
 #
 
 # Libraries
 #


@@ -99,7 +99,7 @@ OBJS += second/fs_reiserfs.o
 endif
 
 # compilation
 endif
 
 # compilation

-lgcc = `$(CC) -print-libgcc-file-name`
+lgcc = `$(CC) -m32 -print-libgcc-file-name`

 
 all: yaboot addnote mkofboot
 
 
 all: yaboot addnote mkofboot