yaboot-1.3.17

[yaboot.git] / Makefile

diff --git a/Makefile b/Makefile
index bff91eb2c67dcfd246af10daf79ba1f743c2a1f3..f3b46a5f02ddebc2e0141445425ddfe54ae9dea3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
 
 include Config
 

-VERSION = 1.3.6
+VERSION = 1.3.17

 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars
 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars


@@ -15,27 +15,33 @@ GETROOT = fakeroot
 # We use fixed addresses to avoid overlap when relocating
 # and other trouble with initrd
 
 # 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
 MALLOCSIZE     = 0x100000

-# Load kernel at 20Mb and ramdisk just after
-KERNELADDR     = 0x01400000
+# Load kernel and ramdisk at as low as possible
+KERNELADDR     = 0x00000000

 
 # 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.
 #

-CROSS = 
+CROSS =
+
+CC             := $(CROSS)gcc
+LD             := $(CROSS)ld
+AS             := $(CROSS)as
+OBJCOPY                := $(CROSS)objcopy

 
 # The flags for the yaboot binary.
 #
 
 # The flags for the yaboot binary.
 #

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

+YBCFLAGS += -Werror -fdiagnostics-show-option

 YBCFLAGS += -I ./include
 YBCFLAGS += -I ./include

+YBCFLAGS += -fno-strict-aliasing

 
 ifeq ($(CONFIG_COLOR_TEXT),y)
 YBCFLAGS += -DCONFIG_COLOR_TEXT
 
 ifeq ($(CONFIG_COLOR_TEXT),y)
 YBCFLAGS += -DCONFIG_COLOR_TEXT


@@ -59,15 +65,16 @@ endif
 
 # Link flags
 #
 
 # Link flags
 #

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

 
 # Libraries
 #
 
 # Libraries
 #

-LLIBS = lib/libext2fs.a
+LLIBS = -lext2fs

 
 # For compiling userland utils
 #
 UCFLAGS = -Os $(CFLAGS) -Wall -I/usr/include
 
 # 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.
 #
 
 # For compiling build-tools that run on the host.
 #


@@ -78,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 \
 
 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)
        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)


@@ -94,12 +103,7 @@ OBJS += second/fs_reiserfs.o
 endif
 
 # compilation
 endif
 
 # compilation

-CC             := $(CROSS)gcc
-LD             := $(CROSS)ld
-AS             := $(CROSS)as
-OBJCOPY                := $(CROSS)objcopy
-
-lgcc = `$(CC) -print-libgcc-file-name`
+lgcc = `$(CC) -m32 -print-libgcc-file-name`

 
 all: yaboot addnote mkofboot
 
 
 all: yaboot addnote mkofboot
 


@@ -111,7 +115,7 @@ addnote:
        $(CC) $(UCFLAGS) -o util/addnote util/addnote.c
 
 elfextract:
        $(CC) $(UCFLAGS) -o util/addnote util/addnote.c
 
 elfextract:

-       $(HOSTCC) $(HOSTCFLAGS) -o util/elfextract util/elfextract.c
+       $(CC) $(UCFLAGS) -o util/elfextract util/elfextract.c

 
 mkofboot:
        ln -sf ybin ybin/mkofboot
 
 mkofboot:
        ln -sf ybin ybin/mkofboot


@@ -148,19 +152,25 @@ bindist: all
 
 clean:
        rm -f second/yaboot util/addnote util/elfextract $(OBJS)
 
 clean:
        rm -f second/yaboot util/addnote util/elfextract $(OBJS)

-       find . -name '#*' | xargs rm -f
-       find . -name '.#*' | xargs rm -f
-       find . -name '*~' | xargs rm -f
-       find . -name '*.swp' | xargs rm -f
+       find . -not -path './\{arch\}*' -name '#*' | xargs rm -f
+       find . -not -path './\{arch\}*' -name '.#*' | xargs rm -f
+       find . -not -path './\{arch\}*' -name '*~' | xargs rm -f
+       find . -not -path './\{arch\}*' -name '*.swp' | xargs rm -f
+       find . -not -path './\{arch\}*' -name ',,*' | xargs rm -rf

        -gunzip man/*.gz
        rm -rf man.deb
        -gunzip man/*.gz
        rm -rf man.deb

-       chmod 755 ybin/ybin ybin/ofpath ybin/yabootconfig
-       chmod -R u+rwX,go=rX .
-       chmod a-w COPYING

 
 cleandocs:
        make -C doc clean
 
 
 cleandocs:
        make -C doc clean
 

+## removes arch revision control crap, only to be called for making
+## release tarballs.  arch should have a export command like cvs...
+
+archclean:
+       rm -rf '{arch}'
+       find . -type d -name .arch-ids | xargs rm -rf
+       rm -f 0arch-timestamps0
+

 maintclean: clean cleandocs
 
 release: docs bindist clean
 maintclean: clean cleandocs
 
 release: docs bindist clean


@@ -204,7 +214,7 @@ install: all strip
        @echo
        @echo "Installation successful."
        @echo
        @echo
        @echo "Installation successful."
        @echo

-       @echo "An example /etc/yaboot.conf has been installed (unless /etc/yaboot.conf already existed"
+       @echo "An example /etc/yaboot.conf has been installed (unless /etc/yaboot.conf already existed)"

        @echo "You may either alter that file to match your system, or alternatively run yabootconfig"
        @echo "yabootconfig will generate a simple and valid /etc/yaboot.conf for your system"
        @echo
        @echo "You may either alter that file to match your system, or alternatively run yabootconfig"
        @echo "yabootconfig will generate a simple and valid /etc/yaboot.conf for your system"
        @echo