Changeset 98a4e76 in mainline


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

centralize configuration data
use a header file for passing most of the configuration directives

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    rfa024ce r98a4e76  
    11#
    22# Copyright (c) 2006 Ondrej Palkovsky
     3# Copyright (c) 2009 Martin Decky
    34# All rights reserved.
    45#
    … …  
    7576
    7677
     78## Mapping between platform and kernel architecture
     79
     80% Kernel architecture
     81@ "amd64"
     82! [PLATFORM=amd64] KARCH (choice)
     83
     84% Kernel architecture
     85@ "arm32"
     86! [PLATFORM=arm32] KARCH (choice)
     87
     88% Kernel architecture
     89@ "ia32"
     90! [PLATFORM=ia32] KARCH (choice)
     91
     92% Kernel architecture
     93@ "ia32xen"
     94! [PLATFORM=ia32xen] KARCH (choice)
     95
     96% Kernel architecture
     97@ "ia64"
     98! [PLATFORM=ia64] KARCH (choice)
     99
     100% Kernel architecture
     101@ "mips32"
     102! [PLATFORM=mips32] KARCH (choice)
     103
     104% Kernel architecture
     105@ "ppc32"
     106! [PLATFORM=ppc32] KARCH (choice)
     107
     108% Kernel architecture
     109@ "ppc64"
     110! [PLATFORM=ppc64] KARCH (choice)
     111
     112% Kernel architecture
     113@ "sparc64"
     114! [PLATFORM=sparc64] KARCH (choice)
     115
     116
     117## Mapping between platform and user space architecture
     118
     119% User space architecture
     120@ "amd64"
     121! [PLATFORM=amd64] UARCH (choice)
     122
     123% User space architecture
     124@ "arm32"
     125! [PLATFORM=arm32] UARCH (choice)
     126
     127% User space architecture
     128@ "ia32"
     129! [PLATFORM=ia32|PLATFORM=ia32xen] UARCH (choice)
     130
     131% User space architecture
     132@ "ia64"
     133! [PLATFORM=ia64] UARCH (choice)
     134
     135% User space architecture
     136@ "mips32"
     137! [PLATFORM=mips32&(MACHINE=msim|MACHINE=simics|MACHINE=lgxemul)] UARCH (choice)
     138
     139% User space architecture
     140@ "mips32eb"
     141! [PLATFORM=mips32&(MACHINE=bgxemul)] UARCH (choice)
     142
     143% User space architecture
     144@ "ppc32"
     145! [PLATFORM=ppc32] UARCH (choice)
     146
     147% User space architecture
     148@ "ppc64"
     149! [PLATFORM=ppc64] UARCH (choice)
     150
     151% User space architecture
     152@ "sparc64"
     153! [PLATFORM=sparc64] UARCH (choice)
     154
     155
     156## Mapping between platform and boot architecture
     157
     158% Boot architecture
     159@ "amd64"
     160! [PLATFORM=amd64] BARCH (choice)
     161
     162% Boot architecture
     163@ "arm32"
     164! [PLATFORM=arm32] BARCH (choice)
     165
     166% Boot architecture
     167@ "ia32"
     168! [PLATFORM=ia32] BARCH (choice)
     169
     170% Boot architecture
     171@ "ia32xen"
     172! [PLATFORM=ia32xen] BARCH (choice)
     173
     174% Boot architecture
     175@ "ia64"
     176! [PLATFORM=ia64] BARCH (choice)
     177
     178% Boot architecture
     179@ "mips32"
     180! [PLATFORM=mips32] BARCH (choice)
     181
     182% Boot architecture
     183@ "ppc32"
     184! [PLATFORM=ppc32] BARCH (choice)
     185
     186% Boot architecture
     187@ "ppc64"
     188! [PLATFORM=ppc64] BARCH (choice)
     189
     190% Boot architecture
     191@ "sparc64"
     192! [PLATFORM=sparc64] BARCH (choice)
     193
     194
     195## Mapping between platform and image format
     196
     197% Image format
     198@ "binary"
     199! [PLATFORM=mips32&MACHINE=msim] IMAGE (choice)
     200
     201% Image format
     202@ "ecoff"
     203! [PLATFORM=mips32&(MACHINE=simics|MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)
     204
     205
    77206## Compiler options
    78207
    … …  
    108237
    109238
     239## Kernel configuration
     240
     241% Fences
     242! [PLATFORM=ia32&(MACHINE=athlon-xp|MACHINE=athlon-mp|MACHINE=pentium3)] CONFIG_FENCES_P3 (y)
     243
     244% Fences
     245! [(PLATFORM=ia32&(MACHINE=pentium4|MACHINE=core))|PLATFORM=amd64] CONFIG_FENCES_P4 (y)
     246
     247% ACPI support
     248! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_ACPI (y)
     249
     250% Hierarchical page tables support
     251! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y)
     252
     253% Page hash table support
     254! [PLATFORM=ia64|PLATFORM=sparc64] CONFIG_PAGE_HT (y)
     255
     256% i8042 controller support
     257! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=ia64&MACHINE=i460GX)] CONFIG_I8042 (y)
     258
     259% Sun keyboard support
     260! [PLATFORM=sparc64] CONFIG_SUN_KBD (y)
     261
     262% EGA support
     263! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=ia64&MACHINE=i460GX)] CONFIG_EGA (y)
     264
     265% Software integer division support
     266! [PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
     267
     268% ASID support
     269! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
     270
     271% ASID FIFO support
     272! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
     273
     274% OpenFirmware tree support
     275! [PLATFORM=sparc64] CONFIG_OFW_TREE (y)
     276
     277% FPU support
     278! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64|(PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul))] CONFIG_FPU (y)
     279
     280
    110281## Kernel features options
    111282
    112283% Support for SMP
    113 ! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64] CONFIG_SMP (y/n)
     284! [(PLATFORM=ia32&MACHINE!=athlon-xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64] CONFIG_SMP (y/n)
    114285
    115286% Improved support for hyperthreading
    116 ! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
     287! [((PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3)|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
    117288
    118289% Simics BIOS AP boot fix
    … …  
    120291
    121292% Lazy FPU context switching
    122 ! [(PLATFORM=mips32&MACHINE!=msim&MACHINE!=simics)|PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU_LAZY (y/n)
     293! [CONFIG_FPU=y] CONFIG_FPU_LAZY (y/n)
    123294
    124295% Use VHPT
    … …  
    134305! [PLATFORM=sparc64|(PLATFORM=ia64&MACHINE!=ski)] CONFIG_NS16550 (n/y)
    135306
     307% IOSapic on default address support
     308! [PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)
     309
     310% Interrupt-driven driver for Legacy Keyboard
     311! [CONFIG_NS16550=n&CONFIG_IOSAPIC=y&MACHINE!=ski] CONFIG_I8042_INTERRUPT_DRIVEN (y/n)
     312
     313% Interrupt-driven driver for NS16550
     314! [CONFIG_NS16550=y&((PLATFORM!=ia64)|CONFIG_IOSAPIC=y)&MACHINE!=ski] CONFIG_NS16550_INTERRUPT_DRIVEN (y/n)
     315
    136316% Support for Serengeti console
    137317! [PLATFORM=sparc64] CONFIG_SGCN (y/n)
    138318
    139 % IOSapic on default address support
    140 ! [PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)
    141 
    142 % Interrupt-driven driver for Legacy Keyboard
    143 ! [CONFIG_NS16550=n&CONFIG_IOSAPIC=y&MACHINE!=ski] CONFIG_I8042_INTERRUPT_DRIVEN (y/n)
    144 
    145 % Interrupt-driven driver for NS16550
    146 ! [CONFIG_NS16550=y&((PLATFORM!=ia64)|CONFIG_IOSAPIC=y)&MACHINE!=ski] CONFIG_NS16550_INTERRUPT_DRIVEN (y/n)
    147 
    148319% Virtually indexed D-cache support
    149320! [PLATFORM=sparc64] CONFIG_VIRT_IDX_DCACHE (y/n)
    … …  
    175346% Framebuffer support
    176347! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|(PLATFORM=ia32)|(PLATFORM=amd64)|(PLATFORM=arm32)|(PLATFORM=sparc64&MACHINE=us3)] CONFIG_FB (y/n)
     348
     349% Framebuffer support
     350! [PLATFORM=ppc32|(PLATFORM=sparc64&MACHINE=us)] CONFIG_FB (y)
    177351
    178352% Framebuffer width

  • Makefile

    rfa024ce r98a4e76  
    3232-include Makefile.config
    3333
    34 ## Setup platform configuration
    35 #
    36 
    37 ifeq ($(PLATFORM),amd64)
    38         KARCH = amd64
    39         UARCH = amd64
    40         BARCH = amd64
    41 endif
    42 
    43 ifeq ($(PLATFORM),arm32)
    44         KARCH = arm32
    45         UARCH = arm32
    46         BARCH = arm32
    47 endif
    48 
    49 ifeq ($(PLATFORM),ia32)
    50         KARCH = ia32
    51         UARCH = ia32
    52         BARCH = ia32
    53 endif
    54 
    55 ifeq ($(PLATFORM),ia64)
    56         KARCH = ia64
    57         UARCH = ia64
    58         BARCH = ia64
    59 endif
    60 
    61 ifeq ($(PLATFORM),mips32)
    62         KARCH = mips32
    63         BARCH = mips32
    64        
    65         ifeq ($(MACHINE),msim)
    66                 UARCH = mips32
    67                 IMAGE = binary
    68         endif
    69        
    70         ifeq ($(MACHINE),simics)
    71                 UARCH = mips32
    72                 IMAGE = ecoff
    73         endif
    74        
    75         ifeq ($(MACHINE),bgxemul)
    76                 UARCH = mips32eb
    77                 IMAGE = ecoff
    78         endif
    79        
    80         ifeq ($(MACHINE),lgxemul)
    81                 UARCH = mips32
    82                 IMAGE = ecoff
    83         endif
    84 endif
    85 
    86 ifeq ($(PLATFORM),ppc32)
    87         KARCH = ppc32
    88         UARCH = ppc32
    89         BARCH = ppc32
    90 endif
    91 
    92 ifeq ($(PLATFORM),ppc64)
    93         KARCH = ppc64
    94         UARCH = ppc64
    95         BARCH = ppc64
    96 endif
    97 
    98 ifeq ($(PLATFORM),sparc64)
    99         KARCH = sparc64
    100         UARCH = sparc64
    101         BARCH = sparc64
    102 endif
    103 
    104 ifeq ($(PLATFORM),ia32xen)
    105         KARCH = ia32xen
    106         UARCH = ia32
    107         BARCH = ia32xen
    108 endif
    109 
    11034.PHONY: all build config distclean clean cscope
    11135
    … …  
    11438        $(MAKE) -C . build
    11539
    116 build: Makefile.config
    117         $(MAKE) -C kernel ARCH=$(KARCH)
    118         $(MAKE) -C uspace ARCH=$(UARCH)
    119         $(MAKE) -C boot ARCH=$(BARCH) IMAGE=$(IMAGE)
     40build: Makefile.config config.h config.defs
     41        $(MAKE) -C kernel
     42        $(MAKE) -C uspace
     43        $(MAKE) -C boot
    12044
    12145config: HelenOS.config
    … …  
    12347
    12448distclean: clean
    125         rm -f Makefile.config tools/*.pyc
     49        rm -f Makefile.config config.h config.defs tools/*.pyc
    12650
    12751clean:
    128         -$(MAKE) -C kernel clean ARCH=$(KARCH)
    129         -$(MAKE) -C uspace clean ARCH=$(UARCH)
    130         -$(MAKE) -C boot clean ARCH=$(BARCH) IMAGE=$(IMAGE)
     52        -$(MAKE) -C kernel clean
     53        -$(MAKE) -C uspace clean
     54        -$(MAKE) -C boot clean
    13155
    13256cscope:

  • kernel/Makefile

    rfa024ce r98a4e76  
    3333include ../version
    3434-include ../Makefile.config
     35-include ../config.defs
    3536
    3637INCLUDES = generic/include
    3738OPTIMIZATION = 3
    3839
     40ifndef CROSS_PREFIX
     41        CROSS_PREFIX = /usr/local
     42endif
     43
    3944## Common compiler flags
    4045#
    4146
    42 DEFS = -D$(ARCH) -DARCH=\"$(ARCH)\" -DRELEASE=\"$(RELEASE)\" "-DNAME=\"$(NAME)\"" \
    43         -DKERNEL
    44 
    45 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) \
     47DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
     48
     49GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
    4650        -fno-builtin -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
    4751        -nostdlib -nostdinc -pipe
    4852
    49 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) \
     53ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
    5054        -fno-builtin -Wall -Wmissing-prototypes -Werror \
    5155        -nostdlib -nostdinc \
    … …  
    5963AFLAGS =
    6064
    61 ifdef REVISION
    62         DEFS += "-DREVISION=\"$(REVISION)\""
    63 endif
    64 
    65 ifdef TIMESTAMP
    66         DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    67 endif
    68 
    69 -include arch/$(ARCH)/Makefile.inc
     65-include arch/$(KARCH)/Makefile.inc
    7066-include genarch/Makefile.inc
    7167
    … …  
    8480#
    8581SYMTAB_SECTION=".section symtab.data, \"a\", $(ATSIGN)progbits;"
    86 
    87 ## Setup kernel configuration
    88 #
    89 ifeq ($(CONFIG_DEBUG),y)
    90         DEFS += -DCONFIG_DEBUG
    91 endif
    92 
    93 ifeq ($(CONFIG_LOG),y)
    94         DEFS += -DCONFIG_LOG
    95 endif
    96 
    97 ifeq ($(CONFIG_KCONSOLE),y)
    98         DEFS += -DCONFIG_KCONSOLE
    99 endif
    100 
    101 ifeq ($(CONFIG_DEBUG_SPINLOCK),y)
    102         DEFS += -DCONFIG_DEBUG_SPINLOCK
    103 endif
    104 
    105 ifeq ($(CONFIG_DEBUG_AS_WATCHPOINT),y)
    106         DEFS += -DCONFIG_DEBUG_AS_WATCHPOINT
    107 endif
    108 
    109 ifeq ($(CONFIG_FPU_LAZY),y)
    110         DEFS += -DCONFIG_FPU_LAZY
    111 endif
    112 
    113 ifeq ($(CONFIG_DEBUG_ALLREGS),y)
    114         DEFS += -DCONFIG_DEBUG_ALLREGS
    115 endif
    116 
    117 ifeq ($(CONFIG_VHPT),y)
    118         DEFS += -DCONFIG_VHPT
    119 endif
    120 
    121 ifeq ($(CONFIG_TSB),y)
    122         DEFS += -DCONFIG_TSB
    123 endif
    124 
    125 ifeq ($(CONFIG_Z8530),y)
    126         DEFS += -DCONFIG_Z8530
    127 endif
    128 
    129 ifeq ($(CONFIG_NS16550),y)
    130         DEFS += -DCONFIG_NS16550
    131 endif
    132 
    133 ifeq ($(CONFIG_I8042_INTERRUPT_DRIVEN),y)
    134         DEFS += -DCONFIG_I8042_INTERRUPT_DRIVEN
    135 endif
    136 
    137 ifeq ($(CONFIG_NS16550_INTERRUPT_DRIVEN),y)
    138         DEFS += -DCONFIG_NS16550_INTERRUPT_DRIVEN
    139 endif
    140 
    141 ifeq ($(CONFIG_IOSAPIC),y)
    142         DEFS += -DCONFIG_IOSAPIC
    143 endif
    144 
    145 ifeq ($(CONFIG_VIRT_IDX_DCACHE),y)
    146         DEFS += -DCONFIG_VIRT_IDX_DCACHE
    147 endif
    148 
    149 ifeq ($(CONFIG_FB),y)
    150         ifeq ($(ARCH),ia32)
    151                 DEFS += -DCONFIG_VESA_WIDTH=$(CONFIG_VESA_WIDTH)
    152                 DEFS += -DCONFIG_VESA_HEIGHT=$(CONFIG_VESA_HEIGHT)
    153                 DEFS += -DCONFIG_VESA_BPP=$(CONFIG_VESA_BPP)
    154         endif
    155        
    156         ifeq ($(ARCH),amd64)
    157                 DEFS += -DCONFIG_VESA_WIDTH=$(CONFIG_VESA_WIDTH)
    158                 DEFS += -DCONFIG_VESA_HEIGHT=$(CONFIG_VESA_HEIGHT)
    159                 DEFS += -DCONFIG_VESA_BPP=$(CONFIG_VESA_BPP)
    160         endif
    161        
    162         ifeq ($(ARCH),ia32xen)
    163                 DEFS += -DCONFIG_VESA_WIDTH=$(CONFIG_VESA_WIDTH)
    164                 DEFS += -DCONFIG_VESA_HEIGHT=$(CONFIG_VESA_HEIGHT)
    165                 DEFS += -DCONFIG_VESA_BPP=$(CONFIG_VESA_BPP)
    166         endif
    167 endif
    168 
    169 ifeq ($(CONFIG_UDEBUG),y)
    170         DEFS += -DCONFIG_UDEBUG
    171 endif
    17282
    17383## Simple detection for the type of the host system
    … …  
    195105        LIBDIR = /usr/lib
    196106        CFLAGS = $(GCC_CFLAGS)
     107        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    197108endif
    198109
    … …  
    206117        LIBDIR = /usr/lib
    207118        CFLAGS = $(ICC_CFLAGS)
     119        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    208120endif
    209121
    … …  
    217129        LIBDIR = /usr/lib
    218130        CFLAGS = $(SUNCC_CFLAGS)
     131        DEFS += $(CONFIG_DEFS)
     132        DEPEND_DEFS = $(DEFS)
    219133endif
    220134
    … …  
    228142        LIBDIR = $(TOOLCHAIN_DIR)/lib
    229143        CFLAGS = $(GCC_CFLAGS)
     144        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    230145endif
    231146
    … …  
    326241
    327242ifeq ($(CONFIG_TEST),y)
    328         DEFS += -DCONFIG_TEST
    329243        CFLAGS += -Itest/
    330244        GENERIC_SOURCES += \
    … …  
    335249                test/debug/mips1.c \
    336250                test/fault/fault1.c \
    337                 test/fpu/fpu1.c \
    338                 test/fpu/sse1.c \
    339                 test/fpu/mips2.c \
    340251                test/mm/falloc1.c \
    341252                test/mm/falloc2.c \
    … …  
    354265                test/thread/thread1.c \
    355266                test/sysinfo/sysinfo1.c
     267       
     268        ifeq ($(CONFIG_FPU),y)
     269                ifeq ($(KARCH),ia32)
     270                        TEST_FPU1 = y
     271                        TEST_SSE1 = y
     272                endif
     273               
     274                ifeq ($(KARCH),amd64)
     275                        TEST_FPU1 = y
     276                        TEST_SSE1 = y
     277                endif
     278               
     279                ifeq ($(KARCH),ia64)
     280                        TEST_FPU1 = y
     281                endif
     282               
     283                ifeq ($(KARCH),mips32)
     284                        TEST_MIPS2 = y
     285                endif
     286        endif
     287       
     288        ifeq ($(TEST_FPU1),y)
     289                GENERIC_SOURCES += test/fpu/fpu1.c
     290        else
     291                GENERIC_SOURCES += test/fpu/fpu1_skip.c
     292        endif
     293       
     294        ifeq ($(TEST_SSE1),y)
     295                GENERIC_SOURCES += test/fpu/sse1.c
     296        else
     297                GENERIC_SOURCES += test/fpu/sse1_skip.c
     298        endif
     299       
     300        ifeq ($(TEST_MIPS2),y)
     301                GENERIC_SOURCES += test/fpu/mips2.c
     302        else
     303                GENERIC_SOURCES += test/fpu/mips2_skip.c
     304        endif
     305       
    356306endif
    357307
    … …  
    362312.PHONY: all build clean archlinks depend disasm
    363313
    364 all: ../Makefile.config
     314all: ../Makefile.config ../config.h ../config.defs
    365315        -rm Makefile.depend
    366316        $(MAKE) -C . build
    … …  
    371321
    372322clean:
    373         -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump kernel.disasm generic/src/debug/real_map.bin Makefile.depend* generic/include/arch generic/include/genarch arch/$(ARCH)/_link.ld
     323        -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump kernel.disasm generic/src/debug/real_map.bin Makefile.depend* generic/include/arch generic/include/genarch arch/$(KARCH)/_link.ld
    374324        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
    375325        for arch in arch/* ; do \
    … …  
    378328
    379329archlinks:
    380         ln -sfn ../../arch/$(ARCH)/include/ generic/include/arch
     330        ln -sfn ../../arch/$(KARCH)/include/ generic/include/arch
    381331        ln -sfn ../../genarch/include/ generic/include/genarch
    382332
    383333depend: archlinks
    384         -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
    385 
    386 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     334        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
     335
     336arch/$(KARCH)/_link.ld: arch/$(KARCH)/_link.ld.in
    387337        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
    388338
    389 generic/src/debug/real_map.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
     339generic/src/debug/real_map.bin: depend arch/$(KARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
    390340        echo $(SYMTAB_SECTION) | $(AS) $(AFLAGS) -o generic/src/debug/empty_map.o
    391         $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/empty_map.o  -o $@ -Map kernel.map.pre
     341        $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/empty_map.o  -o $@ -Map kernel.map.pre
    392342        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
    393343        tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin
    … …  
    395345        # on architectures, that have bss after symtab
    396346        echo $(SYMTAB_SECTION)" .incbin \"$@\"" | $(AS) $(AFLAGS) -o generic/src/debug/sizeok_map.o
    397         $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
     347        $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
    398348        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
    399349        tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin
    … …  
    402352        echo $(SYMTAB_SECTION)" .incbin \"$<\"" | $(AS) $(AFLAGS) -o $@
    403353
    404 kernel.raw: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o
    405         $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/real_map.o -o $@ -Map kernel.map
     354kernel.raw: depend arch/$(KARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o
     355        $(LD) -T arch/$(KARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/real_map.o -o $@ -Map kernel.map
    406356
    407357kernel.bin: kernel.raw

  • version

    rfa024ce r98a4e76  
     1#
     2# Copyright (c) 2006 Martin Decky
     3# All rights reserved.
     4#
     5# Redistribution and use in source and binary forms, with or without
     6# modification, are permitted provided that the following conditions
     7# are met:
     8#
     9# - Redistributions of source code must retain the above copyright
     10#   notice, this list of conditions and the following disclaimer.
     11# - Redistributions in binary form must reproduce the above copyright
     12#   notice, this list of conditions and the following disclaimer in the
     13#   documentation and/or other materials provided with the distribution.
     14# - The name of the author may not be used to endorse or promote products
     15#   derived from this software without specific prior written permission.
     16#
     17# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     18# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     19# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
     20# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
     21# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
     22# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     23# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     24# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     25# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     26# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     27#
     28
     29## This file defines the release information of HelenOS.
     30#
     31# The release string RELEASE consists of three or four components
     32# (version, patch level, sublevel and optionally an extra level).
     33#
     34# The NAME string is the code name of the given release.
     35#
     36
    137VERSION = 0
    238PATCHLEVEL = 3
    339SUBLEVEL = 0
    4 #EXTRAVERSION = 0
    5 NAME = Tartare
    640
    741ifdef EXTRAVERSION
    … …  
    1044        RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
    1145endif
     46
     47NAME = Tartare
Note: See TracChangeset for help on using the changeset viewer.