Changeset fa024ce in mainline


Ignore:
Timestamp:
2009-02-12T20:12:08Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
98a4e76
Parents:
fcd7053
Message:

simplify configuration

Location:
boot
Files:
1 added
22 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    rfcd7053 rfa024ce  
    3131
    3232-include ../Makefile.config
     33-include ../config.defs
    3334
    3435## Paths
    … …  
    3940USPACEDIR = $(BASE)/uspace
    4041
    41 ifeq ($(CONFIG_DEBUG),y)
    42         DEFS += -DCONFIG_DEBUG
    43 endif
    44 
    45 ifeq ($(CONFIG_BAT),y)
    46         DEFS += -DCONFIG_BAT
    47 endif
    48 
    49 ifeq ($(CONFIG_AP),y)
    50         DEFS += -DCONFIG_AP
    51 endif
    52 
    5342.PHONY: all build clean generic_clean
    5443
    55 all: ../Makefile.config build
     44all: ../Makefile.config ../config.h ../config.defs build
    5645
    57 -include arch/$(ARCH)/Makefile.inc
     46-include arch/$(BARCH)/Makefile.inc
    5847
    5948generic_clean:

  • boot/arch/amd64/Makefile.inc

    rfcd7053 rfa024ce  
    5858build: $(BASE)/image.iso
    5959
    60 $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
    61         mkdir -p arch/$(ARCH)/iso/boot/grub
    62         cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
     60$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
     61        mkdir -p arch/$(BARCH)/iso/boot/grub
     62        cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/
    6363ifneq ($(RDFMT),tmpfs)
    64         cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
     64        cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
    6565endif
    6666ifneq ($(RDFMT),fat)
    67         cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
     67        cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
    6868endif
    69         cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
     69        cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
    7070        for task in $(INIT_TASKS) ; do \
    71                 cp $$task arch/$(ARCH)/iso/boot/ ; \
     71                cp $$task arch/$(BARCH)/iso/boot/ ; \
    7272        done
    7373        for file in $(RD_SRVS) ; do \
    … …  
    7878        done
    7979ifeq ($(RDFMT),tmpfs)
    80         $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
     80        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
    8181endif
    8282ifeq ($(RDFMT),fat)
    83         $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
     83        $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
    8484endif
    85         $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
    86         rm arch/$(ARCH)/iso/boot/initrd.fs
    87         mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
     85        $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img
     86        rm arch/$(BARCH)/iso/boot/initrd.fs
     87        mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(BARCH)/iso/
    8888
    8989clean:
    … …  
    9494                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
    9595        done
    96         -rm -fr arch/$(ARCH)/iso
     96        -rm -fr arch/$(BARCH)/iso
    9797        -rm -f $(BASE)/image.iso

  • boot/arch/arm32/Makefile.inc

    rfcd7053 rfa024ce  
    2929build: $(BASE)/image.boot
    3030
    31 $(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
    32         cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
     31$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
     32        cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
    3333
    3434depend:
    35         -rm arch/$(ARCH)/loader/image.boot
     35        -rm arch/$(BARCH)/loader/image.boot
    3636
    37 arch/$(ARCH)/loader/image.boot:
    38         make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
     37arch/$(BARCH)/loader/image.boot:
     38        make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    3939
    4040clean:
    41         make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
     41        make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    4242        -rm -f $(BASE)/image.boot

  • boot/arch/arm32/loader/Makefile

    rfcd7053 rfa024ce  
    2828
    2929include ../../../../version
    30 include ../../../../Makefile.config
     30-include ../../../../Makefile.config
    3131
    3232## Toolchain configuration
    … …  
    5858endif
    5959
    60 CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../.. -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
    61 
    62 ifdef REVISION
    63         CFLAGS += "-DREVISION=\"$(REVISION)\""
    64 endif
    65 
    66 ifdef TIMESTAMP
    67         CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    68 endif
    69 
    70 ifdef MACHINE
    71         CFLAGS += "-DMACHINE=$(MACHINE)"
    72 endif
     60CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../.. -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
    7361
    7462SOURCES = \

  • boot/arch/arm32/loader/main.c

    rfcd7053 rfa024ce  
    3636
    3737
    38 #include "main.h" 
     38#include "main.h"
    3939#include "asm.h"
    4040#include "_components.h"
    4141#include <printf.h>
     42#include <macros.h>
    4243
    4344#include "mm.h"
    … …  
    4748
    4849
    49 char *release = RELEASE;
     50char *release = STRING(RELEASE);
    5051
    5152#ifdef REVISION
    52         char *revision = ", revision " REVISION;
     53        char *revision = ", revision " STRING(REVISION);
    5354#else
    5455        char *revision = "";
    … …  
    5657
    5758#ifdef TIMESTAMP
    58         char *timestamp = "\nBuilt on " TIMESTAMP;
     59        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
    5960#else
    6061        char *timestamp = "";

  • boot/arch/ia32/Makefile.inc

    rfcd7053 rfa024ce  
    5757build: $(BASE)/image.iso
    5858
    59 $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
    60         mkdir -p arch/$(ARCH)/iso/boot/grub
    61         cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
     59$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
     60        mkdir -p arch/$(BARCH)/iso/boot/grub
     61        cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/
    6262ifneq ($(RDFMT),tmpfs)
    63         cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
     63        cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
    6464endif
    6565ifneq ($(RDFMT),fat)
    66         cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
     66        cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
    6767endif
    68         cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
     68        cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
    6969        for task in $(INIT_TASKS) ; do \
    70                 cp $$task arch/$(ARCH)/iso/boot/ ; \
     70                cp $$task arch/$(BARCH)/iso/boot/ ; \
    7171        done
    7272        for file in $(RD_SRVS) ; do \
    … …  
    7777        done
    7878ifeq ($(RDFMT),tmpfs)
    79         $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
     79        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
    8080endif
    8181ifeq ($(RDFMT),fat)
    82         $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
     82        $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
    8383endif
    84         $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
    85         rm arch/$(ARCH)/iso/boot/initrd.fs
    86         mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
     84        $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img
     85        rm arch/$(BARCH)/iso/boot/initrd.fs
     86        mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(BARCH)/iso/
    8787
    8888clean:
    … …  
    9393                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
    9494        done
    95         -rm -fr arch/$(ARCH)/iso
     95        -rm -fr arch/$(BARCH)/iso
    9696        -rm -f $(BASE)/image.iso

  • boot/arch/ia64/Makefile.inc

    rfcd7053 rfa024ce  
    2727#
    2828
    29 #ifeq ($(MACHINE),ski)
    30 
    3129build: $(BASE)/image.boot
    3230
    33 $(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
    34         cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
     31$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
     32        cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
    3533
    3634depend:
    37         -rm arch/$(ARCH)/loader/image.boot
     35        -rm arch/$(BARCH)/loader/image.boot
    3836
    39 arch/$(ARCH)/loader/image.boot:
    40         make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
     37arch/$(BARCH)/loader/image.boot:
     38        make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    4139
    4240clean: generic_clean
    43         make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
     41        make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    4442        -rm -f $(BASE)/image.boot
    45 
    46 #endif
    47 

  • boot/arch/ia64/loader/Makefile

    rfcd7053 rfa024ce  
    2828
    2929include ../../../../version
    30 include ../../../../Makefile.config
     30-include ../../../../Makefile.config
    3131
    3232## Toolchain configuration
    … …  
    4848        OBJCOPY = objcopy
    4949        OBJDUMP = objdump
    50         GEFI_PREXIX =
     50        GEFI_PREFIX =
    5151endif
    5252
    … …  
    6969
    7070#-mno-pic means do not use gp + imm22 to address data
    71 CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -I../../../../kernel/generic/include -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -pipe
    72 
    73 ifdef REVISION
    74         CFLAGS += "-DREVISION=\"$(REVISION)\""
    75 endif
    76 
    77 ifdef TIMESTAMP
    78         CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    79 endif
     71CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -I../../../../kernel/generic/include -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -pipe
    8072
    8173SOURCES = \
    … …  
    131123        make -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
    132124        cp gefi/HelenOS/hello.efi ../../../../
    133 #       cp gefi/HelenOS/hello.efi /boot/efi/
    134125        cp gefi/HelenOS/image.bin ../../../../
    135126

  • boot/arch/ia64/loader/gefi/Make.defaults

    rfcd7053 rfa024ce  
    2828INSTALLROOT=/usr/local
    2929
    30 TOPDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
     30TOPDIR    := $(shell pwd)
    3131
    32 ARCH       = $(shell uname -m | sed s,i[3456789]86,ia32,)
    33 INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
     32ARCH       = ia64
     33INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
    3434CPPFLAGS   = -DCONFIG_$(ARCH)
    35 CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
    36 LDFLAGS    = -nostdlib
    37 INSTALL    = install
     35CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -frename-registers -mfixed-range=f32-f127
     36LDFLAGS    = -nostdlib
     37INSTALL    = install
    3838
    39 GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
    40 
    41 #  prefix       =
    42 CC              = $(prefix)gcc
    43 AS              = $(prefix)as
    44 LD              = $(prefix)ld
    45 AR              = $(prefix)ar
    46 RANLIB  = $(prefix)ranlib
    47 OBJCOPY = $(prefix)objcopy
    48 OBJDUMP = $(prefix)objdump
    49 
    50 
    51 ifneq ($(GCC_VERSION),2)
    52         CFLAGS += -frename-registers
    53 endif
    54 
    55 CFLAGS += -mfixed-range=f32-f127
    56 
     39CC         = $(prefix)gcc
     40AS         = $(prefix)as
     41LD         = $(prefix)ld
     42AR         = $(prefix)ar
     43RANLIB     = $(prefix)ranlib
     44OBJCOPY    = $(prefix)objcopy
     45OBJDUMP    = $(prefix)objdump

  • boot/arch/ia64/loader/gefi/Makefile

    rfcd7053 rfa024ce  
    2626SUBDIRS = lib gnuefi inc
    2727
    28 all:    check_gcc $(SUBDIRS)
     28all: $(SUBDIRS)
    2929
    3030$(SUBDIRS):
    … …  
    4040.PHONY: $(SUBDIRS) clean depend
    4141
    42 #
    43 # on both platforms you must use gcc 3.0 or higher
    44 #
    45 check_gcc:
    46 ifeq ($(GCC_VERSION),2)
    47         @echo "you need to use a version of gcc >= 3.0, you are using `$(CC) --version`"
    48         @exit 1
    49 endif
    50 
    5142include Make.rules

  • boot/arch/ia64/loader/main.c

    rfcd7053 rfa024ce  
    11/*
    22 * Copyright (c) 2005 Martin Decky
    3  * Copyright (c) 2006 Jakub Jermar 
     3 * Copyright (c) 2006 Jakub Jermar
    44 * All rights reserved.
    55 *
    … …  
    3434#include <align.h>
    3535#include <balloc.h>
     36#include <macros.h>
    3637
    3738extern bootinfo_t binfo;
    3839component_t components[COMPONENTS];
    3940
    40 char *release = RELEASE;
     41char *release = STRING(RELEASE);
    4142
    4243void write(const char *str, const int len)
    … …  
    5455
    5556#ifdef REVISION
    56         char *revision = ", revision " REVISION;
     57        char *revision = ", revision " STRING(REVISION);
    5758#else
    5859        char *revision = "";
    … …  
    6061
    6162#ifdef TIMESTAMP
    62         char *timestamp = "\nBuilt on " TIMESTAMP;
     63        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
    6364#else
    6465        char *timestamp = "";

  • boot/arch/mips32/Makefile.inc

    rfcd7053 rfa024ce  
    2929build: $(BASE)/image.boot
    3030
    31 $(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
    32         cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
     31$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
     32        cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
    3333
    3434depend:
    35         -rm arch/$(ARCH)/loader/image.boot
     35        -rm arch/$(BARCH)/loader/image.boot
    3636
    37 arch/$(ARCH)/loader/image.boot:
    38         make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
     37arch/$(BARCH)/loader/image.boot:
     38        make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    3939
    4040clean:
    41         make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
     41        make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    4242        -rm -f $(BASE)/image.boot

  • boot/arch/mips32/loader/Makefile

    rfcd7053 rfa024ce  
    2828
    2929include ../../../../version
    30 include ../../../../Makefile.config
     30-include ../../../../Makefile.config
    3131
    3232## Toolchain configuration
    … …  
    4040        LD_IN = binary
    4141endif
     42
    4243ifeq ($(IMAGE),ecoff)
    4344        LD_IN = ecoff
    4445endif
     46
    4547BFD_NAME = elf32-tradlittlemips
    4648BFD_ARCH = mips
    … …  
    6466endif
    6567
    66 CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mhard-float -mips3 -pipe
    67 
    68 ifdef REVISION
    69         CFLAGS += "-DREVISION=\"$(REVISION)\""
    70 endif
    71 
    72 ifdef TIMESTAMP
    73         CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    74 endif
     68CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mhard-float -mips3 -pipe
    7569
    7670SOURCES = \

  • boot/arch/mips32/loader/main.c

    rfcd7053 rfa024ce  
    2929#include "main.h"
    3030#include <printf.h>
     31#include <macros.h>
    3132#include "msim.h"
    3233#include "asm.h"
    … …  
    3536#define KERNEL_VIRTUAL_ADDRESS 0x80100000
    3637
    37 char *release = RELEASE;
     38char *release = STRING(RELEASE);
    3839
    3940#ifdef REVISION
    40         char *revision = ", revision " REVISION;
     41        char *revision = ", revision " STRING(REVISION);
    4142#else
    4243        char *revision = "";
    … …  
    4445
    4546#ifdef TIMESTAMP
    46         char *timestamp = "\nBuilt on " TIMESTAMP;
     47        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
    4748#else
    4849        char *timestamp = "";

  • boot/arch/ppc32/Makefile.inc

    rfcd7053 rfa024ce  
    2929build: $(BASE)/image.boot
    3030
    31 $(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
    32         cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
     31$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
     32        cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
    3333
    3434depend:
    35         -rm arch/$(ARCH)/loader/image.boot
     35        -rm arch/$(BARCH)/loader/image.boot
    3636
    37 arch/$(ARCH)/loader/image.boot:
    38         make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
     37arch/$(BARCH)/loader/image.boot:
     38        make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    3939
    4040clean: generic_clean
    41         make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
     41        make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    4242        -rm -f $(BASE)/image.boot

  • boot/arch/ppc32/loader/Makefile

    rfcd7053 rfa024ce  
    2828
    2929include ../../../../version
    30 include ../../../../Makefile.config
     30-include ../../../../Makefile.config
    3131
    3232## Toolchain configuration
    … …  
    5858endif
    5959
    60 CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=powerpc -msoft-float -m32 -pipe
    61 
    62 ifdef REVISION
    63         CFLAGS += "-DREVISION=\"$(REVISION)\""
    64 endif
    65 
    66 ifdef TIMESTAMP
    67         CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    68 endif
     60CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=powerpc -msoft-float -m32 -pipe
    6961
    7062SOURCES = \

  • boot/arch/ppc32/loader/_link.ld.in

    rfcd7053 rfa024ce  
    1 OUTPUT_FORMAT("elf32-powerpc") 
    2 OUTPUT_ARCH(powerpc:common) 
    3 ENTRY(start) 
    4  
     1OUTPUT_FORMAT("elf32-powerpc")
     2OUTPUT_ARCH(powerpc:common)
     3ENTRY(start)
     4
    55SECTIONS {
    6         .boot 0x01000000: AT (0) { 
     6        .boot 0x01000000: AT (0) {
    77                *(BOOTSTRAP);
    88                *(REALMODE);
    … …  
    1111                *(.rodata);
    1212                *(.rodata.*);
    13                 *(.data);               /* initialized data */
     13                *(.data);       /* initialized data */
    1414                *(.sdata);
    1515                *(.sdata2);
    1616                *(.sbss);
    17                 *(.bss);                /* uninitialized static variables */   
    18                 *(COMMON);              /* global variables */
     17                *(.bss);        /* uninitialized static variables */
     18                *(COMMON);      /* global variables */
    1919[[COMPONENTS]]
    2020        }

  • boot/arch/ppc32/loader/main.c

    rfcd7053 rfa024ce  
    3333#include <ofw.h>
    3434#include <align.h>
     35#include <macros.h>
    3536
    3637#define HEAP_GAP 1024000
    … …  
    7374}
    7475
    75 char *release = RELEASE;
     76char *release = STRING(RELEASE);
    7677
    7778#ifdef REVISION
    78         char *revision = ", revision " REVISION;
     79        char *revision = ", revision " STRING(REVISION);
    7980#else
    8081        char *revision = "";
    … …  
    8283
    8384#ifdef TIMESTAMP
    84         char *timestamp = "\nBuilt on " TIMESTAMP;
     85        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
    8586#else
    8687        char *timestamp = "";

  • boot/arch/sparc64/Makefile.inc

    rfcd7053 rfa024ce  
    2929TMP = distroot
    3030
    31 ifeq ($(CONFIG_AOUT_ISOFS_B),n)
    32         SILO_PACKAGE=silo.patched.tar.gz
    33 endif
    34 
    3531ifeq ($(CONFIG_AOUT_ISOFS_B),y)
    36         SILO_PACKAGE=silo.tar.gz
     32        SILO_PACKAGE = silo.tar.gz
     33else
     34        SILO_PACKAGE = silo.patched.tar.gz
    3735endif
    3836
    3937build: $(BASE)/image.iso
    4038
    41 ifeq ($(CONFIG_RD_EXTERNAL),y)
    42 SILO_CONF_FILTER = cat
    43 else
    44 SILO_CONF_FILTER = grep -v initrd
    45 endif
    46 
    47 $(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot
     39$(BASE)/image.iso: depend arch/$(BARCH)/loader/image.boot
    4840        mkdir -p $(TMP)/boot
    4941        mkdir -p $(TMP)/HelenOS
    50         cat arch/$(ARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
    51         cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING $(TMP)/boot
    52         cat arch/$(ARCH)/silo/silo.conf | $(SILO_CONF_FILTER) >$(TMP)/boot/silo.conf
    53         cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
     42        cat arch/$(BARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
     43        cp arch/$(BARCH)/silo/README arch/$(BARCH)/silo/COPYING $(TMP)/boot
     44ifeq ($(CONFIG_RD_EXTERNAL),y)
     45        cp arch/$(BARCH)/silo/silo.conf $(TMP)/boot/silo.conf
     46else
     47        cat arch/$(BARCH)/silo/silo.conf | grep -v initrd > $(TMP)/boot/silo.conf
     48endif
     49        cp arch/$(BARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
    5450        gzip -f $(TMP)/HelenOS/image.boot
    5551ifeq ($(CONFIG_RD_EXTERNAL),y)
    56         cp arch/$(ARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
     52        cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
    5753endif
    5854        mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
    5955
    6056depend:
    61         -rm arch/$(ARCH)/loader/image.boot
     57        -rm arch/$(BARCH)/loader/image.boot
    6258
    63 arch/$(ARCH)/loader/image.boot:
    64         $(MAKE) -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
     59arch/$(BARCH)/loader/image.boot:
     60        $(MAKE) -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    6561
    6662clean: generic_clean
    67         $(MAKE) -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     63        $(MAKE) -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
    6864        -rm -fr $(TMP)
    6965        -rm -f $(BASE)/image.iso

  • boot/arch/sparc64/loader/Makefile

    rfcd7053 rfa024ce  
    2828
    2929include ../../../../version
    30 include ../../../../Makefile.config
     30-include ../../../../Makefile.config
    3131
    3232## Toolchain configuration
    … …  
    5858endif
    5959
    60 CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
    61 
    62 ifdef REVISION
    63         CFLAGS += "-DREVISION=\"$(REVISION)\""
    64 endif
    65 
    66 ifdef TIMESTAMP
    67         CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    68 endif
     60CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
    6961
    7062SOURCES = \

  • boot/arch/sparc64/loader/main.c

    rfcd7053 rfa024ce  
    3737#include "ofwarch.h"
    3838#include <align.h>
     39#include <macros.h>
    3940#include <string.h>
    4041
    … …  
    4344component_t components[COMPONENTS];
    4445
    45 char *release = RELEASE;
     46char *release = STRING(RELEASE);
    4647
    4748#ifdef REVISION
    48         char *revision = ", revision " REVISION;
     49        char *revision = ", revision " STRING(REVISION);
    4950#else
    5051        char *revision = "";
    … …  
    5253
    5354#ifdef TIMESTAMP
    54         char *timestamp = "\nBuilt on " TIMESTAMP;
     55        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
    5556#else
    5657        char *timestamp = "";

  • boot/arch/sparc64/loader/ofwarch.c

    rfcd7053 rfa024ce  
    3333 */
    3434
    35 #include <ofwarch.h> 
     35#include <ofwarch.h>
    3636#include <ofw.h>
    3737#include <printf.h>
Note: See TracChangeset for help on using the changeset viewer.